♿️ Disable Dynamic Type on buttons

Cartfile

@@ -1,6 +1,6 @@
 ### Internal
 
-github "kickstarter/Kickstarter-Prelude" "c96c90b026d45839724e827f881dcba3ec812725"
+github "kickstarter/Kickstarter-Prelude" "d03f8831dcec9ad157db4f1c5f769ec17e1a3766"
 github "kickstarter/Kickstarter-ReactiveExtensions" "aa994f0921dca1965ae537fe77c2edc798eef230"
 
 ### 3rd Party

Cartfile.resolved

@@ -1,9 +1,9 @@
 github "AgileBits/onepassword-extension" "framework/1.8.4"
-github "Alamofire/Alamofire" "5.0.0-beta.6"
+github "Alamofire/Alamofire" "5.0.0-beta.7"
 github "Alamofire/AlamofireImage" "c41f8b0acfbb3180fe045df73596e4332c338633"
 github "ReactiveCocoa/ReactiveSwift" "6.0.0"
 github "facebook/facebook-objc-sdk" "v5.0.2"
-github "kickstarter/Kickstarter-Prelude" "c96c90b026d45839724e827f881dcba3ec812725"
+github "kickstarter/Kickstarter-Prelude" "d03f8831dcec9ad157db4f1c5f769ec17e1a3766"
 github "kickstarter/Kickstarter-ReactiveExtensions" "aa994f0921dca1965ae537fe77c2edc798eef230"
 github "stripe/stripe-ios" "v13.2.0"
 github "thoughtbot/Argo" "39f06f089d25c111444e5a85eef64586e54756ac"

Kickstarter-iOS/Views/Controllers/LoginToutViewController.swift

@@ -106,7 +106,7 @@ internal final class LoginToutViewController: UIViewController, MFMailComposeVie
       |> fbLoginButtonStyle
 
     _ = self.disclaimerButton
-      |> baseMultiLineButtonStyle
+      |> multiLineButtonStyle
       |> disclaimerButtonStyle
 
     _ = self.loginButton
@@ -421,12 +421,3 @@ private let baseLabelStyle: LabelStyle = { label in
     |> \.lineBreakMode .~ NSLineBreakMode.byWordWrapping
     |> \.numberOfLines .~ 0
 }
-
-private let baseMultiLineButtonStyle: ButtonStyle = { button in
-  _ = button.titleLabel
-    ?|> \.textAlignment .~ NSTextAlignment.center
-    ?|> \.lineBreakMode .~ NSLineBreakMode.byWordWrapping
-    ?|> \.numberOfLines .~ 0
-
-  return button
-}

Kickstarter-iOS/Views/Controllers/PledgeContinueViewController.swift

@@ -5,7 +5,7 @@ import Prelude
 final class PledgeContinueViewController: UIViewController {
   // MARK: - Properties
 
-  private let continueButton = MultiLineButton(type: .custom)
+  private let continueButton = UIButton(type: .custom)
   private let viewModel = PledgeContinueViewModel()
 
   // MARK: - Lifecycle
@@ -25,10 +25,7 @@ final class PledgeContinueViewController: UIViewController {
       |> checkoutBackgroundStyle
 
     _ = self.continueButton
-      |> greenButtonStyle
-      |> UIButton.lens.title(for: .normal) %~ { _ in
-        Strings.Continue()
-      }
+      |> continueButtonStyle
   }
 
   // MARK: - View model
@@ -74,3 +71,11 @@ final class PledgeContinueViewController: UIViewController {
     self.presentViewControllerWithSheetOverlay(navigationController, offset: navigationBarHeight)
   }
 }
+
+// MARK: - Styles
+
+private let continueButtonStyle: ButtonStyle = { button in
+  button
+    |> greenButtonStyle
+    |> UIButton.lens.title(for: .normal) %~ { _ in Strings.Continue() }
+}

Kickstarter-iOS/Views/PledgeCTAContainerView.swift

