Migrate SignIn to Flows

Change-Id: Ia5c8b28d837a72604790eee01e6091f30254b2ad

Author: JoseAlcerreca

mobile/src/main/java/com/google/samples/apps/iosched/ui/MainActivityViewModel.kt

@@ -53,7 +53,7 @@ class MainActivityViewModel @Inject constructor(
     private val _navigationActions = Channel<MainNavigationAction>(Channel.CONFLATED)
     val navigationActions = _navigationActions.receiveAsFlow()
 
-    val pinnedSessionsJson: StateFlow<String> = currentUserInfoFlow.transformLatest { user ->
+    val pinnedSessionsJson: StateFlow<String> = userInfo.transformLatest { user ->
         val uid = user?.getUid()
         if (uid != null) {
             loadPinnedSessionsUseCase(uid).collect { result ->
@@ -66,7 +66,7 @@ class MainActivityViewModel @Inject constructor(
         }
     }.stateIn(viewModelScope, WhileViewSubscribed, "")
 
-    val canSignedInUserDemoAr: StateFlow<Boolean> = currentUserInfoFlow.transformLatest {
+    val canSignedInUserDemoAr: StateFlow<Boolean> = userInfo.transformLatest {
         val result = loadArDebugFlagUseCase(Unit)
         if (result is Result.Success) {
             emit(result.data)
@@ -89,7 +89,7 @@ class MainActivityViewModel @Inject constructor(
     }.stateIn(viewModelScope, WhileViewSubscribed, null)
 
     fun onProfileClicked() {
-        if (isSignedIn()) {
+        if (isUserSignedInValue) {
             _navigationActions.tryOffer(MainNavigationAction.OpenSignOut)
         } else {
             _navigationActions.tryOffer(MainNavigationAction.OpenSignIn)

mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/FeedFragment.kt

@@ -171,7 +171,7 @@ class FeedFragment : MainNavigationFragment() {
             val countdownViewBinder = CountdownViewBinder()
             val momentViewBinder = MomentViewBinder(
                 eventListener = model,
-                userInfoLiveData = model.currentUserInfo,
+                userInfo = model.userInfo,
                 themeLiveData = model.theme
             )
             val sessionsViewBinder = FeedSessionsViewBinder(model)

mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/FeedHeaderViewBinders.kt

@@ -22,7 +22,6 @@ import android.view.ViewGroup
 import android.widget.Button
 import androidx.core.view.isVisible
 import androidx.databinding.BindingAdapter
-import androidx.lifecycle.LiveData
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.google.android.material.button.MaterialButton
 import com.google.samples.apps.iosched.R
@@ -63,14 +62,14 @@ class CountdownViewBinder : FeedItemViewBinder<CountdownItem, CountdownViewHolde
 // A Moment may be shown during or after the conference based on the current time
 class MomentViewBinder(
     private val eventListener: FeedEventListener,
-    private val userInfoLiveData: LiveData<AuthenticatedUserInfo?>,
+    private val userInfo: StateFlow<AuthenticatedUserInfo?>,
     private val themeLiveData: StateFlow<Theme>
 ) : FeedItemViewBinder<Moment, MomentViewHolder>(Moment::class.java) {
 
     override fun createViewHolder(parent: ViewGroup): MomentViewHolder {
         val binding =
             ItemFeedMomentBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return MomentViewHolder(binding, eventListener, userInfoLiveData, themeLiveData)
+        return MomentViewHolder(binding, eventListener, userInfo, themeLiveData)
     }
 
     override fun bindViewHolder(model: Moment, viewHolder: MomentViewHolder) {
@@ -88,15 +87,15 @@ class MomentViewBinder(
 class MomentViewHolder(
     private val binding: ItemFeedMomentBinding,
     private val eventListener: FeedEventListener,
-    private val userInfoLiveData: LiveData<AuthenticatedUserInfo?>,
+    private val userInfo: StateFlow<AuthenticatedUserInfo?>,
     private val themeLiveData: StateFlow<Theme>
 ) : ViewHolder(binding.root) {
 
     fun bind(item: Moment) {
         binding.executeAfter {
             moment = item
             theme = themeLiveData
-            userInfo = userInfoLiveData
+            userInfo = userInfo
             eventListener = this@MomentViewHolder.eventListener
         }
     }

mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/FeedViewModel.kt

@@ -129,7 +129,7 @@ class FeedViewModel @Inject constructor(
     val timeZoneId = timeZoneIdFlow.asLiveData()
 
     private val loadSessionsResult: StateFlow<Result<List<UserSession>>> =
-        signInViewModelDelegate.observeUserId()
+        signInViewModelDelegate.userId
             .flatMapLatest {
                 // TODO(jdkoren): might need to show sessions for not signed in users too...
                 loadStarredAndReservedSessionsUseCase(it)
@@ -186,7 +186,7 @@ class FeedViewModel @Inject constructor(
         combine(
             feedSessionsContainer,
             conferenceState,
-            signInViewModelDelegate.currentUserInfoFlow
+            signInViewModelDelegate.userInfo
         ) { sessionsContainer: FeedSessions,
             conferenceState: ConferenceState,
             userInfo: AuthenticatedUserInfo?

mobile/src/main/java/com/google/samples/apps/iosched/ui/map/MapFragment.kt

@@ -36,7 +36,6 @@ import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import com.google.android.gms.maps.MapView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -53,6 +52,7 @@ import com.google.samples.apps.iosched.util.slideOffsetToAlpha
 import com.google.samples.apps.iosched.widget.BottomSheetBehavior
 import com.google.samples.apps.iosched.widget.BottomSheetBehavior.BottomSheetCallback
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.threeten.bp.Instant
 import javax.inject.Inject
@@ -154,12 +154,11 @@ class MapFragment : MainNavigationFragment() {
             setupProfileMenuItem(mainActivityViewModel, this@MapFragment)
 
             menu.findItem(R.id.action_my_location)?.let { item ->
-                viewModel.showMyLocationOption.observe(
-                    viewLifecycleOwner,
-                    Observer { option ->
-                        item.isVisible = (option == true)
+                viewLifecycleOwner.lifecycleScope.launchWhenStarted {
+                    viewModel.showMyLocationOption.collect { option ->
+                        item.isVisible = option
                     }
-                )
+                }
             }
             setOnMenuItemClickListener { item ->
                 if (item.itemId == R.id.action_my_location) {

mobile/src/main/java/com/google/samples/apps/iosched/ui/map/MapViewModel.kt

@@ -38,9 +38,10 @@ import com.google.samples.apps.iosched.shared.result.Event
 import com.google.samples.apps.iosched.shared.result.successOr
 import com.google.samples.apps.iosched.shared.result.updateOnSuccess
 import com.google.samples.apps.iosched.ui.signin.SignInViewModelDelegate
-import com.google.samples.apps.iosched.util.combine
 import com.google.samples.apps.iosched.widget.BottomSheetBehavior
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -88,9 +89,9 @@ class MapViewModel @Inject constructor(
     val selectedMarkerInfo: LiveData<MarkerInfo?>
         get() = _selectedMarkerInfo
 
-    private val myLocationOptedIn = MutableLiveData<Boolean>()
+    private val myLocationOptedIn = MutableStateFlow<Boolean>(false)
 
-    val showMyLocationOption = currentUserInfo.combine(myLocationOptedIn) { info, optedIn ->
+    val showMyLocationOption = userInfo.combine(myLocationOptedIn) { info, optedIn ->
         // Show the button to enable "My Location" when the user is an on-site attendee and he/she
         // is not opted into the feature yet.
         info != null && info.isRegistered() && !optedIn

mobile/src/main/java/com/google/samples/apps/iosched/ui/reservation/RemoveReservationViewModel.kt

@@ -57,7 +57,7 @@ class RemoveReservationViewModel @Inject constructor(
         _sessionId.value = sessionId
         loadUserSessionJob.cancelIfActive()
         loadUserSessionJob = viewModelScope.launch {
-            loadUserSessionUseCase(getUserId() to sessionId).collect { loadResult ->
+            loadUserSessionUseCase(userIdValue to sessionId).collect { loadResult ->
                 loadResult.data?.userSession?.let {
                     _userSession.value = it
                 }
@@ -66,7 +66,7 @@ class RemoveReservationViewModel @Inject constructor(
     }
 
     fun removeReservation() {
-        val userId = getUserId() ?: return
+        val userId = userIdValue ?: return
         val sessionId = _sessionId.value ?: return
         val userSession = _userSession.value
         viewModelScope.launch {

mobile/src/main/java/com/google/samples/apps/iosched/ui/schedule/ScheduleFragment.kt

@@ -39,7 +39,6 @@ import com.google.samples.apps.iosched.shared.analytics.AnalyticsActions
 import com.google.samples.apps.iosched.shared.analytics.AnalyticsHelper
 import com.google.samples.apps.iosched.shared.di.SearchScheduleEnabledFlag
 import com.google.samples.apps.iosched.shared.domain.sessions.ConferenceDayIndexer
-import com.google.samples.apps.iosched.shared.result.EventObserver
 import com.google.samples.apps.iosched.shared.util.TimeUtils
 import com.google.samples.apps.iosched.ui.MainActivityViewModel
 import com.google.samples.apps.iosched.ui.MainNavigationFragment
@@ -55,6 +54,7 @@ import com.google.samples.apps.iosched.ui.messages.setupSnackbarManager
 import com.google.samples.apps.iosched.ui.signin.NotificationsPreferenceDialogFragment
 import com.google.samples.apps.iosched.ui.signin.NotificationsPreferenceDialogFragment.Companion.DIALOG_NOTIFICATIONS_PREFERENCE
 import com.google.samples.apps.iosched.ui.signin.SignInDialogFragment
+import com.google.samples.apps.iosched.ui.signin.SignInNavigationAction.ShowNotificationPreferencesDialog
 import com.google.samples.apps.iosched.ui.signin.SignOutDialogFragment
 import com.google.samples.apps.iosched.ui.signin.setupProfileMenuItem
 import com.google.samples.apps.iosched.util.clearDecorations
@@ -66,6 +66,7 @@ import com.google.samples.apps.iosched.widget.FadingSnackbar
 import com.google.samples.apps.iosched.widget.JumpSmoothScroller
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -215,25 +216,24 @@ class ScheduleFragment : MainNavigationFragment() {
             }
         }
         viewLifecycleOwner.lifecycleScope.launchWhenStarted {
-            scheduleViewModel.navigationActions.collect {
-                when (it) {
-                    is NavigateToSession -> openSessionDetail(it.sessionId)
-                    is NavigateToSignInDialogAction -> openSignInDialog()
-                    is NavigateToSignOutDialogAction -> openSignOutDialog()
-                    is ShowScheduleUiHints -> openScheduleUiHintsDialog()
+            launch {
+                scheduleViewModel.navigationActions.collect {
+                    when (it) {
+                        is NavigateToSession -> openSessionDetail(it.sessionId)
+                        is NavigateToSignInDialogAction -> openSignInDialog()
+                        is NavigateToSignOutDialogAction -> openSignOutDialog()
+                        is ShowScheduleUiHints -> openScheduleUiHintsDialog()
+                    }
                 }
             }
-        }
-
-        // TODO: Migrate to StateFlow
-        scheduleViewModel.shouldShowNotificationsPrefAction.observe(
-            viewLifecycleOwner,
-            EventObserver {
-                if (it) {
-                    openNotificationsPreferenceDialog()
+            launch {
+                scheduleViewModel.signInNavigationActions.collect {
+                    if (it == ShowNotificationPreferencesDialog) {
+                        openNotificationsPreferenceDialog()
+                    }
                 }
             }
-        )
+        }
 
         // Show an error message
         viewLifecycleOwner.lifecycleScope.launchWhenStarted {

mobile/src/main/java/com/google/samples/apps/iosched/ui/schedule/ScheduleViewModel.kt

@@ -128,11 +128,11 @@ class ScheduleViewModel @Inject constructor(
     }
 
     // Latest user ID
-    private val userId = observeUserId().stateIn(viewModelScope, WhileViewSubscribed, null)
+    private val currentUserId = userId.stateIn(viewModelScope, WhileViewSubscribed, null)
 
     // Refresh sessions when needed and when the user changes
     private val loadSessionsResult: StateFlow<Result<LoadScheduleUserSessionsResult>> =
-        loadDataSignal.combineTransform(userId) { _, userId ->
+        loadDataSignal.combineTransform(currentUserId) { _, userId ->
             emitAll(
                 loadScheduleUserSessionsUseCase(
                     LoadScheduleUserSessionsParameters(userId)
@@ -260,7 +260,7 @@ class ScheduleViewModel @Inject constructor(
     }
 
     override fun onStarClicked(userSession: UserSession) {
-        if (!isSignedIn()) {
+        if (!isUserSignedInValue) {
             Timber.d("Showing Sign-in dialog after star click")
             _navigationActions.tryOffer(ScheduleNavigationAction.NavigateToSignInDialogAction)
             return
@@ -287,7 +287,7 @@ class ScheduleViewModel @Inject constructor(
         )
 
         viewModelScope.launch {
-            userId.value?.let {
+            currentUserId.value?.let {
                 val result = starEventUseCase(
                     StarEventParameter(
                         it,

mobile/src/main/java/com/google/samples/apps/iosched/ui/search/SearchViewModel.kt

@@ -108,7 +108,7 @@ class SearchViewModel @Inject constructor(
         // Re-execute search when signed in user changes.
         // Required because we show star / reservation status.
         viewModelScope.launch {
-            currentUserInfoFlow.collect {
+            userInfo.collect {
                 executeSearch()
             }
         }
@@ -139,7 +139,7 @@ class SearchViewModel @Inject constructor(
             delay(500)
             trace("search-path-viewmodel") {
                 searchUseCase(
-                    SessionSearchUseCaseParams(getUserId(), textQuery, filters)
+                    SessionSearchUseCaseParams(userIdValue, textQuery, filters)
                 ).collect {
                     processSearchResult(it)
                 }