Jetpack Focus: Display phase two/three overlays for Stats, Reader, and Notifications

WordPress/Classes/Utility/BuildInformation/RemoteConfig.swift

@@ -1,6 +1,7 @@
 import Foundation
 
 /// A struct that holds all remote config parameters.
+/// This is where all remote config parameters should be defined.
 struct RemoteConfig {
 
     // MARK: Private Variables
@@ -16,6 +17,26 @@ struct RemoteConfig {
     // MARK: Remote Config Parameters
 
     var jetpackDeadline: RemoteConfigParameter<String> {
-        RemoteConfigParameter<String>(key: "jp-deadline", defaultValue: nil, store: store)
+        RemoteConfigParameter<String>(key: "jp-deadline", defaultValue: "2022-12-31", store: store) // TODO: Revert this
+    }
+
+    var phaseTwoBlogPostUrl: RemoteConfigParameter<String> {
+        RemoteConfigParameter<String>(key: "phase-two-blog-post", defaultValue: "https://jetpack.com/mobile", store: store) // TODO: Revert this
+    }
+
+    var phaseThreeBlogPostUrl: RemoteConfigParameter<String> {
+        RemoteConfigParameter<String>(key: "phase-three-blog-post", defaultValue: "https://jetpack.com/mobile", store: store) // TODO: Revert this
+    }
+
+    var phaseFourBlogPostUrl: RemoteConfigParameter<String> {
+        RemoteConfigParameter<String>(key: "phase-four-blog-post", defaultValue: nil, store: store)
+    }
+
+    var phaseNewUsersBlogPostUrl: RemoteConfigParameter<String> {
+        RemoteConfigParameter<String>(key: "phase-new-users-blog-post", defaultValue: nil, store: store)
+    }
+
+    var phaseSelfHostedBlogPostUrl: RemoteConfigParameter<String> {
+        RemoteConfigParameter<String>(key: "phase-self-hosted-blog-post", defaultValue: nil, store: store)
     }
 }

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackOverlayFrequencyTracker.swift

@@ -88,7 +88,7 @@ extension JetpackOverlayFrequencyTracker {
 
         // MARK: Static Variables
         static let defaultConfig = FrequencyConfig(featureSpecificInDays: 0, generalInDays: 0)
-        private static let secondsInDay: TimeInterval = 86_400
+        private static let secondsInDay: TimeInterval = 0 // TODO: Revert this
 
         // MARK: Computed Variables
         var featureSpecificInSeconds: TimeInterval {

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayGeneralViewModel.swift

@@ -24,11 +24,11 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
         case (.two, .notifications):
             fallthrough
         case (.two, .reader):
-            return false // TODO: Change this to true when other phase 2 tasks are ready
+            return true
 
         // Phase Three: Show all overlays
         case (.three, _):
-            return false // TODO: Change this to true when other phase 3 tasks are ready
+            return true
 
         // Phase Four: Show feature-collection overlays. Features are removed by this point so they are irrelevant.
         case (.four, _):
@@ -54,22 +54,46 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
             return Strings.PhaseOne.Notifications.title
         case (.one, .reader):
             return Strings.PhaseOne.Reader.title
+
+        // Phase Two
+        case (.two, .stats):
+            return Strings.PhaseTwoAndThree.statsTitle
+        case (.two, .notifications):
+            return Strings.PhaseTwoAndThree.notificationsTitle
+        case (.two, .reader):
+            return Strings.PhaseTwoAndThree.readerTitle
+
+        // Phase Three
+        case (.three, .stats):
+            return Strings.PhaseTwoAndThree.statsTitle
+        case (.three, .notifications):
+            return Strings.PhaseTwoAndThree.notificationsTitle
+        case (.three, .reader):
+            return Strings.PhaseTwoAndThree.readerTitle
         default:
             return ""
         }
     }
 
-    var subtitle: String {
+    var subtitle: NSAttributedString {
         switch (phase, source) {
         // Phase One
         case (.one, .stats):
-            return Strings.PhaseOne.Stats.subtitle
+            return .init(string: Strings.PhaseOne.Stats.subtitle)
         case (.one, .notifications):
-            return Strings.PhaseOne.Notifications.subtitle
+            return .init(string: Strings.PhaseOne.Notifications.subtitle)
         case (.one, .reader):
-            return Strings.PhaseOne.Reader.subtitle
+            return .init(string: Strings.PhaseOne.Reader.subtitle)
+
+        // Phase Two
+        case (.two, _):
+            fallthrough
+
+        // Phase Three
+        case (.three, _):
+            return phaseTwoAndThreeSubtitle()
         default:
-            return ""
+            return .init(string: "")
         }
     }
 
@@ -111,24 +135,40 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
         switch phase {
         case .one:
             return nil
+        case .two:
+            return nil
+        case .three:
+            return Strings.PhaseTwoAndThree.footnote
         default:
             return nil
         }
     }
 
-    var shouldShowLearnMoreButton: Bool {
+    var learnMoreButtonURL: String? {
         switch phase {
         case .one:
-            return false
+            return nil
+        case .two:
+            return RemoteConfig().phaseTwoBlogPostUrl.value
+        case .three:
+            return RemoteConfig().phaseThreeBlogPostUrl.value
+        case .four:
+            return RemoteConfig().phaseFourBlogPostUrl.value
+        case .newUsers:
+            return RemoteConfig().phaseNewUsersBlogPostUrl.value
         default:
-            return false
+            return nil
         }
     }
 
     var switchButtonText: String {
         switch phase {
         case .one:
             return Strings.General.earlyPhasesSwitchButtonTitle
+        case .two:
+            return Strings.General.earlyPhasesSwitchButtonTitle
+        case .three:
+            return Strings.General.latePhasesSwitchButtonTitle
         default:
             return ""
         }
@@ -150,7 +190,9 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
     var shouldShowCloseButton: Bool {
         switch phase {
         case .one:
-            return true
+            fallthrough
+        case .two:
+            return true // Only show close button in phases 1 & 2
         default:
             return false
         }
@@ -163,6 +205,35 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
     var onDismiss: JetpackOverlayDismissCallback?
 }
 
+// MARK: Helpers
+
+private extension JetpackFullscreenOverlayGeneralViewModel {
+    static let dateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "MMMM d, yyyy"
+        return formatter
+    }()
+
+    func phaseTwoAndThreeSubtitle() -> NSAttributedString {
+        guard let deadline = JetpackFeaturesRemovalCoordinator.removalDeadline() else {
+            return NSAttributedString(string: Strings.PhaseTwoAndThree.fallbackSubtitle)
+        }
+
+        let formattedDate = Self.dateFormatter.string(from: deadline)
+        let subtitle = String.localizedStringWithFormat(Strings.PhaseTwoAndThree.subtitle, formattedDate)
+
+        let rangeOfDate = (subtitle as NSString).range(of: formattedDate)
+        let plainFont = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
+        let boldFont = WPStyleGuide.fontForTextStyle(.body, fontWeight: .bold)
+        let attributedSubtitle = NSMutableAttributedString(string: subtitle, attributes: [.font: plainFont])
+        attributedSubtitle.addAttribute(.font, value: boldFont, range: rangeOfDate)
+
+        return attributedSubtitle
+    }
+}
+
+// MARK: Constants
+
 private extension JetpackFullscreenOverlayGeneralViewModel {
     enum Constants {
         static let statsLogoAnimationLtr = "JetpackStatsLogoAnimation_ltr"
@@ -179,6 +250,9 @@ private extension JetpackFullscreenOverlayGeneralViewModel {
             static let earlyPhasesSwitchButtonTitle = NSLocalizedString("jetpack.fullscreen.overlay.early.switch.title",
                                                                         value: "Switch to the new Jetpack app",
                                                                         comment: "Title of a button that navigates the user to the Jetpack app if installed, or to the app store.")
+            static let latePhasesSwitchButtonTitle = NSLocalizedString("jetpack.fullscreen.overlay.late.switch.title",
+                                                                        value: "Switch to the Jetpack app",
+                                                                        comment: "Title of a button that navigates the user to the Jetpack app if installed, or to the app store.")
             static let statsContinueButtonTitle = NSLocalizedString("jetpack.fullscreen.overlay.stats.continue.title",
                                                                     value: "Continue to Stats",
                                                                     comment: "Title of a button that dismisses an overlay and displays the Stats screen.")
@@ -219,5 +293,26 @@ private extension JetpackFullscreenOverlayGeneralViewModel {
                                                      comment: "Subtitle of a screen displayed when the user accesses the Notifications screen from the WordPress app. The screen showcases the Jetpack app.")
             }
         }
+
+        enum PhaseTwoAndThree {
+            static let statsTitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseTwoAndThree.stats.title",
+                                                      value: "Stats are moving to the Jetpack app",
+                                                      comment: "Title of a screen displayed when the user accesses the Stats screen from the WordPress app. The screen showcases the Jetpack app.")
+            static let readerTitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseTwoAndThree.reader.title",
+                                                       value: "Reader is moving to the Jetpack app",
+                                                       comment: "Title of a screen displayed when the user accesses the Reader screen from the WordPress app. The screen showcases the Jetpack app.")
+            static let notificationsTitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseTwoAndThree.notifications.title",
+                                                              value: "Notifications are moving to Jetpack",
+                                                              comment: "Title of a screen displayed when the user accesses the Notifications screen from the WordPress app. The screen showcases the Jetpack app.")
+            static let subtitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseTwoAndThree.subtitle",
+                                                    value: "Stats, Reader, Notifications and other Jetpack powered features will be removed from the WordPress app on %@.",
+                                                    comment: "Subtitle of a screen displayed when the user accesses a Jetpack-powered feature from the WordPress app. The '%@' characters are a placeholder for the date the features will be removed.")
+            static let fallbackSubtitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseTwoAndThree.fallbackSubtitle",
+                                                    value: "Stats, Reader, Notifications and other Jetpack powered features will be removed from the WordPress app soon.",
+                                                    comment: "Subtitle of a screen displayed when the user accesses a Jetpack-powered feature from the WordPress app.")
+            static let footnote = NSLocalizedString("jetpack.fullscreen.overlay.phaseThree.footnote",
+                                                    value: "Switching is free and only takes a minute.",
+                                                    comment: "A footnote in a screen displayed when the user accesses a Jetpack powered feature from the WordPress app. The screen showcases the Jetpack app.")
+        }
     }
 }

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlaySiteCreationViewModel.swift

