-
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
[MBL-1816] PLOT Ineligible state #2220
Merged
+314
−40
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
7fda0e7
Add functionality for the Pledge Over Time option selected
jovaniks 5169766
Fix Tests
jovaniks ed401ec
Adding project to make the currency convertions and increments table …
jovaniks eff7fa4
Test timestamp with constant
jovaniks a334555
Add ineligible option
jovaniks b5aab6c
Format
jovaniks 1c0df65
Fix test and add a new for ineligible
jovaniks 43bd0a5
PR feedback
jovaniks 5db01cb
Merge branch 'main' into jluna/MBL-1815/plot-plan-selector-selected-s…
jovaniks 0f4c23e
Merge branch 'jluna/MBL-1815/plot-plan-selector-selected-state' into …
jovaniks 2bcd664
minor nit
jovaniks acc641d
Minor nits
jovaniks 7d6faa3
Merge branch 'jluna/MBL-1815/plot-plan-selector-selected-state' into …
jovaniks ee2bca5
Format
jovaniks 809c848
update ineligible arg position
jovaniks 8893498
PR Feedback
jovaniks 8589d20
Merge branch 'main' into jluna/MBL-1815/plot-plan-selector-selected-s…
jovaniks d38cfa3
Merge branch 'main' into jluna/MBL-1815/plot-plan-selector-selected-s…
jovaniks 26845e1
Merge conflicts and PR feedback
jovaniks 581c945
Formatting
jovaniks d1da37d
Merge conflicts
jovaniks 306337b
Merge branch 'main' into jluna/MBL-1816/plot-ineligible-state
jovaniks d42d885
Update GraphAPI file
jovaniks 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
Binary file added
BIN
+21.7 KB
...lansViewControllerTest/testView_PledgeOverTimeIneligible.lang_en_device_pad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+17.3 KB
...ontrollerTest/testView_PledgeOverTimeIneligible.lang_en_device_phone4_7inch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Binary file modified
BIN
+2.47 KB
(100%)
...ngPledgeViewControllerTests/testView_ShowCollectionPlans.lang_en_device_pad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+673 Bytes
(100%)
...iewControllerTests/testView_ShowCollectionPlans.lang_en_device_phone4_7inch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+201 KB
...wControllerTests/testView_ShowCollectionPlans_Ineligible.lang_en_device_pad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+111 KB
...erTests/testView_ShowCollectionPlans_Ineligible.lang_en_device_phone4_7inch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import UIKit | ||
|
||
extension UIView { | ||
public func rounded(with cornerRadius: CGFloat = Styles.cornerRadius) { | ||
self.clipsToBounds = true | ||
self.layer.masksToBounds = true | ||
self.layer.cornerRadius = cornerRadius | ||
} | ||
jovaniks marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
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.
Would be slightly cleaner/more brief if the
ineligibleBadgeView
was its own UIView subclassThere 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.
Added to the follow up/clean up ticket https://kickstarter.atlassian.net/browse/MBL-1940