Merge pull request #10248 from wordpress-mobile/merge-release-12.9-in…

…to-develop

Merge release 12.9 into develop

.bundle/config

@@ -1,2 +1,3 @@
 ---
 BUNDLE_PATH: "vendor/bundle"
+BUNDLE_WITHOUT: "screenshots"

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: 9cefa93fed199849a9e53619e2576012412a4d67
+  revision: c555066402074a527a9853932790da8198eb7f21
   tag: 0.6.0
   specs:
     fastlane-plugin-wpmreleasetoolkit (0.6.0)
@@ -31,7 +31,7 @@ GEM
     declarative-option (0.1.0)
     diffy (3.3.0)
     digest-crc (0.4.1)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.4)
     emoji_regex (1.0.1)
@@ -177,7 +177,7 @@ GEM
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.10.0)
+    xcodeproj (1.11.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -195,6 +195,7 @@ DEPENDENCIES
   fastlane (= 2.126)!
   fastlane-plugin-wpmreleasetoolkit!
   nokogiri!
+  rmagick (~> 3.2.0)
 
 BUNDLED WITH
    1.17.3

WordPress/build.gradle

@@ -49,8 +49,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "alpha-180"
-        versionCode 754
+        versionName "alpha-181"
+        versionCode 756
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -78,8 +78,8 @@ android {
     productFlavors {
         vanilla { // used for release and beta
             dimension "buildType"
-            versionName "12.9-rc-1"
-            versionCode 753
+            versionName "12.9-rc-2"
+            versionCode 755
         }
 
         zalpha { // alpha version - enable experimental features

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,14 @@ 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_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"
+msgstr ""
+
 msgctxt "release_note_128"
 msgid ""
 "12.8:\n"
@@ -20,14 +28,6 @@ msgid ""
 "* Block Editor: Fixed a bug that affected pasting text into the Post Title.\n"
 msgstr ""
 
-msgctxt "release_note_127"
-msgid ""
-"12.7:\n"
-"* Quote and More blocks are now available, and we fixed an issue that caused the keyboard in the editor to flicker if you repeatedly pressed Enter on a post title.\n"
-"* Business plan customers can register a custom domain when installing a plugin.\n"
-"* Sometimes when you started a new draft, the app would create two. Fixed!\n"
-msgstr ""
-
 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."
 msgstr ""
@@ -50,21 +50,55 @@ msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
 msgctxt "play_store_promo"
-msgid "Share posts and photos, monitor stats, keep up with blogs you follow, and more!"
+msgid "Easily build your website & blog. Create posts & track analytics from anywhere!"
 msgstr ""
 
 #. translators: Multi-paragraph text used to display in the Play Store.
 msgctxt "play_store_desc"
 msgid ""
-"Manage or create your WordPress blog or website right from your Android device: create and edit posts and pages, upload your favorite photos and videos, view stats and reply to comments.\n"
+"WordPress for Android puts the power of web publishing in your pocket. It’s a website creator and so much more!\n"
+"\n"
+"CREATE\n"
+"- Give your big ideas a home on the web. WordPress for Android is a website builder and a blog maker. Use it to create your website.\n"
+"- Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you.\n"
+"- Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator -- we’re your partner and cheering squad!)\n"
+"\n"
+"STATS\n"
+"- Check your website’s stats in real time to keep track of the activity on your site.\n"
+"- Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights.\n"
+"- Use the traffic map to see which countries your visitors come from.\n"
+"\n"
+"NOTIFICATIONS\n"
+"- Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens.\n"
+"- Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers.\n"
+"\n"
+"PUBLISH\n"
+"- Create updates, stories, photo essays announcements -- anything! --  with the editor.\n"
+"- Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography.\n"
+"- Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging.\n"
+"- Add tags and categories to help new readers discover your posts, and watch your audience grow.\n"
+"\n"
+"READER\n"
+"- WordPress is more than a blog maker — use it to connect with a community of writers in the WordPress Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest.\n"
+"- Hang on to the posts that fascinate you with the Save for later feature.\n"
+"\n"
+"SHARE\n"
+"- Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more.\n"
+"- Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors.\n"
+"\n"
+"Why WordPress?\n"
+"\n"
+"There are a lot of blogging services, website builders, and social networks out there. Why create your website with WordPress?\n"
+"\n"
+"WordPress powers over a third of the web. It’s used by hobby blogs, businesses of all sizes, online stores, even the biggest news sites on the internet. Odds are that many of your favorite websites are running on WordPress.\n"
 "\n"
-"With WordPress for Android, you have the power to publish in the palm of your hand. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments, or check your stats to see what new countries today's readers are coming from.\n"
+"With WordPress, you own your own content.  Other social networks treat you as a commodity, and assume ownership of the content you post. But with WordPress anything you publish is yours, and you can take it with you wherever you’d like.\n"
 "\n"
-"WordPress for Android is an Open Source project, which means you too can contribute to its development. Learn more at https://apps.wordpress.com/contribute/.\n"
+"WordPress is an open source website creator, meaning anyone can see how it's made, and even contribute.  Other services and social networks are proprietary, closed systems; you can never be sure exactly how they work or what they are doing -- and they can disappear!\n"
 "\n"
-"WordPress for Android supports WordPress.com and self-hosted WordPress.org sites running WordPress 4.0 or higher.\n"
+"Whether you need a website builder to create your website, or a simple blog maker, WordPress can help. It gives you beautiful designs, powerful features, and the freedom to build anything you want.\n"
 "\n"
-"Need help with the app? Visit the forums at https://android.forums.wordpress.org/forum/troubleshooting or tweet us @WPAndroid.\n"
+"WordPress for Android supports self-hosted sites running WordPress 4.0 and later, and all sites at WordPress.com. Just like WordPress, WordPress for Android is open source. Learn more at  https://apps.wordpress.com/contribute/.  Need help with the app? Send us a tweet at @WPAndroid, or visit our forums at https://android.forums.wordpress.org/forum/troubleshooting.\n"
 msgstr ""
 
 #. translators: Title to be displayed in the Play Store. Limit to 50 characters including spaces and commas!

WordPress/metadata/full_description.txt

@@ -1,9 +1,43 @@
-Manage or create your WordPress blog or website right from your Android device: create and edit posts and pages, upload your favorite photos and videos, view stats and reply to comments.
+WordPress for Android puts the power of web publishing in your pocket. It’s a website creator and so much more!
 
-With WordPress for Android, you have the power to publish in the palm of your hand. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments, or check your stats to see what new countries today's readers are coming from.
+CREATE
+- Give your big ideas a home on the web. WordPress for Android is a website builder and a blog maker. Use it to create your website. 
+- Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you.
+- Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator -- we’re your partner and cheering squad!)
 
-WordPress for Android is an Open Source project, which means you too can contribute to its development. Learn more at https://apps.wordpress.com/contribute/.
+STATS
+- Check your website’s stats in real time to keep track of the activity on your site. 
+- Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights.
+- Use the traffic map to see which countries your visitors come from.
 
-WordPress for Android supports WordPress.com and self-hosted WordPress.org sites running WordPress 4.0 or higher.
+NOTIFICATIONS
+- Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens.
+- Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers.
 
-Need help with the app? Visit the forums at https://android.forums.wordpress.org/forum/troubleshooting or tweet us @WPAndroid.
+PUBLISH
+- Create updates, stories, photo essays announcements -- anything! --  with the editor.
+- Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography.
+- Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging.
+- Add tags and categories to help new readers discover your posts, and watch your audience grow. 
+
+READER
+- WordPress is more than a blog maker — use it to connect with a community of writers in the WordPress Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest.
+- Hang on to the posts that fascinate you with the Save for later feature. 
+
+SHARE
+- Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more. 
+- Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors.
+
+Why WordPress? 
+
+There are a lot of blogging services, website builders, and social networks out there. Why create your website with WordPress?
+
+WordPress powers over a third of the web. It’s used by hobby blogs, businesses of all sizes, online stores, even the biggest news sites on the internet. Odds are that many of your favorite websites are running on WordPress. 
+
+With WordPress, you own your own content.  Other social networks treat you as a commodity, and assume ownership of the content you post. But with WordPress anything you publish is yours, and you can take it with you wherever you’d like.
+
+WordPress is an open source website creator, meaning anyone can see how it's made, and even contribute.  Other services and social networks are proprietary, closed systems; you can never be sure exactly how they work or what they are doing -- and they can disappear!  
+
+Whether you need a website builder to create your website, or a simple blog maker, WordPress can help. It gives you beautiful designs, powerful features, and the freedom to build anything you want.
+
+WordPress for Android supports self-hosted sites running WordPress 4.0 and later, and all sites at WordPress.com. Just like WordPress, WordPress for Android is open source. Learn more at  https://apps.wordpress.com/contribute/.  Need help with the app? Send us a tweet at @WPAndroid, or visit our forums at https://android.forums.wordpress.org/forum/troubleshooting.

WordPress/metadata/release_notes.txt

@@ -1,4 +1,3 @@
-* In Posts and Pages, Authors, Tags, and Categories Stats cards, a percentage bar has been added to communicate the impact of each item.
-* You can now search posts on the Post List page.
-* New! Widgets for All-time, Today, and Weekly Stats are now available.
-* Block Editor: Fixed a bug that affected pasting text into the Post Title.
+* Customers with unclaimed domain credits can register domains in the app.
+* You can expand the Comment Editor to Full Screen for more space while editing.
+* 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.

WordPress/metadata/short_description.txt

@@ -1 +1 @@
-Share posts and photos, monitor stats, keep up with blogs you follow, and more!
+Easily build your website & blog. Create posts & track analytics from anywhere!

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

@@ -159,7 +159,6 @@
 import org.wordpress.android.util.WPHtml;
 import org.wordpress.android.util.WPMediaUtils;
 import org.wordpress.android.util.WPPermissionUtils;
-import org.wordpress.android.util.WPPrefUtils;
 import org.wordpress.android.util.WPUrlUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.helpers.MediaFile;
@@ -2286,10 +2285,8 @@ public Fragment getItem(int position) {
                         setGutenbergEnabledIfNeeded();
                         String languageString = LocaleManager.getLanguage(EditPostActivity.this);
                         String wpcomLocaleSlug = languageString.replace("_", "-").toLowerCase(Locale.ENGLISH);
-                        WPPrefUtils.setMobileEditorPreferenceToRemote(mDispatcher, mSiteStore);
                         return GutenbergEditorFragment.newInstance("", "", mIsNewPost, wpcomLocaleSlug);
                     } else if (mShowAztecEditor) {
-                        WPPrefUtils.setMobileEditorPreferenceToRemote(mDispatcher, mSiteStore);
                         return AztecEditorFragment.newInstance("", "",
                                                                AppPrefs.isAztecEditorToolbarExpanded());
                     } else if (mShowNewEditor) {

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

@@ -304,7 +304,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             AppPrefs.setGutenbergDefaultForNewPosts((Boolean) newValue);
             // we need to refresh metadata as gutenberg_enabled is now part of the user data
             AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore);
-            WPPrefUtils.setMobileEditorPreferenceToRemote(mDispatcher, mSiteStore);
         } else if (preference == mStripImageLocation) {
             AppPrefs.setStripImageLocation((Boolean) newValue);
         }

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

@@ -9,14 +9,6 @@
 import android.widget.TextView;
 
 import org.wordpress.android.R;
-import org.wordpress.android.fluxc.Dispatcher;
-import org.wordpress.android.fluxc.generated.SiteActionBuilder;
-import org.wordpress.android.fluxc.model.SiteModel;
-import org.wordpress.android.fluxc.store.SiteStore;
-import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorPayload;
-import org.wordpress.android.ui.prefs.AppPrefs;
-
-import java.util.List;
 
 /**
  * Design guidelines for Calypso-styled Site Settings (and likely other screens)
@@ -168,26 +160,4 @@ public static void setTextViewAttributes(TextView textView, int size, int colorR
         textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
         textView.setTextColor(textView.getResources().getColor(colorRes));
     }
-
-    public static void setMobileEditorPreferenceToRemote(final Dispatcher dispatcher, final SiteStore siteStore) {
-        final List<SiteModel> sitesAccessedViaWPComRest = siteStore.getSitesAccessedViaWPComRest();
-        final boolean setDelay = sitesAccessedViaWPComRest.size() > 5;
-        final String editorSetting = AppPrefs.isGutenbergDefaultForNewPosts() ? "gutenberg" : "aztec";
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                for (SiteModel currentSite : sitesAccessedViaWPComRest) {
-                    dispatcher.dispatch(SiteActionBuilder.newDesignateMobileEditorAction(
-                            new DesignateMobileEditorPayload(currentSite, editorSetting)));
-                    if (setDelay) {
-                        try {
-                            Thread.sleep(200);
-                        } catch (InterruptedException e) {
-                            // no-op
-                        }
-                    }
-                }
-            }
-        }).start();
-    }
 }

fastlane/Fastfile

@@ -169,7 +169,18 @@ ENV["HAS_ALPHA_VERSION"]="true"
   desc "Updates store metadata and runs the release checks"
   lane :finalize_release do | options |
     android_finalize_prechecks(options)
-    android_update_metadata(options) unless android_current_branch_is_hotfix
+    hotfix = android_current_branch_is_hotfix
+    android_update_metadata(options) unless hotfix
+    android_bump_version_final_release() unless hotfix
+    version = android_get_release_version() unless hotfix
+    download_metadata_strings(version: version["name"], build_number: version["code"]) unless hotfix
+    android_tag_build(tag_alpha: false)
+
+    # Wrap up
+    removebranchprotection(repository:GHHELPER_REPO, branch: "release/#{version["name"]}")
+    setfrozentag(repository:GHHELPER_REPO, milestone: version["name"], freeze: false)
+    close_milestone(repository:GHHELPER_REPO, milestone: version["name"])
+    create_new_milestone(repository:GHHELPER_REPO)
   end
 
   #####################################################################################
@@ -287,11 +298,15 @@ ENV["HAS_ALPHA_VERSION"]="true"
     }
 
     delete_old_changelogs(build: options[:build_number])
+    download_path=Dir.pwd + "/metadata/android"
     gp_downloadmetadata(project_url: "https://translate.wordpress.org/projects/apps/android/release-notes/", 
       target_files: files, 
       locales: SUPPORTED_LOCALES.map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]},
       source_locale: "en-US",
-      download_path: Dir.pwd + "/metadata/android")
+      download_path: download_path)
+
+    android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: SUPPORTED_LOCALES.map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]})
+    sh("git add #{download_path} && git commit -m \"Update metadata translations for #{options[:version]}\" && git push")
   end 
 
 ########################################################################

fastlane/Pluginfile

@@ -2,6 +2,10 @@
 #
 # Ensure this file is checked in to source control!
 
+group :screenshots, optional: true do
+  gem 'rmagick', '~> 3.2.0'
+end
+
 gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', tag:'0.6.0'