Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix part of #632: Refactor topic list adapter to use bindable adapter #2246

Merged
merged 164 commits into from
Jan 18, 2021
Merged

Fix part of #632: Refactor topic list adapter to use bindable adapter #2246

merged 164 commits into from
Jan 18, 2021

Conversation

jcqli
Copy link
Contributor

@jcqli jcqli commented Dec 9, 2020 •
edited
Loading

Explanation

Fix part of #632 by replacing TopicListAdapter with a BindableAdapter implementation. Adds a HomeViewModel to perform data processing of WelcomeViewModel, PromotedStory view models, and TopicSummary view models all at the same time so child layouts appear with home fragment. Also fixes a data binding for topic_lessons_story_summary that was causing app to crash on tablet and landscape phone orientation.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

@jcqli jcqli requested a review from BenHenning as a code owner December 9, 2020 21:45
@jcqli jcqli marked this pull request as draft December 10, 2020 23:27
@jcqli jcqli requested a review from BenHenning December 11, 2020 02:51
@jcqli jcqli marked this pull request as ready for review December 11, 2020 02:52
BenHenning
BenHenning requested changes Jan 15, 2021
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @jcqli. I'm confused by some of the most recent changes & left comments accordingly.

app/src/main/java/org/oppia/android/app/home/HomeViewModel.kt Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListView.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListView.kt Outdated Show resolved Hide resolved
domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt Outdated Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned jcqli and unassigned BenHenning Jan 15, 2021
@jcqli jcqli assigned BenHenning and unassigned jcqli Jan 15, 2021
@BenHenning BenHenning assigned jcqli and unassigned BenHenning Jan 15, 2021
BenHenning
BenHenning approved these changes Jan 15, 2021
View reviewed changes
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @jcqli! LGTM!

@jcqli jcqli assigned rt4914 and unassigned jcqli Jan 15, 2021
rt4914
rt4914 approved these changes Jan 18, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@rt4914 rt4914 removed their assignment Jan 18, 2021
anandwana001
anandwana001 approved these changes Jan 18, 2021
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

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

nit changes. @jcqli you can resolve my comments once done.
LGTM

app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt Show resolved Hide resolved
...rc/sharedTest/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModelTest.kt Show resolved Hide resolved
@rt4914 rt4914 assigned veena14cs and jcqli and unassigned anandwana001 Jan 18, 2021
@rt4914
Copy link
Contributor

rt4914 commented Jan 18, 2021

@veena14cs Those this is not merged yet as there are 2 nit changes pending. But now you can update your PR fully and it won't create any major conflicts after the nits are solved. Or you can wait for 1 more day and get this code from develop.

@anandwana001
Copy link
Contributor

@veena14cs Those this is not merged yet as there are 2 nit changes pending. But now you can update your PR fully and it won't create any major conflicts after the nits are solved. Or you can wait for 1 more day and get this code from develop.

@rt4914 How about I will shift this nit changes in veena's pr, this way we can merge this PR now?

@rt4914
Copy link
Contributor

rt4914 commented Jan 18, 2021

@veena14cs Those this is not merged yet as there are 2 nit changes pending. But now you can update your PR fully and it won't create any major conflicts after the nits are solved. Or you can wait for 1 more day and get this code from develop.

@rt4914 How about I will shift this nit changes in veena's pr, this way we can merge this PR now?

In @veena14cs 's PR we won't be able to see these changes as they are not done by her. Instead we can file and issue and merge this. I am doing it. Thanks.

@rt4914 rt4914 mentioned this pull request Jan 18, 2021
Closed
@rt4914
Copy link
Contributor

rt4914 commented Jan 18, 2021

#2503
For #2246 (comment)

@rt4914 rt4914 mentioned this pull request Jan 18, 2021
Closed
@rt4914 rt4914 merged commit 9bc61d8 into oppia:develop Jan 18, 2021
@FareesHussain FareesHussain mentioned this pull request Jan 23, 2021
Closed
@yurilev yurilev mentioned this pull request Jan 30, 2021
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrk2205 chrk2205 chrk2205 left review comments

@rt4914 rt4914 rt4914 approved these changes

@anandwana001 anandwana001 anandwana001 approved these changes

@BenHenning BenHenning BenHenning approved these changes

@vinitamurthi vinitamurthi Awaiting requested review from vinitamurthi

Assignees

@veena14cs veena14cs

@jcqli jcqli

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jcqli @anandwana001 @BenHenning @veena14cs @rt4914 @chrk2205 @vinitamurthi