Merge branch 'trunk' into task/enable-qs-for-existing-users-feature-flag

Author: Momo Ozawa

Podfile.lock

@@ -487,7 +487,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.52.0-beta.2):
+  - WordPressKit (4.52.0-beta.3):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -603,7 +603,6 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
-    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -641,6 +640,7 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
+    - WordPressKit
     - WordPressMocks
     - WordPressShared
     - WordPressUI
@@ -853,7 +853,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
   WordPressAuthenticator: 5163f732e4e529781f931f158f54b1a1545bc536
-  WordPressKit: cc1e5b12e92232d977664682ac69110852fc4ce7
+  WordPressKit: 0defd60331a0b66f09e8892179582814cecb9fdc
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac

RELEASE-NOTES.txt

@@ -3,6 +3,8 @@
 * [*] 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]
+* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
 
 19.8
 -----

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

@@ -359,6 +359,7 @@ private extension DashboardPromptsCardCell {
             self?.prompt = prompt
             self?.didFailLoadingPrompt = false
         }, failure: { [weak self] (error) in
+            self?.prompt = nil
             self?.didFailLoadingPrompt = true
             DDLogError("Failed fetching blogging prompt: \(String(describing: error))")
         })

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
 

WordPress/Classes/ViewRelated/System/Action Sheet/BloggingPromptsHeaderView.swift

@@ -18,22 +18,21 @@ class BloggingPromptsHeaderView: UIView, NibLoadable {
         configureView()
     }
 
