Merge branch 'trunk' into task/18389-qs-next-steps-notification

# Conflicts:
#	Podfile
#	Podfile.lock

Author: Momo Ozawa

Podfile

@@ -47,9 +47,9 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    # pod 'WordPressKit', '~> 4.51.0'
+    pod 'WordPressKit', '~> 4.52.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
-    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'task/18389-update-mark-qs-checklist-as-complete'
+    # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end

Podfile.lock

@@ -591,7 +591,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.8)
   - WordPressAuthenticator (~> 2.0.0)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `task/18389-update-mark-qs-checklist-as-complete`)
+  - WordPressKit (~> 4.52.0-beta)
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.1)
   - WordPressUI (~> 1.12.5)
@@ -603,6 +603,7 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
+    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -752,9 +753,6 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.75.0
-  WordPressKit:
-    :branch: task/18389-update-mark-qs-checklist-as-complete
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/Yoga.podspec.json
 
@@ -770,9 +768,6 @@ CHECKOUT OPTIONS:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.75.0
-  WordPressKit:
-    :commit: 674859ccaba6d1d3aadec10f2ad7d2cae45f02f4
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
@@ -858,7 +853,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
   WordPressAuthenticator: 5163f732e4e529781f931f158f54b1a1545bc536
-  WordPressKit: 1af05d9ab2a434290be54b091094e54af081fc58
+  WordPressKit: cc1e5b12e92232d977664682ac69110852fc4ce7
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -874,6 +869,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 6ebe3ea0034d278b43717825cacc0467c045b5c6
+PODFILE CHECKSUM: d7bc9c0d041c5f2d6e109c77b2bf02d28f5f81c0
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -1,6 +1,9 @@
 19.9
 -----
