Manage Insights screen

RELEASE-NOTES.txt

@@ -15,6 +15,8 @@
 * Updated color scheme to Classic Bright
 * Adds support for .blog subdomains for the new site creation flow
 
+* New Insights Management for selecting the most relevant stats
+
 12.1
 -----
 * Design improvements for the new site creation flow

WordPress/src/main/AndroidManifest.xml

@@ -292,7 +292,7 @@
             android:theme="@style/Calypso.NoActionBar" />
         <activity
             android:name=".ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity"
-            android:label="@string/manage_insights"
+            android:label="@string/stats_manage_insights"
             android:launchMode="singleTop"
             android:theme="@style/CalypsoTheme" />
         <activity

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
@@ -65,6 +66,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/StatsFragment.kt

@@ -14,9 +14,6 @@ import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
 import android.support.v4.view.ViewCompat
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -55,35 +52,13 @@ class StatsFragment : DaggerFragment() {
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
     @Inject lateinit var navigator: StatsNavigator
 
-    private var menu: Menu? = null
-
     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)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        super.onCreateOptionsMenu(menu, inflater)
-
-        inflater?.inflate(R.menu.menu_stats_insights, menu)
-        this.menu = menu
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == R.id.manage_insights) {
-            viewModel.onManageInsightsButtonTapped()
-        }
-        return true
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -198,18 +173,6 @@ class StatsFragment : DaggerFragment() {
         viewModel.siteChanged.observe(this, Observer {
             viewModel.refreshData()
         })
-
-        viewModel.isMenuVisible.observe(this, Observer { isMenuVisible ->
-            isMenuVisible?.let {
-                menu?.findItem(R.id.manage_insights)?.isVisible = isMenuVisible
-            }
-        })
-
-        viewModel.navigationTarget.observe(this, Observer { event ->
-            event?.getContentIfNotHandled()?.let { target ->
-                navigator.navigate(activity, target)
-            }
-        })
     }
 }
 

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

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

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

@@ -84,7 +84,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 {
@@ -98,10 +98,10 @@ class StatsViewAllFragment : DaggerFragment() {
             viewModel.onPullToRefresh()
         }
 
-        select_next_date.setOnClickListener {
+        nextDateButton.setOnClickListener {
             viewModel.onNextDateSelected()
         }
-        select_previous_date.setOnClickListener {
+        previousDateButton.setOnClickListener {
             viewModel.onPreviousDateSelected()
         }
     }
@@ -174,8 +174,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))
@@ -184,7 +184,7 @@ class StatsViewAllFragment : DaggerFragment() {
                         loadData(loadingRecyclerView, prepareLayout(it.data, it.type))
                     }
                     is StatsBlock.Error -> {
-                        actionable_error_view.button.setOnClickListener {
+                        statsErrorView.button.setOnClickListener {
                             viewModel.onRetryClick()
                         }
                     }
@@ -202,14 +202,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

@@ -14,7 +14,6 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_PERIOD_WEEKS_
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_PERIOD_YEARS_ACCESSED
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
-import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewInsightsManagement
 import org.wordpress.android.ui.stats.refresh.lists.BaseListUseCase
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.DAYS
@@ -29,7 +28,6 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.mergeNotNull
-import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
@@ -47,9 +45,6 @@ class StatsViewModel
     private val _isRefreshing = MutableLiveData<Boolean>()
     val isRefreshing: LiveData<Boolean> = _isRefreshing
 
-    private val _isMenuVisible = MutableLiveData<Boolean>()
-    val isMenuVisible: LiveData<Boolean> = _isMenuVisible
-
     private var isInitialized = false
 
     private val _showSnackbarMessage = mergeNotNull(
@@ -59,9 +54,6 @@ class StatsViewModel
     )
     val showSnackbarMessage: LiveData<SnackbarMessageHolder> = _showSnackbarMessage
 
-    private val _navigationTarget = MutableLiveData<Event<NavigationTarget>>()
-    val navigationTarget: LiveData<Event<NavigationTarget>> = _navigationTarget
-
     val siteChanged = statsSiteProvider.siteChanged
 
     private val _toolbarHasShadow = MutableLiveData<Boolean>()
@@ -117,7 +109,6 @@ class StatsViewModel
         listUseCases[statsSection]?.onListSelected()
 
         _toolbarHasShadow.value = statsSection == INSIGHTS
-        _isMenuVisible.value = statsSection == INSIGHTS
 
         when (statsSection) {
             INSIGHTS -> analyticsTracker.track(STATS_INSIGHTS_ACCESSED)
@@ -130,10 +121,6 @@ class StatsViewModel
         }
     }
 
-    fun onManageInsightsButtonTapped() {
-        _navigationTarget.value = Event(ViewInsightsManagement)
-    }
-
     override fun onCleared() {
         super.onCleared()
         _showSnackbarMessage.value = null

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,13 +27,17 @@ 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())
+    private val statsTypes = MutableLiveData<List<StatsType>>()
     val data: MediatorLiveData<UiModel> = mergeNotNull(statsTypes, blockListData) { types, map ->
         types.mapNotNull {
             if (map.containsKey(it)) {
@@ -44,13 +47,14 @@ class BaseListUseCase(
             }
         }
     }.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,7 +74,7 @@ class BaseListUseCase(
         loadData(true, forced)
     }
 
-    suspend fun refreshTypes(): List<StatsTypes> {
+    suspend fun refreshTypes(): List<StatsType> {
         val items = getStatsTypes()
         withContext(mainDispatcher) {
             statsTypes.value = items
@@ -99,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)
 }