Skip to content

Move CBC selector from StripePaymentsUI into PaymentSheet #5972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
davidme-stripe wants to merge 1 commit into
base: davidme/cardbrandview
Choose a base branch
from
Draft

Move CBC selector from StripePaymentsUI into PaymentSheet #5972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...PaymentSheet/StripePaymentSheet/Resources/StripePaymentSheet.xcassets/Cards/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
25 changes: 25 additions & 0 deletions ...mentSheet/Resources/StripePaymentSheet.xcassets/Cards/stp_card_cbc.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"images" : [
{
"filename" : "cbcLight.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "cbcDark.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
5 changes: 5 additions & 0 deletions ...t/Resources/StripePaymentSheet.xcassets/Cards/stp_card_cbc.imageset/cbcDark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions .../Resources/StripePaymentSheet.xcassets/Cards/stp_card_cbc.imageset/cbcLight.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...ents/DropDownFieldElement+CardBrand.swift → ...ries/DropDownFieldElement+CardBrand.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../Categories/STPCardBrand+PaymentsUI.swift → .../Categories/STPCardBrand+PaymentsUI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import UIKit
extension STPCardBrand {
func brandIconAttributedString(theme: ElementsAppearance = .default, maxWidth: CGFloat? = nil) -> NSAttributedString {
let brandImageAttachment = NSTextAttachment()
let image: UIImage = self == .unknown ? STPImageLibrary.cardBrandChoiceImage() : STPImageLibrary.cardBrandImage(for: self)
let image: UIImage = self == .unknown ? PaymentSheetImageLibrary.cardBrandChoiceImage() : PaymentSheetImageLibrary.cardBrandImage(for: self)
brandImageAttachment.image = image
// TODO: -3 is a hack for proper vertical alignment, investigate this
let hackyVerticalInset: CGFloat = -3
Expand Down
7 changes: 7 additions & 0 deletions StripePaymentSheet/StripePaymentSheet/Source/Helpers/PaymentSheetImageLibrary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ class PaymentSheetImageLibrary {
class func unknownCardCardImage() -> UIImage {
return cardBrandImage(for: .unknown)
}

/// This returns the icon for an unselected brand when multiple card brands are available.
class func cardBrandChoiceImage()
-> UIImage
{
return self.safeImageNamed("ps_card_cbc", templateIfAvailable: false)
}
}

// MARK: - v2 Images
Expand Down
1 change: 0 additions & 1 deletion ...rce/Internal/Link/Controllers/PayWithLinkViewController-UpdatePaymentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import UIKit

@_spi(STP) import StripeCore
@_spi(STP) import StripePaymentsUI
@_spi(STP) import StripeUICore

protocol UpdatePaymentViewControllerDelegate: AnyObject {
Expand Down
1 change: 0 additions & 1 deletion ...entSheet/Source/Internal/Link/Controllers/PayWithLinkViewController-WalletViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import Foundation
@_spi(STP) import StripeCore
@_spi(STP) import StripePayments
@_spi(STP) import StripePaymentsUI
@_spi(STP) import StripeUICore

protocol PayWithLinkWalletViewModelDelegate: AnyObject {
Expand Down
1 change: 0 additions & 1 deletion ...eet/Source/Internal/Link/Elements/InlineSignup/LinkInlineSignupView-CheckboxElement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
//

@_spi(STP) import StripeCore
@_spi(STP) import StripePaymentsUI
@_spi(STP) import StripeUICore
import UIKit

Expand Down
2 changes: 1 addition & 1 deletion StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Views/CardBrandView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ import UIKit
) {
fatalError("init(coder:) has not been implemented")
}

/// Card brand to display.
var cardBrand: STPCardBrand = .unknown {
didSet {
Expand Down
Loading