@@ -85,33 +85,19 @@ final class PledgeCTAContainerView: UIView {
       |> pledgeRetryButtonStyle
 
     _ = self.titleAndSubtitleStackView
-      |> \.axis .~ NSLayoutConstraint.Axis.vertical
-      |> \.isLayoutMarginsRelativeArrangement .~ true
-      |> \.spacing .~ Styles.gridHalf(1)
-
-    _ = self.pledgeCTAButton
-      |> pledgeCTAButtonStyle(
-        isAccessibilityCategory,
-        amountAndRewardTitleStackViewIsHidden: self.titleAndSubtitleStackView.isHidden
-      )
+      |> titleAndSubtitleStackViewStyle
 
     _ = self.rootStackView
       |> adaptableStackViewStyle(isAccessibilityCategory)
-      |> \.isLayoutMarginsRelativeArrangement .~ true
-      |> \.layoutMargins .~ UIEdgeInsets.init(topBottom: Styles.grid(3), leftRight: Styles.grid(3))
-      |> \.alignment .~ .center
 
     _ = self.titleLabel
-      |> \.font .~ UIFont.ksr_callout().bolded
-      |> \.numberOfLines .~ 0
+      |> titleLabelStyle
 
     _ = self.subtitleLabel
-      |> \.font .~ UIFont.ksr_caption1().bolded
-      |> \.textColor .~ UIColor.ksr_dark_grey_500
-      |> \.numberOfLines .~ 0
+      |> subtitleLabelStyle
 
     _ = self.activityIndicator
-      |> \.color .~ UIColor.ksr_dark_grey_500
+      |> activityIndicatorStyle
   }
 
   // MARK: - View model
