Merge remote-tracking branch 'origin/trunk' into merge/release-19.7-into-trunk

Got a conflict in
`WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift`
because:

- 0caf937 changed it on `trunk`
- 3be617f changed in on `release/19.7`

The commit on `trunk` was older (by one day) but the code it results
with seems better to me because it doesn't use arbitrary emojis as
delimiters for the selected site name.

I ensured the app built, but did not run the tests locally or manually
verified the how the screen where `SiteNameView` is used renders.

The conflict was:

```diff
diff --cc WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
index 28af882,85375f6e2b..0000000000
--- a/WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
+++ b/WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
@@@ -144,15 -142,11 +144,23 @@@ private extension SiteNameView

      /// Highlghts the site name in blue
      func setupTitleColors() {
++<<<<<<< HEAD
 +        // enclose the vertical name between two characters that are not in the title
 +        // (and reasonably never will..) to distinguish it from any substring in the title
 +        let selectedVerticalName = "😎" + siteVerticalName + "🙃"
 +        let fullTitle = String(format: TextContent.title, selectedVerticalName)
 +        var attributedTitle = NSMutableAttributedString(string: fullTitle)
 +        // Use default title if the vertical name is empty or too long
 +        guard let range = fullTitle.nsRange(of: selectedVerticalName),
 +              !siteVerticalName.isEmpty,
 +              siteVerticalName.count <= Metrics.verticalNameDisplayLimit else {
++=======
+         // find the index where the vertical name goes, so that it won't be confused
+         // with any word in the title
+         let replacementIndex = NSString(string: TextContent.title).range(of: "%@")
+
+         guard !siteVerticalName.isEmpty, replacementIndex.length > 0 else {
++>>>>>>> origin/trunk
              titleLabel.setText(TextContent.defaultTitle)
              return
          }
```

Author: mokagio

Gemfile.lock

@@ -16,20 +16,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.552.0)
-    aws-sdk-core (3.126.0)
+    aws-partitions (1.579.0)
+    aws-sdk-core (3.130.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.54.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-kms (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.112.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-s3 (1.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     bigdecimal (1.4.4)
@@ -92,7 +92,7 @@ GEM
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.91.0)
+    excon (0.92.2)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -122,7 +122,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.204.2)
+    fastlane (2.205.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -183,7 +183,7 @@ GEM
     gh_inspector (1.1.3)
     git (1.11.0)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.16.0)
+    google-apis-androidpublisher_v3 (0.19.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -198,24 +198,24 @@ GEM
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.11.0)
+    google-apis-storage_v1 (0.13.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.0)
+    google-cloud-storage (1.36.2)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.0)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.3)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
@@ -227,7 +227,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.5.0)
+    jmespath (1.6.1)
     json (2.6.1)
     jsonlint (0.3.0)
       oj (~> 3)
@@ -261,7 +261,7 @@ GEM
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rake (13.0.6)
     rake-compiler (1.2.0)
@@ -284,9 +284,9 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     security (0.1.3)
-    signet (0.16.0)
+    signet (0.16.1)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -308,7 +308,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)

RELEASE-NOTES.txt

@@ -1,6 +1,11 @@
 19.8
 -----
-
+* [**] 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/Models/Blog+QuickStart.swift

@@ -9,6 +9,22 @@ extension Blog {
         return quickStartTours?.filter { $0.skipped }
     }
 
+    var quickStartType: QuickStartType {
+        get {
+            guard let value = quickStartTypeValue?.intValue,
+                    let type = QuickStartType(rawValue: value) else {
+                return .undefined
+            }
+            return type
+        }
+
+        set {
+            quickStartTypeValue = NSNumber(value: newValue.rawValue)
+            let context = managedObjectContext ?? ContextManager.sharedInstance().mainContext
+            ContextManager.sharedInstance().saveContextAndWait(context)
+        }
+    }
+
     public func skipTour(_ tourID: String) {
         let tourState = findOrCreate(tour: tourID)
         tourState.skipped = true

WordPress/Classes/Models/Blog.h

@@ -156,6 +156,7 @@ typedef NS_ENUM(NSInteger, SiteVisibility) {
 @property (nonatomic, strong, readwrite, nullable) NSSet *sharingButtons;
 @property (nonatomic, strong, readwrite, nullable) NSDictionary *capabilities;
 @property (nonatomic, strong, readwrite, nullable) NSSet<QuickStartTourState *> *quickStartTours;
+@property (nonatomic, strong, readwrite, nullable) NSNumber *quickStartTypeValue;
 /// The blog's user ID for the current user
 @property (nonatomic, strong, readwrite, nullable) NSNumber *userID;
 /// Disk quota for site, this is only available for WP.com sites

WordPress/Classes/Models/Blog.m

@@ -87,6 +87,7 @@ @implementation Blog
 @dynamic sharingButtons;
 @dynamic capabilities;
 @dynamic quickStartTours;
+@dynamic quickStartTypeValue;
 @dynamic userID;
 @dynamic quotaSpaceAllowed;
 @dynamic quotaSpaceUsed;

WordPress/Classes/PropertyWrappers/Atomic.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+@propertyWrapper
+struct Atomic<Value> {
+
+    private var value: Value
+    private let lock = NSLock()
+
+    init(wrappedValue value: Value) {
+        self.value = value
+    }
+
+    var wrappedValue: Value {
+      get { return load() }
+      set { store(newValue: newValue) }
+    }
+
+    func load() -> Value {
+        lock.lock()
+        defer { lock.unlock() }
+        return value
+    }
+
+    mutating func store(newValue: Value) {
+        lock.lock()
+        defer { lock.unlock() }
+        value = newValue
+    }
+}