Merge pull request #10539 from wordpress-mobile/merge/13.3-into-master

Merge 13.3 into master

.circleci/config.yml

@@ -1,6 +1,7 @@
 orbs:
-  android: wordpress-mobile/[email protected]
-  bundle-install: toshimaru/[email protected]
+  android: wordpress-mobile/[email protected]
+  git: wordpress-mobile/[email protected]
+  bundle-install: toshimaru/[email protected]
   slack: circleci/[email protected]
 
 commands:
@@ -17,7 +18,7 @@ jobs:
       name: android/default
       api-version: "28"
     steps:
-      - checkout
+      - git/shallow-checkout
       - android/restore-gradle-cache
       - copy-gradle-properties
       - run:
@@ -30,7 +31,7 @@ jobs:
       name: android/default
       api-version: "28"
     steps:
-      - checkout
+      - git/shallow-checkout
       - android/restore-gradle-cache
       - copy-gradle-properties
       - run:
@@ -54,12 +55,13 @@ jobs:
       - android/save-gradle-cache
       - android/save-lint-results
   Installable Build:
-    executor: 
+    executor:
       name: android/default
       api-version: "28"
     steps:
-      - checkout
-      - bundle-install/bundle-install
+      - git/shallow-checkout
+      - bundle-install/bundle-install:
+          cache_key_prefix: installable-build
       - run:
           name: Copy Secrets
           command: bundle exec fastlane run configure_apply
@@ -78,6 +80,7 @@ jobs:
             echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
 
             ./gradlew --stacktrace assembleVanillaRelease -PversionName="$VERSION_NAME"
+      - android/save-gradle-cache
       - run:
           name: Prepare APK
           command: |
@@ -91,7 +94,7 @@ jobs:
       name: android/default
       api-version: "28"
     steps:
-      - checkout
+      - git/shallow-checkout
       - android/restore-gradle-cache
       - copy-gradle-properties
       - run:
@@ -111,15 +114,13 @@ jobs:
           timeout: 10m
           results-history-name: CircleCI WordPress Connected Tests
       - android/save-gradle-cache
-      - slack/status:
-          fail_only: 'true'
-          failure_message: ':red_circle: WordPress Android end to end tests have failed!\nSee https://console.firebase.google.com/u/0/project/api-project-108380595987/testlab/histories/bh.e0c3a59bd9ed670'
   strings-check:
     docker:
       - image: circleci/ruby:2.3
     steps:
-      - checkout
-      - bundle-install/bundle-install
+      - git/shallow-checkout
+      - bundle-install/bundle-install:
+          cache_key_prefix: strings-check
       - run:
           name: Validate login strings
           command: bundle exec fastlane validate_login_strings pr_url:$CIRCLE_PULL_REQUEST
@@ -131,13 +132,4 @@ workflows:
       - test
       - lint
       - Installable Build
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - develop
-    jobs:
       - connected-tests

RELEASE-NOTES.txt

@@ -1,5 +1,17 @@
+13.4
+-----
+
 13.3
 -----
+* Added ability to change the username via Account Settings
+* Add Jetpack performance settings
+* Sort more than 100 published pages chronologically like Calypso
+* Significant performance improvements to Stats
+* Block Editor: Add rich text styling to video captions
+* Block Editor: Prevent keyboard dismissal when switching between caption and text block
+* Block Editor: Blocks that would be replaced are now hidden when add block bottom sheet displays
+* Block Editor: Tapping on empty editor area now always inserts new block at end of post
+* Block Editor: Automatically saves post locally after 2 seconds of inactivity
 
 13.2
 -----
@@ -9,7 +21,6 @@
 * Redesigned My Site screen to make most commonly used actions easily accessible.
 * File downloads in Stats for WP.com sites
 
-
 13.1
 -----
 * Added ability to switch between Desktop and Mobile versions of the content for Site and Page preview.

WordPress/build.gradle

@@ -53,9 +53,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-188"
+            versionName "alpha-189"
         }
-        versionCode 775
+        versionCode 778
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -81,9 +81,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "13.2"
+                versionName "13.3-rc-1"
             }
