Migrate Horizontal rewards into the Project Page #504

Rcureton · 2019-03-25T20:23:07Z

What ❓

Migrated the great work @eoji did with the Checkout POC into the KSR codebase for the first step towards Horizontal Rewards. On internal builds user's have the ability to toggle on/off the horizontal rewards from the InternalToolsActivity.
Great collaboration with @Scollaco 🎉🎉
We created the RewardFragment, RewardFragmentViewModel, HorizontalRewardViewHolder, HorizontalRewardAdapter,RewardFragmentViewModelTest. Also we updated the tests for ProjectViewModelTest

How to QA? 🤔

When you launch the app with an internal build open the navigation drawer -> InternalTools -> FeatureFlagActivity -> Toggle on or off.
When enabled navigate to the project page and you will no longer see the list of rewards below the project. When disabled you will see the project page in it's original state.

Story 📖

See 👀

Feature flag disabled	Feature flag enabled

…different type of buttons

…ndroid-oss into horizontal-rewards

…n isHorizontalRewardsEnabled = true

…ject xml

…ss into horizontal-rewards

Scollaco · 2019-03-25T20:30:44Z

Remove Vertical Rewards and Insert Horizontal Rewards

eoji · 2019-03-25T20:35:48Z

Great job, y'all! Can't wait to dig into this 🕵️‍♀️

eoji

Great job! I did a first pass. I noticed we're missing a lot of this. but didn't want to have too many comments. Let's add those in.

app/src/main/java/com/kickstarter/ui/activities/ProjectActivity.kt

app/src/main/java/com/kickstarter/ui/adapters/HorizontalRewardsAdapter.kt

app/src/main/java/com/kickstarter/ui/fragments/RewardsFragment.kt

app/src/main/res/layout/project_layout.xml

app/src/test/java/com/kickstarter/viewmodels/RewardFragmentViewModelTest.kt

…nit tests

…ertain classes

eoji

Did another pass on the updates! I'm glad we moved to just having the fragment live in the activity but rotations still aren't handled correctly. If the rewards are visible and you rotate, they should still be visible (but the animation should not repeat).

app/src/main/java/com/kickstarter/ui/fragments/RewardsFragment.kt

app/src/main/java/com/kickstarter/ui/viewholders/HorizontalRewardViewHolder.kt

app/src/main/java/com/kickstarter/ui/viewholders/ProjectViewHolder.java

app/src/main/java/com/kickstarter/viewmodels/ProjectHolderViewModel.java

app/src/main/java/com/kickstarter/viewmodels/ProjectViewModel.kt

eoji

Alright, I think the major parts are good to go so here's some clean up comments

app/src/main/java/com/kickstarter/ui/activities/ProjectActivity.kt

app/src/main/java/com/kickstarter/viewmodels/RewardFragmentViewModel.kt

app/src/main/res/values/dimens.xml

…m viewmodel

eoji

there's some feedback that still has not been addressed

app/src/main/java/com/kickstarter/libs/utils/RewardUtils.java

app/src/main/java/com/kickstarter/ui/activities/ProjectActivity.kt

app/src/main/java/com/kickstarter/ui/fragments/RewardsFragment.kt

app/src/main/java/com/kickstarter/viewmodels/ProjectViewModel.kt

app/src/main/res/layout/item_no_reward.xml

app/src/main/res/layout/item_reward.xml

app/src/main/res/layout/project_layout.xml

…re flag value

eoji

Alright, did another sweep 🐣 I found some strange rotation behavior:

In landscape, idk what the view is but there's something behind the card sheet so the curved card corners don't show.
The position of the reward i'm viewing is not maintained. If I scroll to the last reward and rotate, I see the first reward.

app/src/main/java/com/kickstarter/ui/fragments/RewardsFragment.kt

app/src/main/java/com/kickstarter/libs/utils/RewardUtils.java

app/src/main/java/com/kickstarter/ui/activities/ProjectActivity.kt

app/src/main/java/com/kickstarter/ui/viewholders/HorizontalRewardViewHolder.kt

app/src/main/java/com/kickstarter/viewmodels/RewardFragmentViewModel.kt

…ss into horizontal-rewards

# Conflicts: # app/src/main/java/com/kickstarter/ui/activities/ProjectActivity.kt # app/src/main/java/com/kickstarter/viewmodels/ProjectViewModel.kt # app/src/main/res/layout/project_layout.xml # app/src/main/res/values/dimens.xml # app/src/test/java/com/kickstarter/viewmodels/ProjectViewModelTest.kt

…onger handle clicks

eoji

WE DID IT
٩( ᐛ )و

Rcureton and others added 21 commits March 14, 2019 16:48

copied over classes from prototype into this branch

da8cf10

WIP getting the rewards to show somewhat in the fragment

d370149

have the rewards populating, working on days ending method for rewards

f3ddb73

added new lines to test github

f3fdb01

cleanup