+* [*] 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]
+* [*] Site Creation: we fixed an issue where the navigation buttons were not scaling when large fonts were selected on the device [#18559]
+* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
 
 19.8
 -----

WordPress/Classes/Extensions/Post+BloggingPrompts.swift

@@ -1,76 +1,11 @@
-
 extension Post {
 
-    func prepareForPrompt(_ prompt: Prompt?) {
+    func prepareForPrompt(_ prompt: BloggingPrompt?) {
         guard let prompt = prompt else {
             return
         }
-        postTitle = prompt.postTitle
-        let pullquoteBlock = getPullquoteBlock(title: prompt.promptText,
-                                               promptUrl: prompt.promptUrl?.absoluteString,
-                                               answerUrl: prompt.answerUrl?.absoluteString,
-                                               answerCount: prompt.answerCount)
-        content = pullquoteBlock + Strings.emptyParagraph
+        postTitle = prompt.title
+        content = prompt.content
     }
 
 }
-
-// MARK: - Private methods
-
-private extension Post {
-
-    func getPullquoteBlock(title: String,
-                           promptUrl: String?,
-                           answerUrl: String?,
-                           answerCount: Int) -> String {
-        let answerFormat = answerCount == 1 ? Strings.answerInfoSingularFormat : Strings.answerInfoPluralFormat
-        let answerText = String(format: answerFormat, answerCount)
-        let promptUrlHtml = getUrlHtml(url: promptUrl, urlText: Strings.prompt)
-        let answerUrlHtml = getUrlHtml(url: answerUrl, urlText: answerText)
-        let separatorText = promptUrlHtml.isEmpty || answerUrlHtml.isEmpty ? "" : " — "
-        let subtitleHtml = promptUrlHtml.isEmpty && answerUrlHtml.isEmpty ? "" :  "<cite>\(promptUrlHtml)\(separatorText)\(answerUrlHtml)</cite>"
-        return """
-            <!-- wp:pullquote -->
-            <figure class="wp-block-pullquote"><blockquote><p>\(title)</p>\(subtitleHtml)</blockquote></figure>
-            <!-- /wp:pullquote -->
-            """
-    }
-
-    func getUrlHtml(url: String?, urlText: String) -> String {
-        guard let url = url else {
-            return ""
-        }
-        return "<a href=\"\(url)\">\(urlText)</a>"
-    }
-
-    // MARK: - Strings
-
-    struct Strings {
-        static let prompt = NSLocalizedString("Prompt", comment: "Prompt link text in a new blogging prompts post")
-        static let answerInfoSingularFormat = NSLocalizedString("%1$d answer", comment: "Singular format string for displaying the number of users that answered the blogging prompt.")
-        static let answerInfoPluralFormat = NSLocalizedString("%1$d answers", comment: "Plural format string for displaying the number of users that answered the blogging prompt.")
-        static let emptyParagraph = """
-            <!-- wp:paragraph -->
-            <p></p>
-            <!-- /wp:paragraph -->
-            """
-    }
-
-}
-
-// MARK: - Temporary prompt object
-
-// TODO: Remove after prompt object is created and use that
-struct Prompt {
-    let postTitle: String
-    let promptText: String
-    let promptUrl: URL?
-    let answerUrl: URL?
-    let answerCount: Int
-
-    static let examplePrompt = Prompt(postTitle: "Cast the movie of my life",
-                                      promptText: "Cast the movie of your life.",
-                                      promptUrl: URL(string: "https://wordpress.com"),
-                                      answerUrl: URL(string: "https://wordpress.com"),
-                                      answerCount: 19)
-}

WordPress/Classes/Services/BloggingPromptsService.swift

@@ -73,7 +73,22 @@ struct BloggingPrompt {
     let answered: Bool
     let answerCount: Int
     let displayAvatarURLs: [URL]
+    let attribution: String
 
+    static let examplePrompt = BloggingPrompt(
+            promptID: 239,
+            text: "Was there a toy or thing you always wanted as a child, during the holidays or on your birthday, but never received? Tell us about it.",
+            title: "Prompt number 1",
+            content: "<!-- wp:pullquote -->\n<figure class=\"wp-block-pullquote\"><blockquote><p>Was there a toy or thing you always wanted as a child, during the holidays or on your birthday, but never received? Tell us about it.</p><cite>(courtesy of plinky.com)</cite></blockquote></figure>\n<!-- /wp:pullquote -->",
+            date: Date(),
+            answered: false,
+            answerCount: 5,
+            displayAvatarURLs: [],
+            attribution: ""
+    )
+}
+
+extension BloggingPrompt {
     init(with remotePrompt: RemoteBloggingPrompt) {
         promptID = remotePrompt.promptID
         text = remotePrompt.text
@@ -83,5 +98,6 @@ struct BloggingPrompt {
         answered = remotePrompt.answered
         answerCount = remotePrompt.answeredUsersCount
         displayAvatarURLs = remotePrompt.answeredUserAvatarURLs
+        attribution = remotePrompt.attribution
     }
 }

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -48,6 +48,7 @@ import Foundation
     case gutenbergEditorSettingsFetched
     case gutenbergEditorHelpShown
     case gutenbergEditorBlockInserted
+    case gutenbergEditorBlockMoved
 
     // Notifications Permissions
     case pushNotificationsPrimerSeen
@@ -426,6 +427,8 @@ import Foundation
             return "editor_help_shown"
         case .gutenbergEditorBlockInserted:
             return "editor_block_inserted"
+        case .gutenbergEditorBlockMoved:
+            return "editor_block_moved"
         // Notifications permissions
         case .pushNotificationsPrimerSeen:
             return "notifications_primer_seen"
@@ -1095,6 +1098,7 @@ extension WPAnalytics {
         var event: WPAnalyticsEvent?
         switch eventName {
         case "editor_block_inserted": event = .gutenbergEditorBlockInserted
+        case "editor_block_moved": event = .gutenbergEditorBlockMoved
         default: event = nil
         }
 

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardPromptsCardCell.swift

@@ -65,6 +65,14 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         }
     }
 
+    private var didFailLoadingPrompt: Bool = false {
+        didSet {
+            if didFailLoadingPrompt != oldValue {
+                refreshStackView()
+            }
+        }
+    }
+
     // Used to present:
     // - The menu sheet for contextual menu in iOS13.
     // - The Blogging Prompts list when selected from the contextual menu.
@@ -320,6 +328,12 @@ private extension DashboardPromptsCardCell {
         // clear existing views.
         containerStackView.removeAllSubviews()
 
+        guard !didFailLoadingPrompt else {
+            promptLabel.text = Strings.errorTitle
+            containerStackView.addArrangedSubview(promptTitleView)
+            return
+        }
+
         promptLabel.text = forExampleDisplay ? Strings.examplePrompt : prompt?.text.stringByDecodingXMLCharacters().trim()
         containerStackView.addArrangedSubview(promptTitleView)
 
@@ -336,13 +350,17 @@ private extension DashboardPromptsCardCell {
         // TODO: check for cached prompt first.
 
         guard let bloggingPromptsService = bloggingPromptsService else {
+            didFailLoadingPrompt = true
             DDLogError("Failed creating BloggingPromptsService instance.")
             return
         }
 
         bloggingPromptsService.fetchTodaysPrompt(success: { [weak self] (prompt) in
             self?.prompt = prompt
-        }, failure: { (error) in
+            self?.didFailLoadingPrompt = false
+        }, failure: { [weak self] (error) in
+            self?.prompt = nil
+            self?.didFailLoadingPrompt = true
             DDLogError("Failed fetching blogging prompt: \(String(describing: error))")
         })
     }
@@ -412,6 +430,7 @@ private extension DashboardPromptsCardCell {
                                                                 + "that answered the blogging prompt.")
         static let answerInfoPluralFormat = NSLocalizedString("%1$d answers", comment: "Plural format string for displaying the number of users "
                                                               + "that answered the blogging prompt.")
+        static let errorTitle = NSLocalizedString("Error loading prompt", comment: "Text displayed when there is a failure loading a blogging prompt.")
     }
 
     struct Style {

WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift

@@ -45,6 +45,7 @@ final class SitePickerViewController: UIViewController {
         super.viewDidLoad()
         setupHeaderView()
         startObservingQuickStart()
+        startObservingTitleChanges()
     }
 
     deinit {
@@ -57,6 +58,15 @@ final class SitePickerViewController: UIViewController {
         view.addSubview(blogDetailHeaderView)
         view.pinSubviewToAllEdges(blogDetailHeaderView)
     }
+
+    private func startObservingTitleChanges() {
+        NotificationCenter.default.addObserver(forName: NSNotification.Name.WPBlogUpdated,
+                                               object: nil,
+                                               queue: .main) { [weak self] _ in
+
+            self?.updateTitles()
+        }
+    }
 }
 
 // MARK: - BlogDetailHeaderViewDelegate
@@ -191,22 +201,14 @@ extension SitePickerViewController {
                                             silentlyForBlog: blog)
 
         blogService.updateSettings(for: blog, success: { [weak self] in
-            NotificationCenter.default.post(name: NSNotification.Name.WPBlogUpdated, object: nil)
 
             let notice = Notice(title: title,
                                 message: SiteTitleStrings.titleChangeSuccessfulMessage,
                                 feedbackType: .success)
             ActionDispatcher.global.dispatch(NoticeAction.post(notice))
 
             self?.blogDetailHeaderView.setTitleLoading(false)
-            self?.blogDetailHeaderView.refreshSiteTitle()
-
-            guard let parent = self?.parent as? MySiteViewController else {
-                return
-            }
-
-            parent.updateNavigationTitle(for: blog)
-
+            NotificationCenter.default.post(name: NSNotification.Name.WPBlogUpdated, object: nil)
         }, failure: { [weak self] error in
             self?.blog.settings?.name = existingBlogTitle
             self?.blogDetailHeaderView.setTitleLoading(false)
@@ -219,6 +221,16 @@ extension SitePickerViewController {
         })
     }
 
+    /// Updates site title and navigation bar title
+    private func updateTitles() {
+        blogDetailHeaderView.refreshSiteTitle()
+
+        guard let parent = parent as? MySiteViewController else {
+            return
+        }
+        parent.updateNavigationTitle(for: blog)
+    }
+
     private func showViewSite() {
         WPAppAnalytics.track(.openedViewSite, withProperties: [WPAppAnalyticsKeyTapSource: "link"], with: blog)
 

WordPress/Classes/ViewRelated/Post/EditPostViewController.swift

@@ -23,7 +23,7 @@ class EditPostViewController: UIViewController {
     private let loadAutosaveRevision: Bool
 
     @objc fileprivate(set) var post: Post?
-    private let prompt: Prompt?
+    private let prompt: BloggingPrompt?
     fileprivate var hasShownEditor = false
     fileprivate var editingExistingPost = false
     fileprivate let blog: Blog
@@ -65,7 +65,7 @@ class EditPostViewController: UIViewController {
     ///
     /// - Parameter blog: blog to create a new post for
     /// - Parameter prompt: blogging prompt to configure the new post for
-    convenience init(blog: Blog, prompt: Prompt) {
+    convenience init(blog: Blog, prompt: BloggingPrompt) {
         self.init(post: nil, blog: blog, prompt: prompt)
     }
 
@@ -75,7 +75,7 @@ class EditPostViewController: UIViewController {
     ///   - post: the post to edit
     ///   - blog: the blog to create a post for, if post is nil
     /// - Note: it's preferable to use one of the convenience initializers
-    fileprivate init(post: Post?, blog: Blog, loadAutosaveRevision: Bool = false, prompt: Prompt? = nil) {
+    fileprivate init(post: Post?, blog: Blog, loadAutosaveRevision: Bool = false, prompt: BloggingPrompt? = nil) {
         self.post = post
         self.loadAutosaveRevision = loadAutosaveRevision
         if let post = post {

WordPress/Classes/ViewRelated/Site Creation/Wizard/WizardNavigation.swift

@@ -1,7 +1,7 @@
 import UIKit
 
 // MARK: - WizardNavigation
-final class WizardNavigation: GutenbergLightNavigationController {
+final class WizardNavigation: UINavigationController {
     private let steps: [WizardStep]
     private let pointer: WizardNavigationPointer