update snapshot merge with master

stripe · Dec 23, 2024 · 67891b7 · 67891b7
2 parents ad6c10e + e58c201
commit 67891b7
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 11 deletions.
diff --git a/...ePaymentSheet/Source/PaymentSheet/ViewControllers/UpdatePaymentMethodViewController.swift b/...ePaymentSheet/Source/PaymentSheet/ViewControllers/UpdatePaymentMethodViewController.swift
@@ -86,36 +86,56 @@ final class UpdatePaymentMethodViewController: UIViewController {
 
     private lazy var removeButton: UIButton = {
         let button = UIButton(type: .custom)
+        let font = viewModel.appearance.primaryButton.font ?? viewModel.appearance.scaledFont(for: viewModel.appearance.font.base.medium, style: .callout, maximumPointSize: 25)
         if #available(iOS 15.0, *) {
             var configuration = UIButton.Configuration.bordered()
             configuration.contentInsets = NSDirectionalEdgeInsets(top: 10, leading: 16, bottom: 10, trailing: 16)
             configuration.baseBackgroundColor = .clear
+            configuration.background.cornerRadius = viewModel.appearance.cornerRadius
+            configuration.background.strokeWidth = viewModel.appearance.selectedBorderWidth ?? viewModel.appearance.borderWidth * 1.5
+            configuration.background.strokeColor = viewModel.appearance.colors.danger
+            configuration.titleAlignment = .center
+            configuration.attributedTitle = AttributedString(.Localized.remove, attributes: AttributeContainer([.font: font, .foregroundColor: viewModel.appearance.colors.danger]))
             button.configuration = configuration
         } else {
             button.contentEdgeInsets = UIEdgeInsets(top: 10, left: 16, bottom: 10, right: 16)
+            button.setTitleColor(viewModel.appearance.colors.danger, for: .normal)
+            button.setTitleColor(viewModel.appearance.colors.danger.disabledColor, for: .highlighted)
+            button.layer.borderColor = viewModel.appearance.colors.danger.cgColor
+            button.layer.borderWidth = viewModel.appearance.selectedBorderWidth ?? viewModel.appearance.borderWidth * 1.5
+            button.layer.cornerRadius = viewModel.appearance.cornerRadius
+            button.setTitle(.Localized.remove, for: .normal)
+            button.titleLabel?.textAlignment = .center
+            button.titleLabel?.font = font
+            button.titleLabel?.adjustsFontForContentSizeCategory = true
         }
-        button.setTitleColor(viewModel.appearance.colors.danger, for: .normal)
-        button.setTitleColor(viewModel.appearance.colors.danger.disabledColor, for: .highlighted)
         button.addTarget(self, action: #selector(buttonTouchDown(_:)), for: .touchDown)
         button.addTarget(self, action: #selector(buttonTouchUp(_:)), for: [.touchUpInside, .touchUpOutside])
-        button.layer.borderColor = viewModel.appearance.colors.danger.cgColor
-        button.layer.borderWidth = viewModel.appearance.primaryButton.borderWidth
-        button.layer.cornerRadius = viewModel.appearance.cornerRadius
-        button.setTitle(.Localized.remove, for: .normal)
-        button.titleLabel?.textAlignment = .center
-        button.titleLabel?.font = viewModel.appearance.scaledFont(for: viewModel.appearance.font.base.medium, style: .callout, maximumPointSize: 25)
-        button.titleLabel?.adjustsFontForContentSizeCategory = true
         button.addTarget(self, action: #selector(removePaymentMethod), for: .touchUpInside)
         button.isHidden = !viewModel.canRemove
         return button
     }()
 
     @objc private func buttonTouchDown(_ button: UIButton) {
-        button.layer.borderColor = viewModel.appearance.colors.danger.disabledColor.cgColor
+        if #available(iOS 15.0, *)  {
+            button.configuration?.attributedTitle?.foregroundColor = viewModel.appearance.colors.danger.disabledColor
+            button.configuration?.background.strokeColor = viewModel.appearance.colors.danger.disabledColor
+        }
+        else {
+            button.setTitleColor(viewModel.appearance.colors.danger.disabledColor, for: .normal)
+            button.layer.borderColor = viewModel.appearance.colors.danger.disabledColor.cgColor
+        }
     }
 
     @objc private func buttonTouchUp(_ button: UIButton) {
-        button.layer.borderColor = viewModel.appearance.colors.danger.cgColor
+        if #available(iOS 15.0, *)  {
+            button.configuration?.attributedTitle?.foregroundColor = viewModel.appearance.colors.danger
+            button.configuration?.background.strokeColor = viewModel.appearance.colors.danger
+        }
+        else {
+            button.setTitleColor(viewModel.appearance.colors.danger, for: .normal)
+            button.layer.borderColor = viewModel.appearance.colors.danger.cgColor
+        }
     }
 
     private lazy var paymentMethodForm: UIView = {

diff --git a/...ests/test_EmbeddedSingleCard_UpdatePaymentMethodViewControllerAppearance@3x.png b/...ests/test_EmbeddedSingleCard_UpdatePaymentMethodViewControllerAppearance@3x.png
diff --git a/...tTests/test_EmbeddedSingleCard_UpdatePaymentMethodViewControllerDarkMode@3x.png b/...tTests/test_EmbeddedSingleCard_UpdatePaymentMethodViewControllerDarkMode@3x.png
diff --git a/...Tests/test_EmbeddedSingleCard_UpdatePaymentMethodViewControllerLightMode@3x.png b/...Tests/test_EmbeddedSingleCard_UpdatePaymentMethodViewControllerLightMode@3x.png
diff --git a/...test_EmbeddedSingleSEPADebit_UpdatePaymentMethodViewControllerAppearance@3x.png b/...test_EmbeddedSingleSEPADebit_UpdatePaymentMethodViewControllerAppearance@3x.png
diff --git a/...s/test_EmbeddedSingleSEPADebit_UpdatePaymentMethodViewControllerDarkMode@3x.png b/...s/test_EmbeddedSingleSEPADebit_UpdatePaymentMethodViewControllerDarkMode@3x.png
diff --git a/.../test_EmbeddedSingleSEPADebit_UpdatePaymentMethodViewControllerLightMode@3x.png b/.../test_EmbeddedSingleSEPADebit_UpdatePaymentMethodViewControllerLightMode@3x.png
diff --git a/..._EmbeddedSingleUSBankAccount_UpdatePaymentMethodViewControllerAppearance@3x.png b/..._EmbeddedSingleUSBankAccount_UpdatePaymentMethodViewControllerAppearance@3x.png
diff --git a/...st_EmbeddedSingleUSBankAccount_UpdatePaymentMethodViewControllerDarkMode@3x.png b/...st_EmbeddedSingleUSBankAccount_UpdatePaymentMethodViewControllerDarkMode@3x.png
diff --git a/...t_EmbeddedSingleUSBankAccount_UpdatePaymentMethodViewControllerLightMode@3x.png b/...t_EmbeddedSingleUSBankAccount_UpdatePaymentMethodViewControllerLightMode@3x.png
diff --git a/...ControllerSnapshotTests/test_UpdatePaymentMethodViewControllerAppearance@3x.png b/...ControllerSnapshotTests/test_UpdatePaymentMethodViewControllerAppearance@3x.png
diff --git a/...ewControllerSnapshotTests/test_UpdatePaymentMethodViewControllerDarkMode@3x.png b/...ewControllerSnapshotTests/test_UpdatePaymentMethodViewControllerDarkMode@3x.png
diff --git a/...ontrollerSnapshotTests/test_UpdatePaymentMethodViewControllerExpiredCard@3x.png b/...ontrollerSnapshotTests/test_UpdatePaymentMethodViewControllerExpiredCard@3x.png
diff --git a/...wControllerSnapshotTests/test_UpdatePaymentMethodViewControllerLightMode@3x.png b/...wControllerSnapshotTests/test_UpdatePaymentMethodViewControllerLightMode@3x.png
diff --git a/...rollerSnapshotTests/test_UpdatePaymentMethodViewControllerRemoveOnlyCard@3x.png b/...rollerSnapshotTests/test_UpdatePaymentMethodViewControllerRemoveOnlyCard@3x.png
diff --git a/...rSnapshotTests/test_UpdatePaymentMethodViewControllerSEPADebitAppearance@3x.png b/...rSnapshotTests/test_UpdatePaymentMethodViewControllerSEPADebitAppearance@3x.png
diff --git a/...lerSnapshotTests/test_UpdatePaymentMethodViewControllerSEPADebitDarkMode@3x.png b/...lerSnapshotTests/test_UpdatePaymentMethodViewControllerSEPADebitDarkMode@3x.png
diff --git a/...erSnapshotTests/test_UpdatePaymentMethodViewControllerSEPADebitLightMode@3x.png b/...erSnapshotTests/test_UpdatePaymentMethodViewControllerSEPADebitLightMode@3x.png
diff --git a/...pshotTests/test_UpdatePaymentMethodViewControllerUSBankAccountAppearance@3x.png b/...pshotTests/test_UpdatePaymentMethodViewControllerUSBankAccountAppearance@3x.png
diff --git a/...napshotTests/test_UpdatePaymentMethodViewControllerUSBankAccountDarkMode@3x.png b/...napshotTests/test_UpdatePaymentMethodViewControllerUSBankAccountDarkMode@3x.png
diff --git a/...apshotTests/test_UpdatePaymentMethodViewControllerUSBankAccountLightMode@3x.png b/...apshotTests/test_UpdatePaymentMethodViewControllerUSBankAccountLightMode@3x.png