Merge Insights management to develop

RELEASE-NOTES.txt

@@ -5,6 +5,7 @@
 * Added ability to toggle to compact view type for blog posts list
 * Fixed several bugs on the blog posts screen
 * Fixed bug that prevented audio playing in the reader
+* New Insights Management for selecting the most relevant stats
 
 12.3
 -----

WordPress/src/main/AndroidManifest.xml

@@ -288,9 +288,13 @@
             android:theme="@style/Calypso.NoActionBar" />
         <activity
             android:name=".ui.stats.refresh.StatsViewAllActivity"
-            android:label="@string/stats"
             android:launchMode="singleTop"
             android:theme="@style/Calypso.NoActionBar" />
+        <activity
+            android:name=".ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity"
+            android:label="@string/stats_manage_insights"
+            android:launchMode="singleTop"
+            android:theme="@style/CalypsoTheme" />
         <activity
             android:name=".ui.stats.refresh.lists.detail.StatsDetailActivity"
             android:label="@string/stats"

WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java

@@ -12,6 +12,7 @@
 import org.wordpress.android.ui.stats.refresh.StatsViewAllFragment;
 import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment;
 import org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailFragment;
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementFragment;
 import org.wordpress.android.util.wizard.WizardManager;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatusLiveData;
@@ -38,6 +39,9 @@ public static NewsService provideLocalNewsService(Context context) {
     @ContributesAndroidInjector
     abstract StatsViewAllFragment contributeStatsViewAllFragment();
 
+    @ContributesAndroidInjector
+    abstract InsightsManagementFragment contributeInsightsManagementFragment();
+
     @ContributesAndroidInjector
     abstract StatsFragment contributeStatsFragment();
 

WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java

@@ -19,6 +19,7 @@
 import org.wordpress.android.ui.stats.refresh.lists.MonthsListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.WeeksListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.YearsListViewModel;
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.detail.DetailListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailViewModel;
 import org.wordpress.android.viewmodel.ViewModelFactory;
@@ -132,6 +133,11 @@ abstract class ViewModelModule {
     @ViewModelKey(StatsViewModel.class)
     abstract ViewModel statsViewModel(StatsViewModel viewModel);
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(InsightsManagementViewModel.class)
+    abstract ViewModel insightsManagementViewModel(InsightsManagementViewModel viewModel);
+
     @Binds
     @IntoMap
     @ViewModelKey(HistoryViewModel.class)

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -74,6 +74,7 @@
 import org.wordpress.android.ui.stats.models.StatsPostModel;
 import org.wordpress.android.ui.stats.refresh.StatsActivity;
 import org.wordpress.android.ui.stats.refresh.StatsViewAllFragment;
+import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity;
 import org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailActivity;
 import org.wordpress.android.ui.stockmedia.StockMediaPickerActivity;
 import org.wordpress.android.ui.themes.ThemeBrowserActivity;
@@ -312,6 +313,11 @@ public static void viewAllGranularStats(Context context, StatsGranularity granul
         context.startActivity(intent);
     }
 
+    public static void viewInsightsManagement(Context context) {
+        Intent intent = new Intent(context, InsightsManagementActivity.class);
+        context.startActivity(intent);
+    }
+
     public static void viewBlogStatsAfterJetpackSetup(Context context, SiteModel site) {
         if (site == null) {
             AppLog.e(T.STATS, "SiteModel is null when opening the stats.");

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt

@@ -21,6 +21,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.HEADER
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.INFO
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK
+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK_BUTTON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM_WITH_ICON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LOADING_ITEM
@@ -64,6 +65,7 @@ class BlockDiffCallback(
                 CHART_LEGEND,
                 REFERRED_ITEM,
                 QUICK_SCAN_ITEM,
+                LINK_BUTTON,
                 EMPTY -> oldItem == newItem
             }
         } else {

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/NavigationTarget.kt

@@ -34,4 +34,5 @@ sealed class NavigationTarget {
     object ViewDayAverageStats : NavigationTarget()
     object ViewRecentWeeksStats : NavigationTarget()
     object ViewAnnualStats : NavigationTarget()
+    object ViewInsightsManagement : NavigationTarget()
 }

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt

@@ -36,6 +36,7 @@ import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSect
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.MONTHS
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.WEEKS
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.YEARS
+import org.wordpress.android.ui.stats.refresh.utils.StatsNavigator
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.util.WPSwipeToRefreshHelper
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
@@ -49,15 +50,12 @@ class StatsFragment : DaggerFragment() {
     @Inject lateinit var statsSiteProvider: StatsSiteProvider
     private lateinit var viewModel: StatsViewModel
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
+    @Inject lateinit var navigator: StatsNavigator
 
     private var restorePreviousSearch = false
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        setHasOptionsMenu(true)
         return inflater.inflate(R.layout.stats_fragment, container, false)
     }
 

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsModule.kt

@@ -203,7 +203,7 @@ class StatsModule {
                 mainDispatcher,
                 statsSiteProvider,
                 useCases,
-                { statsStore.getInsights() },
+                { statsStore.getAddedInsights(statsSiteProvider.siteModel) },
                 uiModelMapper::mapInsights
         )
     }

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt

@@ -83,7 +83,7 @@ class StatsViewAllFragment : DaggerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+        private fun initializeViews(savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
 
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
@@ -97,10 +97,10 @@ class StatsViewAllFragment : DaggerFragment() {
             viewModel.onPullToRefresh()
         }
 
-        select_next_date.setOnClickListener {
+        nextDateButton.setOnClickListener {
             viewModel.onNextDateSelected()
         }
-        select_previous_date.setOnClickListener {
+        previousDateButton.setOnClickListener {
             viewModel.onPreviousDateSelected()
         }
     }
@@ -173,8 +173,8 @@ class StatsViewAllFragment : DaggerFragment() {
             if (it != null) {
                 recyclerView.visibility = if (it is StatsBlock.Success) View.VISIBLE else View.GONE
                 loadingContainer.visibility = if (it is StatsBlock.Loading) View.VISIBLE else View.GONE
-                actionable_error_view.visibility = if (it is StatsBlock.Error) View.VISIBLE else View.GONE
-                actionable_empty_view.visibility = if (it is StatsBlock.EmptyBlock) View.VISIBLE else View.GONE
+                statsErrorView.visibility = if (it is StatsBlock.Error) View.VISIBLE else View.GONE
+                statsEmptyView.visibility = if (it is StatsBlock.EmptyBlock) View.VISIBLE else View.GONE
                 when (it) {
                     is StatsBlock.Success -> {
                         loadData(recyclerView, prepareLayout(it.data, it.type))
@@ -183,7 +183,7 @@ class StatsViewAllFragment : DaggerFragment() {
                         loadData(loadingRecyclerView, prepareLayout(it.data, it.type))
                     }
                     is StatsBlock.Error -> {
-                        actionable_error_view.button.setOnClickListener {
+                        statsErrorView.button.setOnClickListener {
                             viewModel.onRetryClick()
                         }
                     }
@@ -201,14 +201,14 @@ class StatsViewAllFragment : DaggerFragment() {
             if (date_selection_toolbar.visibility != dateSelectorVisibility) {
                 date_selection_toolbar.visibility = dateSelectorVisibility
             }
-            selected_date.text = dateSelectorUiModel?.date ?: ""
+            selectedDateTextView.text = dateSelectorUiModel?.date ?: ""
             val enablePreviousButton = dateSelectorUiModel?.enableSelectPrevious == true
-            if (select_previous_date.isEnabled != enablePreviousButton) {
-                select_previous_date.isEnabled = enablePreviousButton
+            if (previousDateButton.isEnabled != enablePreviousButton) {
+                previousDateButton.isEnabled = enablePreviousButton
             }
             val enableNextButton = dateSelectorUiModel?.enableSelectNext == true
-            if (select_next_date.isEnabled != enableNextButton) {
-                select_next_date.isEnabled = enableNextButton
+            if (nextDateButton.isEnabled != enableNextButton) {
+                nextDateButton.isEnabled = enableNextButton
             }
         })
 

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt

@@ -109,6 +109,7 @@ class StatsViewModel
         listUseCases[statsSection]?.onListSelected()
 
         _toolbarHasShadow.value = statsSection == INSIGHTS
+
         when (statsSection) {
             INSIGHTS -> analyticsTracker.track(STATS_INSIGHTS_ACCESSED)
             DAYS -> analyticsTracker.track(STATS_PERIOD_DAYS_ACCESSED)

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt

@@ -7,14 +7,13 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.stats.refresh.NavigationTarget
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
-import org.wordpress.android.util.DistinctMutableLiveData
 import org.wordpress.android.util.PackageUtils
 import org.wordpress.android.util.combineMap
 import org.wordpress.android.util.distinct
@@ -28,29 +27,34 @@ class BaseListUseCase(
     private val mainDispatcher: CoroutineDispatcher,
     private val statsSiteProvider: StatsSiteProvider,
     private val useCases: List<BaseStatsUseCase<*, *>>,
-    private val getStatsTypes: suspend () -> List<StatsTypes>,
-    private val mapUiModel: (useCaseModels: List<UseCaseModel>, showError: (Int) -> Unit) -> UiModel
+    private val getStatsTypes: suspend () -> List<StatsType>,
+    private val mapUiModel: (
+        useCaseModels: List<UseCaseModel>,
+        MutableLiveData<Event<NavigationTarget>>,
+        showError: (Int) -> Unit
+    ) -> UiModel
 ) {
     private val blockListData = combineMap(
             useCases.associateBy { it.type }.mapValues { entry -> entry.value.liveData }
     )
-    private val statsTypes = DistinctMutableLiveData<List<StatsTypes>>(listOf())
-    val data: MediatorLiveData<UiModel> = mergeNotNull(statsTypes, blockListData) { insights, map ->
-        insights.mapNotNull {
+    private val statsTypes = MutableLiveData<List<StatsType>>()
+    val data: MediatorLiveData<UiModel> = mergeNotNull(statsTypes, blockListData) { types, map ->
+        types.mapNotNull {
             if (map.containsKey(it)) {
                 map[it]
             } else {
                 null
             }
         }
     }.map { useCaseModels ->
-        mapUiModel(useCaseModels) { message ->
+        mapUiModel(useCaseModels, mutableNavigationTarget) { message ->
             mutableSnackbarMessage.postValue(message)
         }
     }.distinct()
 
+    private val mutableNavigationTarget = MutableLiveData<Event<NavigationTarget>>()
     val navigationTarget: LiveData<Event<NavigationTarget>> = mergeNotNull(
-            useCases.map { it.navigationTarget },
+            useCases.map { it.navigationTarget } + mutableNavigationTarget,
             distinct = false
     )
 
@@ -70,16 +74,26 @@ class BaseListUseCase(
         loadData(true, forced)
     }
 
+    suspend fun refreshTypes(): List<StatsType> {
+        val items = getStatsTypes()
+        withContext(mainDispatcher) {
+            statsTypes.value = items
+        }
+        return items
+    }
+
     private suspend fun loadData(refresh: Boolean, forced: Boolean) {
         if (statsSiteProvider.hasLoadedSite()) {
             withContext(bgDispatcher) {
                 if (PackageUtils.isDebugBuild() && useCases.distinctBy { it.type }.size < useCases.size) {
                     throw RuntimeException("Duplicate stats type in a use case")
                 }
-                useCases.forEach { block -> launch { block.fetch(refresh, forced) } }
-                val items = getStatsTypes()
-                withContext(mainDispatcher) {
-                    statsTypes.value = items
+                val visibleTypes = refreshTypes()
+                visibleTypes.forEach { type ->
+                    useCases.find { it.type == type }
+                            ?.let { block -> launch(bgDispatcher) {
+                                block.fetch(refresh, forced) }
+                            }
                 }
             }
         } else {
@@ -89,7 +103,6 @@ class BaseListUseCase(
 
     fun onCleared() {
         mutableSnackbarMessage.value = null
-        statsTypes.clear()
         blockListData.value = null
         useCases.forEach { it.clear() }
         data.value = null

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsBlock.kt

@@ -1,37 +1,43 @@
 package org.wordpress.android.ui.stats.refresh.lists
 
-import org.wordpress.android.fluxc.store.StatsStore.StatsTypes
+import org.wordpress.android.fluxc.store.StatsStore.StatsType
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.CONTROL
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.EMPTY
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.ERROR
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.LOADING
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.SUCCESS
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 
-sealed class StatsBlock(val type: Type, open val statsTypes: StatsTypes, open val data: List<BlockListItem>) {
+sealed class StatsBlock(val type: Type, open val data: List<BlockListItem>) {
     enum class Type {
         SUCCESS,
         ERROR,
         EMPTY,
-        LOADING
+        LOADING,
+        CONTROL
     }
 
     data class Success(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem>
-    ) : StatsBlock(SUCCESS, statsTypes, data)
+    ) : StatsBlock(SUCCESS, data)
 
     data class Error(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem> = listOf()
-    ) : StatsBlock(ERROR, statsTypes, data)
+    ) : StatsBlock(ERROR, data)
 
     data class EmptyBlock(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem>
-    ) : StatsBlock(EMPTY, statsTypes, data)
+    ) : StatsBlock(EMPTY, data)
 
     data class Loading(
-        override val statsTypes: StatsTypes,
+        val statsType: StatsType,
         override val data: List<BlockListItem>
-    ) : StatsBlock(LOADING, statsTypes, data)
+    ) : StatsBlock(LOADING, data)
+
+    data class Control(
+        override val data: List<BlockListItem>
+    ) : StatsBlock(CONTROL, data)
 }