@@ -22,14 +22,14 @@ struct JetpackFullscreenOverlaySiteCreationViewModel: JetpackFullscreenOverlayVi
         return Strings.title
     }
 
-    var subtitle: String {
+    var subtitle: NSAttributedString {
         switch phase {
         case .one:
-            return Strings.phaseOneSubtitle
+            return .init(string: Strings.phaseOneSubtitle)
         case .two:
-            return Strings.phaseTwoSubtitle
+            return .init(string: Strings.phaseTwoSubtitle)
         default:
-            return ""
+            return .init(string: "")
         }
     }
 
@@ -45,8 +45,8 @@ struct JetpackFullscreenOverlaySiteCreationViewModel: JetpackFullscreenOverlayVi
         return nil
     }
 
-    var shouldShowLearnMoreButton: Bool {
-        return false
+    var learnMoreButtonURL: String? {
+        return nil
     }
 
     var switchButtonText: String {

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewController.swift

@@ -123,7 +123,7 @@ class JetpackFullscreenOverlayViewController: UIViewController {
     private func setupContent() {
         animationView.animation = animation
         setTitle()
-        subtitleLabel.text = viewModel.subtitle
+        subtitleLabel.attributedText = viewModel.subtitle
         footnoteLabel.text = viewModel.footnote
         switchButton.setTitle(viewModel.switchButtonText, for: .normal)
         continueButton.setTitle(viewModel.continueButtonText, for: .normal)
@@ -159,7 +159,6 @@ class JetpackFullscreenOverlayViewController: UIViewController {
     private func setupFonts() {
         titleLabel.font = WPStyleGuide.fontForTextStyle(.largeTitle, fontWeight: .bold)
         titleLabel.adjustsFontForContentSizeCategory = true
-        subtitleLabel.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
         subtitleLabel.adjustsFontForContentSizeCategory = true
         footnoteLabel.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
         footnoteLabel.adjustsFontForContentSizeCategory = true
@@ -232,7 +231,8 @@ class JetpackFullscreenOverlayViewController: UIViewController {
     }
 
     @IBAction func learnMoreButtonPressed(_ sender: Any) {
-        guard let url = URL(string: Constants.learnMoreURLString) else {
+        guard let urlString = viewModel.learnMoreButtonURL,
+              let url = URL(string: urlString) else {
             return
         }
 
@@ -269,8 +269,6 @@ private extension JetpackFullscreenOverlayViewController {
     }
 
     enum Constants {
-        // TODO: Update link
-        static let learnMoreURLString = "https://jetpack.com/blog/"
         static let closeButtonSystemName = "xmark.circle.fill"
     }
 

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayViewModel.swift

@@ -5,11 +5,11 @@ typealias JetpackOverlayDismissCallback = () -> Void
 /// Protocol used to configure `JetpackFullscreenOverlayViewController`
 protocol JetpackFullscreenOverlayViewModel {
     var title: String { get }
-    var subtitle: String { get }
+    var subtitle: NSAttributedString { get }
     var animationLtr: String { get }
     var animationRtl: String { get }
     var footnote: String? { get }
-    var shouldShowLearnMoreButton: Bool { get }
+    var learnMoreButtonURL: String? { get }
     var switchButtonText: String { get }
     var continueButtonText: String? { get }
     var shouldShowCloseButton: Bool { get }
@@ -25,7 +25,7 @@ protocol JetpackFullscreenOverlayViewModel {
 
 extension JetpackFullscreenOverlayViewModel {
     var learnMoreButtonIsHidden: Bool {
-        !shouldShowLearnMoreButton
+        learnMoreButtonURL == nil
     }
 
     var footnoteIsHidden: Bool {