@@ -122,7 +108,8 @@ final class PledgeCTAContainerView: UIView {
     self.viewModel.outputs.buttonStyleType
       .observeForUI()
       .observeValues { [weak self] buttonStyleType in
-        _ = self?.pledgeCTAButton ?|> buttonStyleType.style
+        _ = self?.pledgeCTAButton
+          ?|> buttonStyleType.style
       }
 
     self.viewModel.outputs.pledgeCTAButtonIsHidden
@@ -196,31 +183,43 @@ final class PledgeCTAContainerView: UIView {
 
 // MARK: - Styles
 
+private let activityIndicatorStyle: ActivityIndicatorStyle = { activityIndicator in
+  activityIndicator
+    |> \.color .~ UIColor.ksr_dark_grey_500
+    |> \.hidesWhenStopped .~ true
+}
+
 private func adaptableStackViewStyle(_ isAccessibilityCategory: Bool) -> (StackViewStyle) {
   return { (stackView: UIStackView) in
-    let axis: NSLayoutConstraint.Axis = (isAccessibilityCategory ? .vertical : .horizontal)
     let spacing: CGFloat = (isAccessibilityCategory ? Styles.grid(1) : 0)
 
     return stackView
-      |> \.axis .~ axis
+      |> \.alignment .~ .center
+      |> \.axis .~ NSLayoutConstraint.Axis.horizontal
+      |> \.isLayoutMarginsRelativeArrangement .~ true
+      |> \.layoutMargins .~ UIEdgeInsets.init(topBottom: Styles.grid(3), leftRight: Styles.grid(3))
       |> \.spacing .~ spacing
   }
 }
 
-private func pledgeCTAButtonStyle(
-  _ isAccessibilityCategory: Bool, amountAndRewardTitleStackViewIsHidden: Bool
-) -> (ButtonStyle) {
-  return { (button: UIButton) in
-    let lineBreakMode: NSLineBreakMode = isAccessibilityCategory || amountAndRewardTitleStackViewIsHidden
-      ? NSLineBreakMode.byWordWrapping : NSLineBreakMode.byTruncatingTail
-
-    return button
-      |> roundedStyle(cornerRadius: 12)
-      |> UIButton.lens.titleLabel.font .~ UIFont.ksr_headline(size: 15)
-      |> UIButton.lens.layer.borderWidth .~ 0
-      |> (UIButton.lens.titleLabel .. UILabel.lens.textAlignment) .~ NSTextAlignment.center
-      |> (UIButton.lens.titleLabel .. UILabel.lens.lineBreakMode) .~ lineBreakMode
-  }
+private let subtitleLabelStyle: LabelStyle = { label in
+  label
+    |> \.font .~ UIFont.ksr_caption1().bolded
+    |> \.textColor .~ UIColor.ksr_dark_grey_500
+    |> \.numberOfLines .~ 0
+}
+
+private let titleAndSubtitleStackViewStyle: StackViewStyle = { stackView in
+  stackView
+    |> \.axis .~ NSLayoutConstraint.Axis.vertical
+    |> \.isLayoutMarginsRelativeArrangement .~ true
+    |> \.spacing .~ Styles.gridHalf(1)
+}
+
+private let titleLabelStyle: LabelStyle = { label in
+  label
+    |> \.font .~ UIFont.ksr_callout().bolded
+    |> \.numberOfLines .~ 0
 }
 
 private let pledgeRetryButtonStyle: ButtonStyle = { button in

Kickstarter-iOS/Views/RewardCardContainerView.swift

@@ -20,8 +20,8 @@ public final class RewardCardContainerView: UIView {
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
   }()
 
-  private let pledgeButton: MultiLineButton = {
-    MultiLineButton(type: .custom)
+  private let pledgeButton: UIButton = {
+    UIButton(type: .custom)
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
   }()
 
@@ -65,9 +65,6 @@ public final class RewardCardContainerView: UIView {
       (UIColor.white.withAlphaComponent(1.0), 1)
     ]
     self.gradientView.setGradient(gradient)
-
-    _ = self.pledgeButton.titleLabel
-      ?|> \.lineBreakMode .~ .byTruncatingTail
   }
 
   public override func bindViewModel() {
@@ -104,8 +101,8 @@ public final class RewardCardContainerView: UIView {
     self.viewModel.outputs.pledgeButtonStyleType
       .observeForUI()
       .observeValues { [weak self] styleType in
-        guard let self = self else { return }
-        _ = self.pledgeButton |> styleType.style
+        _ = self?.pledgeButton
+          ?|> styleType.style
       }
   }
 

Library/Styles/BaseStyles.swift

@@ -15,6 +15,7 @@ public enum Styles {
   }
 }
 
+public typealias ActivityIndicatorStyle = (UIActivityIndicatorView) -> UIActivityIndicatorView
 public typealias ButtonStyle = (UIButton) -> UIButton
 public typealias CollectionViewStyle = (UICollectionView) -> UICollectionView
 public typealias ImageViewStyle = (UIImageView) -> UIImageView

Library/Styles/ButtonStyles.swift

@@ -15,13 +15,13 @@ public let applePayButtonStyle: ButtonStyle = { button in
 public let baseButtonStyle: ButtonStyle = { button in
   button
     |> roundedStyle(cornerRadius: Styles.grid(2))
-    |> UIButton.lens.titleLabel.font .~ UIFont.ksr_callout().bolded
-    |> (UIButton.lens.titleLabel .. UILabel.lens.textAlignment) .~ NSTextAlignment.center
     |> UIButton.lens.contentEdgeInsets .~ .init(all: Styles.grid(2))
-    |> UIButton.lens.titleLabel .. UILabel.lens.lineBreakMode .~ NSLineBreakMode.byTruncatingMiddle
-    |> UIButton.lens.titleLabel .. UILabel.lens.numberOfLines .~ 1
     |> UIButton.lens.adjustsImageWhenDisabled .~ false
     |> UIButton.lens.adjustsImageWhenHighlighted .~ false
+    <> UIButton.lens.titleLabel.font .~ UIFont.boldSystemFont(ofSize: 16)
+    <> UIButton.lens.titleLabel.lineBreakMode .~ NSLineBreakMode.byTruncatingMiddle
+    <> UIButton.lens.titleLabel.textAlignment .~ NSTextAlignment.center
+    <> UIButton.lens.titleLabel.numberOfLines .~ 1
 }
 
 // MARK: - Apricot
@@ -89,14 +89,14 @@ public let facebookButtonStyle = baseButtonStyle
 
   <> UIButton.lens.image(for: .normal) %~ { _ in image(named: "fb-logo-white") }
 
-// MARK: - Red
+// MARK: - Multiline
 
-public let redButtonStyle = baseButtonStyle
-  <> UIButton.lens.titleColor(for: .normal) .~ .white
-  <> UIButton.lens.backgroundColor(for: .normal) .~ .ksr_red_400
-  <> UIButton.lens.titleColor(for: .highlighted) .~ .white
-  <> UIButton.lens.backgroundColor(for: .highlighted) .~ UIColor.ksr_red_400.mixDarker(0.36)
-  <> UIButton.lens.backgroundColor(for: .disabled) .~ UIColor.ksr_red_400.mixLighter(0.36)
+public let multiLineButtonStyle =
+  UIButton.lens.titleLabel.lineBreakMode .~ NSLineBreakMode.byWordWrapping
+  <> UIButton.lens.titleLabel.numberOfLines .~ 0
+  <> UIButton.lens.titleLabel.textAlignment .~ NSTextAlignment.center
+
+// MARK: - Save
 
 public let saveButtonStyle =
   UIButton.lens.title(for: .normal) .~ nil
@@ -105,12 +105,16 @@ public let saveButtonStyle =
   <> UIButton.lens.image(for: .selected) .~ image(named: "icon--heart")
   <> UIButton.lens.accessibilityLabel %~ { _ in Strings.Save_this_project() }
 
+// MARK: - Share
+
 public let shareButtonStyle =
   UIButton.lens.title(for: .normal) .~ nil
   <> UIButton.lens.image(for: .normal) .~ image(named: "icon--share")
   <> UIButton.lens.tintColor .~ .ksr_soft_black
   <> UIButton.lens.accessibilityLabel %~ { _ in Strings.dashboard_accessibility_label_share_project() }
 
+// MARK: - Text only
+
 // Remove when DeprecatedRewardShippingPickerViewController is removed.
 public let textOnlyButtonStyle = roundedStyle(cornerRadius: 0)
   <> UIButton.lens.titleLabel.font %~~ { _, button in

Library/Styles/CheckoutStyles.swift

@@ -93,11 +93,6 @@ public func checkoutAdaptableStackViewStyle(_ isAccessibilityCategory: Bool) ->
   }
 }
 
-public let checkoutSmallBlackButtonStyle: ButtonStyle = { button -> UIButton in
-  button
-    |> blackButtonStyle
-}
-
 public let checkoutBackgroundStyle: ViewStyle = { (view: UIView) in
   view
     |> \.backgroundColor .~ UIColor.ksr_grey_300
@@ -187,8 +182,7 @@ public let cardImageViewStyle: ImageViewStyle = { imageView in
 
 public let cardSelectButtonStyle: ButtonStyle = { button in
   button
-    |> checkoutSmallBlackButtonStyle
-    |> UIButton.lens.titleLabel .. UILabel.lens.font .~ UIFont.ksr_headline()
+    |> blackButtonStyle
 }
 
 public let pledgeCardViewStyle: ViewStyle = { view in

Library/Styles/LoginStyles.swift

@@ -56,7 +56,6 @@ public func emailFieldAutoFillStyle(_ textField: UITextField) -> UITextField {
 }
 
 public let fbLoginButtonStyle = facebookButtonStyle
-  <> baseButtonStyle
   <> UIButton.lens.title(for: .normal) %~ { _ in
     Strings.login_tout_buttons_log_in_with_facebook()
   }