Merge pull request #12066 from wordpress-mobile/merge/15.0-code-freez…

…e-to-master Merge 15.0 code freeze to master
wordpress-mobile · Jun 1, 2020 · 06f3e1a · 06f3e1a
2 parents 0158ada + 4c85583
commit 06f3e1a
Show file tree

Hide file tree

Showing 173 changed files with 5,853 additions and 2,188 deletions.
diff --git a/.configure b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "master",
-  "pinned_hash": "20e63fdda938ea6d0d389ddce3efda2fdaf96fd4",
+  "pinned_hash": "62249ca6e914a98dcee0bb715fab1d24053ce65b",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",

diff --git a/.configure-files/gradle.properties.enc b/.configure-files/gradle.properties.enc
diff --git a/.configure-files/sentry.properties.enc b/.configure-files/sentry.properties.enc
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: 4ae6fbdc229d760e47c4b15faf2eb33f162170b3
-  tag: 0.9.3
+  revision: aa1997a9f798eb17a08023cbe502a8cdffdb34f1
+  tag: 0.9.5
   specs:
-    fastlane-plugin-wpmreleasetoolkit (0.9.3)
+    fastlane-plugin-wpmreleasetoolkit (0.9.5)
       activesupport (~> 4)
       chroma (= 0.2.0)
       diffy (~> 3.3)
@@ -20,7 +20,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -154,7 +154,7 @@ GEM
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)

diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@ it on [Google Play](https://play.google.com/store/apps/details?id=org.wordpress.
 1. `git clone [email protected]:wordpress-mobile/WordPress-Android.git` in the folder of your preference.
 1. `cd WordPress-Android` to enter the working directory.
 1. `cp gradle.properties-example gradle.properties` to set up the sample app credentials file.
+1. `git submodule update --init --recursive`  to pull the submodules (optionally use `--depth=1 --recommend-shallow` flags to skip pulling full submodules' history).
 1. In Android Studio, open the project from the local repository. This will auto-generate `local.properties` with the SDK location.
 1. Go to Tools → AVD Manager and create an emulated device.
 1. Run.

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,23 @@
-15.0
+15.1
 -----
 
+15.0
+-----
+* [*] Fix wrong icon is used when a Password is visible
+* [***] Block Editor: New block: Verse
+* [***] Block Editor: Trash icon that is used to remove blocks is moved to the new menu reachable via ellipsis button in the block toolbar
+* [**] Block Editor: Add support for changing overlay color settings in Cover block
+* [**] Block Editor: Add enter/exit animation in FloatingToolbar
+* [**] Block Editor: Block toolbar can now collapse when the block width is smaller than the toolbar content
+* [**] Block Editor: Creating undo levels less frequently
+* [**] Block Editor: Tooltip for page template selection buttons
+* [*] Block Editor: Fix merging of text blocks when text had active formatting (bold, italic, strike, link)
+* [*] Block Editor: Fix button alignment in page templates and make strings consistent
+* [*] Block Editor: Add support for displaying radial gradients in Buttons and Cover blocks
+* [**] Add homepage settings to pages list and to site settings. Now it's possible to change your posts page and your homepage.
+* [*] Fix wrong icon is used when a Password is visible
+* [*] Reader: Improved UI of the post card in the post feeds.
+
 14.9
 -----
 * [*] Fix issue with Preview post not working after switching to classic editor from inside the post

diff --git a/WordPress/FEATURE_ANNOUNCEMENTS.json-example b/WordPress/FEATURE_ANNOUNCEMENTS.json-example
@@ -4,26 +4,58 @@
 {
   "announcements": [
     {
-      "appVersionName": "14.7",  // app version name that announcement targets. Used for display purposes only.
-      "announcementVersion": 1, // unique version of announcement. Used to track if the specific announcement was shown or not.
-      "detailsUrl": "http://wordpress.org",  // URL that "Find out more" button will open. If empty, "Find out more" button will not be shown.
-      "features": [ // Features will appear in order they are in this list. Try to avoid using long subtitles.
+      "appVersionName": "14.7",
+      // app version name that announcement targets. Used for display purposes only.
+      "announcementVersion": 1,
+      // unique version of announcement. Used to track if the specific announcement was shown or not.
+      "detailsUrl": "http://wordpress.org",
+      // URL that "Find out more" button will open. If empty, "Find out more" button will not be shown.
+      "features": [
         {
-          "title": "Super Publishing",
-          "subtitle": "Publish amazing articles using the power of your mind! Concentrate on what you want to post, and we will do the rest!",
-          "iconUrl": "https://s0.wordpress.com/i/store/mobile/plans-free.png"
+          "localizedContent": {
+            "en": {
+              "title": "Super Publishing",
+              "subtitle": "Super Publishing is here! Publish using the power of your mind."
+            },
+            "it": {
+              "title": "Super Pubblicazione",
+              "subtitle": "Pubblicare articoli incredibili..."
+            }
+          },
+          // icon data represented as base64 string without prefix (data:image/png;base64,).
+          "iconBase64": "iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAAb1BMVEX///+ZzACTyQCRyQDi8MTk8cu+33f2+u3N5piczRSu2EnA4Hr+//rE4oTr9tXy+eOo1Dr1+unS6KOi0Sey2Fvt9tvd7ru322jb7bb6/PPE4oa73XHK5JLr9dfW6q32+uuo1DzQ6KC02mCv11LH4oz7JUSRAAAGUUlEQVR4nO2d63qiMBBASYK2eBcEReul6vs/4wJuEcJEg+Yy3Z3zc7fhyyEjl2TIBAFB/D/ELFmaOtZZrE0dyhy5YDwxdKytYGJj6Fjm+BCM8S8jh9oXh0JoGEx50a+5iSNFjDFT4WAUUx0zd6pMszcTp4YOYwUzJx9tjJaY6BzeGC0xEGCYY7Rk+/YAoI7Rknc7iDtGS6ogu77cfIY8RkuqOE07/5zPB+Hh+7qdlmyvn4dskH50W6OP0RKpk5PZYbtKuBBcpvin6DKNBw1R/DFakt7jdLkZJ6UaU1OasnW8r/6+itFPn53X42+chlMmHrm1PAVfb/KA/YYYLUmKjkbs4dCBlmU7/DFaEvZ0azL23XkN0vUbgowvMt8CT5ivxBt+JSLC7Jjv3vWrHBcz3yIq4r5XF6XjOvftArE8GfJj5W0S4TTNwUSA3hEr30Iya7OCxTAyVLfGPDEXoTUC0UV1bl6vUkTzjJpaGMCb4tS32g1rglgU5/YEC8XX5wuMkQP9Kt6GuPar0+MmIvYtWL0rSZ2NDsfiASDuJXhNi5OVLbqOYuBZsPsmweulv4v2MCY/Uxmf3dsqP3pSuwE8yTQeRka6hpO6yVf3rHh97V8Cp3zy8L8hRNg4JBD1Pi+op253W905axlGzSYH4Kfo720qBoaw9agFdBdg2GwyB8Y9CjyRA/3nrfOtNWXTnuSeAIbephiHkGHr4r7RMtw2m3xAv13h540YiifpdE+1ovTUbAIOO9+5FKuBLyOt34yOXzFCy6dHFcZSdXoADmFxuhuPWVfNW/7l3mSmuMH4GEToV1id7vrupj2xcb/jKd80BbBSZZlc2X0xra4Lxx5Ti3x0W5D7VjZ5Y1HyVWJ1BHIxGu4W/SZuRLIbXx7ORjo37D5d2YW7nrVJTc+tPcX19KLuZdIcYvK8VyaJXAsyx9PgipuhVdwm1T64ktrDqaHei59ZgCQWi3gQbD0PWsfHz9Dts2nm42fo9FUfmBFzgMs74tqHoNNLzcKLoctHUy+CLi+m0HyYC0N374hpN5fSBcLd7SIP/YA2k4ggCIL4L5mEAy+Yf/JOs/gzzro5gkc8zzT7TdnF11amZjt+ExFsLEmCq5gOnkuHUhfDc93Fa2/J+ahhwcW5tQiLw3CftLo47Pd+vJEceGv1GoWhnFzUL+UWWPlrZl9hMLwCeSD6intwhf6+RonAMAO7oG0IrpzxMyZD+A90s6cGsICoU+j8GypSkbimoSJHhB/wGCpWFXgICnW4KJrXMeDfULECzb/1DBVJk7z+dM6/oWL5Ujc9jAzJ0BZkSIZkSIb2IUMyJEMytA8ZkiEZkqF9yJAMyZAM7UOGZEiGZGgfMiRDMiRD+5AhGZIhGdqHDMmQDMnQPmRIhmRIhvYhQzIkQzK0DxmSIRmSoX3IUN9wpWhe79ns31D1ZZfmLkSKfS0xfZ2n2IpLt5CCYrfi+6ba/g3hj2S1v7CEtstnzT21/RsqvpLVLmEKbxp4/94dgSH4JW+PTfmAIOCNTSkQGEJVC1ifWh+htC1z+3N+DIbdTRGSflt+5+tGXRsuVSVCYRgsL80uvlBGeH6N/m6rkXxKpQlwGAZBWlZzLXsoTvFru0Z+DDabbNatvIDFsOBYdnFvfFNMRIaWIEMyJEMyJEMyJEMyJMPfYKiuhGTXcPy8a6bwsq1+j2mY9/Ei6LTSjKfKAQ5rkWvVNTSPO0E/P0SXP8Mg2HpQdFvIcuLe0HX1PHm20j7OC8ruHI9ij+1XTbFyquil6vHQXaBy5rReV03GHA2jWDmuDFgz+WLCuiQXI82VXTuE4xMXP6gHAUZ5dhqHXH37KAUsM7mhKgPFpz9/0SZIFYp8Vh8SGWpDGFWBOo62ZA4ZypAhPshQhgzxQYYyZIgPMpQhQ3yQoQwZ4oMMZcgQH2QoQ4b4IEMZMsQHGcqQIT7IUIYM8UGGMr/PUFXAVPWVvCoT12USYj++4FVroazwCgu6TULshSrqlA3gL/9dZjv3BcyTEuoStnACoOjzxbJjcmhETg8aQAmAQnPrBz/MO4PCk4cpI3IN+EJQt7i2J45J21GsnjTYSN/F4x7Bivie7cZF8rxQdr4TjQZrDBlQT8l2UZWxlUz1EtLy+FLlhbERigwvPSbHZc8dDpZLp2nc/xJ/AMM4nGaREA01AAAAAElFTkSuQmCC",
+          "iconUrl": ""
+          // If icon is missing, we will try to load content of iconBase64
         },
         {
-          "title": "Great cats and superb dogs are right behind you!",
-          "subtitle": "That's right! They are right in the app! They require pets right now. Are you going to look for them or what?",
+          "localizedContent": {
+            "en": {
+              "title": "Amazing Feature",
+              "subtitle": "That's right! They are right in the app! They require pets right now. Are you going to look for them or what?"
+            },
+            "it": { // localized feature description for Italian language
+              "title": "Amazing Feature in Italian",
+              "subtitle": "Description in Italian 2"
+            }
+          },
+          "iconBase64": "",
           "iconUrl": "https://s0.wordpress.com/i/store/mobile/plans-personal.png"
         },
         {
-          "title": "We like long feature announcements that why this one is going to be extra long and span multiple lines",
-          "subtitle": "Here we run out of budget.",
+          "localizedContent": {
+            "en": {
+              "title": "We like long feature announcements that why this one is going to be extra long and span multiple lines",
+              "subtitle": "Here we run out of budget."
+            },
+            "it": { // localized feature description for Italian language
+              "title": "Long feature title in Italian",
+              "subtitle": "Description in Italian 3"
+            }
+          },
+          "iconBase64": "",
           "iconUrl": "https://s0.wordpress.com/i/store/mobile/plans-premium.png"
         }
       ]
     }
   ]
-}
+}
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'se.bjurr.violations:violation-comments-to-github-gradle-plugin:1.51'
-        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.16'
+        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.28'
     }
 }
 
