[Link] UI Polish - Part 3 (#883)

* Add `titleAttributes` to `Button` * Remove redundant icon view Prevent extra leading and trailing padding from being added to the button. * Update snapshots * Hide image view if needed * Reduce the number of constraints * Simplify layout logic * Update plain button insets * Adjust insets * Invalidate intrinsic content size when needed * Prevent unnecessary constraint updates
stripe · Mar 23, 2022 · b8e9955 · b8e9955
1 parent e978335
commit b8e9955
Show file tree

Hide file tree

Showing 30 changed files with 162 additions and 110 deletions.
diff --git a/Stripe/Button+Link.swift b/Stripe/Button+Link.swift
@@ -46,6 +46,7 @@ extension Button.Configuration {
         configuration.disabledForegroundColor = nil
         configuration.colorTransforms.highlightedForeground = .setAlpha(amount: 0.4)
         configuration.colorTransforms.disabledForeground = .setAlpha(amount: 0.3)
+        configuration.titleAttributes = [.underlineStyle: NSUnderlineStyle.single.rawValue]
         return configuration
     }
 

diff --git a/Stripe/Link2FAView-LogoutView.swift b/Stripe/Link2FAView-LogoutView.swift
@@ -29,19 +29,10 @@ extension Link2FAView {
             return label
         }()
 
-        private(set) lazy var button: UIButton = {
+        private(set) lazy var button: Button = {
             // TODO(ramont): Localize.
-            let title = NSAttributedString(string: "Change email", attributes: [
-                .underlineStyle: NSUnderlineStyle.single.rawValue
-            ])
-
-            // TODO(ramont): Replace with `Button(configuration: .linkPlain())` and remove
-            // manual underline.
-            let button = UIButton(type: .system)
-            button.titleLabel?.font = font
-            button.titleLabel?.adjustsFontForContentSizeCategory = true
-            button.setAttributedTitle(title, for: .normal)
-            button.tintColor = CompatibleColor.secondaryLabel
+            let button = Button(configuration: .linkPlain(), title: "Change email")
+            button.configuration.font = font
             return button
         }()
 

diff --git a/Stripe/LinkWalletFooterView.swift b/Stripe/LinkWalletFooterView.swift
@@ -39,18 +39,11 @@ final class LinkWalletFooterView: UIView {
         return label
     }()
 
-    private lazy var logoutButton: UIButton = {
+    private lazy var logoutButton: Button = {
         // TODO(ramont): Localize.
-        let title = NSMutableAttributedString(string: "Log out", attributes: [
-            .underlineStyle: NSUnderlineStyle.single.rawValue
-        ])
-
-        let button = UIButton(type: .system)
-        button.titleLabel?.font = font
-        button.titleLabel?.adjustsFontForContentSizeCategory = true
-        button.setAttributedTitle(title, for: .normal)
+        let button = Button(configuration: .linkPlain(), title: "Log out")
         button.addTarget(self, action: #selector(logoutTapped(_:)), for: .touchUpInside)
-        button.tintColor = CompatibleColor.secondaryLabel
+        button.configuration.font = font
         return button
     }()
 

diff --git a/Stripe/PayWithLinkViewController-WalletViewController.swift b/Stripe/PayWithLinkViewController-WalletViewController.swift
@@ -73,21 +73,9 @@ extension PayWithLinkViewController {
                 ? .linkPlain()
                 : .linkSecondary()
 
-            let button = Button(configuration: buttonConfiguration)
-            button.addTarget(self, action: #selector(cancelButtonTapped(_:)), for: .touchUpInside)
-
             // TODO(ramont): Localize
-            let buttonTitle = "Pay another way"
-
-            if shouldShowApplePayButton {
-                // TODO(ramont): Add `UIConfigurationTextAttributesTransformer` equivalent API to Button.
-                button.attributedTitle = NSAttributedString(string: buttonTitle, attributes: [
-                    .underlineStyle: NSUnderlineStyle.single.rawValue
-                ])
-            } else {
-                button.title = buttonTitle
-            }
-
+            let button = Button(configuration: buttonConfiguration, title: "Pay another way")
+            button.addTarget(self, action: #selector(cancelButtonTapped(_:)), for: .touchUpInside)
             return button
         }()