Merge remote-tracking branch 'origin/trunk' into feature/18440-prompt-card-avatar-train-color

Author: dvdchr

RELEASE-NOTES.txt

@@ -2,7 +2,10 @@
 -----
 * [**] 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]
+* [**] 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/Extensions/UIScrollView+Helpers.swift

@@ -2,8 +2,10 @@ import UIKit
 
 extension UIScrollView {
 
-    // Scroll to a specific view so that it's top is at the top our scrollview
-    @objc func scrollToView(_ view: UIView, animated: Bool) {
+    // MARK: - Vertical scrollview
+
+    // Scroll to a specific view in a vertical scrollview so that it's top is at the top our scrollview
+    @objc func scrollVerticallyToView(_ view: UIView, animated: Bool) {
         if let origin = view.superview {
 
             // Get the Y position of your child view
@@ -16,39 +18,82 @@ extension UIScrollView {
             //
             if childStartPoint.y + safeAreaLayoutGuide.layoutFrame.height < contentSize.height {
                 let targetRect = CGRect(x: 0,
-                                        y: childStartPoint.y - Constants.yOffset,
-                                        width: Constants.targetRectWidth,
+                                        y: childStartPoint.y - Constants.targetRectPadding,
+                                        width: Constants.targetRectDimension,
                                         height: safeAreaLayoutGuide.layoutFrame.height)
                 scrollRectToVisible(targetRect, animated: animated)
+
+                // This ensures scrolling to the correct position, especially when there are layout changes
+                //
+                // See: https://stackoverflow.com/a/35437399
+                //
+                layoutIfNeeded()
             } else {
                 scrollToBottom(animated: true)
             }
-
-            // This ensures scrolling to the correct position, especially when there are layout changes
-            //
-            // See: https://stackoverflow.com/a/35437399
-            //
-            layoutIfNeeded()
         }
     }
 
     @objc func scrollToTop(animated: Bool) {
         let topOffset = CGPoint(x: 0, y: -adjustedContentInset.top)
         setContentOffset(topOffset, animated: animated)
+        layoutIfNeeded()
     }
 
     @objc func scrollToBottom(animated: Bool) {
         let bottomOffset = CGPoint(x: 0, y: contentSize.height - bounds.size.height + adjustedContentInset.bottom)
         if bottomOffset.y > 0 {
             setContentOffset(bottomOffset, animated: animated)
+            layoutIfNeeded()
+        }
+    }
+
+    // MARK: - Horizontal scrollview
+
+    // Scroll to a specific view in a horizontal scrollview so that it's leading edge is at the leading edge of our scrollview
+    @objc func scrollHorizontallyToView(_ view: UIView, animated: Bool) {
+        if let origin = view.superview {
+
+            // Get the X position of your child view
+            let childStartPoint = origin.convert(view.frame.origin, to: self)
+
+            // Scroll to a rectangle starting at the X of your subview, with a width of the scrollview safe area
+            // if the end of the rectangle is within the content size width.
+            //
+            // Otherwise, scroll all the way to the end.
+            //
+            if childStartPoint.x + safeAreaLayoutGuide.layoutFrame.width < contentSize.width {
+                let targetRect = CGRect(x: childStartPoint.x - Constants.targetRectPadding,
+                                        y: 0,
+                                        width: safeAreaLayoutGuide.layoutFrame.width,
+                                        height: Constants.targetRectDimension)
+                scrollRectToVisible(targetRect, animated: animated)
+
+                // This ensures scrolling to the correct position, especially when there are layout changes
+                //
+                // See: https://stackoverflow.com/a/35437399
+                //
+                layoutIfNeeded()
+            } else {
+                scrollToEnd(animated: true)
+            }
+
+        }
+    }
+
+    func scrollToEnd(animated: Bool) {
+        let endOffset = CGPoint(x: contentSize.width - bounds.size.width, y: 0)
+        if endOffset.x > 0 {
+            setContentOffset(endOffset, animated: animated)
+            layoutIfNeeded()
         }
     }
 
     private enum Constants {
         /// An arbitrary placeholder value for the target rect -- must be some value larger than 0
-        static let targetRectWidth: CGFloat = 1
+        static let targetRectDimension: CGFloat = 1
 
-        /// Vertical padding for the target rect
-        static let yOffset: CGFloat = 24
+        /// Padding for the target rect
+        static let targetRectPadding: CGFloat = 20
     }
 }

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/BlogDashboardViewController.swift

@@ -33,6 +33,11 @@ final class BlogDashboardViewController: UIViewController {
         return refreshControl
     }()
 
+    /// The "My Site" parent view controller
+    var mySiteViewController: MySiteViewController? {
+        return parent as? MySiteViewController
+    }
+
     /// The "My Site" main scroll view
     var mySiteScrollView: UIScrollView? {
         return view.superview?.superview as? UIScrollView
@@ -69,7 +74,7 @@ final class BlogDashboardViewController: UIViewController {
         super.viewDidAppear(animated)
 
         viewModel.loadCards()
-        QuickStartTourGuide.shared.currentTourOrigin = .blogDashboard
+        QuickStartTourGuide.shared.currentEntryPoint = .blogDashboard
         startAlertTimer()
 
         WPAnalytics.track(.mySiteDashboardShown)
@@ -147,7 +152,30 @@ final class BlogDashboardViewController: UIViewController {
     }
 
     private func addQuickStartObserver() {
-        NotificationCenter.default.addObserver(self, selector: #selector(loadCardsFromCache), name: .QuickStartTourElementChangedNotification, object: nil)
+        NotificationCenter.default.addObserver(forName: .QuickStartTourElementChangedNotification, object: nil, queue: nil) { [weak self] notification in
+
+            guard let self = self else {
+                return
+            }
+
+            if let info = notification.userInfo,
+               let element = info[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
+
+                switch element {
+                case .setupQuickStart, .removeQuickStart:
+                    self.loadCardsFromCache()
+                case .stats:
+                    if self.embeddedInScrollView {
+                        self.mySiteScrollView?.scrollToTop(animated: true)
+                    } else {
+                        self.collectionView.scrollToTop(animated: true)
+                    }
+                    self.mySiteViewController?.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: Constants.bottomPaddingForQuickStartNotices, right: 0)
+                default:
+                    break
+                }
+            }
+        }
     }
 
     @objc private func updateCollectionViewHeight(notification: Notification) {
@@ -266,6 +294,7 @@ extension BlogDashboardViewController {
         static let horizontalSectionInset: CGFloat = 20
         static let verticalSectionInset: CGFloat = 20
         static let cellSpacing: CGFloat = 20
+        static let bottomPaddingForQuickStartNotices: CGFloat = 80
     }
 }
 

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