1bcf15f

cleaned up horizontalrewardviewholder code

adb4714

added the logic to click the pledge button on the reward card

b940e95

Created drawable for deadline textview of horizontal rewards item

cbd81e9

re-added project action buttons and added logic to show and hide the …

84636f9

…different type of buttons

Merge branch 'horizontal-rewards' of https://github.com/kickstarter/a…

bdf91d5

…ndroid-oss into horizontal-rewards

added logic to show and hide the toolbar

3502923

fixed toolbar in the fragment to match as the mockup with 0 elevation

5c6dea7

Fixed bug where ProjectPage shows the same project multiple times whe…

bb8a365

…n isHorizontalRewardsEnabled = true

Moved logic from ProjectActivity to its ViewModel

c6ae780

Removed unnecessary signal

362ce1c

created RewardFragmentViewModelTest, renamed buttons in landscape pro…

3a11464

…ject xml

Merge branch 'horizontal-rewards' of github.com:kickstarter/android-o…

21d3d91

…ss into horizontal-rewards

cleaned up checkstyle code

9c77389

removed unused files and fixed logic

d9799bb

cleaned up code and refactored methods

46b00de

fixed checkstyle errors

b0803e3

Rcureton added the feature ✨ label Mar 25, 2019

Rcureton requested a review from eoji March 25, 2019 20:23

eoji reviewed Mar 26, 2019

View reviewed changes

Rcureton and others added 4 commits March 27, 2019 10:43

addressed PR feedback and refactored methods in projectviewmodel

4f92b08

refactored logic in project viewmodel to show the project action buttons

8ddb3ec

using the arguments observable from the rewardfragment viewModel

5865f35

Fixed bug where projectActionButton showed when it shouldn't, Added u…

b562c1e

…nit tests

removed unused output in rewardviewholder

f430393

Rcureton removed the blocked ✋ label Mar 29, 2019

Rcureton added 3 commits April 1, 2019 10:13

adding the fragment statically to the project layout

9af3ca7

refactored the rewardfragment viewmodel and viewmodel test

de6341e

added dimen for rewards fragment min height also added new lines in c…

4cb62a4

…ertain classes

eoji reviewed Apr 1, 2019

View reviewed changes

Scollaco and others added 2 commits April 2, 2019 18:00

Fixed rotation bug, PR feedback

26622b3

refactored methods in viewmodel and fixed tests in projectviewmodeltests

6a21182

eoji reviewed Apr 3, 2019

View reviewed changes

Rcureton and others added 4 commits April 4, 2019 10:59

refactoring adapter with new sections also need to remove filters fro…

fa807f2

…m viewmodel

Added NoRewardViewHolder and its ViewModel

aad1b39

Added unit tests

158dff7

PR feedback

9dcef74

eoji reviewed Apr 8, 2019

View reviewed changes

Rcureton and others added 3 commits April 9, 2019 11:08

added tests for rewardUtils, also fixed NL's in PR Feedback

49ce504

Added logic to update recyclerView's bottom constraint based on featu…

bc66082

…re flag value

Removed extra line

e6ca18c

eoji reviewed Apr 9, 2019

View reviewed changes

Scollaco and others added 7 commits April 11, 2019 10:36

Fixed recyclerView bottom constraint bug

b6f70b3

fixed rotation in project layout

95f273d

Merge branch 'horizontal-rewards' of github.com:kickstarter/android-o…

95f802a

…ss into horizontal-rewards

added tests for deadlinecountdownvalue

d4e5049

merged in changes from master and refactored rewardviewholder to no l…

fbaa5ae

…onger handle clicks

cleaned up code in a few classes

a79e0f9

Rcureton modified the milestone: Native Checkout Apr 11, 2019

eoji approved these changes Apr 11, 2019

View reviewed changes

Rcureton merged commit 6a903ac into master Apr 11, 2019

Rcureton deleted the horizontal-rewards branch April 11, 2019 21:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate Horizontal rewards into the Project Page #504

Migrate Horizontal rewards into the Project Page #504

Rcureton commented Mar 25, 2019

Scollaco commented Mar 25, 2019

eoji commented Mar 25, 2019

eoji left a comment

eoji left a comment

eoji left a comment

eoji left a comment

eoji left a comment

eoji left a comment

Migrate Horizontal rewards into the Project Page #504

Migrate Horizontal rewards into the Project Page #504

Conversation

Rcureton commented Mar 25, 2019

What ❓

How to QA? 🤔

Story 📖

See 👀

Scollaco commented Mar 25, 2019

eoji commented Mar 25, 2019

eoji left a comment

Choose a reason for hiding this comment

eoji left a comment

Choose a reason for hiding this comment

eoji left a comment

Choose a reason for hiding this comment

eoji left a comment

Choose a reason for hiding this comment

eoji left a comment

Choose a reason for hiding this comment

eoji left a comment

Choose a reason for hiding this comment