fix:Use viewLifeCycleOwner for livedata observation. This addresses #73

droidconKE · Jan 16, 2020 · 0c39597 · 0c39597
1 parent 5ba93bd
commit 0c39597
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 77 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:theme="@style/AppTheme.NoActionBar">
 
         <activity
-            android:name="com.android254.droidconke19.HomeActivity"
+            android:name="com.android254.droidconke19.ui.home.HomeActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Launch">
             <intent-filter>

diff --git a/app/src/main/java/com/android254/droidconke19/repository/AboutDetailsRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/AboutDetailsRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.AboutDetailsModel
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query

diff --git a/app/src/main/java/com/android254/droidconke19/repository/AgendaRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/AgendaRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.AgendaModel
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query

diff --git a/app/src/main/java/com/android254/droidconke19/repository/AnnouncementRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/AnnouncementRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.Announcement
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.toObjects

diff --git a/app/src/main/java/com/android254/droidconke19/repository/EventFeedbackRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/EventFeedbackRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.UserEventFeedback
 import com.google.firebase.firestore.FirebaseFirestore
 import kotlinx.coroutines.tasks.await

diff --git a/app/src/main/java/com/android254/droidconke19/repository/EventTypeRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/EventTypeRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.EventTypeModel
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query

diff --git a/app/src/main/java/com/android254/droidconke19/repository/RoomRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/RoomRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.RoomModel
 import com.google.firebase.firestore.FirebaseFirestore
 import kotlinx.coroutines.tasks.await

diff --git a/app/src/main/java/com/android254/droidconke19/repository/SessionDataRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/SessionDataRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.SessionsModel
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreException

diff --git a/app/src/main/java/com/android254/droidconke19/repository/SessionFeedbackRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/SessionFeedbackRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.SessionsUserFeedback
 import com.google.firebase.firestore.FirebaseFirestore
 import kotlinx.coroutines.tasks.await

diff --git a/app/src/main/java/com/android254/droidconke19/repository/SessionsRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/SessionsRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.SessionsModel
 import com.android254.droidconke19.models.SpeakersModel
 import com.google.firebase.firestore.FirebaseFirestore

diff --git a/app/src/main/java/com/android254/droidconke19/repository/SpeakersRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/SpeakersRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.SpeakersModel
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.toObjects

diff --git a/app/src/main/java/com/android254/droidconke19/repository/UpdateTokenRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/UpdateTokenRepo.kt
@@ -1,7 +1,7 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.google.firebase.firestore.FirebaseFirestore
 import kotlinx.coroutines.tasks.await
 

diff --git a/app/src/main/java/com/android254/droidconke19/repository/WifiDetailsRepo.kt b/app/src/main/java/com/android254/droidconke19/repository/WifiDetailsRepo.kt
@@ -1,9 +1,9 @@
 package com.android254.droidconke19.repository
 
 import com.android254.droidconke19.datastates.FirebaseResult
-import com.android254.droidconke19.datastates.runCatching
+import com.android254.droidconke19.utils.runCatching
 import com.android254.droidconke19.models.WifiDetailsModel
-import com.android254.droidconke19.models.utils.WifiDetailsModelFactory
+import com.android254.droidconke19.utils.WifiDetailsModelFactory
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import kotlinx.coroutines.tasks.await
 

