[Brand Updates] Feature branch

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.2)
+    activesupport (7.2.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -26,16 +26,16 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1011.0)
-    aws-sdk-core (3.213.0)
+    aws-partitions (1.1033.0)
+    aws-sdk-core (3.214.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.172.0)
+    aws-sdk-s3 (1.177.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -44,7 +44,7 @@ GEM
     babosa (1.0.4)
     base64 (0.2.0)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     buildkit (1.6.1)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -98,7 +98,7 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     cork (0.3.0)
       colored2 (~> 3.1)
     danger (9.5.1)
@@ -158,17 +158,17 @@ GEM
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -208,12 +208,12 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.25.1)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (12.3.3)
+    fastlane-plugin-wpmreleasetoolkit (12.4.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -277,26 +277,26 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.8.2)
-    jwt (2.9.3)
+    json (2.9.1)
+    jwt (2.10.1)
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
+    logger (1.6.4)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.1)
+    minitest (5.25.4)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -305,10 +305,10 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     nkf (0.2.0)
-    nokogiri (1.16.7)
+    nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.18.1-x86_64-darwin)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -321,7 +321,7 @@ GEM
     parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    plist (3.7.1)
+    plist (3.7.2)
     progress_bar (1.3.4)
       highline (>= 1.6)
       options (~> 2.3.0)
@@ -330,18 +330,18 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (12.3.3)
-    rake-compiler (1.2.8)
+    rake-compiler (1.2.9)
       rake
