Remove dashboard experiment logic and set initial default tab to app instance. Home for Jetpack and menu for WP

Author: zwarm

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt

@@ -164,7 +164,7 @@ class MySiteViewModel @Inject constructor(
     private val quickStartTracker: QuickStartTracker,
     private val dispatcher: Dispatcher
 ) : ScopedViewModel(mainDispatcher) {
-    private var isDefaultABExperimentTabSet: Boolean = false
+    private var isDefaultTabSet: Boolean = false
     private val _onSnackbarMessage = MutableLiveData<Event<SnackbarMessageHolder>>()
     private val _onTechInputDialogShown = MutableLiveData<Event<TextInputDialogModel>>()
     private val _onBasicDialogShown = MutableLiveData<Event<SiteDialogModel>>()
@@ -209,9 +209,9 @@ class MySiteViewModel @Inject constructor(
             listOf(MySiteTabType.ALL)
         }
 
-    private val defaultABExperimentTab: MySiteTabType
+    private val defaultTab: MySiteTabType
         get() = if (isMySiteTabsEnabled) {
-            if (appPrefsWrapper.getMySiteInitialScreen() == MySiteTabType.SITE_MENU.label) {
+            if (appPrefsWrapper.getMySiteInitialScreen(buildConfigWrapper.isJetpackApp) == MySiteTabType.SITE_MENU.label) {
                 MySiteTabType.SITE_MENU
             } else {
                 MySiteTabType.DASHBOARD
@@ -530,20 +530,20 @@ class MySiteViewModel @Inject constructor(
         _onNavigation.value = Event(SiteNavigationAction.OpenJetpackPoweredBottomSheet)
     }
 
-    private fun shouldEnableQuickLinkRibbonFocusPoints() = defaultABExperimentTab == MySiteTabType.DASHBOARD
+    private fun shouldEnableQuickLinkRibbonFocusPoints() = defaultTab == MySiteTabType.DASHBOARD
 
-    private fun shouldEnableSiteItemsFocusPoints() = defaultABExperimentTab != MySiteTabType.DASHBOARD
+    private fun shouldEnableSiteItemsFocusPoints() = defaultTab != MySiteTabType.DASHBOARD
 
     private fun getCardTypeExclusionFiltersForTab(tabType: MySiteTabType) = when (tabType) {
         MySiteTabType.SITE_MENU -> mutableListOf<Type>().apply {
             add(Type.DASHBOARD_CARDS)
-            if (defaultABExperimentTab == MySiteTabType.DASHBOARD) {
+            if (defaultTab == MySiteTabType.DASHBOARD) {
                 add(Type.QUICK_START_CARD)
             }
             add(Type.QUICK_LINK_RIBBON)
         }
         MySiteTabType.DASHBOARD -> mutableListOf<Type>().apply {
-            if (defaultABExperimentTab == MySiteTabType.SITE_MENU) {
+            if (defaultTab == MySiteTabType.SITE_MENU) {
                 add(Type.QUICK_START_CARD)
             }
             add(Type.DOMAIN_REGISTRATION_CARD)
@@ -553,8 +553,8 @@ class MySiteViewModel @Inject constructor(
     }
 
     private fun shouldIncludeDynamicCards(tabType: MySiteTabType) = when (tabType) {
-        MySiteTabType.SITE_MENU -> defaultABExperimentTab != MySiteTabType.DASHBOARD
-        MySiteTabType.DASHBOARD -> defaultABExperimentTab != MySiteTabType.SITE_MENU
+        MySiteTabType.SITE_MENU -> defaultTab != MySiteTabType.DASHBOARD
+        MySiteTabType.DASHBOARD -> defaultTab != MySiteTabType.SITE_MENU
         MySiteTabType.ALL -> true
     }
 
@@ -720,7 +720,7 @@ class MySiteViewModel @Inject constructor(
 
     private fun onQuickStartTaskTypeItemClick(type: QuickStartTaskType) {
         clearActiveQuickStartTask()
-        if (defaultABExperimentTab == MySiteTabType.DASHBOARD) {
+        if (defaultTab == MySiteTabType.DASHBOARD) {
             cardsTracker.trackQuickStartCardItemClicked(type)
         } else {
             quickStartTracker.track(Stat.QUICK_START_TAPPED, mapOf(TYPE to type.toString()))
@@ -1074,7 +1074,7 @@ class MySiteViewModel @Inject constructor(
     }
 
     fun onCreateSiteResult() {
-        isDefaultABExperimentTabSet = false
+        isDefaultTabSet = false
         selectDefaultTabIfNeeded()
     }
 
@@ -1269,9 +1269,9 @@ class MySiteViewModel @Inject constructor(
     @Suppress("NestedBlockDepth")
     private fun selectDefaultTabIfNeeded() {
         if (!isMySiteTabsEnabled) return
-        val index = orderedTabTypes.indexOf(defaultABExperimentTab)
+        val index = orderedTabTypes.indexOf(defaultTab)
         if (index != -1) {
-            if (isDefaultABExperimentTabSet) {
+            if (isDefaultTabSet) {
                 // This logic checks if the current default tab is the same as the tab
                 // set as initial screen, if yes then return
                 _selectTab.value?.let { tab ->
@@ -1281,7 +1281,7 @@ class MySiteViewModel @Inject constructor(
             }
             quickStartRepository.quickStartTaskOriginTab = orderedTabTypes[index]
             _selectTab.postValue(Event(TabNavigation(index, smoothAnimation = false)))
-            isDefaultABExperimentTabSet = true
+            isDefaultTabSet = true
         }
     }
 
@@ -1290,7 +1290,7 @@ class MySiteViewModel @Inject constructor(
                 .forEach { domainRegistrationCardShownTracker.trackShown(it.type) }
         siteSelected.cardAndItems.filterIsInstance<DashboardCards>().forEach { cardsTracker.trackShown(it) }
         siteSelected.cardAndItems.filterIsInstance<QuickStartCard>()
-                .firstOrNull()?.let { quickStartTracker.trackShown(it.type, defaultABExperimentTab) }
+                .firstOrNull()?.let { quickStartTracker.trackShown(it.type, defaultTab) }
         siteSelected.dashboardCardsAndItems.filterIsInstance<QuickStartCard>()
                 .firstOrNull()?.let { cardsTracker.trackQuickStartCardShown(quickStartRepository.quickStartType) }
     }

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java

@@ -174,9 +174,6 @@ public enum DeletablePrefKey implements PrefKey {
         SHOULD_SCHEDULE_CREATE_SITE_NOTIFICATION,
         SHOULD_SHOW_WEEKLY_ROUNDUP_NOTIFICATION,
 
-        // Used to indicate if the variant has been assigned for the My Site Tab experiment
-        MY_SITE_DEFAULT_TAB_EXPERIMENT_VARIANT_ASSIGNED,
-
         SKIPPED_BLOGGING_PROMPT_DAY,
     }
 
@@ -1406,10 +1403,10 @@ public static void setSkippedPromptDay(@Nullable Date date, int siteId) {
         return DeletablePrefKey.SKIPPED_BLOGGING_PROMPT_DAY.name() + siteId;
     }
 
-    public static String getMySiteInitialScreen() {
+    public static String getMySiteInitialScreen(boolean isJetpackApp) {
         return getString(
                 UndeletablePrefKey.wp_pref_initial_screen,
-                MySiteTabType.SITE_MENU.getLabel()
+                isJetpackApp ? MySiteTabType.DASHBOARD.getLabel() : MySiteTabType.SITE_MENU.getLabel()
         );
     }
 

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt

@@ -220,7 +220,7 @@ class AppPrefsWrapper @Inject constructor() {
     fun setLastSelectedQuickStartTypeForSite(quickStartType: QuickStartType, siteLocalId: Long) =
             AppPrefs.setLastSelectedQuickStartTypeForSite(quickStartType, siteLocalId)
 
-    fun getMySiteInitialScreen(): String = AppPrefs.getMySiteInitialScreen()
+    fun getMySiteInitialScreen(isJetpackApp: Boolean): String = AppPrefs.getMySiteInitialScreen(isJetpackApp)
 
     fun setSkippedPromptDay(date: Date?, siteId: Int) = AppPrefs.setSkippedPromptDay(date, siteId)