Merge release 24.2 changes w/out ß to send strings to GlotPress (#22566)

Author: mokagio

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 
 24.2
 -----
+* [*] [Jetpack-only] Fixed a UI bug where the Dynamic Dashboard Card would slightly jump on first launch.
 * [**] Prevent images from temporarily disappearing when uploading media [https://github.com/WordPress/gutenberg/pull/57869]
 * [*] [Jetpack-only] Site Monitoring: Add Metrics, PHP Logs, and Web Server Logs under Site Monitoring [#22475, #22499, #22504, #22500]
 * [***] [Jetpack-only] Reader: introduced new UI/UX for content navigation and filtering [#22536]

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/BlogDashboardDynamicCardCell.swift

@@ -120,7 +120,12 @@ private extension DynamicDashboardCard {
             return .init(title: title, callback: callback)
         }()
 
-        let input = Input(featureImageURL: featureImageURL, rows: rows, action: action)
+        let input = Input(
+            featureImageURL: featureImageURL,
+            featureImageWidthToHeightRatio: payload.featuredImageSize?.widthToHeightRatio ?? 2,
+            rows: rows,
+            action: action
+        )
         self.init(input: input)
     }
 }

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Dynamic/DynamicDashboardCard.swift

@@ -21,6 +21,7 @@ struct DynamicDashboardCard: View {
         }
 
         let featureImageURL: URL?
+        let featureImageWidthToHeightRatio: CGFloat
         let rows: [Row]
         let action: Action?
     }
@@ -39,30 +40,27 @@ struct DynamicDashboardCard: View {
         }
         .padding(.bottom, Length.Padding.single)
         .padding(.horizontal, Length.Padding.double)
-        .fixedSize(horizontal: false, vertical: true)
     }
 
     @ViewBuilder
     var featureImage: some View {
         if let featureImageURL = input.featureImageURL {
             AsyncImage(url: featureImageURL) { phase in
-                Group {
-                    if let image = phase.image {
-                        image
-                            .resizable()
-                            .aspectRatio(contentMode: .fit)
-                    } else {
-                        Color.DS.Background.secondary
-                            .frame(maxWidth: .infinity)
-                            .frame(height: 150)
-                    }
+                switch phase {
+                case .success(let image):
+                    image
+                        .resizable()
+                        .aspectRatio(input.featureImageWidthToHeightRatio, contentMode: .fit)
+                default:
+                    Color.DS.Background.secondary
+                        .aspectRatio(input.featureImageWidthToHeightRatio, contentMode: .fit)
                 }
-                .clipShape(
-                    RoundedRectangle(
-                        cornerRadius: Length.Radius.small
-                    )
-                )
             }
+            .clipShape(
+                RoundedRectangle(
+                    cornerRadius: Length.Radius.small
+                )
+            )
         }
     }
 
@@ -141,6 +139,7 @@ struct DynamicDashboardCard_Previews: PreviewProvider {
         DynamicDashboardCard(
             input: .init(
                 featureImageURL: URL(string: "https://i.pickadummy.com/index.php?imgsize=400x200")!,
+                featureImageWidthToHeightRatio: 2,
                 rows: [
                     .init(
                         title: "Title first",

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Service/BlogDashboardRemoteEntity.swift

@@ -59,6 +59,7 @@ extension BlogDashboardRemoteEntity {
         let id: String
         let title: String?
         let featuredImage: String?
+        let featuredImageSize: ImageSize?
         let url: String?
         let action: String?
         let order: Order?
@@ -75,10 +76,23 @@ extension BlogDashboardRemoteEntity {
             let icon: String?
         }
 
+        struct ImageSize: Decodable, Hashable {
+            let width: Int?
+            let height: Int?
+
+            var widthToHeightRatio: CGFloat? {
+                guard let width, let height else {
+                    return nil
+                }
+                return CGFloat(width) / CGFloat(height)
+            }
+        }
+
         private enum CodingKeys: String, CodingKey {
             case id
             case title
             case featuredImage = "featured_image"
+            case featuredImageSize = "featured_image_size"
             case url
             case action
             case order

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.h

@@ -69,7 +69,7 @@ typedef NS_ENUM(NSInteger, QuickStartTourElement) {
     QuickStartTourElementSharing = 8,
     QuickStartTourElementConnections = 9,
     QuickStartTourElementReaderTab = 10,
-    QuickStartTourElementReaderDiscoverSettings = 12,
+    QuickStartTourElementReaderDiscoverSubscriptions = 12,
     QuickStartTourElementTourCompleted = 13,
     QuickStartTourElementCongratulations = 14,
     QuickStartTourElementSiteIcon = 15,

WordPress/Classes/ViewRelated/Blog/QuickStartTourGuide.swift

@@ -42,6 +42,13 @@ open class QuickStartTourGuide: NSObject {
         return tourState.tour.mustBeShownInBlogDetails
     }
 
+    private var shouldAutoComplete: Bool {
+        guard let element = currentElement() else {
+            return false
+        }
+        return element.autoCompleteDelay != .never
+    }
+
     @objc static let shared = QuickStartTourGuide()
 
     private override init() {}
@@ -292,7 +299,7 @@ open class QuickStartTourGuide: NSObject {
         }
         if element != currentElement {
             let blogDetailEvents: [QuickStartTourElement] = [.blogDetailNavigation, .checklist, .themes, .viewSite, .sharing, .siteMenu]
-            let readerElements: [QuickStartTourElement] = [.readerTab, .readerDiscoverSettings]
+            let readerElements: [QuickStartTourElement] = [.readerTab, .readerDiscoverSubscriptions]
 
             if blogDetailEvents.contains(element) {
                 endCurrentTour()
@@ -442,6 +449,15 @@ private extension QuickStartTourGuide {
             showStepNotice(waypoint.description)
         }
 
+        if shouldAutoComplete {
+            let element = waypoint.element
+            DispatchQueue.main.asyncAfter(deadline: .now() + element.autoCompleteDelay) {
+                if element == self.currentElement() {
+                    self.visited(element)
+                }
+            }
+        }
+
         let userInfo: [String: Any] = [
             QuickStartTourGuide.notificationElementKey: waypoint.element,
             QuickStartTourGuide.notificationDescriptionKey: waypoint.description
@@ -527,3 +543,18 @@ private struct TourState {
     var blog: Blog
     var step: Int
 }
+
+extension QuickStartTourElement {
+
+    /// The delay to wait before auto completing the tour step. A value of `.never` means it will
+    /// not auto complete.
+    var autoCompleteDelay: DispatchTimeInterval {
+        switch self {
+        case .readerDiscoverSubscriptions:
+            return .seconds(5)
+        default:
+            return .never
+        }
+    }
+
+}

WordPress/Classes/ViewRelated/Blog/QuickStartTours.swift

@@ -176,21 +176,35 @@ struct QuickStartFollowTour: QuickStartTour {
     var waypoints: [WayPoint] = {
         let step1DescriptionBase = NSLocalizedString("Select %@ to find other sites.", comment: "A step in a guided tour for quick start. %@ will be the name of the item to select.")
         let step1DescriptionTarget = NSLocalizedString("Reader", comment: "The menu item to select during a guided tour.")
-        let step1: WayPoint = (element: .readerTab, description: step1DescriptionBase.highlighting(phrase: step1DescriptionTarget, icon: .gridicon(.reader)))
+        let step1: WayPoint = (element: .readerTab,
+                               description: step1DescriptionBase.highlighting(phrase: step1DescriptionTarget,
+                                                                              icon: UIImage(named: "tab-bar-reader-selected")))
 
         let step2DiscoverDescriptionBase = NSLocalizedString("Use %@ to find sites and tags.", comment: "A step in a guided tour for quick start. %@ will be the name of the item to select.")
         let step2DiscoverDescriptionTarget = NSLocalizedString("Discover", comment: "The menu item to select during a guided tour.")
         let step2DiscoverDescription = step2DiscoverDescriptionBase.highlighting(phrase: step2DiscoverDescriptionTarget, icon: nil)
 
-        let step2SettingsDescriptionBase = NSLocalizedString("Try selecting %@ to add topics you like.", comment: "A step in a guided tour for quick start. %@ will be the name of the item to select.")
-        let step2SettingsDescriptionTarget = NSLocalizedString("Settings", comment: "The menu item to select during a guided tour.")
-        let step2SettingsDescription = step2SettingsDescriptionBase.highlighting(phrase: step2SettingsDescriptionTarget, icon: .gridicon(.cog))
+        let step2SubscriptionDescriptionBase = NSLocalizedString(
+            "quick.start.reader.2.subscriptions.base",
+            value: "Try selecting %@ to view subscribed content and manage your subscriptions.",
+            comment: "A step in a guided tour for quick start. %@ will be a bolded Subscriptions text."
+        )
+        let step2SubscriptionDescriptionTarget = NSLocalizedString(
+            "quick.start.reader.2.subscriptions.target",
+            value: "Subscriptions",
+            comment: "The bolded Subscriptions text in the Reader step 2 description for the quick start tour."
+        )
+        let step2SubscriptionDescription = step2SubscriptionDescriptionBase.highlighting(
+            phrase: step2SubscriptionDescriptionTarget,
+            icon: nil
+        )
 
         /// Combined description for step 2
         let step2Format = NSAttributedString(string: "%@ %@")
-        let step2Description = NSAttributedString(format: step2Format, args: step2DiscoverDescription, step2SettingsDescription)
+        let step2Description = NSAttributedString(format: step2Format,
+                                                  args: step2DiscoverDescription, step2SubscriptionDescription)
 
-        let step2: WayPoint = (element: .readerDiscoverSettings, description: step2Description)
+        let step2: WayPoint = (element: .readerDiscoverSubscriptions, description: step2Description)
 
         return [step1, step2]
     }()

WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift

@@ -100,11 +100,6 @@ extension FilterProvider: Equatable {
 
 extension FilterProvider {
 
-    func showAdd(on presenterViewController: UIViewController, sceneDelegate: ScenePresenterDelegate?) {
-        let presenter = ReaderManageScenePresenter(selected: section, sceneDelegate: sceneDelegate)
-        presenter.present(on: presenterViewController, animated: true, completion: nil)
-    }
-
     static func filterItems(_ items: [TableDataItem], siteType: SiteOrganizationType?) -> [TableDataItem] {
         // If a site type is specified, filter items by it.
         // Otherwise, just return all items.
@@ -366,7 +361,7 @@ extension ReaderTagTopic {
         )
 
         static let pluralFilterTitle = NSLocalizedString(
-            "reader.navigation.filter.blog.plural",
+            "reader.navigation.filter.tag.plural",
             value: "%1$d Tags",
             comment: """
                 Plural button title to filter the Reader stream by tag.

WordPress/Classes/ViewRelated/Reader/Filter/FilterSheetViewController.swift

@@ -249,7 +249,8 @@ private extension FilterSheetViewController {
             present(navController, animated: true)
             break
         case .tag:
-            filterProvider.showAdd(on: self, sceneDelegate: self)
+            // Go to the Filter management view
+            didTapEditButton()
         }
     }
 

WordPress/Classes/ViewRelated/Reader/Manage/ReaderManageScenePresenter.swift

@@ -70,7 +70,6 @@ class ReaderManageScenePresenter {
         presentedViewController = navigationController
         viewController.present(navigationController, animated: true, completion: nil)
 
-        QuickStartTourGuide.shared.visited(.readerDiscoverSettings)
         WPAnalytics.track(.readerManageViewDisplayed)
     }
 }