Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/master-remote-previews

Author: maxme

WordPress/build.gradle

@@ -49,8 +49,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "alpha-183"
-        versionCode 762
+        versionName "alpha-185"
+        versionCode 766
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -74,8 +74,8 @@ android {
     productFlavors {
         vanilla { // used for release and beta
             dimension "buildType"
-            versionName "13.0-rc-1"
-            versionCode 761
+            versionName "13.0-rc-3"
+            versionCode 765
         }
 
         zalpha { // alpha version - enable experimental features

WordPress/metadata/PlayStoreStrings.po

@@ -10,13 +10,23 @@ msgstr ""
 "X-Generator: VsCode\n"
 "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_130"
+msgid ""
+"13.0:\n"
+"* Block editor improvements: the editor is auto-enabled when you open a block post (unless you opted out in v12.9), or you can enable it on a per-site basis.\n"
+"* Accessibility improvements: screen readers can now read more of the stats screen.\n"
+"* General usability improvements: logging in is speedier, colors are more consistent across screens, and bug fixes put an end to some crashes.\n"
+msgstr ""
+
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "release_note_129"
 msgid ""
 "12.9:\n"
 "* Customers with unclaimed domain credits can register domains in the app.\n"
 "* You can expand the Comment Editor to Full Screen for more space while editing.\n"
 "* The Block editor has a few improvements: Video blocks are available, and a some issues that led to content loss when using unsupported blocks have been resolved.\n"
+"* The block editor is now the default for new posts after you open a block-based post for the first time.\n"
 msgstr ""
 
 msgctxt "release_note_128"

WordPress/metadata/release_notes.txt

@@ -1,5 +1,3 @@
-* Fixes a crash that could happen when viewing help from the login screen
-* Allow setting which editor to use on a per-site basis
-* Improves accessibility in stats
-* Makes it easier to log in by validating the URL to your site more quickly.
-* Some minor tweaks to the colour scheme
+* Block editor improvements: the editor is auto-enabled when you open a block post (unless you opted out in v12.9), or you can enable it on a per-site basis.
+* Accessibility improvements: screen readers can now read more of the stats screen.
+* General usability improvements: logging in is speedier, colors are more consistent across screens, and bug fixes put an end to some crashes.

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

@@ -880,7 +880,7 @@ public void onAppComesFromBackground() {
             sDeleteExpiredStats.runIfNotLimited();
 
             // Let's migrate the old editor preference if available in AppPrefs to the remote backend
-            SiteUtils.migrateAppWideMobileEditorPreferenceToRemote(mContext, mDispatcher, mSiteStore);
+            SiteUtils.migrateAppWideMobileEditorPreferenceToRemote(mContext, mDispatcher);
 
             if (mFirstActivityResumed) {
                 deferredInit();

WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java

@@ -258,6 +258,7 @@ private void initToolbar(View view) {
         mToolbar.setSubtitleTextAppearance(view.getContext(), R.style.Toolbar_Subtitle);
         mToolbar.setBackgroundColor(getResources().getColor(mToolbarColor));
         mToolbar.setNavigationIcon(ContextCompat.getDrawable(view.getContext(), R.drawable.ic_close_white_24dp));
+        mToolbar.setNavigationContentDescription(R.string.close_dialog_button_desc);
         mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java

@@ -227,7 +227,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             case RequestCodes.CREATE_SITE:
                 if (data != null) {
                     int newSiteLocalID = data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1);
-                    SiteUtils.enableBlockEditor(mDispatcher, mSiteStore, newSiteLocalID);
+                    SiteUtils.enableBlockEditorOnSiteCreation(mDispatcher, mSiteStore, newSiteLocalID);
                     // Mark the site to show the GB popup at first editor run
                     SiteModel newSiteModel = mSiteStore.getSiteByLocalId(newSiteLocalID);
                     if (newSiteModel != null) {

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -49,6 +49,7 @@
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask;
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartPayload;
+import org.wordpress.android.fluxc.store.SiteStore.OnAllSitesMobileEditorChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnQuickStartCompleted;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteEditorsChanged;
@@ -775,7 +776,7 @@ public void onClick(View v) {
                 // Enable the block editor on sites created on mobile
                 if (data != null) {
                     int newSiteLocalID = data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1);
-                    SiteUtils.enableBlockEditor(mDispatcher, mSiteStore, newSiteLocalID);
+                    SiteUtils.enableBlockEditorOnSiteCreation(mDispatcher, mSiteStore, newSiteLocalID);
                     // Mark the site to show the GB popup at first editor run
                     SiteModel newSiteModel = mSiteStore.getSiteByLocalId(newSiteLocalID);
                     if (newSiteModel != null) {
@@ -1157,6 +1158,26 @@ public void onSiteEditorsChanged(OnSiteEditorsChanged event) {
             return;
         }
 
+       refreshCurrentSelectedSiteAfterEditorChanges(false, event.site.getId());
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onAllSitesMobileEditorChanged(OnAllSitesMobileEditorChanged event) {
+        if (event.isError()) {
+            return;
+        }
+        if (event.isNetworkResponse) {
+            // We can remove the global app setting now, since we're sure the migration ended with success.
+            AppPrefs.removeAppWideEditorPreference();
+        }
+        refreshCurrentSelectedSiteAfterEditorChanges(true, -1);
+    }
+
+    private void refreshCurrentSelectedSiteAfterEditorChanges(boolean alwaysRefreshUI, int localSiteID) {
+        // Need to update the user property about GB enabled on any of the sites
+        AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore);
+
         // "Reload" selected site from the db
         // It would be better if the OnSiteChanged provided the list of changed sites.
         if (getSelectedSite() == null && mSiteStore.hasSite()) {
@@ -1166,6 +1187,15 @@ public void onSiteEditorsChanged(OnSiteEditorsChanged event) {
             return;
         }
 
+        // When alwaysRefreshUI is `true` we need to refresh the UI regardless of the current site
+        if (!alwaysRefreshUI) {
+            // we need to refresh the UI only when the site IDs matches
+            if (getSelectedSite().getId() != localSiteID) {
+                // No need to refresh the UI, since the current selected site is another site
+                return;
+            }
+        }
+
         SiteModel site = mSiteStore.getSiteByLocalId(getSelectedSite().getId());
         if (site != null) {
             mSelectedSite = site;

WordPress/src/main/java/org/wordpress/android/ui/plans/PlansListAdapter.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
@@ -62,7 +63,12 @@ class PlansListAdapter(
         private val subtitle: TextView = itemView.findViewById(R.id.plan_subtitle)
 
         fun bind(planOffersModel: PlanOffersModel) {
-            itemView.setOnClickListener { itemClickListener(planOffersModel) }
+            itemView.setOnClickListener {
+                itemView.performAccessibilityAction(
+                        AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS, null
+                )
+                itemClickListener(planOffersModel)
+            }
             title.text = planOffersModel.name
             subtitle.text = planOffersModel.tagline
 

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -165,6 +165,7 @@
 import org.wordpress.android.util.WPPermissionUtils;
 import org.wordpress.android.util.WPUrlUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
 import org.wordpress.android.util.helpers.MediaGalleryImageSpan;
@@ -1702,10 +1703,16 @@ private void showGutenbergInformativeDialog() {
     }
 
     private void setGutenbergEnabledIfNeeded() {
-        if ((TextUtils.isEmpty(mSite.getMobileEditor()) && !mIsNewPost)
-            || AppPrefs.shouldShowGutenbergInfoPopup(mSite.getUrl())) {
+        boolean showPopup = AppPrefs.shouldShowGutenbergInfoPopup(mSite.getUrl());
+
+        if (TextUtils.isEmpty(mSite.getMobileEditor()) && !mIsNewPost) {
             SiteUtils.enableBlockEditor(mDispatcher, mSite);
-            AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, mSite);
+            AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, mSite,
+                    BlockEditorEnabledSource.ON_BLOCK_POST_OPENING.asPropertyMap());
+            showPopup = true;
+        }
+
+        if (showPopup) {
             showGutenbergInformativeDialog();
         }
     }

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

@@ -648,6 +648,10 @@ public static boolean isGutenbergEditorEnabled() {
         return true;
     }
 
+    /**
+     * @deprecated  As of release 13.0, replaced by SiteSettings mobile editor value
+     */
+    @Deprecated
     public static boolean isGutenbergDefaultForNewPosts() {
         return getBoolean(DeletablePrefKey.GUTENBERG_DEFAULT_FOR_NEW_POSTS, false);
     }