-            versionCode 776
+            versionCode 777
         }
 
         zalpha { // alpha version - enable experimental features

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_133"
+msgid ""
+"13.3:\n"
+"* Your stats have just become a lot more responsive.\n"
+"* You can now change your username in Account Settings.\n"
+"* Tweaking your Jetpack performance settings? Do it directly from the app!\n"
+"* If you’re a prolific publisher with more than 100 pages on your site, we’ll list them chronologically for faster access.\n"
+"* We’ve added many upgrades to the Block Editor, like rich-text styling in video captions, more intuitive block additions, and automatic content saves after two seconds of inactivity.\n"
+msgstr ""
+
 msgctxt "release_note_132"
 msgid ""
 "13.2:\n"
@@ -21,13 +31,6 @@ msgid ""
 "* Tweak your Notifications settings right from the Notifications List.\n"
 msgstr ""
 
-msgctxt "release_note_131"
-msgid ""
-"13.1:\n"
-"* In Site and Page preview, you can now switch between the desktop and mobile versions of the site.\n"
-"* We fixed a bug affecting some users who couldn’t connect their social media services.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"
 msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."

WordPress/metadata/release_notes.txt

@@ -1,5 +1,5 @@
-* Access your most commonly used actions more quickly from the redesigned My Sites screen.
-* Have you encountered issues connecting to LinkedIn? We fixed that, so: network away!
-* The Blog Post screen now shows the author of each post.
-* Data files for WordPress.com sites are available for download from Stats.
-* Tweak your Notifications settings right from the Notifications List.
+* Your stats have just become a lot more responsive.
+* You can now change your username in Account Settings.
+* Tweaking your Jetpack performance settings? Do it directly from the app!
+* If you’re a prolific publisher with more than 100 pages on your site, we’ll list them chronologically for faster access.
+* We’ve added many upgrades to the Block Editor, like rich-text styling in video captions, more intuitive block additions, and automatic content saves after two seconds of inactivity.

WordPress/src/androidTest/java/org/wordpress/android/e2e/components/MasterbarComponent.java

@@ -14,7 +14,7 @@ public MasterbarComponent goToMySitesTab() {
     }
 
     public MasterbarComponent clickBlogPosts() {
-        clickOn(R.id.row_blog_posts);
+        clickOn(R.id.quick_action_posts_button);
         return this;
     }
 }

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

@@ -5,16 +5,15 @@
 
 import org.wordpress.android.R;
 
-import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.typeText;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.RootMatchers.isDialog;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static androidx.test.espresso.matcher.ViewMatchers.withHint;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -28,6 +27,7 @@
 
 public class EditorPage {
     private static ViewInteraction publishButton = onView(withId(R.id.menu_primary_action));
+    private static ViewInteraction optionsButton = onView(withContentDescription("More options"));
     private static ViewInteraction editor = onView(withId(R.id.aztec));
     private static ViewInteraction titleField = onView(allOf(withId(R.id.title),
             withHint("Title")));
@@ -53,10 +53,10 @@ public void enterContent(String postContent) {
     // Image needs a little time to be uploaded after entering the image
     public void enterImage() {
         // Click on add media button
-        String addMediaButtonId = "media_button_container";
+        String addMediaButtonId = "id/media_button_container";
         clickOn(addMediaButtonId);
 
-        String mediaBarButtonId = "media_bar_button_library";
+        String mediaBarButtonId = "id/media_bar_button_library";
         clickOn(mediaBarButtonId);
 
         if (isElementDisplayed(allowMediaAccessButton)) {
@@ -82,8 +82,8 @@ public void enterImage() {
     }
 
     public void openSettings() {
-        openActionBarOverflowOrOptionsMenu(getApplicationContext());
-        clickOn(onView(withText("Post settings")));
+        clickOn(optionsButton);
+        clickOn("Post settings");
     }
 
     public void addACategory(String category) {

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

@@ -31,7 +31,6 @@ public MySitesPage go() {
 
     public void switchSite() {
         clickOn(R.id.switch_site);
-
         chooseSiteLabel.check(matches(withText("Choose site")));
     }
 
@@ -47,6 +46,6 @@ public void removeSite(String siteName) {
     }
 
     public void startNewPost() {
-        clickOn("fab_button");
+        clickOn("id/fab_button");
     }
 }