adjust the position of logout observer

butterflyforever · butterflyforever · commit 303f5ada0aae · 2020-08-11T13:07:11.000-04:00
diff --git a/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/LoginFragment.kt b/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/LoginFragment.kt
@@ -20,7 +20,6 @@ import com.google.samples.quickstart.canonical.SignInViewModel.Companion.GOOGLE_
 class LoginFragment : Fragment() {
 
     private val signInVM: SignInViewModel by activityViewModels()
-    private val profileVM : ProfileViewModel by activityViewModels()
 
     private fun signIn() {
         val signInIntent = signInVM.getSignInIntent()
diff --git a/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MainActivity.kt b/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MainActivity.kt
@@ -1,11 +1,13 @@
 package com.google.samples.quickstart.canonical
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.viewModels
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.FragmentTransaction
+import androidx.lifecycle.Observer
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import java.lang.Exception
 
@@ -27,29 +29,35 @@ class MainActivity : AppCompatActivity() {
         when (item.itemId) {
 
           R.id.bottom_navigation_item_run -> {
-            supportFragmentManager
-              .beginTransaction()
-              .replace(R.id.fragment_container, RunFragment())
-              .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-              .commit()
+            if (!bottomNavigation.menu.findItem(R.id.bottom_navigation_item_run).isChecked) {
+              supportFragmentManager
+                .beginTransaction()
+                .replace(R.id.fragment_container, RunFragment())
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .commit()
+            }
             true
           }
 
           R.id.bottom_navigation_item_map -> {
-            supportFragmentManager
-              .beginTransaction()
-              .replace(R.id.fragment_container, MapsFragment())
-              .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-              .commit()
+            if (!bottomNavigation.menu.findItem(R.id.bottom_navigation_item_map).isChecked) {
+              supportFragmentManager
+                .beginTransaction()
+                .replace(R.id.fragment_container, MapsFragment())
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .commit()
+            }
             true
           }
 
           R.id.bottom_navigation_item_profile -> {
-            supportFragmentManager
-              .beginTransaction()
-              .replace(R.id.fragment_container, ProfileFragment())
-              .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-              .commit()
+            if (!bottomNavigation.menu.findItem(R.id.bottom_navigation_item_profile).isChecked) {
+              supportFragmentManager
+                .beginTransaction()
+                .replace(R.id.fragment_container, ProfileFragment())
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .commit()
+            }
             true
           }
 
@@ -62,13 +70,33 @@ class MainActivity : AppCompatActivity() {
     }
   }
 
+  private fun logoutUserObserver() {
+    val observer = Observer<Boolean> {
+      when (it) {
+        true -> {
+          Log.d("Profile", "firebaseUser is not null")
+        }
+
+        false -> {
+          Log.d("Profile", "firebaseUser is null")
+          val intent = Intent(this, MainActivity::class.java)
+          intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+          startActivity(intent)
+        }
+      }
+    }
+    // set LifeCycle owner with MainActivity. Observe will be destroyed when MainActivity is destroyed
+    signInVM.getFirebaseAuthLogStatusLiveData().observe(this, observer)
+  }
+
   private fun checkLogin() {
     when (signInVM.isLogIn()) {
       true -> {
         Log.d(MAIN_ACTIVITY_TAG, "Already login")
         setupNavigationBar()
         // Init Profile
         profileVM.initAppUser(signInVM.getFirebaseAuthCurUser()!!)
+        logoutUserObserver()
       }
 
       false -> {
diff --git a/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/ProfileFragment.kt b/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/ProfileFragment.kt
@@ -1,12 +1,10 @@
 package com.google.samples.quickstart.canonical
 
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.ImageButton
 import android.widget.ListView
 import androidx.fragment.app.Fragment
@@ -20,7 +18,6 @@ class ProfileFragment : Fragment() {
 
     private val signInVM: SignInViewModel by activityViewModels()
     private val profileVM : ProfileViewModel by activityViewModels()
-    private lateinit var observer : Observer<Boolean>
     private lateinit var binding : FragmentProfileBinding
 
     private fun downloadPhotoAndSetView(view: View) {
@@ -40,29 +37,6 @@ class ProfileFragment : Fragment() {
         runHistoryListView?.adapter = runHistoryAdapter
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        // Add login status change listener.
-        // When firebaseUser is null, signing out successfully
-        observer = Observer {
-            when (it) {
-                true -> {
-                    Log.d(PROFILE_TAG, "firebaseUser is not null")
-                }
-
-                false -> {
-                    Log.d(PROFILE_TAG, "firebaseUser is null")
-                    val intent = Intent(context, MainActivity::class.java)
-                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                    startActivity(intent)
-                }
-            }
-        }
-        // set LifeCycle owner with MeFragment. Observe will be destroyed when MeFragment is destroyed
-        signInVM.getFirebaseAuthLogStatusLiveData().observe(this, observer)
-
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -81,9 +55,15 @@ class ProfileFragment : Fragment() {
             // Sign out both Google account and Firebase
             signInVM.signOut()
         }
+        val refreshButton : ImageButton = view.findViewById(R.id.refresh_button)
+        refreshButton.setOnClickListener {
+            profileVM.refreshUser(view.findViewById<ListView>(R.id.run_history_list_view).adapter
+                    as RunHistoryAdapter)
+            downloadPhotoAndSetView(view)
+        }
+        setRunHistory()
         // update UI
         downloadPhotoAndSetView(view)
-        setRunHistory()
     }
 
     companion object {
diff --git a/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/ProfileViewModel.kt b/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/ProfileViewModel.kt
@@ -39,6 +39,9 @@ class ProfileViewModel : ViewModel() {
     private lateinit var runCollectionRef : CollectionReference
     private lateinit var curAppUser: AppUser
     private var runHistoryListForView: ArrayList<SingleRun> = ArrayList()
+    private var totalEnergyCaloriesMutableLiveDataString : MutableLiveData<String> = MutableLiveData("")
+    private var totalTimeMutableLiveDataString : MutableLiveData<String> = MutableLiveData("")
+
 
     private fun getUid() : String {
         return curAppUser.uid
@@ -51,6 +54,7 @@ class ProfileViewModel : ViewModel() {
     private fun getRunHistoryList() : ArrayList<HashMap<String, Any>> {
         val reversedRunHistory = curAppUser.runHistoryList
         reversedRunHistory.reverse()
+        Log.d(PROFILE_VM_TAG, "size ${reversedRunHistory.size}")
         return reversedRunHistory
     }
 
@@ -66,6 +70,14 @@ class ProfileViewModel : ViewModel() {
         curAppUser.totalTimeMillisecond.value = totalTimeMillisecond
     }
 
+    private fun setTotalEnergyCaloriesString() {
+        totalEnergyCaloriesMutableLiveDataString.value = curAppUser.totalEnergyCalories.value.toString()
+    }
+
+    private fun setTotalTimeString() {
+        totalTimeMutableLiveDataString.value = convertMStoStringHMS(curAppUser.totalTimeMillisecond.value ?: 0)
+    }
+
     private fun setRunHistoryList(runHistoryList : ArrayList<HashMap<String, Any>>) {
         curAppUser.runHistoryList = runHistoryList
     }
@@ -92,15 +104,22 @@ class ProfileViewModel : ViewModel() {
         return millionSeconds.div(4500)
     }
 
-    private fun syncAppUserStatistic() {
+    private fun syncAppUserStatistic(adapter: RunHistoryAdapter? = null) {
         runUserDocRef.get()
             .addOnSuccessListener {document ->
-                Log.d(PROFILE_VM_TAG, "Get doc successfully")
-                setTotalDistanceMeters(document.data!![KEY_TOTAL_DIS_M] as Long)
-                setTotalEnergyCalories(document.data!![KEY_TOTAL_EN_CAL] as Long)
-                setTotalTimeMillisecond(document.data!![KEY_TOTAL_TIME_MS] as Long)
-                setRunHistoryList(document.data!![KEY_RUN_HISTORY] as ArrayList<HashMap<String, Any>>)
-                setRunHistoryListForView()
+                if (document != null) {
+                    Log.d(PROFILE_VM_TAG, "Get doc successfully")
+                    setTotalDistanceMeters(document.data!![KEY_TOTAL_DIS_M] as Long)
+                    setTotalEnergyCalories(document.data!![KEY_TOTAL_EN_CAL] as Long)
+                    setTotalTimeMillisecond(document.data!![KEY_TOTAL_TIME_MS] as Long)
+                    setRunHistoryList(document.data!![KEY_RUN_HISTORY] as ArrayList<HashMap<String, Any>>)
+                    setRunHistoryListForView()
+                    setTotalEnergyCaloriesString()
+                    setTotalTimeString()
+                    adapter?.notifyDataSetChanged()
+                } else {
+                    Log.d(PROFILE_VM_TAG, "No such user")
+                }
             }
             .addOnFailureListener {
                 Log.w(PROFILE_VM_TAG, "Get doc Failed")
@@ -119,13 +138,12 @@ class ProfileViewModel : ViewModel() {
         return curAppUser.googleAccountProfileUrl
     }
 
-    fun getTimeHMSString() : String {
-        val ms = getTotalTimeMillisecond()
-        return ms ?.let { convertMStoStringHMS(ms) } ?: run { DEFAULT_TIME }
+    fun getTimeHMSMutableLiveData() : MutableLiveData<String> {
+        return totalTimeMutableLiveDataString
     }
 
-    fun getTotalEnergyCaloriesString() : String {
-        return curAppUser.totalEnergyCalories.value.toString()
+    fun getTotalEnergyCaloriesMutableLiveData() : MutableLiveData<String> {
+        return totalEnergyCaloriesMutableLiveDataString
     }
 
     fun getRunHistoryListForView(): ArrayList<SingleRun> {
@@ -141,37 +159,35 @@ class ProfileViewModel : ViewModel() {
         syncAppUserStatistic()
     }
 
-    fun uploadNewRecord(singleRunningTimeMillionSeconds : Long, timestamp : String) {
+    fun refreshUser(adapter: RunHistoryAdapter) {
+        syncAppUserStatistic(adapter)
+    }
 
-        val newTotalTimeMillisecond = getTotalTimeMillisecond()?.plus(
-            singleRunningTimeMillionSeconds
-        )
+    fun uploadNewRecord(singleRunningTimeMillionSeconds : Long, timestamp : String) {
 
-        val newTotalCalories = calculateCalories(newTotalTimeMillisecond ?: 0)
+        val singleRunningCalories = calculateCalories(singleRunningTimeMillionSeconds ?: 0)
 
-        Log.d(PROFILE_VM_TAG, "newTotalTimeMillisecond $newTotalTimeMillisecond")
+        Log.d(PROFILE_VM_TAG, "newTotalTimeMillisecond $singleRunningTimeMillionSeconds")
 
         val singleRunData = hashMapOf(
             KEY_SINGLE_RUN_TIME to singleRunningTimeMillionSeconds,
             KEY_SINGLE_RUN_TIMESTAMP to timestamp
         )
 
         val updateRunUserData = hashMapOf(
-            KEY_TOTAL_TIME_MS to newTotalTimeMillisecond,
-            KEY_TOTAL_EN_CAL to newTotalCalories,
+            KEY_TOTAL_TIME_MS to FieldValue.increment(singleRunningTimeMillionSeconds),
+            KEY_TOTAL_EN_CAL to FieldValue.increment(singleRunningCalories),
             KEY_RUN_HISTORY to FieldValue.arrayUnion(singleRunData)
         )
 
 
         Firebase.firestore.runBatch { batch ->
-            batch.update(runUserDocRef, updateRunUserData)
+            batch.update(runUserDocRef, updateRunUserData as Map<String, Any>)
 
         }
             .addOnSuccessListener {
                 Log.d(PROFILE_VM_TAG, "Upload record successfully")
                 syncAppUserStatistic()
-                // No need to call Adapter.notifyDataSetChanged()
-                // Each time we access profile page, just create a new one.
             }
     }
 
diff --git a/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/SignInViewModel.kt b/android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/SignInViewModel.kt
@@ -59,10 +59,7 @@ class SignInViewModel : ViewModel() {
     private fun firebaseSignOutInit() {
         Log.d(SIGN_IN_VM_TAG, "firebaseSignOutInit")
         authStateListenerForSignOut = FirebaseAuth.AuthStateListener {
-            it.currentUser ?. let {
-                Log.w(SIGN_IN_VM_TAG, "firebaseSignOut Failed")
-                Toast.makeText(context, context.getString(R.string.sign_out_failed), Toast.LENGTH_SHORT).show()
-            } ?: run {
+            it.currentUser ?: let {
                 Log.w(SIGN_IN_VM_TAG, "firebaseSignOut Succeed")
                 curFirebaseUser.value!!.firebaseUser.value = null
                 curFirebaseUser.value!!.isLogin.value = false
diff --git a/android/canonical/app/src/main/res/drawable/ic_baseline_refresh_24.xml b/android/canonical/app/src/main/res/drawable/ic_baseline_refresh_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/android/canonical/app/src/main/res/layout/fragment_profile.xml b/android/canonical/app/src/main/res/layout/fragment_profile.xml
@@ -93,7 +93,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="5dp"
                         android:fontFamily="sans-serif-light"
-                        android:text="@{profileViewModel.getTimeHMSString()}"
+                        android:text="@{profileViewModel.getTimeHMSMutableLiveData()}"
                         android:textColor="@android:color/white"
                         android:textSize="30sp" />
 
@@ -132,7 +132,7 @@
                         android:layout_marginBottom="5dp"
                         android:gravity="center"
                         android:fontFamily="sans-serif-light"
-                        android:text="@{profileViewModel.getTotalEnergyCaloriesString()}"
+                        android:text="@{profileViewModel.getTotalEnergyCaloriesMutableLiveData()}"
                         android:textColor="@android:color/white"
                         android:textSize="30sp" />
 
@@ -152,6 +152,16 @@
 
         </LinearLayout>
 
+        <ImageButton
+            android:id="@+id/refresh_button"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_margin="15dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_refresh_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <ImageButton
             android:id="@+id/logout_button"
             android:layout_width="40dp"
@@ -166,8 +176,9 @@
             android:id="@+id/run_history_list_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintVertical_weight="1"
-            app:layout_constraintTop_toBottomOf="@+id/usr_statistic_bar"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/usr_statistic_bar"
+            app:layout_constraintVertical_weight="1" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/canonical/app/src/main/res/values/strings.xml b/android/canonical/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="cannot_access_location">Cannot access location now. Please Try later</string>
     <string name="logout_button_text">Logout</string>
     <string name="sign_out_failed">SignOut Failed. Please try again.</string>
-    <string name="login_failed">Login Failed. Please try it later.</string>
+    <string name="login_failed">Login Failed. Please try it again.</string>
     <string name="total_time">TOTAL TIME</string>
     <string name="total_energy">CALORIES</string>
     <string name="usr_run_energy">240</string>
