Merge remote-tracking branch 'origin/trunk' into feature/18375-prompts-core-data

Author: dvdchr

Podfile

@@ -169,7 +169,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :tag => 'v1.75.0'
+    gutenberg :tag => 'v1.76.0'
 
     ## Third party libraries
     ## =====================

Podfile.lock

@@ -2,7 +2,13 @@
 -----
 * [*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]
 * [*] Media Picker: Fixed an issue where the empty state view was being displayed incorrectly. [#18471]
+* [*] Quick Start: We are now showing a different set of Quick Start tasks for existing sites and new sites. The existing sites checklist includes new tours such as: "Check your notifications" and "Upload photos or videos".  [#18395, #18412, #18443, #18471]
 * [*] Site Creation: we fixed an issue where the navigation buttons were not scaling when large fonts were selected on the device [#18559]
+* [**] Block Editor: Cover Block: Improve color contrast between background and text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4808]
+* [***] Block Editor: Add drag & drop blocks feature [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4832]
+* [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
+* [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
+* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
 
 19.8
 -----

RELEASE-NOTES.txt

@@ -15,11 +15,11 @@ - (void)removeQuickStartFromBlog:(Blog *)blog sourceView:(UIView *)sourceView so
 
     UIAlertController *removeConfirmation = [UIAlertController alertControllerWithTitle:removeTitle message:removeMessage preferredStyle:UIAlertControllerStyleAlert];
     [removeConfirmation addCancelActionWithTitle:cancelTitle handler:^(UIAlertAction * _Nonnull action) {
-        [WPAnalytics track:WPAnalyticsStatQuickStartRemoveDialogButtonCancelTapped];
+        [WPAnalytics trackQuickStartStat:WPAnalyticsStatQuickStartRemoveDialogButtonCancelTapped blog: blog];
         [NoticesDispatch unlock];
     }];
     [removeConfirmation addDefaultActionWithTitle:confirmationTitle handler:^(UIAlertAction * _Nonnull action) {
-        [WPAnalytics track:WPAnalyticsStatQuickStartRemoveDialogButtonRemoveTapped];
+        [WPAnalytics trackQuickStartStat:WPAnalyticsStatQuickStartRemoveDialogButtonRemoveTapped blog: blog];
         [[QuickStartTourGuide shared] removeFrom:blog];
         [NoticesDispatch unlock];
     }];

WordPress/Classes/Categories/UIViewController+RemoveQuickStart.m

@@ -65,6 +65,18 @@ class BloggingPromptsService {
         }, failure: failure)
     }
 
+    /// Convenience method to fetch the blogging prompts for the Prompts List.
+    /// Fetches 11 prompts - the current day and 10 previous.
+    ///
+    /// - Parameters:
+    ///   - success: Closure to be called when the fetch process succeeded.
+    ///   - failure: Closure to be called when the fetch process failed.
+    func fetchListPrompts(success: @escaping ([BloggingPrompt]) -> Void,
+                          failure: @escaping (Error?) -> Void) {
+        let fromDate = calendar.date(byAdding: .day, value: -9, to: Date()) ?? Date()
+        fetchPrompts(from: fromDate, number: 11, success: success, failure: failure)
+    }
+
     required init?(contextManager: CoreDataStack = ContextManager.shared,
                    remote: BloggingPromptsServiceRemote? = nil,
                    blog: Blog? = nil) {

WordPress/Classes/Services/BloggingPromptsService.swift

@@ -0,0 +1,43 @@
+import Foundation
+
+extension WPAnalytics {
+
+    static let WPAppAnalyticsKeyQuickStartSiteType: String = "site_type"
+
+    /// Track a Quick Start event
+    ///
+    /// This will call each registered tracker and fire the given event
+    /// - Parameter event: a `WPAnalyticsEvent` that represents the Quick Start event to track
+    /// - Parameter properties: a `Hash` that represents the properties
+    /// - Parameter blog: a `Blog` to which the Quick Start event relates to. Used to determine the Quick Start Type
+    ///
+    static func trackQuickStartEvent(_ event: WPAnalyticsEvent, properties: [AnyHashable: Any] = [:], blog: Blog) {
+        var props = properties
+        props[WPAppAnalyticsKeyQuickStartSiteType] = blog.quickStartType.key
+        WPAnalytics.track(event, properties: props)
+    }
+
+    /// Track a Quick Start stat
+    ///
+    /// This will call each registered tracker and fire the given stat
+    /// - Parameter stat: a `WPAnalyticsStat` that represents the Quick Start stat to track
+    /// - Parameter properties: a `Hash` that represents the properties
+    /// - Parameter blog: a `Blog` to which the Quick Start stat relates to. Used to determine the Quick Start Type
+    ///
+    static func trackQuickStartStat(_ stat: WPAnalyticsStat, properties: [AnyHashable: Any] = [:], blog: Blog) {
+        var props = properties
+        props[WPAppAnalyticsKeyQuickStartSiteType] = blog.quickStartType.key
+        WPAnalytics.track(stat, withProperties: props)
+    }
+
+    /// Track a Quick Start stat in Obj-C
+    ///
+    /// This will call each registered tracker and fire the given stat
+    /// - Parameter stat: a `WPAnalyticsStat` that represents the Quick Start stat to track
+    /// - Parameter blog: a `Blog` to which the Quick Start stat relates to. Used to determine the Quick Start Type
+    ///
+    @objc static func trackQuickStartStat(_ stat: WPAnalyticsStat, blog: Blog) {
+        let props = [WPAppAnalyticsKeyQuickStartSiteType: blog.quickStartType.key]
+        WPAnalytics.track(stat, withProperties: props)
+    }
+}

WordPress/Classes/Utility/Analytics/WPAnalytics+QuickStart.swift

@@ -58,7 +58,7 @@ class Animator: NSObject {
             preamble?()
         }
 
-        UIView.animate(withDuration: duration, delay: 0, options: .curveEaseOut, animations: animations) { [unowned self] _ in
+        UIView.animate(withDuration: duration, delay: 0, options: .curveEaseOut, animations: animations) { _ in
             self.animationsInProgress -= 1
 
             if self.animationsInProgress == 0 {

WordPress/Classes/Utility/Animator.swift

@@ -59,4 +59,9 @@ extension AppConstants {
     struct Zendesk {
         static let ticketSubject = NSLocalizedString("WordPress for iOS Support", comment: "Subject of new Zendesk ticket.")
     }
+
+    struct QuickStart {
+        static let getToKnowTheAppTourTitle = NSLocalizedString("Get to know the WordPress app",
+                                                                comment: "Name of the Quick Start list that guides users through a few tasks to explore the WordPress app.")
+    }
 }

WordPress/Classes/Utility/App Configuration/AppConstants.swift

@@ -88,7 +88,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .siteName:
             return true
         case .quickStartForExistingUsers:
-            return BuildConfiguration.current == .localDeveloper
+            return true
         }
     }
 

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -427,17 +427,19 @@ extension PushNotificationsManager {
         }
         WPTabBarController.sharedInstance()?.showMySitesTab()
 
-        if let taskName = userInfo.string(forKey: QuickStartTracking.taskNameKey) {
+        if let taskName = userInfo.string(forKey: QuickStartTracking.taskNameKey),
+            let quickStartType = userInfo.string(forKey: QuickStartTracking.quickStartTypeKey) {
             WPAnalytics.track(.quickStartNotificationTapped,
-                              withProperties: [QuickStartTracking.taskNameKey: taskName])
+                              withProperties: [QuickStartTracking.taskNameKey: taskName,
+                                               WPAnalytics.WPAppAnalyticsKeyQuickStartSiteType: quickStartType])
         }
 
         completionHandler?(.newData)
 
         return true
     }
 
-    func postNotification(for tour: QuickStartTour) {
+    func postNotification(for tour: QuickStartTour, quickStartType: QuickStartType) {
         deletePendingLocalNotifications()
 
         let content = UNMutableNotificationContent()
@@ -459,7 +461,8 @@ extension PushNotificationsManager {
         UNUserNotificationCenter.current().add(request)
 
         WPAnalytics.track(.quickStartNotificationStarted,
-                          withProperties: [QuickStartTracking.taskNameKey: tour.analyticsKey])
+                          withProperties: [QuickStartTracking.taskNameKey: tour.analyticsKey,
+                                           WPAnalytics.WPAppAnalyticsKeyQuickStartSiteType: quickStartType.key])
     }
 
     @objc func deletePendingLocalNotifications() {
@@ -473,6 +476,7 @@ extension PushNotificationsManager {
 
     private enum QuickStartTracking {
         static let taskNameKey = "task_name"
+        static let quickStartTypeKey = "site_type"
     }
 }