Merge branch 'trunk' into gutenberg/integrate_release_1.75.0

Author: SiobhyB

RELEASE-NOTES.txt

@@ -3,12 +3,13 @@
 * [**] Self hosted sites are not restricted by video length during media uploads [https://github.com/wordpress-mobile/WordPress-iOS/pull/18414]
 * [*] [internal] My Site Dashboard: Made some changes to the code architecture of the dashboard. The majority of the changes are related to the posts cards. It should have no visible changes but could cause regressions. Please test it by creating/trashing drafts and scheduled posts and testing that they appear correctly on the dashboard. [#18405]
 * [*] Quick Start: Updated the Stats tour. The tour can now be accessed from either the dashboard or the menu tab. [#18413]
+* [*] Quick Start: Updated the Reader tour. The tour now highlights the Discover tab and guides users to follow topics via the Settings screen. [#18450]
 * [*] [internal] Quick Start: Refactored some code related to the tasks displayed in the Quick Start Card and the Quick Start modal. It should have no visible changes but could cause regressions. [#18395]
 * [*] Block Editor: Latest Posts block: Add featured image settings [https://github.com/WordPress/gutenberg/pull/39257]
 * [*] Block Editor: Prevent incorrect notices displaying when switching between HTML-Visual mode quickly [https://github.com/WordPress/gutenberg/pull/40415]
 * [*] Block Editor: Embed block: Fix inline preview cut-off when editing URL [https://github.com/WordPress/gutenberg/pull/35326]
 * [*] Block Editor: Prevent gaps shown around floating toolbar when using external keyboard [https://github.com/WordPress/gutenberg/pull/40266]
-
+* [**] We'll now ask users logging in which area of the app they'd like to focus on to build towards a more personalized experience. [#18385]
 
 19.7
 -----

Scripts/BuildPhases/LintAppLocalizedStringsUsage.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require 'xcodeproj'
+
+REPO_ROOT = Pathname.new(__dir__) + '../..'
+
+def lint(file_path:, target_name:)
+  violations_count = 0
+  File.foreach(file_path, mode: 'rb:BOM|UTF-8').with_index do |line, line_no|
+    next if line.match? %r(^\s*//) # Skip commented lines
+
+    col_no = line.index('NSLocalizedString')
+    next if col_no.nil?
+
+    puts "#{file_path}:#{line_no+1}:#{col_no+1}: error: Use `AppLocalizedString` instead of `NSLocalizedString` in source files that are used in the `#{target_name}` extension target. See paNNhX-nP-p2 for more info."
+    violations_count += 1
+  end
+  violations_count
+end
+
+## Main ##
+
+project = Xcodeproj::Project.open(REPO_ROOT + 'WordPress/WordPress.xcodeproj')
+targets_to_analyze = if ARGV.count.positive?
+  project.targets.select { |t| t.name == ARGV.first }
+else
+  project.targets.select { |t| t.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) && t.extension_target_type? }
+end
+
+violations_count = 0
+targets_to_analyze.each do |target|
+  build_phase = target.build_phases.find { |p| p.is_a?(Xcodeproj::Project::Object::PBXSourcesBuildPhase) }
+  next if build_phase.nil?
+
+  puts "Linting extension target #{target.name} for improper NSLocalizedString usage..."
+  source_files = build_phase.files_references.map(&:real_path).select { |f| ['.m', '.swift'].any? { |ext| f.extname == ext } }
+  source_files.each { |f| violations_count += lint(file_path: f, target_name: target.name) }
+  puts "Done."
+end
+
+exit 1 if violations_count > 0

Scripts/BuildPhases/runRubyScript

@@ -0,0 +1,27 @@
+#!/bin/bash -eu
+
+# Use this to run a Ruby script from a "Script Build Phase" from Xcode.
+#
+# Since shell scripts ran by Xcode do not source the user shell profile, typical user setups like the configurations of `rbenv` or `rvm` would not be set up properly.
+# This script check if either `rbenv` or `rvm` is installed on the Mac and runs the setup steps as appropriate, before running the ruby script via `bundle exec`
+#
+# Usage:
+#   `runRubyScript <script_name.rb> <optional_args>`
+#
+# Where <script_name.rb` can be either an absolute path, or a path relative to this runRubyScript wrapper script.
+#
+# Inspiration: https://mgrebenets.github.io/xcode/2019/04/04/xcode-build-phases-and-environment
+#
+
+# Add `rbenv` and `rvm` binaries to PATH, so that we support both
+export PATH="$HOME/.rbenv/shims:$HOME/.rvm/bin:$PATH"
+RUBY_VERSION="$(cat "${PROJECT_DIR}/../.ruby-version")"
+if command -v rvm; then
+  source "$(rvm "${RUBY_VERSION}" do rvm env --path | tail -n1)"
+fi
+
+# Run the script with bundle exec
+echo "Running the script using 'bundle exec' ..."
+cd "$(dirname "${BASH_SOURCE[0]}")"
+bundle exec ruby "$@"
+cd -

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -338,6 +338,16 @@ import Foundation
     // Quick Start
     case quickStartStarted
 
+    // Onboarding Question Prompt
+    case onboardingQuestionsDisplayed
+    case onboardingQuestionsItemSelected
+    case onboardingQuestionsSkipped
+
+    // Onboarding Enable Notifications Prompt
+    case onboardingEnableNotificationsDisplayed
+    case onboardingEnableNotificationsSkipped
+    case onboardingEnableNotificationsEnableTapped
+
     /// A String that represents the event
     var value: String {
         switch self {
@@ -895,6 +905,21 @@ import Foundation
         case .enhancedSiteCreationIntentQuestionExperiment:
             return "enhanced_site_creation_intent_question_experiment"
 
+        // Onboarding Question Prompt
+        case .onboardingQuestionsDisplayed:
+            return "onboarding_questions_displayed"
+        case .onboardingQuestionsItemSelected:
+            return "onboarding_questions_item_selected"
+        case .onboardingQuestionsSkipped:
+            return "onboarding_questions_skipped"
+
+        // Onboarding Enable Notifications Prompt
+        case .onboardingEnableNotificationsDisplayed:
+            return "onboarding_enable_notifications_displayed"
+        case .onboardingEnableNotificationsSkipped:
+            return "onboarding_enable_notifications_skipped"
+        case .onboardingEnableNotificationsEnableTapped:
+            return "onboarding_enable_notifications_enable_tapped"
         // Site Name
         case .enhancedSiteCreationSiteNameCanceled:
             return "enhanced_site_creation_site_name_canceled"

WordPress/Classes/Utility/FormattableContent/Actions/FormattableContentAction.swift

@@ -12,9 +12,9 @@ public enum NotificationDeletionKind {
     public var legendText: String {
         switch self {
         case .deletion:
-            return NSLocalizedString("Comment has been deleted", comment: "Displayed when a Comment is deleted")
+            return AppLocalizedString("Comment has been deleted", comment: "Displayed when a Comment is deleted")
         case .spamming:
-            return NSLocalizedString("Comment has been marked as Spam", comment: "Displayed when a Comment is spammed")
+            return AppLocalizedString("Comment has been marked as Spam", comment: "Displayed when a Comment is spammed")
         }
     }
 }

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Posts/DashboardEmptyPostsCardCell.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressShared
 
 /// Card cell prompting the user to create their first post
 final class DashboardFirstPostCardCell: DashboardEmptyPostsCardCell, BlogDashboardCardConfigurable {
@@ -48,7 +49,7 @@ class DashboardEmptyPostsCardCell: UICollectionViewCell, Reusable {
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.text = "Create your first post"
-        titleLabel.font = WPStyleGuide.notoBoldFontForTextStyle(.title3)
+        titleLabel.font = WPStyleGuide.serifFontForTextStyle(.title3, fontWeight: .semibold)
         titleLabel.adjustsFontForContentSizeCategory = true
         titleLabel.adjustsFontSizeToFitWidth = true
         titleLabel.minimumScaleFactor = 0.5

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

@@ -13,6 +13,32 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         }
     }
 
+    // This is public so it can be accessed from the BloggingPromptsFeatureDescriptionView.
+    private(set) lazy var cardFrameView: BlogDashboardCardFrameView = {
+        let frameView = BlogDashboardCardFrameView()
+        frameView.translatesAutoresizingMaskIntoConstraints = false
+        frameView.title = Strings.cardFrameTitle
+        frameView.icon = Style.frameIconImage
+
+        // NOTE: Remove the logic for iOS 13 once we drop that version.
+        if #available (iOS 14.0, *) {
+            // assign an empty closure so the button appears.
+            frameView.onEllipsisButtonTap = {}
+            frameView.ellipsisButton.showsMenuAsPrimaryAction = true
+            frameView.ellipsisButton.menu = contextMenu
+        } else {
+            // Show a fallback implementation using `MenuSheetViewController`.
+            // iOS 13 doesn't support showing UIMenu programmatically.
+            frameView.onEllipsisButtonTap = { [weak self] in
+                self?.showMenuSheet()
+            }
+        }
+
+        return frameView
+    }()
+
+    // MARK: - Private Properties
+
     /// When set to true, a "default" version of the card is displayed. That is:
     /// - `maxAvatarCount` number of avatars.
     /// - `maxAvatarCount` answer count.
@@ -25,8 +51,6 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         }
     }
 
-    // MARK: - Private Properties
-
     // Used to present the menu sheet for contextual menu.
     // NOTE: Remove this once we drop support for iOS 13.
     private weak var presenterViewController: BlogDashboardViewController? = nil
@@ -39,35 +63,12 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         return stackView
     }()
 
-    private lazy var cardFrameView: BlogDashboardCardFrameView = {
-        let frameView = BlogDashboardCardFrameView()
-        frameView.translatesAutoresizingMaskIntoConstraints = false
-        frameView.title = Strings.cardFrameTitle
-        frameView.icon = Style.frameIconImage
-
-        // NOTE: Remove the logic for iOS 13 once we drop that version.
-        if #available (iOS 14.0, *) {
-            // assign an empty closure so the button appears.
-            frameView.onEllipsisButtonTap = {}
-            frameView.ellipsisButton.showsMenuAsPrimaryAction = true
-            frameView.ellipsisButton.menu = contextMenu
-        } else {
-            // Show a fallback implementation using `MenuSheetViewController`.
-            // iOS 13 doesn't support showing UIMenu programmatically.
-            frameView.onEllipsisButtonTap = { [weak self] in
-                self?.showMenuSheet()
-            }
-        }
-
-        return frameView
-    }()
-
     // MARK: Top row views
 
     private lazy var promptLabel: UILabel = {
         let label = UILabel()
         label.translatesAutoresizingMaskIntoConstraints = false
-        label.font = Style.promptContentFont
+        label.font = WPStyleGuide.BloggingPrompts.promptContentFont
         label.textAlignment = .center
         label.numberOfLines = 0
         label.adjustsFontForContentSizeCategory = true
@@ -129,8 +130,8 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         let label = UILabel()
         label.translatesAutoresizingMaskIntoConstraints = false
         label.text = answerInfoText
-        label.font = Style.answerInfoLabelFont
-        label.textColor = Style.answerInfoLabelColor
+        label.font = WPStyleGuide.BloggingPrompts.answerInfoLabelFont
+        label.textColor = WPStyleGuide.BloggingPrompts.answerInfoLabelColor
         label.textAlignment = (effectiveUserInterfaceLayoutDirection == .leftToRight ? .left : .right)
         label.numberOfLines = 0
         label.adjustsFontForContentSizeCategory = true
@@ -166,8 +167,8 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         let button = UIButton()
         button.translatesAutoresizingMaskIntoConstraints = false
         button.setTitle(Strings.answerButtonTitle, for: .normal)
-        button.setTitleColor(Style.buttonTitleColor, for: .normal)
-        button.titleLabel?.font = Style.buttonTitleFont
+        button.setTitleColor(WPStyleGuide.BloggingPrompts.buttonTitleColor, for: .normal)
+        button.titleLabel?.font = WPStyleGuide.BloggingPrompts.buttonTitleFont
         button.titleLabel?.adjustsFontForContentSizeCategory = true
         button.titleLabel?.adjustsFontSizeToFitWidth = true
 
@@ -178,8 +179,8 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
 
     private lazy var answeredLabel: UILabel = {
         let label = UILabel()
-        label.font = Style.buttonTitleFont
-        label.textColor = Style.answeredLabelColor
+        label.font = WPStyleGuide.BloggingPrompts.buttonTitleFont
+        label.textColor = WPStyleGuide.BloggingPrompts.answeredLabelColor
         label.text = Strings.answeredLabelTitle
 
         // The 'answered' label needs to be close to the Share button.
@@ -195,8 +196,8 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         let button = UIButton()
         button.translatesAutoresizingMaskIntoConstraints = false
         button.setTitle(Strings.shareButtonTitle, for: .normal)
-        button.setTitleColor(Style.buttonTitleColor, for: .normal)
-        button.titleLabel?.font = Style.buttonTitleFont
+        button.setTitleColor(WPStyleGuide.BloggingPrompts.buttonTitleColor, for: .normal)
+        button.titleLabel?.font = WPStyleGuide.BloggingPrompts.buttonTitleFont
         button.titleLabel?.adjustsFontForContentSizeCategory = true
         button.titleLabel?.adjustsFontSizeToFitWidth = true
         button.contentHorizontalAlignment = .leading
@@ -353,12 +354,6 @@ private extension DashboardPromptsCardCell {
     struct Style {
         static let frameIconImage = UIImage(named: "icon-lightbulb-outline")?.resizedImage(Constants.cardIconSize, interpolationQuality: .default)
         static let avatarPlaceholderImage = UIImage(color: .quaternarySystemFill)
-        static let promptContentFont = WPStyleGuide.serifFontForTextStyle(.headline, fontWeight: .semibold)
-        static let answerInfoLabelFont = WPStyleGuide.fontForTextStyle(.caption1)
-        static let answerInfoLabelColor = UIColor.primary
-        static let buttonTitleFont = WPStyleGuide.fontForTextStyle(.subheadline)
-        static let buttonTitleColor = UIColor.primary
-        static let answeredLabelColor = UIColor.muriel(name: .green, .shade50)
     }
 
     struct Constants {

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

@@ -60,7 +60,7 @@ typedef NS_ENUM(NSInteger, QuickStartTourElement) {
     QuickStartTourElementSharing = 8,
     QuickStartTourElementConnections = 9,
     QuickStartTourElementReaderTab = 10,
-    QuickStartTourElementReaderSearch = 12,
+    QuickStartTourElementReaderDiscoverSettings = 12,
     QuickStartTourElementTourCompleted = 13,
     QuickStartTourElementCongratulations = 14,
     QuickStartTourElementSiteIcon = 15,
@@ -71,8 +71,9 @@ typedef NS_ENUM(NSInteger, QuickStartTourElement) {
     QuickStartTourElementSiteTitle = 20,
     QuickStartTourElementEditHomepage = 21,
     QuickStartTourElementSiteMenu = 22,
-    QuickStartTourElementSetupQuickStart = 23,
-    QuickStartTourElementRemoveQuickStart = 24,
+    QuickStartTourElementNotifications = 23,
+    QuickStartTourElementSetupQuickStart = 24,
+    QuickStartTourElementRemoveQuickStart = 25,
 };
 
 typedef NS_ENUM(NSUInteger, BlogDetailsNavigationSource) {

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+OnboardingPrompt.swift

@@ -0,0 +1,43 @@
+import Foundation
+
+extension MySiteViewController {
+    func startObservingOnboardingPrompt() {
+        NotificationCenter.default.addObserver(self, selector: #selector(onboardingPromptWasDismissed(_:)), name: .onboardingPromptWasDismissed, object: nil)
+    }
+
+    @objc func onboardingPromptWasDismissed(_ notification: NSNotification) {
+        guard
+            let userInfo = notification.userInfo,
+            let option = userInfo["option"] as? OnboardingOption
+        else {
+            return
+        }
+
+        switch option {
+        case .stats:
+            // Show the stats view for the current blog
+            if let blog = blog {
+                StatsViewController.show(for: blog, from: self)
+            }
+        case .writing:
+            // Open the editor
+            let controller = tabBarController as? WPTabBarController
+            controller?.showPostTab(completion: {
+                self.startAlertTimer()
+            })
+
+        case .showMeAround:
+            // Start the quick start
+            if let blog = blog {
+                let type: QuickStartType = FeatureFlag.quickStartForExistingUsers.enabled ? .existingSite : .newSite
+                QuickStartTourGuide.shared.setup(for: blog, type: type)
+            }
+
+        case .skip, .reader, .notifications:
+            // Skip: Do nothing
+            // Reader and notifications will be handled by:
+            // WPAuthenticationManager.handleOnboardingQuestionsWillDismiss
+            break
+        }
+    }
+}

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -155,6 +155,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         subscribeToModelChanges()
         subscribeToContentSizeCategory()
         startObservingQuickStart()
+        startObservingOnboardingPrompt()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -268,8 +269,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         segmentedControlContainerView.isHidden = hideSegmentedControl
 
         if !hideSegmentedControl && switchTabsIfNeeded {
-            segmentedControl.selectedSegmentIndex = mySiteSettings.defaultSection.rawValue
-            segmentedControlValueChanged()
+            switchTab(to: mySiteSettings.defaultSection)
         }
     }
 
@@ -478,6 +478,13 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
         }
     }
 
+    /// Changes between the site menu and dashboard
+    /// - Parameter section: The section to switch to
+    func switchTab(to section: Section) {
+        segmentedControl.selectedSegmentIndex = section.rawValue
+        segmentedControlValueChanged()
+    }
+
     // MARK: - Child VC logic
 
     private func embedChildInStackView(_ child: UIViewController) {
@@ -765,8 +772,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
             }
 
             if !blog.isAccessibleThroughWPCom() && self.isShowingDashboard {
-                self.segmentedControl.selectedSegmentIndex = Section.siteMenu.rawValue
-                self.segmentedControlValueChanged()
+                self.switchTab(to: .siteMenu)
             }
 
             self.updateNavigationTitle(for: blog)