Merge branch 'main' into postCampaignFragment

kickstarter · Feb 7, 2024 · 4b7902b · 4b7902b
2 parents 330e4c0 + 2096367
commit 4b7902b
Show file tree

Hide file tree

Showing 148 changed files with 101 additions and 70 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,6 +8,7 @@ orbs:
 aws_cli_setup: &aws_cli_setup
   role-arn: $AWS_ROLE_ARN
 
+# Keep xcode version in sync with `.fastlane/Fastfile`
 xcode_version: &xcode_version 15.2.0
 iphone_name: &iphone_name iPhone SE (3rd generation)
 

diff --git a/.fastlane/Fastfile b/.fastlane/Fastfile
@@ -232,7 +232,8 @@ platform :ios do
   end
 
   private_lane :xcode_check do
-    xcodes(version: "14.2", select_for_current_build_only: true)
+    # Keep xcode version in sync with `.circleci/config.yml`
+    xcodes(version: "15.2", select_for_current_build_only: true)
   end
 
   private_lane :build_the_app do |options|

diff --git a/...ter-iOS/Features/FacebookConfirmation/Controller/FacebookConfirmationViewController.swift b/...ter-iOS/Features/FacebookConfirmation/Controller/FacebookConfirmationViewController.swift
@@ -59,22 +59,18 @@ internal final class FacebookConfirmationViewController: UIViewController,
   internal override func bindStyles() {
     super.bindStyles()
 
-    _ = self
-      |> baseControllerStyle()
-
-    _ = self.disclaimerTextView
-      |> disclaimerTextViewStyle
-
     _ = self.confirmationLabel |> fbConfirmationMessageLabelStyle
     _ = self.createAccountButton |> createNewAccountButtonStyle
     _ = self.emailLabel |> fbConfirmEmailLabelStyle
     _ = self.loginButton |> loginWithEmailButtonStyle
     _ = self.loginLabel |> fbWrongAccountLabelStyle
     _ = self.navigationItem.title = Strings.signup_navbar_title()
-    _ = self.newsletterLabel
-      |> newsletterLabelStyle
+    _ = self.newsletterLabel |> newsletterLabelStyle
     _ = self.newsletterSwitch |> newsletterSwitchStyle
-    _ = self.rootStackView |> loginRootStackViewStyle
+
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+    applyDisclaimerTextViewStyle(self.disclaimerTextView, useLargerText: isPad)
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
   }
 
   override func bindViewModel() {

diff --git a/...OS/Features/FacebookConfirmation/Controller/FacebookConfirmationViewControllerTests.swift b/...OS/Features/FacebookConfirmation/Controller/FacebookConfirmationViewControllerTests.swift
@@ -11,7 +11,7 @@ internal final class FacebookConfirmationViewControllerTests: TestCase {
 
   func testView() {
     let devices = [Device.phone4_7inch, Device.phone5_8inch, Device.pad]
-    combos(Language.allLanguages, devices).forEach { language, device in
+    orthogonalCombos(Language.allLanguages, devices).forEach { language, device in
       withEnvironment(language: language) {
         let controller = FacebookConfirmationViewController
           .configuredWith(facebookUserEmail: "hello@kickstarter.com", facebookAccessToken: "")

diff --git a/...shots__/FacebookConfirmationViewControllerTests/testView.lang_de_device_pad.png b/...shots__/FacebookConfirmationViewControllerTests/testView.lang_de_device_pad.png
diff --git a/...acebookConfirmationViewControllerTests/testView.lang_de_device_phone5_8inch.png b/...acebookConfirmationViewControllerTests/testView.lang_de_device_phone5_8inch.png
diff --git a/...shots__/FacebookConfirmationViewControllerTests/testView.lang_en_device_pad.png b/...shots__/FacebookConfirmationViewControllerTests/testView.lang_en_device_pad.png
diff --git a/...acebookConfirmationViewControllerTests/testView.lang_en_device_phone4_7inch.png b/...acebookConfirmationViewControllerTests/testView.lang_en_device_phone4_7inch.png
diff --git a/...shots__/FacebookConfirmationViewControllerTests/testView.lang_es_device_pad.png b/...shots__/FacebookConfirmationViewControllerTests/testView.lang_es_device_pad.png
diff --git a/...acebookConfirmationViewControllerTests/testView.lang_es_device_phone4_7inch.png b/...acebookConfirmationViewControllerTests/testView.lang_es_device_phone4_7inch.png
diff --git a/...acebookConfirmationViewControllerTests/testView.lang_es_device_phone5_8inch.png b/...acebookConfirmationViewControllerTests/testView.lang_es_device_phone5_8inch.png
diff --git a/...shots__/FacebookConfirmationViewControllerTests/testView.lang_fr_device_pad.png b/...shots__/FacebookConfirmationViewControllerTests/testView.lang_fr_device_pad.png
diff --git a/...acebookConfirmationViewControllerTests/testView.lang_fr_device_phone5_8inch.png b/...acebookConfirmationViewControllerTests/testView.lang_fr_device_phone5_8inch.png
diff --git a/...shots__/FacebookConfirmationViewControllerTests/testView.lang_ja_device_pad.png b/...shots__/FacebookConfirmationViewControllerTests/testView.lang_ja_device_pad.png
diff --git a/...acebookConfirmationViewControllerTests/testView.lang_ja_device_phone4_7inch.png b/...acebookConfirmationViewControllerTests/testView.lang_ja_device_phone4_7inch.png
diff --git a/.../FacebookResetPasswordViewController/Controller/FacebookResetPasswordViewController.swift b/.../FacebookResetPasswordViewController/Controller/FacebookResetPasswordViewController.swift
@@ -70,7 +70,8 @@ public final class FacebookResetPasswordViewController: UIViewController {
 
     _ = self.rootStackView
       |> baseStackViewStyle
-      |> loginRootStackViewStyle
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
 
     _ = self.emailLabel
       |> textFieldLabelStyle

diff --git a/...bookResetPasswordViewController/Controller/FacebookResetPasswordViewControllerTests.swift b/...bookResetPasswordViewController/Controller/FacebookResetPasswordViewControllerTests.swift
@@ -11,7 +11,7 @@ internal final class FacebookResetPasswordViewControllerTests: TestCase {
 
   func testFacebookResetPasswordViewController() {
     let devices = [Device.phone4_7inch, Device.pad]
-    combos(Language.allLanguages, devices).forEach { language, device in
+    orthogonalCombos(Language.allLanguages, devices).forEach { language, device in
       withEnvironment(language: language) {
         let controller = FacebookResetPasswordViewController.instantiate()
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)

diff --git a/...wControllerTests/testFacebookResetPasswordViewController.lang_de_device_pad.png b/...wControllerTests/testFacebookResetPasswordViewController.lang_de_device_pad.png
diff --git a/...wControllerTests/testFacebookResetPasswordViewController.lang_en_device_pad.png b/...wControllerTests/testFacebookResetPasswordViewController.lang_en_device_pad.png
diff --git a/...erTests/testFacebookResetPasswordViewController.lang_en_device_phone4_7inch.png b/...erTests/testFacebookResetPasswordViewController.lang_en_device_phone4_7inch.png
diff --git a/...wControllerTests/testFacebookResetPasswordViewController.lang_es_device_pad.png b/...wControllerTests/testFacebookResetPasswordViewController.lang_es_device_pad.png
diff --git a/...wControllerTests/testFacebookResetPasswordViewController.lang_fr_device_pad.png b/...wControllerTests/testFacebookResetPasswordViewController.lang_fr_device_pad.png
diff --git a/...erTests/testFacebookResetPasswordViewController.lang_fr_device_phone4_7inch.png b/...erTests/testFacebookResetPasswordViewController.lang_fr_device_phone4_7inch.png
diff --git a/...wControllerTests/testFacebookResetPasswordViewController.lang_ja_device_pad.png b/...wControllerTests/testFacebookResetPasswordViewController.lang_ja_device_pad.png
diff --git a/Kickstarter-iOS/Features/Login/Controller/LoginViewController.swift b/Kickstarter-iOS/Features/Login/Controller/LoginViewController.swift
@@ -101,7 +101,8 @@ internal final class LoginViewController: UIViewController {
 
     _ = self.formBackgroundView |> cardStyle()
 
-    _ = self.rootStackView |> loginRootStackViewStyle
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
   }
 
   override func bindViewModel() {

diff --git a/Kickstarter-iOS/Features/Login/Controller/LoginViewControllerTests.swift b/Kickstarter-iOS/Features/Login/Controller/LoginViewControllerTests.swift
@@ -10,15 +10,19 @@ internal final class LoginViewControllerTests: TestCase {
   }
 
   func testView() {
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
+    orthogonalCombos(Language.allLanguages, [Device.pad, Device.phone4_7inch, Device.phone5_8inch]).forEach {
       language, device in
       withEnvironment(language: language) {
         let controller = Storyboard.Login.instantiate(LoginViewController.self)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 
         self.scheduler.run()
 
-        assertSnapshot(matching: parent.view, as: .image, named: "lang_\(language)_device_\(device)")
+        assertSnapshot(
+          matching: parent.view,
+          as: .image,
+          named: "lang_\(language)_device_\(device)"
+        )
       }
     }
   }

diff --git a/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_de_device_pad.png b/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_de_device_pad.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_de_device_phone4_7inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_de_device_phone4_7inch.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_de_device_phone5_8inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_de_device_phone5_8inch.png
diff --git a/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_en_device_pad.png b/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_en_device_pad.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_en_device_phone5_8inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_en_device_phone5_8inch.png
diff --git a/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_es_device_pad.png b/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_es_device_pad.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_es_device_phone4_7inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_es_device_phone4_7inch.png
diff --git a/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_fr_device_pad.png b/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_fr_device_pad.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_fr_device_phone4_7inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_fr_device_phone4_7inch.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_fr_device_phone5_8inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_fr_device_phone5_8inch.png
diff --git a/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_ja_device_pad.png b/...ntroller/__Snapshots__/LoginViewControllerTests/testView.lang_ja_device_pad.png
diff --git a/...__Snapshots__/LoginViewControllerTests/testView.lang_ja_device_phone5_8inch.png b/...__Snapshots__/LoginViewControllerTests/testView.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewController.swift b/Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewController.swift
@@ -108,6 +108,8 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
   public override func bindStyles() {
     super.bindStyles()
 
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+
     _ = self.backgroundImageView
       |> backgroundImageViewStyle
 
@@ -131,8 +133,8 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
 
     _ = self.getNotifiedLabel
       |> baseLabelStyle
-      |> UILabel.lens.font %~~ { _, label in
-        label.traitCollection.isRegularRegular ? UIFont.ksr_subhead() : UIFont.ksr_caption2()
+      |> UILabel.lens.font %~~ { _, _ in
+        isPad ? UIFont.ksr_subhead() : UIFont.ksr_caption2()
       }
       |> UILabel.lens.text %~ { _ in Strings.Get_notified_when_your_friends_back_and_launch_projects() }
 
@@ -144,9 +146,9 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
 
     _ = self.loginContextStackView
       |> UIStackView.lens.spacing .~ Styles.gridHalf(1)
-      |> UIStackView.lens.layoutMargins %~~ { _, stack in
-        stack.traitCollection.isRegularRegular
-          ? .init(topBottom: Styles.grid(10), leftRight: 0)
+      |> UIStackView.lens.layoutMargins %~~ { _, _ in
+        isPad
+          ? .init(topBottom: Styles.grid(2), leftRight: 0)
           : .init(top: Styles.grid(10), left: 0, bottom: Styles.grid(5), right: 0)
       }
       |> UIStackView.lens.isLayoutMarginsRelativeArrangement .~ true
@@ -156,8 +158,8 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
 
     _ = self.rootStackView
       |> baseStackViewStyle
-      |> loginRootStackViewStyle
       |> UIStackView.lens.spacing .~ Styles.grid(5)
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
 
     _ = self.separatorView
       |> separatorViewStyle

diff --git a/Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewControllerTests.swift b/Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewControllerTests.swift
@@ -18,7 +18,7 @@ internal final class LoginToutViewControllerTests: TestCase {
     let devices = [Device.phone4_7inch, Device.phone5_8inch, Device.pad]
     let intents = [LoginIntent.generic, .starProject, .messageCreator, .backProject]
 
-    combos(Language.allLanguages, devices, intents).forEach { language, device, intent in
+    orthogonalCombos(Language.allLanguages, devices, intents).forEach { language, device, intent in
       withEnvironment(language: language) {
         let controller = LoginToutViewController.configuredWith(loginIntent: intent)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)

diff --git a/...ViewControllerTests/testLoginToutView.intent_backProject_lang_de_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_backProject_lang_de_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_de_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_de_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_de_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_de_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_backProject_lang_en_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_backProject_lang_en_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_en_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_en_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_en_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_en_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_backProject_lang_es_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_backProject_lang_es_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_es_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_es_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_es_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_es_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_backProject_lang_fr_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_backProject_lang_fr_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_fr_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_fr_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_backProject_lang_ja_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_backProject_lang_ja_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_ja_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_ja_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_backProject_lang_ja_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_backProject_lang_ja_device_phone5_8inch.png
diff --git a/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_de_device_pad.png b/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_de_device_pad.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_de_device_phone5_8inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_de_device_phone5_8inch.png
diff --git a/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_en_device_pad.png b/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_en_device_pad.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_en_device_phone4_7inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_en_device_phone4_7inch.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_en_device_phone5_8inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_en_device_phone5_8inch.png
diff --git a/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_es_device_pad.png b/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_es_device_pad.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_es_device_phone4_7inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_es_device_phone4_7inch.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_es_device_phone5_8inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_es_device_phone5_8inch.png
diff --git a/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_fr_device_pad.png b/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_fr_device_pad.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_fr_device_phone4_7inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_fr_device_phone4_7inch.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_fr_device_phone5_8inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_fr_device_phone5_8inch.png
diff --git a/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_ja_device_pad.png b/...ToutViewControllerTests/testLoginToutView.intent_generic_lang_ja_device_pad.png
diff --git a/...ontrollerTests/testLoginToutView.intent_generic_lang_ja_device_phone4_7inch.png b/...ontrollerTests/testLoginToutView.intent_generic_lang_ja_device_phone4_7inch.png
diff --git a/...wControllerTests/testLoginToutView.intent_messageCreator_lang_de_device_pad.png b/...wControllerTests/testLoginToutView.intent_messageCreator_lang_de_device_pad.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_de_device_phone4_7inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_de_device_phone4_7inch.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_de_device_phone5_8inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_de_device_phone5_8inch.png
diff --git a/...wControllerTests/testLoginToutView.intent_messageCreator_lang_en_device_pad.png b/...wControllerTests/testLoginToutView.intent_messageCreator_lang_en_device_pad.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_en_device_phone4_7inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_en_device_phone4_7inch.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_en_device_phone5_8inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_en_device_phone5_8inch.png
diff --git a/...wControllerTests/testLoginToutView.intent_messageCreator_lang_es_device_pad.png b/...wControllerTests/testLoginToutView.intent_messageCreator_lang_es_device_pad.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_es_device_phone4_7inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_es_device_phone4_7inch.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_es_device_phone5_8inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_es_device_phone5_8inch.png
diff --git a/...wControllerTests/testLoginToutView.intent_messageCreator_lang_fr_device_pad.png b/...wControllerTests/testLoginToutView.intent_messageCreator_lang_fr_device_pad.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_fr_device_phone4_7inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_fr_device_phone4_7inch.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_fr_device_phone5_8inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_fr_device_phone5_8inch.png
diff --git a/...wControllerTests/testLoginToutView.intent_messageCreator_lang_ja_device_pad.png b/...wControllerTests/testLoginToutView.intent_messageCreator_lang_ja_device_pad.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_ja_device_phone4_7inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_ja_device_phone4_7inch.png
diff --git a/...erTests/testLoginToutView.intent_messageCreator_lang_ja_device_phone5_8inch.png b/...erTests/testLoginToutView.intent_messageCreator_lang_ja_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_starProject_lang_de_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_starProject_lang_de_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_de_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_de_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_de_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_de_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_starProject_lang_en_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_starProject_lang_en_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_en_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_en_device_phone4_7inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_starProject_lang_es_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_starProject_lang_es_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_es_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_es_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_es_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_es_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_starProject_lang_fr_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_starProject_lang_fr_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_fr_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_fr_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_fr_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_fr_device_phone5_8inch.png
diff --git a/...ViewControllerTests/testLoginToutView.intent_starProject_lang_ja_device_pad.png b/...ViewControllerTests/testLoginToutView.intent_starProject_lang_ja_device_pad.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_ja_device_phone4_7inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_ja_device_phone4_7inch.png
diff --git a/...ollerTests/testLoginToutView.intent_starProject_lang_ja_device_phone5_8inch.png b/...ollerTests/testLoginToutView.intent_starProject_lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/ResetPassword/Controller/ResetPasswordViewController.swift b/Kickstarter-iOS/Features/ResetPassword/Controller/ResetPasswordViewController.swift
@@ -31,7 +31,9 @@ internal final class ResetPasswordViewController: UIViewController {
     _ = self.emailTextField |> emailFieldStyle
     _ = self.emailTextFieldBackgroundView |> cardStyle()
     _ = self.resetPasswordButton |> resetPasswordButtonStyle
-    _ = self.rootStackView |> loginRootStackViewStyle
+
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
   }
 
   override func bindViewModel() {

diff --git a/Kickstarter-iOS/Features/ResetPassword/Controller/ResetPasswordViewControllerTests.swift b/Kickstarter-iOS/Features/ResetPassword/Controller/ResetPasswordViewControllerTests.swift
@@ -10,7 +10,7 @@ internal final class ResetPasswordViewControllerTests: TestCase {
   }
 
   func testView() {
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
+    orthogonalCombos(Language.allLanguages, [Device.pad, Device.phone4_7inch, Device.phone5_8inch]).forEach {
       language, device in
       withEnvironment(language: language) {
         let controller = ResetPasswordViewController.configuredWith(email: "americasnexttopmodulus@gmail.com")

diff --git a/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_de_device_pad.png b/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_de_device_pad.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_de_device_phone4_7inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_de_device_phone4_7inch.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_de_device_phone5_8inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_de_device_phone5_8inch.png
diff --git a/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_en_device_pad.png b/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_en_device_pad.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_en_device_phone5_8inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_en_device_phone5_8inch.png
diff --git a/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_es_device_pad.png b/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_es_device_pad.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_es_device_phone4_7inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_es_device_phone4_7inch.png
diff --git a/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_fr_device_pad.png b/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_fr_device_pad.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_fr_device_phone4_7inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_fr_device_phone4_7inch.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_fr_device_phone5_8inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_fr_device_phone5_8inch.png
diff --git a/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_ja_device_pad.png b/.../__Snapshots__/ResetPasswordViewControllerTests/testView.lang_ja_device_pad.png
diff --git a/...ots__/ResetPasswordViewControllerTests/testView.lang_ja_device_phone5_8inch.png b/...ots__/ResetPasswordViewControllerTests/testView.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/SetYourPassword/Controller/SetYourPasswordViewController.swift b/Kickstarter-iOS/Features/SetYourPassword/Controller/SetYourPasswordViewController.swift
@@ -74,9 +74,11 @@ public final class SetYourPasswordViewController: UIViewController {
     _ = self.contextLabel
       |> contextLabelStyle
 
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+
     _ = self.rootStackView
       |> baseStackViewStyle
-      |> loginRootStackViewStyle
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
 
     _ = self.newPasswordLabel
       |> textFieldLabelStyle

diff --git a/Kickstarter-iOS/Features/SetYourPassword/Controller/SetYourPasswordViewControllerTests.swift b/Kickstarter-iOS/Features/SetYourPassword/Controller/SetYourPasswordViewControllerTests.swift
@@ -22,7 +22,7 @@ final class SetYourPasswordViewControllerTests: TestCase {
     let userEnvelope = UserEnvelope(me: userTemplate)
     let service = MockService(fetchGraphUserResult: .success(userEnvelope))
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach {
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach {
       language, device in
       withEnvironment(apiService: service, apiDelayInterval: .seconds(0), language: language) {
         let controller = SetYourPasswordViewController.instantiate()

diff --git a/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_de_device_pad.png b/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_de_device_pad.png
diff --git a/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_en_device_pad.png b/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_en_device_pad.png
diff --git a/.../testSetYourPasswordViewController_DisabledSave.lang_en_device_phone4_7inch.png b/.../testSetYourPasswordViewController_DisabledSave.lang_en_device_phone4_7inch.png
diff --git a/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_es_device_pad.png b/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_es_device_pad.png
diff --git a/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_fr_device_pad.png b/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_fr_device_pad.png
diff --git a/.../testSetYourPasswordViewController_DisabledSave.lang_fr_device_phone4_7inch.png b/.../testSetYourPasswordViewController_DisabledSave.lang_fr_device_phone4_7inch.png
diff --git a/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_ja_device_pad.png b/...llerTests/testSetYourPasswordViewController_DisabledSave.lang_ja_device_pad.png
diff --git a/Kickstarter-iOS/Features/Signup/SignupViewController.swift b/Kickstarter-iOS/Features/Signup/SignupViewController.swift
@@ -82,9 +82,6 @@ internal final class SignupViewController: UIViewController, MFMailComposeViewCo
     _ = self
       |> signupControllerStyle
 
-    _ = self.disclaimerTextView
-      |> disclaimerTextViewStyle
-
     _ = self.nameTextField
       |> UITextField.lens.returnKeyType .~ .next
       |> UITextField.lens.placeholder %~ { _ in Strings.Name() }
@@ -103,11 +100,12 @@ internal final class SignupViewController: UIViewController, MFMailComposeViewCo
       |> newPasswordFieldAutoFillStyle
       |> UITextField.lens.returnKeyType .~ .go
 
-    _ = self.rootStackView
-      |> loginRootStackViewStyle
-
     _ = self.signupButton
       |> signupButtonStyle
+
+    let isPad = self.traitCollection.userInterfaceIdiom == .pad
+    applyDisclaimerTextViewStyle(self.disclaimerTextView, useLargerText: isPad)
+    applyLoginRootStackViewStyle(self.rootStackView, useLargerMargins: isPad)
   }
 
   internal override func bindViewModel() {

diff --git a/Kickstarter-iOS/Features/Signup/SignupViewControllerTests.swift b/Kickstarter-iOS/Features/Signup/SignupViewControllerTests.swift
@@ -10,8 +10,8 @@ internal final class SignupViewControllerTests: TestCase {
   }
 
   func testView() {
-    let devices = [Device.phone4_7inch, Device.phone5_8inch, Device.pad]
-    combos(Language.allLanguages, devices).forEach { language, device in
+    let devices = [Device.phone4_7inch, Device.pad, Device.phone5_8inch]
+    orthogonalCombos(Language.allLanguages, devices).forEach { language, device in
       withEnvironment(language: language) {
         let controller = SignupViewController.instantiate()
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)

diff --git a/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_de_device_pad.png b/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_de_device_pad.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_de_device_phone5_8inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_de_device_phone5_8inch.png
diff --git a/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_en_device_pad.png b/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_en_device_pad.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_en_device_phone4_7inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_en_device_phone4_7inch.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_en_device_phone5_8inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_en_device_phone5_8inch.png
diff --git a/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_es_device_pad.png b/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_es_device_pad.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_es_device_phone4_7inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_es_device_phone4_7inch.png
diff --git a/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_fr_device_pad.png b/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_fr_device_pad.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_fr_device_phone5_8inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_fr_device_phone5_8inch.png
diff --git a/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_ja_device_pad.png b/.../Signup/__Snapshots__/SignupViewControllerTests/testView.lang_ja_device_pad.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_ja_device_phone4_7inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_ja_device_phone4_7inch.png
diff --git a/..._Snapshots__/SignupViewControllerTests/testView.lang_ja_device_phone5_8inch.png b/..._Snapshots__/SignupViewControllerTests/testView.lang_ja_device_phone5_8inch.png
diff --git a/Kickstarter-iOS/Features/TwoFactorAuthentication/Controller/TwoFactorViewController.swift b/Kickstarter-iOS/Features/TwoFactorAuthentication/Controller/TwoFactorViewController.swift
@@ -28,19 +28,21 @@ internal final class TwoFactorViewController: UIViewController {
   internal override func bindStyles() {
     super.bindStyles()
 
+    let isPad = self.traitCollection.isRegularRegular
+
     _ = self
       |> twoFactorControllerStyle
-      |> UIViewController.lens.view.layoutMargins %~~ { _, view in
-        view.traitCollection.isRegularRegular ? .init(all: Styles.grid(20)) : .init(all: Styles.grid(3))
+      |> UIViewController.lens.view.layoutMargins %~~ { _, _ in
+        isPad ? .init(all: Styles.grid(20)) : .init(all: Styles.grid(3))
       }
 
     _ = self.codeTextField
       |> tfaCodeFieldAutoFillStyle
 
     _ = self.formBackgroundView
       |> cardStyle()
-      |> UIView.lens.layoutMargins %~~ { _, view in
-        view.traitCollection.isRegularRegular ? .init(all: Styles.grid(10)) : .init(all: Styles.grid(3))
+      |> UIView.lens.layoutMargins %~~ { _, _ in
+        isPad ? .init(all: Styles.grid(10)) : .init(all: Styles.grid(3))
       }
 
     _ = self.formStackView

diff --git a/...tarter-iOS/Features/TwoFactorAuthentication/Controller/TwoFactorViewControllerTests.swift b/...tarter-iOS/Features/TwoFactorAuthentication/Controller/TwoFactorViewControllerTests.swift
@@ -12,7 +12,7 @@ internal final class TwoFactorViewControllerTests: TestCase {
   }
 
   func testView() {
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.phone5_8inch, Device.pad]).forEach {
       language, device in
       withEnvironment(language: language) {
         let controller = Storyboard.Login.instantiate(TwoFactorViewController.self)

diff --git a/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_de_device_pad.png b/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_de_device_pad.png
diff --git a/...apshots__/TwoFactorViewControllerTests/testView.lang_de_device_phone5_8inch.png b/...apshots__/TwoFactorViewControllerTests/testView.lang_de_device_phone5_8inch.png
diff --git a/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_en_device_pad.png b/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_en_device_pad.png
diff --git a/...apshots__/TwoFactorViewControllerTests/testView.lang_en_device_phone4_7inch.png b/...apshots__/TwoFactorViewControllerTests/testView.lang_en_device_phone4_7inch.png
diff --git a/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_es_device_pad.png b/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_es_device_pad.png
diff --git a/...apshots__/TwoFactorViewControllerTests/testView.lang_es_device_phone4_7inch.png b/...apshots__/TwoFactorViewControllerTests/testView.lang_es_device_phone4_7inch.png
diff --git a/...apshots__/TwoFactorViewControllerTests/testView.lang_es_device_phone5_8inch.png b/...apshots__/TwoFactorViewControllerTests/testView.lang_es_device_phone5_8inch.png
diff --git a/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_fr_device_pad.png b/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_fr_device_pad.png
diff --git a/...apshots__/TwoFactorViewControllerTests/testView.lang_fr_device_phone5_8inch.png b/...apshots__/TwoFactorViewControllerTests/testView.lang_fr_device_phone5_8inch.png
diff --git a/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_ja_device_pad.png b/...ller/__Snapshots__/TwoFactorViewControllerTests/testView.lang_ja_device_pad.png
diff --git a/...apshots__/TwoFactorViewControllerTests/testView.lang_ja_device_phone4_7inch.png b/...apshots__/TwoFactorViewControllerTests/testView.lang_ja_device_phone4_7inch.png
diff --git a/Kickstarter-iOS/TestHelpers/Combos.swift b/Kickstarter-iOS/TestHelpers/Combos.swift
@@ -1,3 +1,5 @@
+// Combine two arrays by creating an array consisting of each pairwise combo.
+// Result consists of `A.count * B.count` pairs.
 internal func combos<A, B>(_ xs: [A], _ ys: [B]) -> [(A, B)] {
   return xs.flatMap { x in
     ys.map { y in
@@ -6,6 +8,8 @@ internal func combos<A, B>(_ xs: [A], _ ys: [B]) -> [(A, B)] {
   }
 }
 
+// Combine three arrays by creating an array consisting of all possible tuples.
+// Result consists of `A.count * B.count * C.count` tuples.
 internal func combos<A, B, C>(_ xs: [A], _ ys: [B], _ zs: [C]) -> [(A, B, C)] {
   return xs.flatMap { x in
     ys.flatMap { y in
@@ -15,3 +19,35 @@ internal func combos<A, B, C>(_ xs: [A], _ ys: [B], _ zs: [C]) -> [(A, B, C)] {
     }
   }
 }
+
+// Combine two arrays by creating an array where each element is represented at least once.
+// Result consists of `max(A.count, B.count)` pairs.
+internal func orthogonalCombos<A, B>(_ xs: [A], _ ys: [B]) -> [(A, B)] {
+  if xs.count >= ys.count {
+    return xs.enumerated().map { index, x in
+      (x, ys[index % ys.count])
+    }
+  } else {
+    return ys.enumerated().map { index, y in
+      (xs[index % xs.count], y)
+    }
+  }
+}
+
+// Combine three arrays by creating an array where each element is represented at least once.
+// Result consists of `max(A.count, B.count, C.count)` tuples.
+internal func orthogonalCombos<A, B, C>(_ xs: [A], _ ys: [B], _ zs: [C]) -> [(A, B, C)] {
+  if xs.count >= ys.count, xs.count >= zs.count {
+    return xs.enumerated().map { index, x in
+      (x, ys[index % ys.count], zs[index % zs.count])
+    }
+  } else if ys.count >= xs.count, ys.count >= zs.count {
+    return ys.enumerated().map { index, y in
+      (xs[index % xs.count], y, zs[index % zs.count])
+    }
+  } else {
+    return zs.enumerated().map { index, z in
+      (xs[index % xs.count], ys[index % ys.count], z)
+    }
+  }
+}