💲[Native Checkout] Pledge Amount Cell #660

dusi · 2019-04-11T23:42:09Z

📲 What

Implements pledge amount cell UI.

🤔 Why

New design = new cell 😄

🛠 How

We've added custom cell PledgeAmountCell as well a custom input view for the amount AmountInputView which properly aligns the amount value and the currency.

Please note that user interaction has not been enabled (this is simply a visual layout work).

This is me fighting UIKit this week...thanks Apple
(I'm the hamster)

📍 Note

In order to being able to see the screen you can navigate to ProjectPamphletContentViewController and change the behaviour of goToRewardsPledge function to the following

let vc = PledgeViewController.instantiate()
vc.configureWith(project: project, reward: reward)

let nc = UINavigationController(rootViewController: vc)
self.present(nc, animated: true)

👀 See

iPhone SE	iPhone X

♿️ Accessibility

For the Dynamic Type support we're switching the axis of the container that holds the stepper & the input field. If the font gets too big the axis are vertical...for anything normal-ish the axis are horizontal.

iPhone SE	iPhone X

Dynamic Type

Stepper & input field are aligned horizontally for smaller/normal-ish font sizes
Stepper & input field are aligned vertically for accessibility (larger) font sizes

VoiceOver

The title is read as Your pledge amount (and is localized)
The minus button is read as Decrement, button (alternatively dimmed if it's in default state)
The plus button is read as Increment, button
The currency is read as US dollars (or any other currency)
The amount is read as X, textfield (plus instructions on editing the textfield)

✅ Acceptance criteria

The cell matches designs
Stepper's default state for the - button is disabled
Stepper's - & + buttons have highlighted state (light shade of gray)
Currency's ascender is aligned to amount's ascender

dusi · 2019-04-11T23:42:47Z

Kickstarter-iOS/Locales/Base.lproj/Localizable.strings

🤦‍♂️

dusi · 2019-04-12T00:30:14Z

Please note that there are some deprecated snapshot tests included, I'm not entirely sure but they must have been missed on the feature branch.

ifbarrera

This is looking really really good!! 🌟 have a few questions/comments

ifbarrera · 2019-04-12T15:28:14Z

Kickstarter-iOS/Views/Controllers/PledgeTableViewController.swift

+    let estimatedHeight: CGFloat = 44
+
+    return style
+      |> \.contentInset .~ UIEdgeInsets(top: 30)


What is this content inset for?

That's a really good question.

I've decided to use UITableView .grouped style in order to not have floating headers/footers (which we thought might come handy for the section separators).

By default the .grouped style adds certain padding above the first row so this removes that padding. In addition to that the value of insets is different on iOS 11+ and iOS 10 (so this line is a special case - which with our deprecation plans might disappear soon). There's also a know issue on iOS 10 (when rotating to landscape) that still shows the padding - I tried couple workarounds there but without luck...so hopefully we can remove iOS 10 support before this thing gets released. Otherwise we'd have to use .plain style and use cells for separators.

ifbarrera · 2019-04-12T15:34:49Z

Kickstarter-iOS/DataSources/PledgeDataSource.swift

@@ -9,16 +9,16 @@ final class PledgeDataSource: ValueCellDataSource {
    case summary
  }

-  func load(reward: Reward) {
+  func load(amount: Double, currency: String) {


I imagine that some other cell in this table view will eventually probably need other data from the Reward object. I wonder if it might be better to keep this as load(reward: Reward) and then add helper functions in this data sources to extract & convert the necessary pieces of information to populate each cell. For example you might define a helper function in here called func amountAndCurrency(from reward: Reward) -> (amount: Double, currency: String) and use it to extract your amount & currency for the PledgeAmountCell directly in this data source.

Good point.

I've actually previously passed Reward object and accessed its properties...but since some of the values now come from Project we would also have to pass Project and Reward. As soon as this happened my thinking was: Let's reduce the complexity for now" and when we need to pass more data either add more attributes or pass entire objects.. I'd prefer for now going this way and if we find out that the amount of information passed in is making the function attributes too big we should think about your approach from above. For now this will stay more isolated and with less dependencies on model layer.

Hope that makes sense?

Fair enough! Thanks for elaborating 🙏

ifbarrera · 2019-04-12T15:49:37Z

Kickstarter-iOS/Views/AmountInputView.swift

+      |> stackViewStyle
+
+    // Align label's ascender to text field's ascender
+    if let textFieldFont = self.textField.font, let labelFont = self.label.font {


Can we extract this to a helper function?

ifbarrera · 2019-04-12T15:54:37Z

Kickstarter-iOS/Views/AmountInputView.swift

+    if let textFieldFont = self.textField.font, let labelFont = self.label.font {
+      let constant = (textFieldFont.capHeight - labelFont.capHeight) / 2
+
+      self.labelCenterYAnchor = NSLayoutConstraint(


Using layout anchors should simplify this code a bit:

self.labelCenterYAnchor = self.label.centerYAnchor.constraint(equalTo: self.textField.centerYAnchor, constant: -constant)

LOL, I don't know where was I going with this 😆

ifbarrera · 2019-04-12T15:55:56Z

Kickstarter-iOS/Views/AmountInputView.swift

+      |> \.text .~ amount
+  }
+}
+


Can we add a MARK: - Styles? I really like this approach for separating styles though!

ifbarrera · 2019-04-12T15:59:03Z

Kickstarter-iOS/Views/Cells/PledgeAmountCell.swift

+    self.rootStackView.addArrangedSubview(self.label)
+    self.rootStackView.addArrangedSubview(self.inputStackView)
+    self.inputStackView.addArrangedSubview(self.stepper)
+    self.inputStackView.addArrangedSubview(UIView(frame: .zero))


What's this one-off view for?

It's a spacer...it fills in the space between the stepper and the amount input.

Please see attached specs.

ifbarrera · 2019-04-12T16:01:05Z

Kickstarter-iOS/Views/Cells/PledgeAmountCell.swift

+      |> \.alignment .~ alignment
+      |> \.axis .~ axis
+      |> \.distribution .~ distribution
+      |> \.spacing .~ (isAccessibilityCategory ? Styles.grid(1) : 0)


I noticed that if you type a very long number in the AmountInputView that it goes right up to the right of the stepper. Should maybe keep the spacing at Styles.grid(1) even when the axis is horizontal?

I completely forgot about this..thanks for bringing it up...I'll see if I can use the separator and it's min width or any other option. It actually seems to behave slightly different on device vs SIM.

ifbarrera · 2019-04-12T16:14:13Z

Kickstarter-iOS/Views/Cells/PledgeAmountCell.swift

+
+private let inputStackViewStyle: StackViewStyle = { (stackView: UIStackView) in
+  stackView
+    |> \.spacing .~ Styles.grid(1)


Yeah actually it seems that this isn't consistent with the spacing in func configureView(for traitCollection: UITraitCollection)

ifbarrera · 2019-04-12T16:16:16Z

Kickstarter-iOS/Views/Controllers/PledgeTableViewController.swift

      |> \.dataSource .~ self.dataSource

    self.tableView.register(PledgeRowCell.self, forCellReuseIdentifier: "PledgeRowCell")
+    self.tableView.register(PledgeAmountCell.self, forCellReuseIdentifier: "PledgeAmountCell")


Should we maybe convert these reuse identifiers to an enum?

ifbarrera · 2019-04-12T16:18:38Z

Library/UIView+AutoLayout.swift

@@ -16,6 +16,11 @@ extension UIView {
    NSLayoutConstraint.activate(constraints)
  }

+  public func addSubviewConstrainedToEdges(_ view: UIView) {


Combining adding the subview with constraining to edges doesn't feel like it really adds value, and it also hides how the subview is being added from the "owner" of the subview (the VC). I would argue we don't need this "helper" and we should keep adding subviews and constraining them separate.

I'm kinda conflicted about the fact that this doesn't add value Isabel

A) it merges two common operations into one (adding subview + settings constraints) - technically one wouldn't work without the other
B) the name explicitly says what it does when establishing constraints so I'm not sure how does it hide this from the owner

I'm fine with changing this if you feel strongly about it...I feel like I've seen this in some UIKit library but can't remember exactly which one ¯_(ツ)_/¯

Let me know, I'll make the appropriate changes.

These are fair points. My concerns are around adding helpers that prescribe "how" a subview is added to the hierarchy. Sometimes it's important to specify where the subview is added (insertSubview: at: etc) although admittedly the majority of the time we do end up using addSubview. I also have a general feeling that adding subviews and settings constraints are operations that should be grouped by together by type: all subviews added in the right order first, then all constraints added. Imo keeping them separate makes it easier to reason about how a view is being configured by splitting up how views are added from how they're positioned.

I actually just noticed that we already have addSubviewConstrainedToMargins below, so we already have a precedent for introducing this function 🤷‍♀️

@justinswart thoughts on this?

I guess as we continue building out view programmatically we risk starting to create our own AutoLayout DSL and then sticking to conventions across the project 🤔 While I don't have strong feelings about this in particular, perhaps a way to achieve both things is through function composition?

Here's a quick example I cobbled together, of course better function and argument naming would make this more readable.

// Functions public func ksr_addSubviewToParent() -> ((UIView, UIView) -> (UIView, UIView)) { return { subview, parent in parent.addSubview(subview) return (subview, parent) } } public func ksr_constrainToEdgesInParent() -> ((UIView, UIView) -> (UIView, UIView)) { return { subview, parent in subview.translatesAutoresizingMaskIntoConstraints = false let constraints = [ subview.leadingAnchor.constraint(equalTo: parent.leadingAnchor), subview.trailingAnchor.constraint(equalTo: parent.trailingAnchor), subview.topAnchor.constraint(equalTo: parent.topAnchor), subview.bottomAnchor.constraint(equalTo: parent.bottomAnchor) ] NSLayoutConstraint.activate(constraints) return (subview, parent) } } // Usage override public func viewDidLoad() { super.viewDidLoad() let view = UIView() _ = (view, self.view) |> ksr_addSubviewToParent() |> ksr_constrainToEdgesInParent() }

Decisions could be made as to whether we want to pass both the child and parent as arguments and receive both as return values to pipe forward or if we just want to receive the subview to do more things to it.

Anyway, just an idea!

I like this approach a lot @justinswart, it's more consistent with the overall patterns in our codebase 👍

justinswart · 2019-04-15T22:00:41Z

Kickstarter-iOS/Views/AmountInputView.swift

+
+    let traitCollection = self.traitCollection
+
+    if previousTraitCollection?.preferredContentSizeCategory


Does this not work if you just put it in bindStyles? I believe that is called when the traitcollection changes.

Yeah, it works without it thanks to our swizzling....why did I do this Justin? 🤦‍♂️

justinswart · 2019-04-15T22:07:15Z

Kickstarter-iOS/Views/Cells/PledgeAmountCell.swift

+
+// MARK: - Styles
+
+func inputStackViewStyle(_ isAccessibilityCategory: Bool) -> ((UIStackView) -> UIStackView) {


Perhaps we should test these to see that the UIStackView that's passed in is configured correctly.

On the second thought it's still a private func. I was going to start extracting these in case these styles need to be reused. How about I start testing these when (if) we extract it to a shared style?

justinswart · 2019-04-15T22:46:00Z

Library/UIView+AutoLayout.swift

@@ -16,6 +16,11 @@ extension UIView {
    NSLayoutConstraint.activate(constraints)
  }

+  public func addSubviewConstrainedToEdges(_ view: UIView) {


I guess as we continue building out view programmatically we risk starting to create our own AutoLayout DSL and then sticking to conventions across the project 🤔 While I don't have strong feelings about this in particular, perhaps a way to achieve both things is through function composition?

Here's a quick example I cobbled together, of course better function and argument naming would make this more readable.

// Functions public func ksr_addSubviewToParent() -> ((UIView, UIView) -> (UIView, UIView)) { return { subview, parent in parent.addSubview(subview) return (subview, parent) } } public func ksr_constrainToEdgesInParent() -> ((UIView, UIView) -> (UIView, UIView)) { return { subview, parent in subview.translatesAutoresizingMaskIntoConstraints = false let constraints = [ subview.leadingAnchor.constraint(equalTo: parent.leadingAnchor), subview.trailingAnchor.constraint(equalTo: parent.trailingAnchor), subview.topAnchor.constraint(equalTo: parent.topAnchor), subview.bottomAnchor.constraint(equalTo: parent.bottomAnchor) ] NSLayoutConstraint.activate(constraints) return (subview, parent) } } // Usage override public func viewDidLoad() { super.viewDidLoad() let view = UIView() _ = (view, self.view) |> ksr_addSubviewToParent() |> ksr_constrainToEdgesInParent() }

Decisions could be made as to whether we want to pass both the child and parent as arguments and receive both as return values to pipe forward or if we just want to receive the subview to do more things to it.

Anyway, just an idea!

ifbarrera

👏 🚢

* Add stepper image resources * Add convenience function to add subview constrained to edges * Prepare pledge amount cell * Implement amount input field * Pass correct amount and currency values * Disable selection * Explicitly declare types in styles * Add localized strings * Add iOS 10 support * Style with explicit types * Use localized string * Re-record screenshot tests for the deprecated controller * Explicitly set accessibility elements * Extract ascender constrain to private function * Add background color * Prevent spacer from collapsing bellow its minimum width * Fix inputStackViewStyle * Register cells and footers using their classes for type safety * Remove unnecessary traitCollectionDidChange handler * Make style private * Refactor auto layout helpers

…indings (#779) * 💲[Native Checkout] Rename CheckoutViewController to DeprecatedCheckoutViewController (#647) * Rename CheckoutViewController to DeprecatedCheckoutViewController * Rename CheckoutViewModel to DeprecatedCheckoutViewModel * Remove CheckoutViewModelTests * 💲[Native Checkout] Hide rewards when "ios_native_checkout" feature flag is enabled (#646) * Feature-flagging old rewards treatment & tests * Adding another test * Fix issue causing test failure * PR comments and adding other features to the “Feature” enum * Renaming and clearer logic/func naming * Line break * 💲[Native Checkout] Rename RewardPledgeVC/VM to DeprecatedRewardPledgeVC/VM (#653) * Rename RewardPledgeViewController.swift to DeprecatedRewardPledgeViewController.swift * Rename RewardPledgeViewModel.swift to DeprecatedRewardPledgeViewModel.swift * Rename RewardPledgeViewController to DeprecatedRewardPledgeViewController * Rename RewardPledgeViewModel to DeprecatedRewardPledgeViewModel * Update Snapshot tests * 💲 [Native Checkout] Plumbing (#654) * Prepare PledgeViewModel * Prepare PledgeViewController * Prepare PledgeDataSource * 💲[Native Checkout] Pledge Amount Cell (#660) * Add stepper image resources * Add convenience function to add subview constrained to edges * Prepare pledge amount cell * Implement amount input field * Pass correct amount and currency values * Disable selection * Explicitly declare types in styles * Add localized strings * Add iOS 10 support * Style with explicit types * Use localized string * Re-record screenshot tests for the deprecated controller * Explicitly set accessibility elements * Extract ascender constrain to private function * Add background color * Prevent spacer from collapsing bellow its minimum width * Fix inputStackViewStyle * Register cells and footers using their classes for type safety * Remove unnecessary traitCollectionDidChange handler * Make style private * Refactor auto layout helpers * [Native Checkout] "Back this project" button (#659) * Back this project buttons setup * Adding feature flag behaviour * Tests * Swiftlint * Default off * Revert test changes * Cleanup * PR comments and dynamic type support for button * Updating screenshots to account for accurate button font size * Wrapping button text and storing reference to shape layer * Concat constraints * Renaming button * Cleanup * Set stepper images using a lens (#661) * 💲[Native Checkout] Shipping Location Cell 1/3 (UI) (#666) * Fix tests * Extract shared styles * Add shipping location cell * Expose only certain elements to VoiceOver * Add header trait * Add new line for better readability * Update tests * Add arranged subviews to stack view using a functional helper * Fix font size * Use point free expression * Fix tests * Fix style test * 💲[Native Checkout] Description Cell (#663) * wip description cell * wip description cell, new strings * wip description cell, refactor * wip- estimated deloivery date from reward * wip- datasource test * new snapshots * stackview refactor * stackview func name change * func name change * corrected datasource test * refactor * pr feedback * pr feedback * swiftlint fix * datasource test fix * datasource test fix * description string * fixing lib/framework tests * new snapshots for deprecated rewards * using new string * wip- vm test name change * pr feedback * pr feedback * strings * snapshot tests * change padding * datasource change * updated strings to correct deprecated pledge view * new snapshots * font change, remove unnecessary constraint and view color, alphabetizing * blended layers and usimng helper function to add arranged subviews to stack view * 💲[Native Checkout] Reverts strings & snapshots (#671) * Revert strings * Update comment * reverted strings * 💲[Native Checkout] Rewards Collection View Plumbing (#664) * New files * removing scroll view stuff for now * Tests * Cleaning up insets * More cleanup * Swiftlint * Adding “deprecated” to more file names * Removing duplicated file * Increasing hit area of close button * PR comments * PR comments * 💲[Native Checkout] Pledge Continue Button - UI Only (#670) * PledgeContinueCell * Common green button styling * Tests * Adding a test, cleaning up * Swiftlint * Fixing merge conflicts * PR feedback * 💲[Native Checkout] Description Cell User Interaction (#668) * wip description cell * wip description cell, new strings * wip description cell, refactor * wip- estimated deloivery date from reward * wip- datasource test * new snapshots * stackview refactor * stackview func name change * func name change * corrected datasource test * refactor * setup delegate * pr feedback * pr feedback * swiftlint fix * datasource test fix * datasource test fix * pledgevm * description string * fixing lib/framework tests * new snapshots for deprecated rewards * using new string * wip- presenting trust and safety now * wip- vm tests * wip- refactor * wip * button * learn more higlight color change * snapshot tests * pr edit * pr edits * snapshot tests and strings * Replace label and button with UITextView for tappable links * pr feedback * font size removed * 💲[Native Checkout] "Peek" functionality using hidden scroll view (#665) * New files * removing scroll view stuff for now * Tests * Cleaning up insets * More cleanup * Swiftlint * Adding “deprecated” to more file names * Removing duplicated file * Increasing hit area of close button * Hidden scroll view * Hidden scroll view working * Refactoring & cleanup * Use collection view’s content size * PR updates from comments * Fix autolayout warnings on device rotation * Cleanup * More cleanup * More PR feedback * Use HTML string with anchor tags (#673) * Add missing imports, update to use traitCollection.preferredContentSizeCategory.isAccessibilityCategory * Fix imports in tests * 💲[Native Checkout] Sheet Overlay Container (#674) * Sheet overlay container VC and animator * Renaming, fixing rotation issues * Revert testing code * Cleanup and fixing a snapshot * Using keypath lenses * Updating the comment * PR comments * Renaming * Cleanup * View helpers * Style naming * Fix build * Remove iOS 11 Availability Checks From Native Checkout (#679) * Remove iOS 11 availability references * Fix merge conflict issues * Renaming suggestions * Swiftlint * Clean up issues with live stream deprecation * 💲[Native Checkout] Shipping Location Cell 2/3 (Currency formatter 🤯) (#667) * Fix tests * Extract shared styles * Add shipping location cell * Expose only certain elements to VoiceOver * Add header trait * Add new line for better readability * Add the ability to format currency strings * Add currency formatter playground * Add currency formatter tests * Fix typo * Remove duplicate type conformance * Set label background color for better performance * Move attributed currency string to shared functions * Disable Swiftlint's line length in tests * Add convenience function to calculate superscript offset between two UIFonts * Refactor attributed currency formatter to a NSNumberFormatter subclass * Expose attributed formatter through Format enum * Use the new attributed currency formatter * Move attributes to checkout styles * Pass shipping information to data source from view model * Change font size on the input view to match shipping location * Fix playground * Fix Swiftlint issue * Use typealias for string attributes * Remove dangling playground reference * Localize string * Remove obsolete imports * 💲[Native Checkout] Reward Selection (no animation) (#683) * Navigate to PledgeVC when reward is selected * One more test * Renaming * Updates based on feedback * 💲[Native Checkout] - SwiftFormat (#687) * Remove SwiftFormat's hoisting rule * Update SwiftFormat rules * Format all Swift files added or updated by feature branch * Fix line length violations * Re-enable explicit self reference rule * Format code with explicit self reference ON * Update .init spacing * Format decimals * Format and operator * Format comments * Order SwiftFormat rules alphabetically * Format selectors * Format ChangeEmailViewController * Order excluded swiftformat files alphabeticallyr * Rename UIView+AutoLayout * Fix formatter causing build errors * Disable rules on new line * Reformat indentation * Rename ksr_swiftformat to format * Fix version after merge * 💲[Native Checkout] Shipping location cell plus sign (#691) * Add the ability to concatenate two NSAttributedStrings * Add plus sign attributed string * Prefix shipping location amount with a plus sign * Resolve swiftformat configuration merge conflict * Format files that were missed during merge conflict resolution * 💲[Native Checkout] Load Shipping Rules (#682) * Setting up for loading shipping locations * Fixing shippingIsLoading * Test scaffolding * WIP * Mutable Property * Tests * Adding debounce to prevent race condition * Swiftlint * Reverting testing code * Improving reloadData handling * Adding reloadDataProperty check to selected shipping rules signal * Removing stored property * Removing redundant test * Fix all the conflicts :\ * Refactoring for new shipping cell requirements * Adding more tests * Cartfile.resolved? * Conflicts for ReactiveSwift 6.0 * Removing Result module * Format shipping amount properly * SwiftFormat * Improving tests * Formatting * Adding TODO * 💲[Native Checkout] Refactor cells to be backed by view model (#693) * Reformat UITableViewDelegate function * Expose label and textfield publicly * Refactor cells to be backed by view models * Format code * Extract date format to a convenience getter * Fix tests * 💲[Native Checkout] Rewards - Basic (#700) * RewardCell content * Scrolling behaviour * View model setup * Pledge Button Functionality * Fixing logic * Remove unneeded output * Removing unneeded input in RewardCollectionViewModel * Tests * Swiftformat * Swiftlint * Fixing dynamic type issue and iPad presentation * Screenshots * Strings * Fix screenshots from Strings update * Remove Result import * Improve tests * Formatting * Blended layers * Bumping the tolerance * Undoing schema change * PR comments * More PR Comments * Reverting schema change * Formatting * Swiftlint * Reverting strings * Only commiting required strings * 💲[Native Checkout] Stepper haptics (#711) * Refactor haptic feedback to being more testable * Add haptic feedback for the amount stepper * Update reactive extensions dependency * Use UIStepper reactive extensions * Reorder alphabetically * Refactor feedback generators * Fix capitalization typo * Revert "💲[Native Checkout] Stepper haptics (#711)" (#714) This reverts commit ad39509. * Feature Flag Tools 🔨 (#705) * Refactor Beta tools to table view * Removing Storyboard and fixing tests * Adding FeatureFlagTools * Tests * Screenshot tests * Swiftformat * Fixing iPad sourceView * Updating BetaTools screenshot and fixing naming issue * More cleanup * Swiftformat * PR comments * Fixing typo, autolayout warnings, moving styles to base styles * Swift format * Tint debug icon when filters are active * Cleanup * Prefering alert style for iPad * Swiftformat * 💲[Native Checkout] Stepper Haptics Final Final (#716) * Refactor haptic feedback to being more testable * Add haptic feedback for the amount stepper * Update reactive extensions dependency * Use UIStepper reactive extensions * Reorder alphabetically * Refactor feedback generators * Fix capitalization typo * Update reactive extensions commit hash * 💲[Native Checkout] Pledge amount Stepper and Textfield input + Done button (#719) * Add inputAccessoryView to amount text field * Expose done button getter * Dismiss text field by tapping done button * Dismiss text field by tapping anywhere else * Bind stepper and text field changes and properly enable/disable done button * Batch layout constraints activation * Make textfield signal point free * Persist Debug Feature Flags (#721) * Persiting debug data * Tests * Adding some more assertions * Formatting * PR comments * Switching DebugData to Library * 💲[Native Checkout] Pledge Summary Cell Layout (#715) * Pledge Summary Cell layout * SwiftFormat * Fix test * 💲[Native Checkout] Pledge Summary Cell Handle Links (#717) * Open links in web view * Add tests * DRY it up a little * Formatting * Remove PledgeRowCell * Fix textview voiceover * Fix amount label voice-over * 💲[Native Checkout] Pledge Summary Cell Handle State Change (#718) * Open links in web view * Add tests * DRY it up a little * Formatting * Handle amount state between cells * swiftlint * Add tests * Move parentheses * Pass ShippingRule to delegate * total -> pledgeTotal * Use the same output for reloading and updating the tableview * Move a brace * Add minimumScaleFactor to total label * Abstract isShippingEnabled implementation detail to PledgeViewModel * SwiftFormat lol * Improve output naming and type, add tests * 💲[Native Checkout] UITextView bottom padding improvements (#723) * Pledge Summary Cell layout * SwiftFormat * Fix test * Open links in web view * Add tests * DRY it up a little * Formatting * Handle amount state between cells * swiftlint * Add tests * Move parentheses * Pass ShippingRule to delegate * total -> pledgeTotal * Use the same output for reloading and updating the tableview * Move a brace * 💲[Native Checkout] Pledge Summary Cell Handle Links (#717) * Open links in web view * Add tests * DRY it up a little * Formatting * Remove PledgeRowCell * Add minimumScaleFactor to total label * Fix textview voiceover * Fix amount label voice-over * Improve UITextView bottom padding * Add ksr_ prefix * 💲[Native Checkout] Disable non-numeric, non-decimal separator input for the amount (#722) * Disable non-numeric, non-decimal separator input for the amount * Replace string initializer with a literal * Simplify return statement * Add the ability to reset text field's value to min or max depending on the value that the keyboard is being dismissed with * Use coalesceWith * Add test that was removed during merge * 💲[Native Checkout] Project Pledge States UI (#702) * wip project states * wip project states button colors and label showing up * wip project states button height fix * wip, manage button * wip setting up vm for states * wip setting up vm for states * wip for reward title in manage state * wip - refactor and vm tests * wip - getting reward title now * wip - amount and reward formatted for manage state * wip * wip- deleted backer banner * wip- swiftlint fixes * wip - got view layer back * wip - refactor and renaming * wip - snapshot tests * wip * wip- corrected shipping amount in manage state * wip- final and alphabetize files * pr feedback -move stylings to bindStyles() * smapshot tests * manage and view rewards strings added * using new strings * vm tests fix * swift format * revert strings * backer banner is back * snapshots * refactor- was not using user * light refactor * refactor and snapshot test correction * swiftlint fix * new snapshots * remove images from new snapshots * remove image * pr feedback * ksr blue now added * word wrapping to button * swift format * button stacks and label wraps * line length correction * swift format * 💲[Native Checkout] Project Pledge States UI - UI Fixes (#724) * Add signal that would emit whether or not the spacer is hidden * Trim the amount * Fix UI issues with Dynamic Type * Revert back to the right font * Rename button and style * 💲[Native Checkout] Re-enable the CTA button action (#728) * Remove unused property * Re-add target to the CTA button * Remove padding fix, instead use correct string (#729) * 💲[Native Checkout] Load default, min and max pledge values properly (#726) * Load min and max pledge values properly * Format code * Update reactive extensions dependency * Set stepper's step value properly * Update reactive extensions dependency * Omit unnecessary signal reference * [Native Checkout] Pledge Payment Methods Collection View UI (#725) * Rename deprecated vc and vm (#739) * 💲[Native Checkout] Refactor shipping rules (#736) * Rename button * Hook the button up to its action * Fit target action on one line * Refactor shipping rules logic * Revert MockService changes * Rename button signal * Rename a property * Add comments * Extract tuple to a private function for allowing point free assignment * Explicitly state masked corners type to help the compiler * Format comment a bit better * Feature native checkout applepay button (#742) * 💲[Native Checkout] Shipping Picker - Navigation Workflow - 1/4 (#738) * Rename button * Hook the button up to its action * Fit target action on one line * Refactor shipping rules logic * Revert MockService changes * Hook up selection of a shipping rule to presenting a picker * Rename button signal * Rename a property * Add comments * Extract tuple to a private function for allowing point free assignment * Explicitly state masked corners type to help the compiler * Rename view controller * Extract offset value to a private enum constant * Rename delegate method * Rename signals * Update top offset * Rename output signal * 💲[Native Checkout] Pledge Error State CTA (#746) * wip project states * wip project states button colors and label showing up * wip project states button height fix * wip, manage button * wip setting up vm for states * wip setting up vm for states * wip for reward title in manage state * wip - refactor and vm tests * wip - getting reward title now * wip - amount and reward formatted for manage state * wip * wip- deleted backer banner * wip- swiftlint fixes * wip - got view layer back * wip - refactor and renaming * wip - snapshot tests * wip * wip- corrected shipping amount in manage state * wip- final and alphabetize files * pr feedback -move stylings to bindStyles() * smapshot tests * manage and view rewards strings added * using new strings * vm tests fix * swift format * wip- fix pledge * revert strings * backer banner is back * snapshots * refactor- was not using user * light refactor * refactor and snapshot test correction * swiftlint fix * new snapshots * remove images from new snapshots * remove image * wip - fix state * case * fix logic is there * fix vm tests are passing * snapshot tests fixed * snapshot tests fix for error state * strings for error state * vm refactor * vm refactor title text * undid change * swift format * fix button width * new snapshots * design feedback, new snapshots * swift format * added spacing * renamed a stackview * capitalized * capitalized * Revert "💲[Native Checkout] Pledge Error State CTA (#746)" (#748) This reverts commit f073a51. * 💲[Native Checkout] Fix Pledge CTA for logged out users (#744) * Use backing from personalization over making network request * SwiftFormat, cleanup * Feature tests * Improving screenshot tests * Formatting * Fixing flaking tests * Assert output didn’t emit * 💲[Native Checkout] Shipping Picker - Show List - 2/4 (#747) * Rename button * Hook the button up to its action * Fit target action on one line * Refactor shipping rules logic * Revert MockService changes * Hook up selection of a shipping rule to presenting a picker * Rename button signal * Rename a property * Add comments * Extract tuple to a private function for allowing point free assignment * Explicitly state masked corners type to help the compiler * Rename view controller * Extract offset value to a private enum constant * Show shipping rules list * Dismiss shipping rules through view model * Remove duplicate signal * Format code * Use a simple dismiss * Remove unnecessary advance call * Use weak self * Make the test more explicit * Use combineLatest instead of takeWhen * Rename signal for better readability * 💲[Native Checkout] Login & Sign-up on the pledge screen (Part 1) (#727) * Continue button functionality * Tests * Fixing merge conflict issues * Fix more issues from merge * SwiftFormat * Cleanup * Fixing merge issues * Code review comments * Formatting * PR comment * Renaming signals * Swiftformat * Change pragma mark from Binding to View model (#749) [skip ci] * 💲[Native Checkout] Prepare reward checkmark image view UI (#755) * Add reward checkmark image resource * Add checkmark image view to the cell (temporarily hidden) * Update snapshots * Remove trailing comma * Rename image view and its container to use more descriptive naming * 💲[Native Checkout] Pledge Screen Refactor: UITableView -> UIStackView (#754) * Beginning to refactor * Renaming everything, getting it to build * Get it to render properly * Fix shipping rules * Fix amount functionality * Fix all the links * Renaming VMs and tests * Fixing some tests * Fixing tests * Add keyboard handling * Rename * Refactoring login/signup * Formatting * Getting instantiate protocol to work properly * formatting * Fixing diffs * Testing file names * Renaming * Last rename * Moving * remove comments * Updates to shipping VM * Renaming missed output * Formatting * Moving to helper extension * 💲[Native Checkout] Pledge Screen Refactor: UITableView -> UIStackView - Fix Tests 🙌 (#758) * Format imports * Fix checkout styles tests * PR feedback * Formatting * Apply suggestions from code review Co-Authored-By: Pavel Dusatko <pavel.dusatko@gmail.com> * Functions & renaming protocol * Rename protocol * Removing layoutMargins * Formatting * Make alert icon single scale (#759) * 💲[Native Checkout] Prepare reward pill collection view UI (#757) * Extract classNameWithoutModule to shared functions * Update collection view convenience functions * Update table view convenience functions * Add pill collection view, cell, layout and data source * Style pill cell * Add pill collection to reward cell * Format code * Update font * Fix a bug caused by a merge gone wrong * Make adding / removing pill collection view controller more robust * Refactor pill collection view * Use consistent way to register collection view cell * Remove nilling out delegate * 💲[Native Checkout] Pledge Error State CTA (#753) * wip project states * wip project states button colors and label showing up * wip project states button height fix * wip, manage button * wip setting up vm for states * wip setting up vm for states * wip for reward title in manage state * wip - refactor and vm tests * wip - getting reward title now * wip - amount and reward formatted for manage state * wip * wip- deleted backer banner * wip- swiftlint fixes * wip - got view layer back * wip - refactor and renaming * wip - snapshot tests * wip * wip- corrected shipping amount in manage state * wip- final and alphabetize files * pr feedback -move stylings to bindStyles() * smapshot tests * manage and view rewards strings added * using new strings * vm tests fix * swift format * wip- fix pledge * revert strings * backer banner is back * snapshots * refactor- was not using user * light refactor * refactor and snapshot test correction * swiftlint fix * new snapshots * remove images from new snapshots * remove image * wip - fix state * case * fix logic is there * fix vm tests are passing * snapshot tests fixed * snapshot tests fix for error state * strings for error state * vm refactor * vm refactor title text * undid change * swift format * fix button width * new snapshots * design feedback, new snapshots * swift format * added spacing * renamed a stackview * capitalized * capitalized * fixes * Cleaning up screenshots, fixing issues with merge conflict * Formatting * Revert unneeded project template * Cleaning up the snapshot configurations so they’re more consistent from test to test * Formatting * Line length * Line length again * new snapshots * requested changes * fixed reward title missing * fixed snapshot failures * new snapshots * swift format * swift lint fix * swift format * pr feedback and snapshot test for error state * name change to minHeight and minWidth * snapshot tests for error state * constant name change * snapshot correction * 💲[Native Checkout] Pledge Screen Separators (#760) * Sections and section separators * Formatting * Renaming from feedback * PR feedback * 💲[Native Checkout] Reward -> Pledge View transition animation (#741) * Rebase animation on top of refactor * SwiftFormat * Improve layout passes and snapshot flicker issue * Move values to constants * SwiftFormat * Infer duration from spring timing, align titleStackView top * SwiftFormat missed self * SwiftFormat * Alphabetize rootStackView * Remove redundant bindViewModel() * Move constraint setup to function, add private modifiers * Move translatesAutoresizingMaskIntoConstraints to initializer * Move minWidth to constant * Update to use helper functions * CheckoutNavigationController -> RewardPledgeNavigationController * Spacing tweaks * Remove redundant bind call * Remove old view model * Repair merge * Use keypaths * Light design pass and screenshots (#771) * 💲[Native Checkout] Sheet Overlay iPad Bugfix (#769) * Page sheet * WIP ipad handling for sheet overlap * More wip * Helper for presenting sheet overlay w/ ipad exception * Addressing feedback & formatting * PR feedback * 💲[Native Checkout] Login/Signup design pass (#770) * Add outputs and bindings * SwiftFormat * 💲[Native Checkout] Activity Indicator for the Pledge View (#773) * Adding activity indicator * Add starting/stopping indicator behavior * Fade in effect * Tests * Formatting * Cleanup * Formatting * Fix center alignment on indicator * snapshots and fix title font (#775) * [Native Checkout] Credit card cell (#766) * Add RewardCardContainerView snapshot tests * Update RewardsCollectionViewController snapshots * Add NoReward snapshots * Improve snapshot naming * Feature native checkout rewards gradient (#776) * Tidy up some logic * Feature native checkout reward pledge states (#764) * reward state type * icon to reward states * time based and limited reward states * some renaming * time based and limited reward states * disabled pledge button * fix payment copy * new green 200 color * new snapshots * new copy * updating business logic * rewardstates enum * snapshot tests * swift format * swift lint fix * swift lint fix * frameworks not needed * removed strings * new copy in Strings file * fix payment copy translations * fix failing tests * arg name change * new snapshots * delete orig files * removing colors * removed latests copy * remove copy for error state * removing new localized copy * removing fix copy * snapshot fix * noreward test * noreward test * noreward test * Simplified and rename enum, updated tests * 💲[Native Checkout] Add New Card View (#777) * PledgeAddNewCardView * Add new card view styling * Adding delegate * View model & tests * Formatting * Cleanup * More cleanup * Tried to fix blended layers, gave up * Original image * Better naming * formatting * 💲[Native Checkout] Add native pledge view feature flag (#774) * Add ios_native_checkout_pledge_view feature flag * Fix tests * Fix back button * Revert "Fix back button" This reverts commit b2cb23b. * Add test for featureNativeCheckoutPledgeViewEnabled() * Only add close button when modal * Set navigationItem in presenting VC * Remove type after merge * 💲[Native Checkout] Button style sweep (#781) * Update button styles first pass * Move color mixing to extension file * Update Colors.json * Updated remaining button styles * Record new snapshots * Rename playground buttons * Move button up slightly on empty state VC * Update empty state snapshots * SwiftFormat * Repair merge * Revert unrelated code-changes from merging * Tidy up logic with guards and ternary operators * Add logged out non-backer test * 💲[Native Checkout] RewardCardView states VM tests (#780) * Add RewardCardContainerViewModelTests * Add RewardCardViewModelTests * Fix test * Remove shippingAmount from noReward test * Add logged out non-backer test * Add tests for NonLive, Backed and NonLive, NonBacked

dusi added 9 commits April 11, 2019 15:17

Add stepper image resources

4da7798

Add convenience function to add subview constrained to edges

08e150c

Prepare pledge amount cell

a11375d

Implement amount input field

30a56fa

Pass correct amount and currency values

7e72dca

Disable selection

de29b7a

Explicitly declare types in styles

7df25f3

Add localized strings

a88da5e

Add iOS 10 support

5f81869

dusi commented Apr 11, 2019

View reviewed changes

Kickstarter-iOS/Locales/Base.lproj/Localizable.strings

"via_kickstarter" = "via Kickstarter";

Copy link

Contributor Author

dusi Apr 11, 2019

Choose a reason for hiding this comment

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

🤦‍♂️

dusi added 2 commits April 11, 2019 16:52

Style with explicit types

3f696af

Use localized string

13eb101

dusi assigned ifbarrera Apr 11, 2019

dusi requested a review from cdolm92 April 11, 2019 23:55

dusi added 2 commits April 11, 2019 17:26

Re-record screenshot tests for the deprecated controller

809f74f

Explicitly set accessibility elements

61c766c

ifbarrera reviewed Apr 12, 2019

View reviewed changes

dusi added 5 commits April 12, 2019 12:32

Extract ascender constrain to private function

3d3af67

Add background color

ae5f351

Prevent spacer from collapsing bellow its minimum width

1d876f2

Fix inputStackViewStyle

bbfb719

Register cells and footers using their classes for type safety

83dea20

dusi requested a review from ifbarrera April 12, 2019 22:46

dusi added the needs review label Apr 15, 2019

justinswart reviewed Apr 15, 2019

View reviewed changes

dusi added 3 commits April 16, 2019 09:46

Remove unnecessary traitCollectionDidChange handler

67c6219

Make style private

21225e8

Refactor auto layout helpers

22553c9

dusi requested a review from justinswart April 16, 2019 17:48

ifbarrera approved these changes Apr 17, 2019

View reviewed changes

dusi merged commit ee5c0e7 into feature-native-checkout Apr 17, 2019

dusi mentioned this pull request Apr 17, 2019

💲[Native Checkout] Feature #652

Merged

dusi deleted the feature-native-checkout-pledge-amount-cell branch April 24, 2019 16:24

ifbarrera mentioned this pull request Aug 5, 2019

💲Feature - Native Checkout #783

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

💲[Native Checkout] Pledge Amount Cell #660

💲[Native Checkout] Pledge Amount Cell #660

dusi commented Apr 11, 2019 •

edited

Loading

dusi Apr 11, 2019

dusi commented Apr 12, 2019

ifbarrera left a comment

ifbarrera Apr 12, 2019

dusi Apr 12, 2019

ifbarrera Apr 12, 2019

dusi Apr 12, 2019

ifbarrera Apr 15, 2019

ifbarrera Apr 12, 2019

ifbarrera Apr 12, 2019

dusi Apr 12, 2019

ifbarrera Apr 12, 2019

ifbarrera Apr 12, 2019

dusi Apr 12, 2019

ifbarrera Apr 12, 2019

dusi Apr 12, 2019

ifbarrera Apr 12, 2019

ifbarrera Apr 12, 2019

ifbarrera Apr 12, 2019

dusi Apr 12, 2019

ifbarrera Apr 15, 2019

justinswart Apr 15, 2019 •

edited

Loading

ifbarrera Apr 16, 2019

dusi Apr 16, 2019

justinswart Apr 15, 2019

dusi Apr 16, 2019

justinswart Apr 15, 2019

dusi Apr 16, 2019 •

edited

Loading

justinswart Apr 15, 2019 •

edited

Loading

ifbarrera left a comment


		let traitCollection = self.traitCollection

		if previousTraitCollection?.preferredContentSizeCategory


		// MARK: - Styles

		func inputStackViewStyle(_ isAccessibilityCategory: Bool) -> ((UIStackView) -> UIStackView) {

💲[Native Checkout] Pledge Amount Cell #660

💲[Native Checkout] Pledge Amount Cell #660

Conversation

dusi commented Apr 11, 2019 • edited Loading

📲 What

🤔 Why

🛠 How

📍 Note

👀 See

♿️ Accessibility

✅ Acceptance criteria

Choose a reason for hiding this comment

dusi commented Apr 12, 2019

ifbarrera left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justinswart Apr 15, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dusi Apr 16, 2019 • edited Loading

Choose a reason for hiding this comment

justinswart Apr 15, 2019 • edited Loading

Choose a reason for hiding this comment

ifbarrera left a comment

Choose a reason for hiding this comment

dusi commented Apr 11, 2019 •

edited

Loading

justinswart Apr 15, 2019 •

edited

Loading

dusi Apr 16, 2019 •

edited

Loading

justinswart Apr 15, 2019 •

edited

Loading