[NT-361] Select new reward polish #899
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,12 +5,18 @@ import ReactiveSwift | |
|
|
||
| public typealias PledgeData = (project: Project, reward: Reward, refTag: RefTag?) | ||
|
|
||
| public enum RewardsCollectionViewContext { | ||
| case createPledge | ||
| case managePledge | ||
| } | ||
|
|
||
| public protocol RewardsCollectionViewModelInputs { | ||
| func configure(with project: Project, refTag: RefTag?, context: RewardsCollectionViewContext) | ||
| func rewardCellShouldShowDividerLine(_ show: Bool) | ||
| func rewardSelected(with rewardId: Int) | ||
| func traitCollectionDidChange(_ traitCollection: UITraitCollection) | ||
| func viewDidAppear() | ||
| func viewDidLayoutSubviews() | ||
| func viewDidLoad() | ||
| func viewWillAppear() | ||
| } | ||
|
|
@@ -23,6 +29,9 @@ public protocol RewardsCollectionViewModelOutputs { | |
| var navigationBarShadowImageHidden: Signal<Bool, Never> { get } | ||
| var reloadDataWithValues: Signal<[(Project, Either<Reward, Backing>)], Never> { get } | ||
| var rewardsCollectionViewFooterIsHidden: Signal<Bool, Never> { get } | ||
| var scrollToBackedRewardIndexPath: Signal<IndexPath, Never> { get } | ||
| var title: Signal<String, Never> { get } | ||
|
|
||
| func selectedReward() -> Reward? | ||
| } | ||
|
|
||
|
|
@@ -46,6 +55,18 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType, | |
| let rewards = project | ||
| .map { $0.rewards } | ||
|
|
||
| self.title = configData | ||
| .map(third) | ||
| .combineLatest(with: self.viewDidLoadProperty.signal.ignoreValues()) | ||
| .map(first) | ||
| .map(titleForContext) | ||
|
|
||
| self.scrollToBackedRewardIndexPath = Signal.combineLatest(project, rewards) | ||
| .takeWhen(self.viewDidLayoutSubviewsProperty.signal.ignoreValues()) | ||
| .map(backedReward(_:rewards:)) | ||
| .skipNil() | ||
| .take(first: 1) | ||
|
|
||
| self.reloadDataWithValues = Signal.combineLatest(project, rewards) | ||
| .map { project, rewards in | ||
| rewards.map { (project, Either<Reward, Backing>.left($0)) } | ||
|
|
@@ -108,9 +129,9 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType, | |
| ) | ||
| } | ||
|
|
||
| private let configDataProperty = MutableProperty<(Project, RefTag?, RewardsCollectionViewContext)?>(nil) | ||
| public func configure(with project: Project, refTag: RefTag?, context: RewardsCollectionViewContext) { | ||
| self.configDataProperty.value = (project, refTag, context) | ||
| } | ||
|
|
||
| private let rewardCellShouldShowDividerLineProperty = MutableProperty<Bool>(false) | ||
|
|
@@ -133,6 +154,11 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType, | |
| self.viewDidAppearProperty.value = () | ||
| } | ||
|
|
||
| private let viewDidLayoutSubviewsProperty = MutableProperty(()) | ||
| public func viewDidLayoutSubviews() { | ||
| self.viewDidLayoutSubviewsProperty.value = () | ||
| } | ||
|
|
||
| private let viewDidLoadProperty = MutableProperty(()) | ||
| public func viewDidLoad() { | ||
| self.viewDidLoadProperty.value = () | ||
|
|
@@ -150,6 +176,8 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType, | |
| public let navigationBarShadowImageHidden: Signal<Bool, Never> | ||
| public let reloadDataWithValues: Signal<[(Project, Either<Reward, Backing>)], Never> | ||
| public let rewardsCollectionViewFooterIsHidden: Signal<Bool, Never> | ||
| public let scrollToBackedRewardIndexPath: Signal<IndexPath, Never> | ||
| public let title: Signal<String, Never> | ||
|
|
||
| private let selectedRewardProperty = MutableProperty<Reward?>(nil) | ||
| public func selectedReward() -> Reward? { | ||
|
|
@@ -159,3 +187,18 @@ public final class RewardsCollectionViewModel: RewardsCollectionViewModelType, | |
| public var inputs: RewardsCollectionViewModelInputs { return self } | ||
| public var outputs: RewardsCollectionViewModelOutputs { return self } | ||
| } | ||
|
|
||
| private func titleForContext(_ context: RewardsCollectionViewContext) -> String { | ||
| return context == .createPledge ? Strings.Back_this_project() : Strings.Choose_another_reward() | ||
| } | ||
|
|
||
| private func backedReward(_ project: Project, rewards: [Reward]) -> IndexPath? { | ||
|
There was a problem hiding this comment. Please update this to use the function @ifbarrera is using in #905 when that merges. https://github.com/kickstarter/ios-oss/pull/905/files#diff-234cfa58d101616352832cb332756878R33 |
||
| guard let backing = project.personalization.backing else { | ||
| return nil | ||
| } | ||
|
|
||
| let backedReward = reward(from: backing, inProject: project) | ||
| return rewards | ||
| .firstIndex(where: { $0.id == backedReward.id }) | ||
| .flatMap { IndexPath(row: $0, section: 0) } | ||
| } | ||
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
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.
Using
viewWillAppearPropertyhere didn't do anything, soviewDidLayoutSubviewswas the way to go.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.
Interesting 🤔 I believe it needs a run loop to render the cells. We could probably go ahead with this but for interest sake, if you used
viewWillAppearand added.ksr_delay(AppEnvironment.current.apiDelayInterval, on: AppEnvironment.current.scheduler)which is a delay of0and just puts the emission on the next run loop, that would also work.