Merge branch 'develop' into feature/bottom-sheet-pan

# Conflicts: # Podfile.lock
wordpress-mobile · May 19, 2020 · 2a79132 · 2a79132
2 parents dabeab3 + 85afe07
commit 2a79132
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 33 deletions.
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -34,14 +34,21 @@ jobs:
         # frozen-lockfile will make the build fail if the lockfile is not there
         run: yarn install --frozen-lockfile
 
-      - name: Validate Labels
-        run: |
-          yarn run danger ci \
-            --dangerfile Automattic/peril-settings/org/pr/label.ts \
-            --id pr_labels
+      # Disabled because of issues that look like outside of our control on the
+      # GitHub end.
+      #
+      # See:
+      # - https://github.com/wordpress-mobile/WordPress-iOS/pull/14110
+      # - https://github.com/wordpress-mobile/wordpress-ios/pull/14124
+      #
+      # - name: Validate Labels
+      #   run: |
+      #     yarn run danger ci \
+      #       --dangerfile Automattic/peril-settings/org/pr/label.ts \
+      #       --id pr_labels
 
-      - name: Consistency Checks
-        run: |
-          yarn run danger ci \
-            --dangerfile Automattic/peril-settings/org/pr/ios-macos.ts \
-            --id consistency_checks
+      # - name: Consistency Checks
+      #   run: |
+      #     yarn run danger ci \
+      #       --dangerfile Automattic/peril-settings/org/pr/ios-macos.ts \
+      #       --id consistency_checks
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,7 +1,20 @@
+15.0
+-----
+
 14.9
 -----
+* Streamlined navigation: now there are fewer and better organized tabs, posting shortcuts and more, so you can find what you need fast.
+* My Site: the "Add Posts and Pages" features has been moved. There is a new "Floating Action Button" in "My Site" that lets you create a new post or page without having to navigate to another screen.
+* My Site: the "Me" section has been moved. There is a new button on the top right of "My Site" that lets you access the "Me" section from there.
+* Reader: revamped UI with a tab bar that lets you quickly switch between sections, and filtering and settings panes to easily access and manage your favorite content.
 * [internal] the "Change Username" on the Signup Epilogue screen has navigation changes that can cause regressions. See https://git.io/JfGnv for testing details.
 * [internal] the "3 button view" (WP.com email, Google, SIWA, Site Address) presented after pressing the "Log In" button has navigation changes that can cause regressions. See https://git.io/JfZUV for testing details.
+* [**] Support the superscript and subscript HTML formatting on the Block Editor and Classic Editor.
+* [**] Block editor: Support for the pullquote block.
+* [**] Block editor: Fix the icons and buttons in Gallery, Paragraph, List and MediaText block on RTL mode.
+* [**] Block editor: Update page templates to use new blocks.
+* [**] Block editor: Fix a crash when uploading new videos on a video block.
+
 * [internal] the "enter your password" screen has navigation changes that can cause regressions. See https://git.io/Jfl1C for full testing details.
 * Support the superscript and subscript HTML formatting on the Block Editor and Classic Editor.
 * [***] You can now draw on images to annotate them using the Edit image feature in the post editor.

diff --git a/Scripts/fastlane/Deliverfile b/Scripts/fastlane/Deliverfile
@@ -5,7 +5,7 @@ screenshots_path "./screenshots/"
 app_identifier "org.wordpress"
 
 # Make sure to update these keys for a new version
