-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
💲[Native Checkout] RewardCardContainerView snapshots and view model bindings #779
Merged
justinswart
merged 116 commits into
master
from
feature-native-checkout-reward-cell-state-bindings
Aug 7, 2019
Merged
Changes from 111 commits
Commits
Show all changes
116 commits
Select commit
Hold shift + click to select a range
94ca65c
💲[Native Checkout] Rename CheckoutViewController to DeprecatedCheckou…
dusi 77f4507
💲[Native Checkout] Hide rewards when "ios_native_checkout" feature fl…
ifbarrera 35429b5
💲[Native Checkout] Rename RewardPledgeVC/VM to DeprecatedRewardPledge…
dusi 96dbb61
💲 [Native Checkout] Plumbing (#654)
dusi ee5c0e7
💲[Native Checkout] Pledge Amount Cell (#660)
dusi 4f9a14d
[Native Checkout] "Back this project" button (#659)
ifbarrera 9eade4c
Merge branch 'master' of https://github.com/kickstarter/ios-oss into …
dusi c080e45
Set stepper images using a lens (#661)
dusi 0cb3394
💲[Native Checkout] Shipping Location Cell 1/3 (UI) (#666)
dusi b5c331f
💲[Native Checkout] Description Cell (#663)
cdolm92 ed973f2
💲[Native Checkout] Rewards Collection View Plumbing (#664)
1f23126
💲[Native Checkout] Pledge Continue Button - UI Only (#670)
d19a718
💲[Native Checkout] Description Cell User Interaction (#668)
cdolm92 9c4dc94
Merge branch 'master' into feature-native-checkout
dusi 294e9cb
💲[Native Checkout] "Peek" functionality using hidden scroll view (#665)
40c00e5
Merge branch 'master' of https://github.com/kickstarter/ios-oss into …
ifbarrera a44c37b
Use HTML string with anchor tags (#673)
justinswart 6ccdfb6
Merge branch 'master' into feature-native-checkout
justinswart a52c4e5
Add missing imports, update to use traitCollection.preferredContentSi…
justinswart 5778e71
Fix imports in tests
justinswart 3bad8c3
💲[Native Checkout] Sheet Overlay Container (#674)
e2eaa98
Merge branch 'master' of https://github.com/kickstarter/ios-oss into …
ifbarrera a48b021
Clean up issues with live stream deprecation
ifbarrera a05c511
💲[Native Checkout] Shipping Location Cell 2/3 (Currency formatter 🤯) …
dusi e4abb8e
Merge branch 'master' into feature-native-checkout
dusi 7324bf0
💲[Native Checkout] Reward Selection (no animation) (#683)
ff804ac
💲[Native Checkout] - SwiftFormat (#687)
dusi e42a163
Merge branch 'master' into feature-native-checkout
justinswart 7fd1363
Merge branch 'master' into feature-native-checkout
justinswart 353e2c8
Merge branch 'master' into feature-native-checkout
justinswart 56ecf6a
Fix version after merge
justinswart 5433d37
Merge branch 'master' into feature-native-checkout
justinswart 5e93ad0
💲[Native Checkout] Shipping location cell plus sign (#691)
dusi 5eda5cf
Merge branch 'master' into feature-native-checkout
dusi 4325229
Resolve swiftformat configuration merge conflict
dusi 71bafed
Format files that were missed during merge conflict resolution
dusi b77e12a
💲[Native Checkout] Load Shipping Rules (#682)
ad15d3a
💲[Native Checkout] Refactor cells to be backed by view model (#693)
dusi 62b3663
💲[Native Checkout] Rewards - Basic (#700)
ad3a1f7
Merge branch 'master' of https://github.com/kickstarter/ios-oss into …
ifbarrera ee7895b
Merge branch 'master' into feature-native-checkout
justinswart ad39509
💲[Native Checkout] Stepper haptics (#711)
dusi a79bf1b
Revert "💲[Native Checkout] Stepper haptics (#711)" (#714)
justinswart 3b1179d
Feature Flag Tools 🔨 (#705)
cfc51e9
💲[Native Checkout] Stepper Haptics Final Final (#716)
dusi 7d74c02
Merge branch 'master' into feature-native-checkout
justinswart 73ad884
💲[Native Checkout] Pledge amount Stepper and Textfield input + Done b…
dusi 9c4261e
Persist Debug Feature Flags (#721)
0351d37
💲[Native Checkout] Pledge Summary Cell Layout (#715)
justinswart d1f96a8
💲[Native Checkout] UITextView bottom padding improvements (#723)
justinswart 3d50c91
💲[Native Checkout] Disable non-numeric, non-decimal separator input f…
dusi 0e15fe8
💲[Native Checkout] Project Pledge States UI (#702)
cdolm92 4c96bd7
💲[Native Checkout] Re-enable the CTA button action (#728)
dusi 11cef5e
Remove padding fix, instead use correct string (#729)
justinswart ea6ba76
💲[Native Checkout] Load default, min and max pledge values properly (…
dusi 6f4810f
[Native Checkout] Pledge Payment Methods Collection View UI (#725)
Scollaco f2c1fa7
Merge branch 'master' into feature-native-checkout
justinswart d65e900
Merge branch 'master' into feature-native-checkout
dusi bcd871b
Rename deprecated vc and vm (#739)
dusi 39a7dbb
💲[Native Checkout] Refactor shipping rules (#736)
dusi 027f5e6
Feature native checkout applepay button (#742)
Scollaco 05d7791
💲[Native Checkout] Shipping Picker - Navigation Workflow - 1/4 (#738)
dusi f4cfc49
Merge branch 'master' into feature-native-checkout
justinswart f073a51
💲[Native Checkout] Pledge Error State CTA (#746)
cdolm92 7d307de
Revert "💲[Native Checkout] Pledge Error State CTA (#746)" (#748)
139fe01
💲[Native Checkout] Fix Pledge CTA for logged out users (#744)
8ce75ac
💲[Native Checkout] Shipping Picker - Show List - 2/4 (#747)
dusi cb6932a
💲[Native Checkout] Login & Sign-up on the pledge screen (Part 1) (#727)
7a2df88
Merge branch 'master' into feature-native-checkout
dusi 742e822
Change pragma mark from Binding to View model (#749)
dusi b0d93c2
Merge branch 'master' into feature-native-checkout
dusi d04021d
💲[Native Checkout] Prepare reward checkmark image view UI (#755)
dusi f619123
💲[Native Checkout] Pledge Screen Refactor: UITableView -> UIStackView…
7736c0d
Merge branch 'master' of https://github.com/kickstarter/ios-oss into …
ifbarrera fbe8a79
Make alert icon single scale (#759)
dusi d54a401
💲[Native Checkout] Prepare reward pill collection view UI (#757)
dusi c5e5c27
💲[Native Checkout] Pledge Error State CTA (#753)
cdolm92 547d276
💲[Native Checkout] Pledge Screen Separators (#760)
83f01bb
💲[Native Checkout] Reward -> Pledge View transition animation (#741)
justinswart 9b7ea15
Light design pass and screenshots (#771)
bdc8fa5
💲[Native Checkout] Sheet Overlay iPad Bugfix (#769)
be8b202
Merge branch 'master' into feature-native-checkout
justinswart 3ba3f75
💲[Native Checkout] Login/Signup design pass (#770)
ifbarrera 232247c
Add outputs and bindings
justinswart b6eb2ef
SwiftFormat
justinswart 03c7bec
Merge branch 'master' into feature-native-checkout
justinswart e9e183e
💲[Native Checkout] Activity Indicator for the Pledge View (#773)
46fabcc
Merge branch 'feature-native-checkout' into feature-native-checkout-r…
justinswart 8d97fd6
snapshots and fix title font (#775)
cdolm92 75641f6
[Native Checkout] Credit card cell (#766)
Scollaco df55b06
Add RewardCardContainerView snapshot tests
justinswart fe10bee
Update RewardsCollectionViewController snapshots
justinswart 4df9cf0
Merge branch 'feature-native-checkout' into feature-native-checkout-r…
justinswart ff85d92
Add NoReward snapshots
justinswart e48be9b
Improve snapshot naming
justinswart 2f57bf5
Feature native checkout rewards gradient (#776)
Scollaco 2197984
Tidy up some logic
justinswart 18624c5
Merge branch 'feature-native-checkout' into feature-native-checkout-r…
justinswart 0a22a5d
Feature native checkout reward pledge states (#764)
cdolm92 c8ab67e
💲[Native Checkout] Add New Card View (#777)
4985ecc
Merge branch 'master' into feature-native-checkout
justinswart 3361492
💲[Native Checkout] Add native pledge view feature flag (#774)
justinswart a575cc5
Merge branch 'feature-native-checkout' into feature-native-checkout-r…
justinswart bb2bc4c
Remove type after merge
justinswart 83ba683
💲[Native Checkout] Button style sweep (#781)
justinswart 230a893
Merge branch 'feature-native-checkout' into feature-native-checkout-r…
justinswart 5413203
SwiftFormat
justinswart 65939a3
Merge pull request #652 from kickstarter/feature-native-checkout
justinswart 5d035a4
Merge branch 'master' into feature-native-checkout-reward-cell-state-…
justinswart f750ebf
Merge branch 'master' into feature-native-checkout-reward-cell-state-…
justinswart 52ac96c
Repair merge
justinswart 50d6e1d
Revert unrelated code-changes from merging
justinswart 1c065fb
Tidy up logic with guards and ternary operators
justinswart 6c94205
Add logged out non-backer test
justinswart 380cc93
💲[Native Checkout] RewardCardView states VM tests (#780)
justinswart 54ac574
Add tests for NonLive, Backed and NonLive, NonBacked
justinswart File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,8 +56,7 @@ final class FeatureFlagToolsViewController: UITableViewController { | |
private func updateConfig(with features: Features) { | ||
guard let config = AppEnvironment.current.config else { return } | ||
|
||
let updatedConfig = config | ||
|> \.features .~ features | ||
let updatedConfig = config |> \.features .~ features | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🤔 |
||
|
||
AppEnvironment.updateDebugData(DebugData(config: updatedConfig)) | ||
AppEnvironment.updateConfig(updatedConfig) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this just be
Functions
😁There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lol thanks