Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android into analysis/detekt-fine-tune-default-rules

Author: ParaskP7

CODEOWNERS

@@ -0,0 +1 @@
+/WordPress/src/androidTest/ @wordpress-mobile/mobile-ui-testing-squad

RELEASE-NOTES.txt

@@ -2,7 +2,8 @@
 
 20.5
 -----
-
+* [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
+* [*] Jetpack App: Use the Jetpack green color for the skip buttons text in site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16994]
 
 20.4
 -----

WordPress/build.gradle

@@ -109,8 +109,6 @@ android {
         buildConfigField "boolean", "SITE_NAME", "false"
         buildConfigField "boolean", "LAND_ON_THE_EDITOR", "false"
         buildConfigField "boolean", "BLOGGING_PROMPTS", "false"
-        buildConfigField "boolean", "MY_SITE_DEFAULT_TAB_EXPERIMENT", "false"
-        buildConfigField "boolean", "MY_SITE_DEFAULT_TAB_EXPERIMENT_VARIANT_DASHBOARD", "false"
         buildConfigField "boolean", "STATS_REVAMP_V2", "false"
         buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
         buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"

WordPress/src/androidTest/java/org/wordpress/android/AppInitializerTest.kt

@@ -0,0 +1,22 @@
+package org.wordpress.android
+
+import androidx.lifecycle.ProcessLifecycleOwner
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Assert.assertFalse
+import org.junit.Test
+import org.wordpress.android.AppInitializer.ApplicationLifecycleMonitor
+import org.wordpress.android.support.BaseTest
+
+/**
+ * This tests if [ProcessLifecycleOwner] observer works at the app startup.
+ *
+ * [WordPress.appIsInTheBackground] is set to false when [ApplicationLifecycleMonitor.onAppComesFromBackground] is
+ * called.
+ */
+@HiltAndroidTest
+class AppInitializerTest : BaseTest() {
+    @Test
+    fun verifyOnAppComesFromBackgroundCalled() {
+        assertFalse(WordPress.appIsInTheBackground)
+    }
+}

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java

@@ -175,6 +175,7 @@ public void goToBackup() {
     public StatsPage goToStats() {
         goToMenuTab();
         clickQuickActionOrSiteMenuItem(R.id.quick_action_stats_button, R.string.stats);
+        idleFor(4000);
         dismissJetpackAdIfPresent();
         waitForElementToBeDisplayedWithoutFailure(R.id.tabLayout);
 

WordPress/src/jetpack/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+
+    <!-- Site creation -->
+    <color name="site_creation_skip_button_text">@color/jetpack_green_40</color>
+</resources>

WordPress/src/jetpack/res/values/strings.xml

@@ -26,4 +26,7 @@
 
     <!-- About button in Me -->
     <string name="me_btn_about">About Jetpack</string>
+
+    <!-- My Site Initial Tab Default value -->
+    <string name="initial_screen_entry_value_default_key" translatable="false">@string/initial_screen_entry_value_home</string>
 </resources>

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -81,7 +81,6 @@ import org.wordpress.android.support.ZendeskHelper
 import org.wordpress.android.ui.ActivityId
 import org.wordpress.android.ui.debug.cookies.DebugCookieManager
 import org.wordpress.android.ui.mysite.SelectedSiteRepository
-import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
 import org.wordpress.android.ui.notifications.SystemNotificationsTracker
 import org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter
 import org.wordpress.android.ui.notifications.utils.NotificationsUtils
@@ -153,7 +152,6 @@ class AppInitializer @Inject constructor(
     @Inject lateinit var debugCookieManager: DebugCookieManager
     @Inject @Named(APPLICATION_SCOPE) lateinit var appScope: CoroutineScope
     @Inject lateinit var selectedSiteRepository: SelectedSiteRepository
-    @Inject lateinit var mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
 
     // For development and production `AnalyticsTrackerNosara`, for testing a mocked `Tracker` will be injected.
     @Inject lateinit var tracker: Tracker
@@ -307,8 +305,6 @@ class AppInitializer @Inject constructor(
 
         debugCookieManager.sync()
 
-        initAnalyticsExperimentPropertiesIfNeeded()
-
         initialized = true
     }
 
@@ -682,11 +678,6 @@ class AppInitializer @Inject constructor(
         EmojiCompat.init(config)
     }
 
-    /* If default tab experiment is running, pass along to tracker */
-    private fun initAnalyticsExperimentPropertiesIfNeeded() {
-        mySiteDefaultTabExperiment.checkAndSetTrackingPropertiesIfNeeded()
-    }
-
     @Suppress("unused")
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun onAppComesFromBackground() {

WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt

@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.ViewModel
 import org.wordpress.android.fluxc.store.SiteStore
-import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.viewmodel.Event
@@ -14,8 +13,7 @@ import javax.inject.Inject
 class LoginEpilogueViewModel @Inject constructor(
     private val appPrefsWrapper: AppPrefsWrapper,
     private val buildConfigWrapper: BuildConfigWrapper,
-    private val siteStore: SiteStore,
-    private val mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
+    private val siteStore: SiteStore
 ) : ViewModel() {
     private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
     val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
@@ -32,10 +30,6 @@ class LoginEpilogueViewModel @Inject constructor(
         if (!siteStore.hasSite()) handleNoSitesFound() else handleSitesFound()
     }
 
-    fun checkAndSetVariantForMySiteDefaultTabExperiment() {
-        mySiteDefaultTabExperiment.checkAndSetVariantIfNeeded()
-    }
-
     private fun handleNoSitesFound() {
         if (buildConfigWrapper.isJetpackApp && !buildConfigWrapper.isSiteCreationEnabled) {
             _navigationEvents.postValue(Event(LoginNavigationEvents.ShowNoJetpackSites))

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java

@@ -173,7 +173,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (savedInstanceState == null) {
-            mParentViewModel.checkAndSetVariantForMySiteDefaultTabExperiment();
             AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_EPILOGUE_VIEWED);
             mUnifiedLoginTracker.track(Step.SUCCESS);
         }