-    @IBAction private func answerPromptTapped(_ sender: Any) {
-        answerPromptHandler?()
+    static func view(for prompt: BloggingPrompt?) -> BloggingPromptsHeaderView {
+        let promptsHeaderView = BloggingPromptsHeaderView.loadFromNib()
+        promptsHeaderView.configure(prompt)
+        return promptsHeaderView
     }
 
-    @IBAction private func shareTapped(_ sender: Any) {
-        // TODO
-    }
 }
 
 // MARK: - Private methods
 
 private extension BloggingPromptsHeaderView {
 
+    // MARK: - Configure View
+
     func configureView() {
-        // TODO: Hide correct UI based on if prompt is answered
-        answeredStackView.isHidden = true
         configureSpacing()
         configureStrings()
         configureStyles()
@@ -49,8 +48,6 @@ private extension BloggingPromptsHeaderView {
 
     func configureStrings() {
         titleLabel.text = Strings.title
-        // TODO: Use prompt from backend
-        promptLabel.text = Strings.examplePrompt
         answerPromptButton.titleLabel?.text = Strings.answerButtonTitle
         answeredLabel.text = Strings.answeredLabelTitle
         shareButton.titleLabel?.text = Strings.shareButtonTitle
@@ -91,6 +88,24 @@ private extension BloggingPromptsHeaderView {
         }
     }
 
+    func configure(_ prompt: BloggingPrompt?) {
+        promptLabel.text = prompt?.text
+
+        let answered = prompt?.answered ?? false
+        answerPromptButton.isHidden = answered
+        answeredStackView.isHidden = !answered
+    }
+
+    // MARK: - Button Actions
+
+    @IBAction func answerPromptTapped(_ sender: Any) {
+        answerPromptHandler?()
+    }
+
+    @IBAction func shareTapped(_ sender: Any) {
+        // TODO
+    }
+
     // MARK: - Constants
 
     struct Constants {
@@ -102,7 +117,6 @@ private extension BloggingPromptsHeaderView {
     }
 
     struct Strings {
-        static let examplePrompt = NSLocalizedString("Cast the movie of your life.", comment: "Example prompt for blogging prompts in the create new bottom action sheet.")
         static let title = NSLocalizedString("Prompts", comment: "Title label for blogging prompts in the create new bottom action sheet.")
         static let answerButtonTitle = NSLocalizedString("Answer Prompt", comment: "Title for a call-to-action button in the create new bottom action sheet.")
         static let answeredLabelTitle = NSLocalizedString("✓ Answered", comment: "Title label that indicates the prompt has been answered.")

WordPress/Classes/ViewRelated/System/Floating Create Button/CreateButtonCoordinator.swift

@@ -56,20 +56,11 @@ import WordPressFlux
         }
     }
 
-    private lazy var promptsHeaderView: BloggingPromptsHeaderView? = {
-        let headerView = FeatureFlag.bloggingPrompts.enabled ? BloggingPromptsHeaderView.loadFromNib() : nil
-        headerView?.answerPromptHandler = { [weak self] in
-            self?.viewController?.dismiss(animated: true) {
-                guard let blog = self?.blog else {
-                    return
-                }
-                let editor = EditPostViewController(blog: blog, prompt: .examplePrompt)
-                editor.modalPresentationStyle = .fullScreen
-                editor.entryPoint = .bloggingPromptsActionSheetHeader
-                self?.viewController?.present(editor, animated: true)
-            }
-        }
-        return headerView
+    // TODO: when prompt is used, get prompt from cache so it's using the latest.
+    private var prompt: BloggingPrompt?
+
+    private lazy var bloggingPromptsService: BloggingPromptsService? = {
+        return BloggingPromptsService(blog: blog)
     }()
 
     private weak var noticeContainerView: NoticeContainerView?
@@ -92,6 +83,11 @@ import WordPressFlux
         super.init()
 
         listenForQuickStart()
+
+        // Only fetch the prompt if it is actually needed, i.e. on the FAB that has multiple actions.
+        if actions.count > 1 {
+            fetchBloggingPrompt()
+        }
     }
 
     deinit {
@@ -161,7 +157,7 @@ import WordPressFlux
     }
 
     private func actionSheetController(with traitCollection: UITraitCollection) -> UIViewController {
-        let actionSheetVC = CreateButtonActionSheet(headerView: promptsHeaderView, actions: actions)
+        let actionSheetVC = CreateButtonActionSheet(headerView: createPromptHeaderView(), actions: actions)
         setupPresentation(on: actionSheetVC, for: traitCollection)
         return actionSheetVC
     }
@@ -302,3 +298,50 @@ extension UserDefaults {
         }
     }
 }
+
+
+// MARK: - Blogging Prompts Methods
+
+private extension CreateButtonCoordinator {
+
+    private func fetchBloggingPrompt() {
+
+        // TODO: check for cached prompt first.
+
+        guard let bloggingPromptsService = bloggingPromptsService else {
+            DDLogError("FAB > failed creating BloggingPromptsService instance.")
+            prompt = nil
+            return
+        }
+
+        bloggingPromptsService.fetchTodaysPrompt(success: { [weak self] (prompt) in
+            self?.prompt = prompt
+        }, failure: { [weak self] (error) in
+            self?.prompt = nil
+            DDLogError("FAB > failed fetching blogging prompt: \(String(describing: error))")
+        })
+    }
+
+    private func createPromptHeaderView() -> BloggingPromptsHeaderView? {
+        guard FeatureFlag.bloggingPrompts.enabled,
+              let blog = blog,
+              let prompt = prompt else {
+            return nil
+        }
+
+        let promptsHeaderView = BloggingPromptsHeaderView.view(for: prompt)
+
+        promptsHeaderView.answerPromptHandler = { [weak self] in
+            self?.viewController?.dismiss(animated: true) {
+                // TODO: pass prompt to post editor
+                let editor = EditPostViewController(blog: blog, prompt: .examplePrompt)
+                editor.modalPresentationStyle = .fullScreen
+                editor.entryPoint = .bloggingPromptsActionSheetHeader
+                self?.viewController?.present(editor, animated: true)
+            }
+        }
+
+        return promptsHeaderView
+    }
+
+}

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -1542,7 +1542,6 @@
 		8BD36E062395CC4400EFFF1C /* MediaEditorOperation+DescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD36E052395CC4400EFFF1C /* MediaEditorOperation+DescriptionTests.swift */; };
 		8BD66ED42787530C00CCD95A /* PostsCardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD66ED32787530C00CCD95A /* PostsCardViewModel.swift */; };
 		8BD66ED52787530C00CCD95A /* PostsCardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD66ED32787530C00CCD95A /* PostsCardViewModel.swift */; };
