Merge pull request #20069 from wordpress-mobile/refactor-date-selecto…

…r-usage-in-statsviewallviewmodel Refactor the usage of the date selector in the Stats screens
wordpress-mobile · Jan 31, 2024 · 7320dcf · 7320dcf
2 parents b419c53 + 40a0457
commit 7320dcf
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 62 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
@@ -191,17 +191,17 @@ class StatsViewAllFragment : Fragment(R.layout.stats_view_all_fragment) {
     }
 
     private fun StatsViewAllFragmentBinding.setupObservers(activity: FragmentActivity) {
-        viewModel.isRefreshing.observe(viewLifecycleOwner, {
+        viewModel.isRefreshing.observe(viewLifecycleOwner) {
             it?.let { isRefreshing ->
                 swipeToRefreshHelper.isRefreshing = isRefreshing
             }
-        })
+        }
 
-        viewModel.showSnackbarMessage.observeEvent(viewLifecycleOwner, { holder ->
+        viewModel.showSnackbarMessage.observeEvent(viewLifecycleOwner) { holder ->
             showSnackbar(activity, holder)
-        })
+        }
 
-        viewModel.data.observe(viewLifecycleOwner, {
+        viewModel.data.observe(viewLifecycleOwner) {
             if (it != null) {
                 with(statsListFragment) {
                     recyclerView.visibility = if (it is Success) View.VISIBLE else View.GONE
@@ -214,41 +214,44 @@ class StatsViewAllFragment : Fragment(R.layout.stats_view_all_fragment) {
                         is Success -> {
                             loadData(recyclerView, prepareLayout(it.data, it.type))
                         }
+
                         is Loading -> {
                             loadData(loadingRecyclerView, prepareLayout(it.data, it.type))
                         }
+
                         is Error -> {
                             errorView.statsErrorView.button.setOnClickListener {
                                 viewModel.onRetryClick()
                             }
                         }
+
                         is EmptyBlock -> {
                         }
                     }
                 }
             }
-        })
-        viewModel.navigationTarget.observeEvent(viewLifecycleOwner, { target ->
+        }
+        viewModel.navigationTarget.observeEvent(viewLifecycleOwner) { target ->
             navigator.navigate(activity, target)
-        })
+        }
 
-        viewModel.dateSelectorData.observe(viewLifecycleOwner, { dateSelectorUiModel ->
+        viewModel.dateSelectorData.observe(viewLifecycleOwner) { dateSelectorUiModel ->
             statsListFragment.drawDateSelector(dateSelectorUiModel)
-        })
+        }
 
-        viewModel.navigationTarget.observeEvent(viewLifecycleOwner, { target ->
+        viewModel.navigationTarget.observeEvent(viewLifecycleOwner) { target ->
             navigator.navigate(activity, target)
-        })
+        }
 
-        viewModel.selectedDate.observe(viewLifecycleOwner, { event ->
+        viewModel.selectedDate?.observe(viewLifecycleOwner) { event ->
             if (event != null) {
                 viewModel.onDateChanged()
             }
-        })
+        }
 
-        viewModel.toolbarHasShadow.observe(viewLifecycleOwner, { hasShadow ->
+        viewModel.toolbarHasShadow.observe(viewLifecycleOwner) { hasShadow ->
             appBarLayout.showShadow(hasShadow == true)
-        })
+        }
     }
 
     private fun showSnackbar(

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt
@@ -20,8 +20,8 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDa
 import org.wordpress.android.ui.stats.refresh.utils.StatsDateSelector
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.ui.utils.UiString.UiStringRes
-import org.wordpress.android.util.mapSafe
 import org.wordpress.android.util.mapNullable
+import org.wordpress.android.util.mapSafe
 import org.wordpress.android.util.throttle
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
@@ -31,14 +31,14 @@ class StatsViewAllViewModel(
     val bgDispatcher: CoroutineDispatcher,
     val useCase: BaseStatsUseCase<*, *>,
     private val statsSiteProvider: StatsSiteProvider,
-    private val dateSelector: StatsDateSelector,
+    private val dateSelector: StatsDateSelector?,
     @StringRes val title: Int
 ) : ScopedViewModel(mainDispatcher) {
-    val selectedDate = dateSelector.selectedDate
+    val selectedDate = dateSelector?.selectedDate
 
-    val dateSelectorData: LiveData<DateSelectorUiModel> = dateSelector.dateSelectorData.mapNullable {
+    val dateSelectorData: LiveData<DateSelectorUiModel> = dateSelector?.dateSelectorData?.mapNullable {
         it ?: DateSelectorUiModel(false)
-    }
+    } ?:  MutableLiveData(DateSelectorUiModel(false))
 
     val navigationTarget: LiveData<Event<NavigationTarget>> = useCase.navigationTarget
 
@@ -62,12 +62,12 @@ class StatsViewAllViewModel(
     fun start(startDate: SelectedDate?) {
         launch {
             startDate?.let {
-                dateSelector.start(startDate)
+                dateSelector?.start(startDate)
             }
             loadData(refresh = false, forced = false)
-            dateSelector.updateDateSelector()
+            dateSelector?.updateDateSelector()
         }
-        dateSelector.updateDateSelector()
+        dateSelector?.updateDateSelector()
     }
 
     @SuppressLint("NullSafeMutableLiveData")
@@ -109,13 +109,13 @@ class StatsViewAllViewModel(
 
     fun onNextDateSelected() {
         launch(mainDispatcher) {
-            dateSelector.onNextDateSelected()
+            dateSelector?.onNextDateSelected()
         }
     }
 
     fun onPreviousDateSelected() {
         launch(mainDispatcher) {
-            dateSelector.onPreviousDateSelected()
+            dateSelector?.onPreviousDateSelected()
         }
     }
 
@@ -131,7 +131,7 @@ class StatsViewAllViewModel(
         }
     }
 
-    fun getSelectedDate(): SelectedDate {
-        return dateSelector.getSelectedDate()
+    fun getSelectedDate(): SelectedDate? {
+        return dateSelector?.getSelectedDate()
     }
 }
diff --git a/...ress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt b/...ress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
@@ -30,7 +30,6 @@ import org.wordpress.android.ui.stats.StatsViewType.TAGS_AND_CATEGORIES
 import org.wordpress.android.ui.stats.StatsViewType.TOP_POSTS_AND_PAGES
 import org.wordpress.android.ui.stats.StatsViewType.VIDEO_PLAYS
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
-import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.INSIGHTS
 import org.wordpress.android.ui.stats.refresh.lists.detail.PostAverageViewsPerDayUseCase
 import org.wordpress.android.ui.stats.refresh.lists.detail.PostMonthsAndYearsUseCase
 import org.wordpress.android.ui.stats.refresh.lists.detail.PostRecentWeeksUseCase
@@ -66,7 +65,7 @@ class StatsViewAllViewModelFactory(
     private val bgDispatcher: CoroutineDispatcher,
     private val useCase: BaseStatsUseCase<*, *>,
     private val statsSiteProvider: StatsSiteProvider,
-    private val dateSelector: StatsDateSelector,
+    private val dateSelector: StatsDateSelector?,
     @StringRes private val titleResource: Int
 ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
@@ -92,34 +91,29 @@ class StatsViewAllViewModelFactory(
         private val statsSiteProvider: StatsSiteProvider,
         private val dateSelectorFactory: StatsDateSelector.Factory
     ) {
-        fun build(type: StatsViewType, granularity: StatsGranularity?): StatsViewAllViewModelFactory {
-            return when {
-                type == ANNUAL_STATS -> buildAnnualStatsFactory()
-                granularity == null -> buildFactory(type)
-                else -> buildFactory(type, granularity)
-            }
-        }
-
-        private fun buildFactory(type: StatsViewType, granularity: StatsGranularity): StatsViewAllViewModelFactory {
-            val (useCase, title) = getGranularUseCase(type, granularity, granularFactories)
-            return StatsViewAllViewModelFactory(
-                mainDispatcher,
-                bgDispatcher,
-                useCase,
-                statsSiteProvider,
-                dateSelectorFactory.build(granularity.toStatsSection()),
-                title
-            )
+        fun build(type: StatsViewType, granularity: StatsGranularity?) = if (type == ANNUAL_STATS) {
+            buildAnnualStatsFactory()
+        } else {
+            buildFactory(type, granularity)
         }
 
-        private fun buildFactory(type: StatsViewType): StatsViewAllViewModelFactory {
-            val (useCase, title) = getInsightsUseCase(type, insightsUseCases)
+        private fun buildFactory(type: StatsViewType, granularity: StatsGranularity?): StatsViewAllViewModelFactory {
+            val (useCase, title) = if (granularity == null) {
+                getInsightsUseCase(type, insightsUseCases)
+            } else {
+                getGranularUseCase(type, granularity, granularFactories)
+            }
+            val dateSelector = if (granularity == null) {
+                null
+            } else {
+                dateSelectorFactory.build(granularity.toStatsSection())
+            }
             return StatsViewAllViewModelFactory(
                 mainDispatcher,
                 bgDispatcher,
                 useCase,
                 statsSiteProvider,
-                dateSelectorFactory.build(INSIGHTS),
+                dateSelector,
                 title
             )
         }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
@@ -243,7 +243,7 @@ class StatsListFragment : ViewPagerFragment(R.layout.stats_list_fragment) {
             navigator.navigate(activity, target)
         }
 
-        viewModel.selectedDate.observe(viewLifecycleOwner) { event ->
+        viewModel.selectedDate?.observe(viewLifecycleOwner) { event ->
             if (event != null) {
                 viewModel.onDateChanged(event.selectedSection)
             }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
@@ -49,7 +49,7 @@ abstract class StatsListViewModel(
     defaultDispatcher: CoroutineDispatcher,
     private val statsUseCase: BaseListUseCase,
     private val analyticsTracker: AnalyticsTrackerWrapper,
-    protected val dateSelector: StatsDateSelector,
+    protected val dateSelector: StatsDateSelector?,
     popupMenuHandler: ItemPopupMenuHandler? = null,
     private val newsCardHandler: NewsCardHandler? = null,
     actionCardHandler: ActionCardHandler? = null
@@ -72,7 +72,7 @@ abstract class StatsListViewModel(
         ANNUAL_STATS(R.string.stats_insights_annual_site_stats);
     }
 
-    val selectedDate = dateSelector.selectedDate
+    val selectedDate = dateSelector?.selectedDate
 
     private val mutableNavigationTarget = MutableLiveData<Event<NavigationTarget>>()
     val navigationTarget: LiveData<Event<NavigationTarget>> = mergeNotNull(
@@ -85,9 +85,9 @@ abstract class StatsListViewModel(
         statsUseCase.data.throttle(viewModelScope, distinct = true)
     }
 
-    val dateSelectorData: LiveData<DateSelectorUiModel> = dateSelector.dateSelectorData.mapNullable {
+    val dateSelectorData: LiveData<DateSelectorUiModel> = dateSelector?.dateSelectorData?.mapNullable {
         it ?: DateSelectorUiModel(false)
-    }
+    } ?: MutableLiveData(DateSelectorUiModel(false))
 
     val typesChanged = merge(
         popupMenuHandler?.typeMoved,
@@ -115,13 +115,13 @@ abstract class StatsListViewModel(
 
     fun onNextDateSelected() {
         launch(Dispatchers.Default) {
-            dateSelector.onNextDateSelected()
+            dateSelector?.onNextDateSelected()
         }
     }
 
     fun onPreviousDateSelected() {
         launch(Dispatchers.Default) {
-            dateSelector.onPreviousDateSelected()
+            dateSelector?.onPreviousDateSelected()
         }
     }
 
@@ -138,7 +138,7 @@ abstract class StatsListViewModel(
     }
 
     fun onListSelected() {
-        dateSelector.updateDateSelector()
+        dateSelector?.updateDateSelector()
     }
 
     fun onEmptyInsightsButtonClicked() {
@@ -156,10 +156,10 @@ abstract class StatsListViewModel(
             isInitialized = true
             launch {
                 statsUseCase.loadData()
-                dateSelector.updateDateSelector()
+                dateSelector?.updateDateSelector()
             }
         }
-        dateSelector.updateDateSelector()
+        dateSelector?.updateDateSelector()
     }
 
     sealed class UiModel {

diff --git a/.../src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/DetailListViewModel.kt b/.../src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/DetailListViewModel.kt
@@ -20,6 +20,6 @@ class DetailListViewModel
 ) : StatsListViewModel(mainDispatcher, detailUseCase, analyticsTracker, dateSelectorFactory.build(DETAIL)) {
     override fun onCleared() {
         super.onCleared()
-        dateSelector.clear()
+        dateSelector?.clear()
     }
 }