@@ -55,9 +55,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-225"
+            versionName "alpha-226"
         }
-        versionCode 872
+        versionCode 875
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -68,7 +68,7 @@ android {
 
         buildConfigField "boolean", "OFFER_GUTENBERG", "true"
         buildConfigField "boolean", "TENOR_AVAILABLE", "true"
-        buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "false"
+        buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "true"
     }
 
     // Gutenberg's dependency - react-native-video is using
@@ -85,23 +85,24 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "14.9"
+                versionName "15.0-rc-1"
             }
-            versionCode 873
+            versionCode 874
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
+            buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"
         }
 
         zalpha { // alpha version - enable experimental features
             applicationId "org.wordpress.android"
             dimension "buildType"
             buildConfigField "boolean", "VIDEO_OPTIMIZATION_AVAILABLE", "true"
+            buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"
         }
 
         wasabi { // "hot" version, can be installed along release, alpha or beta versions
             applicationId "org.wordpress.android.beta"
             dimension "buildType"
-            buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "true"
         }
 
         jalapeno { // Pre-Alpha version, used for PR builds, can be installed along release, alpha, beta, dev versions
@@ -170,9 +171,9 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.6.2'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
 
-    implementation 'androidx.core:core:1.0.2'
+    implementation 'androidx.core:core:1.2.0'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-    implementation 'androidx.fragment:fragment:1.0.0'
+    implementation 'androidx.fragment:fragment:1.2.4'
 
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -307,7 +308,7 @@ dependencies {
     lintChecks 'org.wordpress:lint:1.0.1'
 
     // Sentry
-    implementation 'io.sentry:sentry-android:1.7.16'
+    implementation 'io.sentry:sentry-android:2.1.3'
     implementation 'org.slf4j:slf4j-nop:1.7.25'
 
     // Encrypted Logging

diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po
@@ -27,6 +27,21 @@ msgid ""
 "<b>General updates:</b> Added reblog functionality.\n"
 msgstr ""
 
+#. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_short_149"
+msgid ""
+"14.9:\n"
+"<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.\n"
+msgstr ""
+
+msgctxt "release_note_short_148"
+msgid ""
+"14.8:\n"
+"<b>Block editor additions:</b> Buttons block displays multiple buttons in a single row; Image blocks prefill captions when available; Cover blocks allow uploading; inserted images can be cropped, zoomed, or rotated; Heading block includes alignment options.\n"
+"<b>Block editor improvements:</b> Relocated floating toolbar, fixed bug impact white space in Text blocks, fixed misaligned toolbar icons in RTL mode.\n"
+"<b>General updates:</b> Added reblog functionality.\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."

diff --git a/WordPress/metadata/release_notes_short.txt b/WordPress/metadata/release_notes_short.txt
@@ -0,0 +1 @@
+<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.
diff --git a/...ss/src/androidTest/java/org/wordpress/android/util/FeatureAnnouncementJsonValidityTest.kt b/...ss/src/androidTest/java/org/wordpress/android/util/FeatureAnnouncementJsonValidityTest.kt
@@ -1,11 +1,9 @@
 package org.wordpress.android.util
 
 import android.content.Context
-import android.text.TextUtils
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
-import org.junit.Assert.assertEquals
 import org.junit.Assert.fail
 import org.junit.Test
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncements
@@ -24,8 +22,6 @@ class FeatureAnnouncementJsonValidityTest {
             fail("FEATURE_ANNOUNCEMENTS.json is missing")
         }
 
-        assertEquals(TextUtils.isEmpty(featureAnnouncementFileContent), false)
-
         try {
             Gson().fromJson(
                     featureAnnouncementFileContent,

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
@@ -64,6 +64,8 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/com_google_android_geo_api_key"/>
 
+        <meta-data android:name="io.sentry.auto-init" android:value="false" />
+
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
@@ -384,6 +386,27 @@
                     android:host="wordpress.com"
                     android:pathPattern="/post/..*"
                     android:scheme="http" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/stats/..*"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/stats/..*"
+                    android:scheme="http" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/pages/..*"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/pages/..*"
+                    android:scheme="http" />
+
             </intent-filter>
 
         </activity>
@@ -394,6 +417,11 @@
             android:label="@string/reader"
             android:theme="@style/WordPress.NoActionBar">
         </activity>
+        <activity
+            android:name=".ui.reader.ReaderSearchActivity"
+            android:label="@string/reader"
+            android:theme="@style/WordPress.NoActionBar">
+        </activity>
         <activity
             android:name=".ui.reader.ReaderPostPagerActivity"
             android:excludeFromRecents="true"
@@ -483,6 +511,13 @@
             android:screenOrientation="landscape"
             android:theme="@style/ReaderMediaViewerTheme" />
 
+        <!-- Gutenberg activities -->
+        <activity
+            android:name=".ui.SuggestUsersActivity"
+            android:theme="@style/WordPressNoDisplay"
+            android:windowSoftInputMode="adjustResize"
+            />
+
         <!-- Other activities -->
         <activity
             android:name=".ui.publicize.PublicizeListActivity"

diff --git a/WordPress/src/main/assets/FEATURE_ANNOUNCEMENTS.json b/WordPress/src/main/assets/FEATURE_ANNOUNCEMENTS.json
@@ -1,26 +0,0 @@
-{
-  "announcements": [
-    {
-      "appVersionName": "14.7",
-      "announcementVersion": 1,
-      "detailsUrl": "http://wordpress.org",
-      "features": [
-        {
-          "title": "Super Publishing",
-          "subtitle": "Publish amazing articles using the power of your mind! Concentrate on what you want to post, and we will do the rest!",
-          "iconUrl": "https://s0.wordpress.com/i/store/mobile/plans-free.png"
-        },
-        {
-          "title": "Great cats and superb dogs are right behind you!",
-          "subtitle": "That's right! They are right in the app! They require pets right now. Are you going to look for them or what?",
-          "iconUrl": "https://s0.wordpress.com/i/store/mobile/plans-personal.png"
-        },
-        {
-          "title": "We like long feature announcements that why this one is going to be extra long and span multiple lines",
-          "subtitle": "Here we run out of budget.",
-          "iconUrl": "https://s0.wordpress.com/i/store/mobile/plans-premium.png"
-        }
-      ]
-    }
-  ]
-}

diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java
@@ -230,7 +230,9 @@ public void onCreate() {
         // This call needs be made before accessing any methods in android.webkit package
         setWebViewDataDirectorySuffixOnAndroidP();
 
-        CrashLoggingUtils.startCrashLogging(getContext());
+        if (CrashLoggingUtils.shouldEnableCrashLogging(getContext())) {
+            CrashLoggingUtils.startCrashLogging(getContext());
+        }
 
         initWellSql();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.