Merge branch 'trunk' into Jetpack-Focus-Show-or-hide-Automattic-Family-section-on-About-screen

Author: ravishanker

RELEASE-NOTES.txt

@@ -3,6 +3,8 @@
 21.0
 -----
 * [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
+* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
+* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
 
 20.9
 -----

WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java

@@ -39,7 +39,7 @@ public void setUp() {
                        + "<!-- /wp:image --></div>\n";
 
     @Test
-    public void publishSimplePost() {
+    public void e2ePublishSimplePost() {
         String title = "publishSimplePost";
 
         new MySitesPage()
@@ -55,7 +55,7 @@ public void publishSimplePost() {
     }
 
     @Test
-    public void publishFullPost() {
+    public void e2ePublishFullPost() {
         String title = "publishFullPost";
 
         new MySitesPage()
@@ -75,7 +75,7 @@ public void publishFullPost() {
     }
 
     @Test
-    public void blockEditorCanDisplayElementAddedInHtmlMode() {
+    public void e2eBlockEditorCanDisplayElementAddedInHtmlMode() {
         String title = "blockEditorCanDisplayElementAddedInHtmlMode";
 
         new MySitesPage()

WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java

@@ -20,7 +20,7 @@ public void setUp() {
 
     @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void sendButtonEnabledWhenTextIsEntered() {
+    public void e2eSendButtonEnabledWhenTextIsEntered() {
         try {
             new LoginFlow()
                 .chooseContinueWithWpCom()
@@ -40,7 +40,7 @@ public void sendButtonEnabledWhenTextIsEntered() {
 
     @Ignore("As long as CI does not use gradle.properties from MobileSecrets")
     @Test
-    public void messageCanBeSent() {
+    public void e2eMessageCanBeSent() {
         String userMessageText = "Please ignore, this is an automated test.";
         String automatedReplyText = "Mobile support will respond as soon as possible, "
                                     + "generally within 48-96 hours. "
@@ -62,15 +62,15 @@ public void messageCanBeSent() {
     }
 
     @Test
-    public void helpCanBeOpenedWhileEnteringEmail() {
+    public void e2eHelpCanBeOpenedWhileEnteringEmail() {
         new LoginFlow()
                 .chooseContinueWithWpCom()
                 .tapHelp()
                 .assertHelpAndSupportScreenLoaded();
     }
 
     @Test
-    public void helpCanBeOpenedWhileEnteringPassword() {
+    public void e2eHelpCanBeOpenedWhileEnteringPassword() {
         new LoginFlow()
                 .chooseContinueWithWpCom()
                 .enterEmailAddress(E2E_WP_COM_USER_EMAIL)

WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java

@@ -56,7 +56,7 @@ public void setUp() {
     // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
     @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
-    public void testPublishSimplePost() {
+    public void e2ePublishSimplePostClassic() {
         String title = "Hello Espresso!";
         String content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
 
@@ -70,7 +70,7 @@ public void testPublishSimplePost() {
     // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
     @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
-    public void testPublishFullPost() {
+    public void e2ePublishFullPostClassic() {
         String title = "Hello Espresso!";
         String content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
                          + "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "

WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.java

@@ -26,7 +26,7 @@ public void setUp() {
 
     @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void loginWithEmailPassword() {
+    public void e2eLoginWithEmailPassword() {
         new LoginFlow().chooseContinueWithWpCom()
                        .enterEmailAddress(E2E_WP_COM_USER_EMAIL)
                        .enterPassword(E2E_WP_COM_USER_PASSWORD)
@@ -35,15 +35,15 @@ public void loginWithEmailPassword() {
 
     @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void loginWithPasswordlessAccount() {
+    public void e2eLoginWithPasswordlessAccount() {
         new LoginFlow().chooseContinueWithWpCom()
                        .enterEmailAddress(E2E_WP_COM_PASSWORDLESS_USER_EMAIL)
                        .openMagicLink()
                        .confirmLogin(false);
     }
 
     @Test
-    public void loginWithSiteAddress() {
+    public void e2eLoginWithSiteAddress() {
         new LoginFlow().chooseEnterYourSiteAddress()
                        .enterSiteAddress(E2E_WP_COM_USER_SITE_ADDRESS)
                        .enterEmailAddress(E2E_WP_COM_USER_EMAIL)
@@ -53,7 +53,7 @@ public void loginWithSiteAddress() {
 
     @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void loginWithMagicLink() {
+    public void e2eLoginWithMagicLink() {
         new LoginFlow().chooseContinueWithWpCom()
                        .enterEmailAddress(E2E_WP_COM_USER_EMAIL)
                        .chooseMagicLink()
@@ -62,7 +62,7 @@ public void loginWithMagicLink() {
     }
 
     @Test
-    public void loginWithSelfHostedAccount() {
+    public void e2eLoginWithSelfHostedAccount() {
         new LoginFlow().chooseEnterYourSiteAddress()
                        .enterSiteAddress(E2E_SELF_HOSTED_USER_SITE_ADDRESS)
                        .enterUsernameAndPassword(E2E_SELF_HOSTED_USER_USERNAME, E2E_SELF_HOSTED_USER_PASSWORD)

WordPress/src/androidTest/java/org/wordpress/android/e2e/ReaderTests.java

@@ -5,7 +5,9 @@
 import androidx.test.rule.GrantPermissionRule;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
+import org.junit.Test;
 import org.wordpress.android.e2e.pages.ReaderPage;
 import org.wordpress.android.support.BaseTest;
 
@@ -26,8 +28,9 @@ public void setUp() {
     String mCoachingPostTitle = "Let's check out the coaching team!";
     String mCompetitionPostTitle = "Let's focus on the competition.";
 
-//    @Test
-    public void navigateThroughPosts() {
+    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
+    @Test
+    public void e2eNavigateThroughPosts() {
         new ReaderPage()
                 .tapFollowingTab()
                 .openPost(mCoachingPostTitle)
@@ -39,8 +42,9 @@ public void navigateThroughPosts() {
                 .goBackToReader();
     }
 
-//    @Test
-    public void likePost() {
+    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
+    @Test
+    public void e2eLikePost() {
         new ReaderPage()
                 .tapFollowingTab()
                 .openPost(mCoachingPostTitle)

WordPress/src/androidTest/java/org/wordpress/android/e2e/SignUpTests.java

@@ -26,7 +26,7 @@ public void tearDown() {
     }
 
     @Test
-    public void signUpWithMagicLink() {
+    public void e2eSignUpWithMagicLink() {
         new SignupFlow().chooseContinueWithWpCom()
                         .enterEmail(E2E_SIGNUP_EMAIL)
                         .openMagicLink()

WordPress/src/androidTest/java/org/wordpress/android/e2e/StatsTests.java

@@ -38,7 +38,7 @@ public void tearDown() {
     }
 
     @Test
-    public void allDayStatsLoad() {
+    public void e2eAllDayStatsLoad() {
         StatsVisitsData todayVisits = new StatsVisitsData("97", "28", "14", "11");
         List<StatsKeyValueData> postsList = new StatsMocksReader().readDayTopPostsToList();
         List<StatsKeyValueData> referrersList = new StatsMocksReader().readDayTopReferrersToList();

WordPress/src/jetpack/AndroidManifest.xml

@@ -37,6 +37,9 @@
                 <data
                     android:host="notifications"
                     android:scheme="jetpack" />
+                <data
+                    android:host="home"
+                    android:scheme="jetpack" />
             </intent-filter>
         </activity>
 

WordPress/src/jetpack/res/drawable/ic_splash.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="25">
+  <path
+      android:fillColor="#ffffff"
+      android:pathData="M12.5,0L12.5,0A12,12 0,0 1,24.5 12L24.5,12A12,12 0,0 1,12.5 24L12.5,24A12,12 0,0 1,0.5 12L0.5,12A12,12 0,0 1,12.5 0z" />
+  <path
+      android:fillColor="#069E08"
+      android:pathData="M12.5,0C5.889,0 0.5,5.374 0.5,12C0.5,18.626 5.874,24 12.5,24C19.126,24 24.5,18.626 24.5,12C24.5,5.374 19.126,0 12.5,0ZM11.882,13.988H5.904L11.882,2.356V13.988ZM13.104,21.615V9.983H19.067L13.104,21.615Z" />
+</vector>