-		8BD6E34A2477514E009AE97C /* TestContextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD6E3492477514E009AE97C /* TestContextManager.m */; };
 		8BD8201924BCCE8600FF25FD /* ReaderWelcomeBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8BD8201824BCCE8600FF25FD /* ReaderWelcomeBanner.xib */; };
 		8BD8201B24BCDBFF00FF25FD /* ReaderWelcomeBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD8201A24BCDBFF00FF25FD /* ReaderWelcomeBanner.swift */; };
 		8BD8201D24BF9E5200FF25FD /* ReaderWelcomeBannerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD8201C24BF9E5200FF25FD /* ReaderWelcomeBannerTests.swift */; };
@@ -6311,8 +6310,6 @@
 		8BD36E012395CAEA00EFFF1C /* MediaEditorOperation+Description.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MediaEditorOperation+Description.swift"; sourceTree = "<group>"; };
 		8BD36E052395CC4400EFFF1C /* MediaEditorOperation+DescriptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MediaEditorOperation+DescriptionTests.swift"; sourceTree = "<group>"; };
 		8BD66ED32787530C00CCD95A /* PostsCardViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostsCardViewModel.swift; sourceTree = "<group>"; };
-		8BD6E3492477514E009AE97C /* TestContextManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestContextManager.m; sourceTree = "<group>"; };
-		8BD6E34B24775164009AE97C /* TestContextManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestContextManager.h; sourceTree = "<group>"; };
 		8BD8201724BC93B500FF25FD /* WordPress 98.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 98.xcdatamodel"; sourceTree = "<group>"; };
 		8BD8201824BCCE8600FF25FD /* ReaderWelcomeBanner.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReaderWelcomeBanner.xib; sourceTree = "<group>"; };
 		8BD8201A24BCDBFF00FF25FD /* ReaderWelcomeBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderWelcomeBanner.swift; sourceTree = "<group>"; };
@@ -14208,8 +14205,6 @@
 				4A17C1A3281A823E0001FFE5 /* NSManagedObject+Fixture.swift */,
 				93E9050519E6F3D8005513C9 /* ContextManagerMock.h */,
 				93E9050619E6F3D8005513C9 /* ContextManagerMock.m */,
-				8BD6E34B24775164009AE97C /* TestContextManager.h */,
-				8BD6E3492477514E009AE97C /* TestContextManager.m */,
 				933D1F451EA64108009FB462 /* TestingAppDelegate.h */,
 				933D1F461EA64108009FB462 /* TestingAppDelegate.m */,
 				933D1F6B1EA7A3AB009FB462 /* TestingMode.storyboard */,
@@ -19730,7 +19725,6 @@
 				E135965D1E7152D1006C6606 /* RecentSitesServiceTests.swift in Sources */,
 				D88A64AC208D9B09008AE9BC /* StockPhotosPageableTests.swift in Sources */,
 				40C403F82215D88100E8C894 /* TopViewedStatsTests.swift in Sources */,
-				8BD6E34A2477514E009AE97C /* TestContextManager.m in Sources */,
 				59ECF87B1CB7061D00E68F25 /* PostSharingControllerTests.swift in Sources */,
 				E157D5E01C690A6C00F04FB9 /* ImmuTableTestUtils.swift in Sources */,
 				40C403EE2215CE9500E8C894 /* SearchResultsStatsRecordValueTests.swift in Sources */,

WordPress/WordPressStatsWidgets/Views/Cards/FlexibleCard.swift

@@ -62,7 +62,6 @@ struct FlexibleCard: View {
                 Spacer()
                 titleView
             }
-            .flipsForRightToLeftLayoutDirection(true)
         }
     }
 }

WordPress/WordPressStatsWidgets/Views/Cards/ListRow.swift

@@ -80,7 +80,6 @@ struct ListRow: View {
         .frame(height: rowHeight)
         .offset(x: 0, y: Constants.verticalCenteringOffset) // each row isn't _quite_ centered vertically
                                                             // and we're not entirely sure why yet, but this fixes it
-        .flipsForRightToLeftLayoutDirection(true)
     }
 }
 

WordPress/WordPressStatsWidgets/Views/Cards/VerticalCard.swift

@@ -30,7 +30,6 @@ struct VerticalCard: View {
                 .accessibility(label: accessibilityLabel)
 
         }
-        .flipsForRightToLeftLayoutDirection(true)
     }
 }