-    rchardet (1.8.0)
+    rchardet (1.9.0)
     regexp_parser (2.9.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rmagick (4.3.0)
-    rouge (2.0.7)
+    rouge (3.28.0)
     rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -359,11 +359,11 @@ GEM
     ruby-macho (2.5.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    securerandom (0.3.2)
+    securerandom (0.4.1)
     security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -399,8 +399,8 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 

Podfile

@@ -91,9 +91,9 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 9.10.1'
+  # pod 'WordPressAuthenticator', '~> 9.10.1'
   # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
-  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
+  pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: 'e5247b2d9bdb522c5d210dd6b66d58a4013eed99'
   # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
 
   wordpress_shared

Podfile.lock

@@ -67,16 +67,14 @@ DEPENDENCIES:
   - StripeTerminal (~> 3.9.1)
   - SwiftLint (= 0.54.0)
   - WordPress-Editor-iOS (~> 1.19)
-  - WordPressAuthenticator (~> 9.10.1)
+  - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `e5247b2d9bdb522c5d210dd6b66d58a4013eed99`)
   - WordPressShared (~> 2.1)
   - WordPressUI (~> 1.15)
   - Wormholy (~> 1.6.6)
   - WPMediaPicker (~> 1.8)
   - ZendeskSupportSDK (~> 9.0.0)
 
 SPEC REPOS:
-  https://github.com/wordpress-mobile/cocoapods-specs.git:
-    - WordPressAuthenticator
   trunk:
     - Alamofire
     - Automattic-Tracks-iOS
@@ -109,6 +107,16 @@ SPEC REPOS:
     - ZendeskSupportProvidersSDK
     - ZendeskSupportSDK
 
+EXTERNAL SOURCES:
+  WordPressAuthenticator:
+    :commit: e5247b2d9bdb522c5d210dd6b66d58a4013eed99
+    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
+
+CHECKOUT OPTIONS:
+  WordPressAuthenticator:
+    :commit: e5247b2d9bdb522c5d210dd6b66d58a4013eed99
+    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
+
 SPEC CHECKSUMS:
   Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
   Automattic-Tracks-iOS: 2d4bee68ff9db4d51f2f6c9fc85857dc69a008a4
@@ -127,7 +135,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: 8eaa928fb3a5694924ed3befac64beaae5656e12
   WordPress-Editor-iOS: 98ce1fc542c3a09e48ddc9423405b1d1e48240f1
-  WordPressAuthenticator: 2896e9a678fbe09463866fe7ee82bb5c7c1ba530
+  WordPressAuthenticator: d54323ca733b41b10a7fd64f5d1ca2d9efc47720
   WordPressKit: faf8c6de7c2acfe71cf95b4db896901060967089
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c
@@ -142,6 +150,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 281acf2bb731d2a67f913cfe653ed0da9f5b2f42
   ZendeskSupportSDK: b512cfc74b6bf8490e589f02cf52e27ed4f2bebe
 
-PODFILE CHECKSUM: 9b0e747f08251a1b347a70debab470e5e105f89a
+PODFILE CHECKSUM: 3c4625f3cbe2d1db480727650952ee77b82c2931
 
 COCOAPODS: 1.16.2

WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/automattic/AutomatticAbout-swift",
         "state": {
           "branch": null,
-          "revision": "31045d654bcc1f2b56c85dd658f160fad5b50a29",
-          "version": "1.1.4"
+          "revision": "606384a7492faa1139d489080dd961b0b57f9fd9",
+          "version": "1.1.5"
         }
       },
       {
@@ -111,7 +111,7 @@
       },
       {
         "package": "swift-numerics",
-        "repositoryURL": "https://github.com/apple/swift-numerics.git",
+        "repositoryURL": "https://github.com/apple/swift-numerics",
         "state": {
           "branch": null,
           "revision": "0a5bc04095a675662cf24757cc0640aa2204253b",

WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift

@@ -140,7 +140,7 @@ private extension ULAccountMismatchViewController {
     func configureTermsLabel() {
         let linkAttributes: [NSAttributedString.Key: Any] = [
             NSAttributedString.Key.foregroundColor: UIColor.accent,
-            NSAttributedString.Key.underlineColor: UIColor.accent,
+            NSAttributedString.Key.underlineColor: UIColor.clear,
             NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
         ]
         termsLabel.linkTextAttributes = linkAttributes

WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift

@@ -140,7 +140,7 @@ private extension ULErrorViewController {
     func configureTermsLabel() {
         let linkAttributes: [NSAttributedString.Key: Any] = [
             NSAttributedString.Key.foregroundColor: UIColor.accent,
-            NSAttributedString.Key.underlineColor: UIColor.accent,
+            NSAttributedString.Key.underlineColor: UIColor.clear,
             NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
         ]
         termsLabel.linkTextAttributes = linkAttributes

WooCommerce/Classes/Authentication/Prologue/LoginOnboardingPageViewController.swift

@@ -0,0 +1,98 @@
+import UIKit
+
+/// Displays the Login Prologue carousel, populated with `LoginOnboardingPageTypeViewController` pages.
+///
+final class LoginOnboardingPageViewController: UIPageViewController {
+
+    private let pages: [UIViewController]
+
+    init(pageTypes: [LoginOnboardingPageType] = LoginOnboardingPageType.allCases, showsSubtitle: Bool = false) {
+        self.pages = pageTypes.map { LoginOnboardingPageTypeViewController(pageType: $0, showsSubtitle: showsSubtitle) }
+        super.init(transitionStyle: .scroll, navigationOrientation: .horizontal)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        dataSource = pages.count > 1 ? self : nil
+
+        if let firstPage = pages.first {
+            setViewControllers([firstPage], direction: .forward, animated: false)
+        }
+    }
+
+    override func viewDidLayoutSubviews() {
+        if let pageControl = view.subviews.first(where: { $0 is UIPageControl }) as? UIPageControl {
+            configurePageControllerAppearance(pageControl: pageControl)
+        }
+    }
+
+    /// Shows the next page of content if it is not on the last page.
+    /// - Returns: Whether it can go to the next page, if it has not reached the last page.
+    func goToNextPageIfPossible() -> Bool {
+        let currentPage = dataSource?.presentationIndex?(for: self) ?? 0
+        guard currentPage < pages.count - 1 else {
+            return false
+        }
+        setViewControllers([pages[currentPage + 1]], direction: .forward, animated: true)
+        return true
+    }
+}
+
+private extension LoginOnboardingPageViewController {
+    // MARK: Page Control Setup
+    //
+    func configurePageControllerAppearance(pageControl: UIPageControl) {
+        pageControl.currentPageIndicatorTintColor = .accent
+        pageControl.pageIndicatorTintColor = .gray(.shade10)
+        pageControl.transform = CGAffineTransform(scaleX: Constants.pageControlScale, y: Constants.pageControlScale)
+    }
+}
+
+// MARK: - UIPageViewControllerDataSource Conformance
+//
+extension LoginOnboardingPageViewController: UIPageViewControllerDataSource {
+
+    func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
+        guard let index = pages.firstIndex(of: viewController),
+              index > 0 else {
+            return nil
+        }
+
+        return pages[index - 1]
+    }
+
+    func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
+        guard let index = pages.firstIndex(of: viewController),
+              index < pages.count - 1 else {
+            return nil
+        }
+
+        return pages[index + 1]
+    }
+
+    func presentationCount(for pageViewController: UIPageViewController) -> Int {
+        pages.count
+    }
+
+    func presentationIndex(for pageViewController: UIPageViewController) -> Int {
+        guard let currentPage = viewControllers?.first,
+              let currentIndex = pages.firstIndex(of: currentPage) else {
+            return 0
+        }
+
+        return currentIndex
+    }
+}
+
+
+// MARK: - Constants
+private extension LoginOnboardingPageViewController {
+    enum Constants {
+        static let pageControlBottomMargin: CGFloat = 0
+        static let pageControlScale: CGFloat = 0.8 // Scales page control according to design
+    }
+}