-app_version "14.8"
+app_version "14.9"
 
 privacy_url({
   'default' => 'https://automattic.com/privacy/',

diff --git a/Scripts/fastlane/download_metadata.swift b/Scripts/fastlane/download_metadata.swift
@@ -3,7 +3,7 @@
 import Foundation
 
 let glotPressSubtitleKey = "app_store_subtitle"
-let glotPressWhatsNewKey = "v14.8-whats-new"
+let glotPressWhatsNewKey = "v14.9-whats-new"
 let glotPressDescriptionKey = "app_store_desc"
 let glotPressKeywordsKey = "app_store_keywords"
 let baseFolder = "./metadata"

diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift b/WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift
@@ -20,9 +20,9 @@ import Foundation
 
     // Settings and Prepublishing Nudges
     case editorPostPublishTap
-    case editorPostScheduled
+    case editorPostScheduledChanged
     case editorPostVisibilityChanged
-    case editorPostTagsAdded
+    case editorPostTagsChanged
     case editorPostPublishNowTapped
     case editorPostCategoryChanged
     case editorPostStatusChanged
@@ -61,12 +61,12 @@ import Foundation
         // Editor    
         case .editorPostPublishTap:
             return "editor_post_publish_tapped"
-        case .editorPostScheduled:
-            return "editor_post_scheduled"
+        case .editorPostScheduledChanged:
+            return "editor_post_scheduled_changed"
         case .editorPostVisibilityChanged:
             return "editor_post_visibility_changed"
-        case .editorPostTagsAdded:
-            return "editor_post_tags_added"
+        case .editorPostTagsChanged:
+            return "editor_post_tags_changed"
         case .editorPostPublishNowTapped:
             return "editor_post_publish_now_tapped"
         case .editorPostCategoryChanged:

diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -27,11 +27,11 @@ enum FeatureFlag: Int, CaseIterable {
         case .quickActions:
             return true
         case .meMove:
-            return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest, .a8cPrereleaseTesting]
+            return true
         case .floatingCreateButton:
-            return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest, .a8cPrereleaseTesting]
+            return true
         case .newReaderNavigation:
-            return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest]
+            return true
         case .tenor:
             return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest]
         }

diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
@@ -1263,9 +1263,7 @@ - (void)showTagsPicker
     PostTagPickerViewController *tagsPicker = [[PostTagPickerViewController alloc] initWithTags:self.post.tags blog:self.post.blog];
 
     tagsPicker.onValueChanged = ^(NSString * _Nonnull value) {
-        if (!value.isEmpty) {
-            [WPAnalytics trackEvent:WPAnalyticsEventEditorPostTagsAdded properties:@{@"via": @"settings"}];
-        }
+        [WPAnalytics trackEvent:WPAnalyticsEventEditorPostTagsChanged properties:@{@"via": @"settings"}];
 
         self.post.tags = value;
     };

diff --git a/WordPress/Classes/ViewRelated/Post/PrepublishingViewController.swift b/WordPress/Classes/ViewRelated/Post/PrepublishingViewController.swift
@@ -147,9 +147,7 @@ class PrepublishingViewController: UITableViewController {
         let tagPickerViewController = PostTagPickerViewController(tags: post.tags ?? "", blog: post.blog)
 
         tagPickerViewController.onValueChanged = { [weak self] tags in
-            if !tags.isEmpty {
-                WPAnalytics.track(.editorPostTagsAdded, properties: Constants.analyticsDefaultProperty)
-            }
+            WPAnalytics.track(.editorPostTagsChanged, properties: Constants.analyticsDefaultProperty)
 
             self?.post.tags = tags
             self?.reloadData()
@@ -197,7 +195,7 @@ class PrepublishingViewController: UITableViewController {
             sourceView: tableView.cellForRow(at: indexPath)?.contentView,
             viewModel: publishSettingsViewModel,
             updated: { [weak self] date in
-                WPAnalytics.track(.editorPostScheduled, properties: Constants.analyticsDefaultProperty)
+                WPAnalytics.track(.editorPostScheduledChanged, properties: Constants.analyticsDefaultProperty)
                 self?.publishSettingsViewModel.setDate(date)
                 self?.reloadData()
                 self?.updatePublishButtonLabel()

diff --git a/WordPress/Classes/ViewRelated/Post/Scheduling/PublishSettingsViewController.swift b/WordPress/Classes/ViewRelated/Post/Scheduling/PublishSettingsViewController.swift
@@ -209,7 +209,7 @@ private struct DateAndTimeRow: ImmuTableRow {
                 dateFormatter: model.dateFormatter,
                 dateTimeFormatter: model.dateTimeFormatter,
                 updated: { [weak self] date in
-                    WPAnalytics.track(.editorPostScheduled, properties: ["via": "settings"])
+                    WPAnalytics.track(.editorPostScheduledChanged, properties: ["via": "settings"])
                     self?.viewModel.setDate(date)
                     NotificationCenter.default.post(name: Foundation.Notification.Name(rawValue: ImmuTableViewController.modelChangedNotification), object: nil)
                 }

diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings
diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig
@@ -1,4 +1,4 @@
-VERSION_SHORT=14.8
+VERSION_SHORT=14.9
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=14.8.0.20200515
+VERSION_LONG=14.9.0.20200518
diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig
@@ -1,4 +1,4 @@
-VERSION_SHORT=14.8
+VERSION_SHORT=14.9
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=14.8.0.3
+VERSION_LONG=14.9.0.0