Skip to content
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

Jump to bottom

[Native Checkout] Credit card cell #766

Merged
merged 18 commits into from
Jul 31, 2019
Merged

[Native Checkout] Credit card cell #766

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
51cdbd4
Created PledgePaymentDataSource abd PledgeCreditCardCell
Scollaco Jul 23, 2019
ab05382
Updated configuration of PledgePaymentMethodsViewController
Scollaco Jul 23, 2019
fcd04df
Created class with CreditCard helpers
Scollaco Jul 23, 2019
9af4b49
Added checkoutSmallBlackButtonStyle
Scollaco Jul 23, 2019
720271f
Updated CreditCardCellViewModel and its tests to use long and short s…
Scollaco Jul 23, 2019
60f3ed5
Added PledgePaymentMethodsViewModel and its tests
Scollaco Jul 23, 2019
c1819f0
Using right string, ui tweaks
Scollaco Jul 24, 2019
30524be
Add Ending_in_last_four string
justinswart Jul 24, 2019
14c4d23
Silence constraint and layout warnings
justinswart Jul 24, 2019
ca5bd40
SwiftFormat
justinswart Jul 24, 2019
ca9caec
Merge branch 'feature-native-checkout' into feature-native-checkout-c…
justinswart Jul 25, 2019
bde3b6b
Merge branch 'feature-native-checkout' into feature-native-checkout-c…
justinswart Jul 26, 2019
bc1ee07
[Pledge Payment Methods] Replace UICollectionView with UIScrollView (…
justinswart Jul 30, 2019
27999f3
Merge branch 'feature-native-checkout' into feature-native-checkout-c…
justinswart Jul 30, 2019
09c7464
Feedback from Isabel
Scollaco Jul 30, 2019
ee9ab6b
Feedback from Danny
Scollaco Jul 31, 2019
de7a8b7
Swiftformat
Scollaco Jul 31, 2019
fcb2af7
Moved Styling properties to outside the class
Scollaco Jul 31, 2019
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
18 changes: 9 additions & 9 deletions Kickstarter-iOS/Views/Cells/PledgeCreditCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,34 +77,34 @@ final class PledgeCreditCardView: UIView {
super.bindStyles()

_ = self
|> viewStyle
|> self.viewStyle
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm why did it add self here? These styles should live outside the class, private to the file. 🤔


_ = self.selectButton
|> selectButtonStyle
|> self.selectButtonStyle

_ = self.selectButton.titleLabel
?|> selectButtonTitleLabelStyle
?|> self.selectButtonTitleLabelStyle

_ = self.imageView
|> imageViewStyle
|> self.imageViewStyle

_ = self.lastFourLabel
|> lastFourLabelStyle
|> self.lastFourLabelStyle

_ = self.expirationDateLabel
|> expirationDateLabelStyle
|> self.expirationDateLabelStyle

_ = self.labelsStackView
|> labelsStackViewStyle
|> self.labelsStackViewStyle

_ = self.adaptableStackView
|> checkoutAdaptableStackViewStyle(
self.traitCollection.preferredContentSizeCategory.isAccessibilityCategory
)
|> adaptableStackViewStyle
|> self.adaptableStackViewStyle

_ = self.rootStackView
|> rootStackViewStyle
|> self.rootStackViewStyle
}

override func bindViewModel() {
Expand Down
13 changes: 7 additions & 6 deletions Kickstarter-iOS/Views/Controllers/PledgePaymentMethodsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ final class PledgePaymentMethodsViewController: UIViewController {
private lazy var scrollViewHeightConstraint: NSLayoutConstraint = {
self.scrollView.heightAnchor.constraint(equalToConstant: 0)
}()

private lazy var spacer: UIView = { UIView(frame: .zero) }()
private lazy var titleLabel: UILabel = { UILabel(frame: .zero) }()

Expand Down Expand Up @@ -50,8 +51,8 @@ final class PledgePaymentMethodsViewController: UIViewController {
private func setupConstraints() {
NSLayoutConstraint.activate([
self.scrollViewHeightConstraint,
self.applePayButton.heightAnchor.constraint(greaterThanOrEqualToConstant: Styles.minTouchSize.height)
])
self.applePayButton.heightAnchor.constraint(greaterThanOrEqualToConstant: Styles.minTouchSize.height)
])
}

override func viewDidLayoutSubviews() {
Expand All @@ -74,19 +75,19 @@ final class PledgePaymentMethodsViewController: UIViewController {
|> checkoutBackgroundStyle

_ = self.cardsStackView
|> cardsStackViewStyle
|> self.cardsStackViewStyle

_ = self.applePayButton
|> applePayButtonStyle
|> self.applePayButtonStyle

_ = self.scrollView
|> checkoutBackgroundStyle

_ = self.rootStackView
|> rootStackViewStyle
|> self.rootStackViewStyle

_ = self.titleLabel
|> titleLabelStyle
|> self.titleLabelStyle
}

// MARK: - View model
Expand Down
1 change: 0 additions & 1 deletion Library/CreditCard+UtilsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Prelude
import XCTest

final class CreditCard_UtilsTests: XCTestCase {

func testExpirationDate() {
let card = GraphUserCreditCard.masterCard
|> \.expirationDate .~ "2019-09-20"
Expand Down