Merge branch 'master-auto-upload' into issue/10174-update-changes-confirmed-at

Author: maxme

RELEASE-NOTES.txt

@@ -1,27 +1,30 @@
+XX.X
+----
+* Add Remote Preview support for posts and pages.
+* Post List: Trashed post must now be restored before edit or preview.
+* All changes to posts and pages will be automatically synced with the server.
+
 13.1
 -----
-* All changes to posts and pages will be automatically synced with the server.
- 
+* Added ability to switch between Desktop and Mobile versions of the content for Site and Page preview.
+* Improvement to the functionality and design of Web Preview.
+
 13.0
 -----
-* Add Remote Preview support for posts and pages.
-* Post List: Trashed post must now be restored before edit or preview
-
 * Block editor: Auto-enabled upon first open of a block post, unless opted out in v12.9.
 * Block editor: You can now enable and disable the block editor on a per-site basis.
 * Improve accessibility in the Stats
 * Block editor: Adding a block from the post title now shows the add block here indicator.
 * Block editor: Deselect post title any time a block is added
 * Block editor: Fix loss of center alignment in image captions
- 
+
 12.9
 -----
 * Add Publish screen to Edit post settings - with notification for scheduled posts and option to add event to calendar
 * Block editor: Video block is now available in the Inserter
 * Block editor: Tapping on an empty editor area will create a new paragraph block
 * Block editor: Fix content loss issue when loading unsupported blocks containing inner blocks.
 * Block editor: Adding a block from the Post Title now inserts the block at the top of the Post.
-
 * Setting featured image on a post doesn't require network connection
 * Full screen comments view
 * Added Domain Registration functionality for customers with unclaimed domain credit

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/ActivityLauncher.java

@@ -476,14 +476,16 @@ public static void viewCurrentSite(Context context, SiteModel site, boolean open
             String siteUrl = site.getUrl();
             if (site.isWPCom()) {
                 // Show wp.com sites authenticated
-                WPWebViewActivity.openUrlByUsingGlobalWPCOMCredentials(context, siteUrl);
+                WPWebViewActivity.openUrlByUsingGlobalWPCOMCredentials(context, siteUrl, true);
             } else if (!TextUtils.isEmpty(site.getUsername()) && !TextUtils.isEmpty(site.getPassword())) {
                 // Show self-hosted sites as authenticated since we should have the username & password
-                WPWebViewActivity.openUrlByUsingBlogCredentials(context, site, null, siteUrl, new String[]{}, false);
+                WPWebViewActivity
+                        .openUrlByUsingBlogCredentials(context, site, null, siteUrl, new String[]{}, false, true,
+                                false);
             } else {
                 // Show non-wp.com sites without a password unauthenticated. These would be Jetpack sites that are
                 // connected through REST API.
-                WPWebViewActivity.openURL(context, siteUrl);
+                WPWebViewActivity.openURL(context, siteUrl, true);
             }
         }
     }
@@ -598,6 +600,7 @@ private static void browsePostOrPageEx(
                     url,
                     shareableUrl,
                     shareSubject,
+                    true,
                     startPreviewForResult);
         } else if (site.isJetpackConnected()) {
             WPWebViewActivity
@@ -607,6 +610,7 @@ private static void browsePostOrPageEx(
                             shareableUrl,
                             shareSubject,
                             site.getFrameNonce(),
+                            true,
                             startPreviewForResult);
         } else {
             // Add the original post URL to the list of allowed URLs.
@@ -621,6 +625,7 @@ private static void browsePostOrPageEx(
                     url,
                     new String[]{post.getLink()},
                     true,
+                    true,
                     startPreviewForResult);
         }
     }

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/JetpackConnectionWebViewActivity.java

@@ -81,6 +81,7 @@ public void onCreate(Bundle savedInstanceState) {
         mSource = (JetpackConnectionSource) getIntent().getSerializableExtra(TRACKING_SOURCE_KEY);
         // We need to get the site before calling super since it'll create the web client
         super.onCreate(savedInstanceState);
+        toggleNavbarVisibility(false);
     }
 
     @Override

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

@@ -0,0 +1,62 @@
+package org.wordpress.android.ui
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ImageView
+import android.widget.TextView
+
+import org.wordpress.android.R
+import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode
+
+class PreviewModeMenuAdapter(context: Context, private val selectedPreviewMode: PreviewMode) : BaseAdapter() {
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private val menuItems = arrayOf(PreviewMode.DEFAULT, PreviewMode.DESKTOP)
+
+    override fun getCount(): Int {
+        return menuItems.size
+    }
+
+    override fun getItem(position: Int): PreviewMode {
+        return menuItems[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View? {
+        var view = convertView
+        val holder: PreviewModeMenuHolder
+        if (view == null) {
+            view = inflater.inflate(R.layout.preview_mode_popup_menu_item, parent, false)
+            holder = PreviewModeMenuHolder(view)
+            view.tag = holder
+        } else {
+            holder = view.tag as PreviewModeMenuHolder
+        }
+
+        val previewMode = menuItems[position]
+        val labelResId = when (previewMode) {
+            PreviewMode.DEFAULT -> R.string.web_preview_default
+            PreviewMode.DESKTOP -> R.string.web_preview_desktop
+        }
+
+        holder.label.setText(labelResId)
+
+        if (previewMode === selectedPreviewMode) {
+            holder.checkmark.visibility = View.VISIBLE
+        } else {
+            holder.checkmark.visibility = View.GONE
+        }
+
+        return view
+    }
+
+    internal inner class PreviewModeMenuHolder(view: View) {
+        val label: TextView = view.findViewById(R.id.preview_mode_label)
+        val checkmark: ImageView = view.findViewById(R.id.checkmark)
+    }
+}