diff --git a/app/src/main/java/com/android254/droidconke19/ui/about/AboutFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/about/AboutFragment.kt
@@ -48,16 +48,16 @@ class AboutFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        aboutViewModel.getAboutDetailsResponse().observe(this, Observer { aboutDetailsList ->
+        aboutViewModel.getAboutDetailsResponse().observe(viewLifecycleOwner, Observer { aboutDetailsList ->
             handleFetchAboutDetails(aboutDetailsList)
         })
-        aboutViewModel.getFirebaseError().observe(this, Observer { firebaseError ->
+        aboutViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer { firebaseError ->
             handleDatabaseError(firebaseError)
         })
-        aboutViewModel.getOrganizersResponse().observe(this, Observer {
+        aboutViewModel.getOrganizersResponse().observe(viewLifecycleOwner, Observer {
             handleGetOrganizersResponse(it)
         })
-        aboutViewModel.getSponsorsResponse().observe(this, Observer {
+        aboutViewModel.getSponsorsResponse().observe(viewLifecycleOwner, Observer {
             handleSponsorsResponse(it)
         })
     }

diff --git a/app/src/main/java/com/android254/droidconke19/ui/agenda/AgendaFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/agenda/AgendaFragment.kt
@@ -39,10 +39,10 @@ class AgendaFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        agendaViewModel.getAgendasResponse().observe(this, Observer {
+        agendaViewModel.getAgendasResponse().observe(viewLifecycleOwner, Observer {
             handleAgendaResponse(it, agendaRv)
         })
-        agendaViewModel.getFirebaseError().observe(this, Observer {
+        agendaViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer {
             handleDatabaseError(it)
         })
     }

diff --git a/app/src/main/java/com/android254/droidconke19/ui/announcements/AnnouncementFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/announcements/AnnouncementFragment.kt
@@ -55,11 +55,11 @@ class AnnouncementFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        announcementViewModel.getAnnouncementsResponse().observe(this, Observer {
+        announcementViewModel.getAnnouncementsResponse().observe(viewLifecycleOwner, Observer {
             hideProgressBar()
             announcementAdapter.setAnnouncements(it)
         })
-        announcementViewModel.getFirebaseError().observe(this, Observer {
+        announcementViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer {
             handleError(it)
         })
 

diff --git a/app/src/main/java/com/android254/droidconke19/ui/events/EventFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/events/EventFragment.kt
@@ -44,10 +44,10 @@ class EventFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        eventTypeViewModel.getWifiDetailsResponse().observe(this, Observer {
+        eventTypeViewModel.getWifiDetailsResponse().observe(viewLifecycleOwner, Observer {
             handleFetchEventsResponse(it, eventTypesRv)
         })
-        eventTypeViewModel.getFirebaseError().observe(this, Observer {
+        eventTypeViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer {
             handleDatabaseError(it)
         })
         eventTypeViewModel.wifiDetails.observe(viewLifecycleOwner, Observer {

diff --git a/app/src/main/java/com/android254/droidconke19/ui/feedback/EventFeedbackFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/feedback/EventFeedbackFragment.kt
@@ -73,10 +73,10 @@ class EventFeedbackFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        feedBackViewModel.getEventFeedBackResponse().observe(this, Observer {
+        feedBackViewModel.getEventFeedBackResponse().observe(viewLifecycleOwner, Observer {
             handleFeedbackResponse(it)
         })
-        feedBackViewModel.getFirebaseError().observe(this, Observer {
+        feedBackViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer {
             handleDataError(it)
         })
     }

diff --git a/app/src/main/java/com/android254/droidconke19/ui/feedback/SessionFeedbackFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/feedback/SessionFeedbackFragment.kt
@@ -74,10 +74,10 @@ class SessionFeedbackFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        sessionDataViewModel.getSessionFeedBackResponse().observe(this, Observer{
+        sessionDataViewModel.getSessionFeedBackResponse().observe(viewLifecycleOwner, Observer{
             handleFeedbackResponse(it)
         })
-        sessionDataViewModel.getFirebaseError().observe(this, Observer {
+        sessionDataViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer {
             handleDatabaseError(it)
         })
 

diff --git a/...m/android254/droidconke19/HomeActivity.kt → ...d254/droidconke19/ui/home/HomeActivity.kt b/...m/android254/droidconke19/HomeActivity.kt → ...d254/droidconke19/ui/home/HomeActivity.kt
@@ -1,4 +1,4 @@
-package com.android254.droidconke19
+package com.android254.droidconke19.ui.home
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -12,6 +12,8 @@ import androidx.navigation.Navigation
 import androidx.navigation.findNavController
 import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.onNavDestinationSelected
+import com.android254.droidconke19.BuildConfig
+import com.android254.droidconke19.R
 import com.android254.droidconke19.utils.isSignedIn
 import com.android254.droidconke19.viewmodels.SessionDetailsViewModel
 import com.google.android.material.appbar.AppBarLayout
@@ -25,7 +27,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class HomeActivity : AppCompatActivity() {
-    val sharedPreferences: SharedPreferences by inject { parametersOf(this) }
+    private val sharedPreferences: SharedPreferences by inject { parametersOf(this) }
     private val firebaseRemoteConfig: FirebaseRemoteConfig by inject()
     private val firebaseMessaging: FirebaseMessaging by inject()
     private val firebaseAuth: FirebaseAuth by inject()

diff --git a/app/src/main/java/com/android254/droidconke19/ui/sessiondetails/SessionDetailsFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/sessiondetails/SessionDetailsFragment.kt
@@ -138,7 +138,7 @@ class SessionDetailsFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        sessionDetailsViewModel.getReserveSeatResponse().observe(this, Observer {
+        sessionDetailsViewModel.getReserveSeatResponse().observe(viewLifecycleOwner, Observer {
             handleReserveSeatResponse(it)
         })
     }

diff --git a/app/src/main/java/com/android254/droidconke19/ui/sessions/SessionDayFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/sessions/SessionDayFragment.kt
@@ -68,10 +68,10 @@ class SessionDayFragment : Fragment() {
     }
 
     private fun observeLiveData() {
-        sessionsViewModel.getSessionsResponse().observe(this, Observer { sessionList ->
+        sessionsViewModel.getSessionsResponse().observe(viewLifecycleOwner, Observer { sessionList ->
             updateAdapterWithList(sessionList)
         })
-        sessionsViewModel.getFirebaseError().observe(this, Observer { databaseError ->
+        sessionsViewModel.getFirebaseError().observe(viewLifecycleOwner, Observer { databaseError ->
             handleError(databaseError)
         })
     }

diff --git a/app/src/main/java/com/android254/droidconke19/ui/venuemap/MapFragment.kt b/app/src/main/java/com/android254/droidconke19/ui/venuemap/MapFragment.kt
@@ -117,8 +117,8 @@ class MapFragment : Fragment(), OnMapReadyCallback {
 
         //collapse bottom sheet
         view.collapseBottomSheetImg.setOnClickListener {
-            when {
-                bottomSheetBehavior?.state == BottomSheetBehavior.STATE_EXPANDED -> bottomSheetBehavior?.state = BottomSheetBehavior.STATE_COLLAPSED
+            when (bottomSheetBehavior?.state) {
+                BottomSheetBehavior.STATE_EXPANDED -> bottomSheetBehavior?.state = BottomSheetBehavior.STATE_COLLAPSED
             }
         }
 

diff --git a/app/src/main/java/com/android254/droidconke19/ui/widget/BottomNavigationBehaviour.kt b/app/src/main/java/com/android254/droidconke19/ui/widget/BottomNavigationBehaviour.kt
diff --git a/...54/droidconke19/datastates/RunCatching.kt → ...roid254/droidconke19/utils/RunCatching.kt b/...54/droidconke19/datastates/RunCatching.kt → ...roid254/droidconke19/utils/RunCatching.kt
@@ -1,5 +1,6 @@
-package com.android254.droidconke19.datastates
+package com.android254.droidconke19.utils
 
+import com.android254.droidconke19.datastates.FirebaseResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 

diff --git a/...e19/models/utils/WifiDetailsModelUtils.kt → ...oidconke19/utils/WifiDetailsModelUtils.kt b/...e19/models/utils/WifiDetailsModelUtils.kt → ...oidconke19/utils/WifiDetailsModelUtils.kt
@@ -1,4 +1,4 @@
-package com.android254.droidconke19.models.utils
+package com.android254.droidconke19.utils
 
 import com.android254.droidconke19.models.WifiDetailsModel
 import com.android254.droidconke19.models.isPropertiesNotEmpty

diff --git a/app/src/main/res/layout/home_fragment_content.xml b/app/src/main/res/layout/home_fragment_content.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:background="@color/colorWhite"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.android254.droidconke19.HomeActivity"
+    tools:context="com.android254.droidconke19.ui.home.HomeActivity"
     tools:showIn="@layout/activity_home">