Merge branch 'trunk' into gutenberg/integrate_release_1.81.0

Author: derekblank

.buildkite/commands/instrumented-tests.sh

@@ -7,4 +7,4 @@ echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
 echo "--- 🧪 Testing"
-bundle exec fastlane build_and_instrumented_test
+bundle exec fastlane build_and_run_instrumented_test

CODEOWNERS

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

RELEASE-NOTES.txt

@@ -4,7 +4,7 @@
 -----
 * [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
 * [***] [internal] Block Editor: List block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/42702]
-
+* [*] 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,7 +109,6 @@ android {
         buildConfigField "boolean", "SITE_NAME", "false"
         buildConfigField "boolean", "LAND_ON_THE_EDITOR", "false"
         buildConfigField "boolean", "BLOGGING_PROMPTS", "false"
-        buildConfigField "boolean", "STATS_REVAMP_V2", "false"
         buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
         buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"
         buildConfigField "boolean", "BETA_SITE_DESIGNS", "false"

WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java

@@ -38,6 +38,7 @@ public LoginFlow chooseContinueWithWpCom() {
     public LoginFlow enterEmailAddress(String emailAddress) {
         // Email Address Screen – Fill it in and click "Continue"
         // See LoginEmailFragment
+        clickOn(R.id.input);
         populateTextField(R.id.input, emailAddress);
         clickOn(R.id.login_continue_button);
         return this;
@@ -46,6 +47,7 @@ public LoginFlow enterEmailAddress(String emailAddress) {
     public LoginFlow enterPassword(String password) {
         // Password Screen – Fill it in and click "Continue"
         // See LoginEmailPasswordFragment
+        clickOn(R.id.input);
         populateTextField(R.id.input, password);
         clickOn(R.id.bottom_button);
         return this;
@@ -104,7 +106,9 @@ public LoginFlow enterUsernameAndPassword(String username, String password) {
                 Matchers.instanceOf(EditText.class)));
         ViewInteraction passwordElement = onView(allOf(isDescendantOfA(withId(R.id.login_password_row)),
                 Matchers.instanceOf(EditText.class)));
+        clickOn(usernameElement);
         populateTextField(usernameElement, username + "\n");
+        clickOn(passwordElement);
         populateTextField(passwordElement, password + "\n");
         clickOn(R.id.bottom_button);
         return this;
@@ -120,6 +124,7 @@ public LoginFlow chooseEnterYourSiteAddress() {
     public LoginFlow enterSiteAddress(String siteAddress) {
         // Site Address Screen – Fill it in and click "Continue"
         // See LoginSiteAddressFragment
+        clickOn(R.id.input);
         populateTextField(R.id.input, siteAddress);
         clickOn(R.id.bottom_button);
         return this;

WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java

@@ -820,9 +820,17 @@ public static void scrollIntoView(Integer scrollableContainerID, ViewInteraction
     }
 
     public static void dismissJetpackAdIfPresent() {
+        String jetpackAdText = "Stats, Reader, Notifications, and other features are powered by Jetpack.";
+        ViewInteraction jetpackBanner = onView(withText(jetpackAdText));
+
         // Dismiss Jetpack ad that might be shown after Sign-Up or after opening Stats
-        if (isElementDisplayed(onView(withText("Jetpack powered")))) {
+        if (isElementDisplayed(jetpackBanner)) {
             clickOn(onView(withId(R.id.secondary_button)));
+            waitForElementToNotBeDisplayed(jetpackBanner);
+
+            // Account for potential Emulator slowness on CI: the case of banner text
+            // being already hidden, but top part of banner still sliding away
+            idleFor(1000);
         }
     }
 }

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/main/java/org/wordpress/android/AppInitializer.kt

@@ -124,7 +124,6 @@ import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
 
-@Suppress("TooManyFunctions")
 @Singleton
 class AppInitializer @Inject constructor(
     wellSqlInitializer: WellSqlInitializer,

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

@@ -28,7 +28,6 @@ abstract class WordPress : MultiDexApplication() {
         initializer().wordPressComSignOut()
     }
 
-    @Suppress("TooManyFunctions")
     companion object {
         const val SITE = "SITE"
         const val LOCAL_SITE_ID = "LOCAL_SITE_ID"

WordPress/src/main/java/org/wordpress/android/support/ZendeskHelper.kt

@@ -336,7 +336,6 @@ class ZendeskHelper(
 /**
  * This is a helper function which builds a `UiConfig` through helpers to be used during ticket creation.
  */
-@Suppress("LongParameterList")
 private fun buildZendeskConfig(
     context: Context,
     allSites: List<SiteModel>?,