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 #138: Topic train fragment Low-fi UI (Part 3) #203

Merged
merged 19 commits into from
Oct 8, 2019
Merged

Fix part of #138: Topic train fragment Low-fi UI (Part 3) #203

merged 19 commits into from
Oct 8, 2019

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented Oct 3, 2019 •
edited
Loading

Explanation

Replicated from #197

Part 1: #200
Part 2: #202
Part 3: This PR contains final UI implementation of Topic Train Fragment and everything is functional.
Part 4: #204

Mock: https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/f403add1-079a-4202-9975-efe04c076290/Home-Page-1-Start-Learning-Pre-Scroll-6

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 assigned to an appropriate reviewer.

@rt4914 rt4914 changed the base branch from develop to topic-train-low-fi-part-2 October 3, 2019 10:05
This was referenced Oct 3, 2019
Merged
Merged
Merged
@rt4914 rt4914 changed the title Fix (#138): Topic train fragment Low-fi UI (Part 1) Fix (#138): Topic train fragment Low-fi UI (Part 3) Oct 3, 2019
@rt4914 rt4914 mentioned this pull request Oct 3, 2019
Closed
6 tasks
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 3, 2019

@veena14cs @nikitamarysolomanpvt PTAL

veena14cs
veena14cs approved these changes Oct 3, 2019
View reviewed changes
Copy link
Contributor

@veena14cs veena14cs left a comment

Choose a reason for hiding this comment

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

LGTM

@veena14cs veena14cs assigned rt4914 and unassigned veena14cs Oct 3, 2019
nikitamarysolomanpvt
nikitamarysolomanpvt approved these changes Oct 3, 2019
View reviewed changes
Copy link
Contributor

@nikitamarysolomanpvt nikitamarysolomanpvt left a comment

Choose a reason for hiding this comment

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

LGTM

@nikitamarysolomanpvt nikitamarysolomanpvt removed their assignment Oct 3, 2019
@rt4914 rt4914 assigned BenHenning and unassigned rt4914 Oct 3, 2019
@rt4914 rt4914 mentioned this pull request Oct 3, 2019
Merged
@BenHenning
Copy link
Member

Nit for this & others: only the final PR that wraps up the work should have 'Fix #138' otherwise closing each one will close the final issue (which we don't want until it's fully completed).

@BenHenning BenHenning assigned rt4914 and unassigned BenHenning Oct 4, 2019
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 4, 2019

Nit for this & others: only the final PR that wraps up the work should have 'Fix #138' otherwise closing each one will close the final issue (which we don't want until it's fully completed).

Got it. Will update all the PR titles accordingly.

@rt4914 rt4914 changed the title Fix (#138): Topic train fragment Low-fi UI (Part 3) Fix part of #138: Topic train fragment Low-fi UI (Part 3) Oct 4, 2019
@rt4914 rt4914 assigned BenHenning and unassigned rt4914 Oct 5, 2019
@rt4914 rt4914 changed the base branch from topic-train-low-fi-part-2 to develop October 5, 2019 10:28
@rt4914 rt4914 changed the base branch from develop to topic-train-low-fi-part-2 October 5, 2019 10:29
@rt4914 rt4914 changed the base branch from topic-train-low-fi-part-2 to develop October 5, 2019 10:29
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 5, 2019

@BenHenning PTAL.
Changes done:

  • Fetched skills from domain layer.
  • Introduced QuestionPlayerActivity which will open on click on Start button
  • Using viewmodel for recyclerview-item too.

Test cases will be finished in #204

@rt4914
Copy link
Contributor Author

rt4914 commented Oct 7, 2019

@BenHenning PTAL

BenHenning
BenHenning approved these changes Oct 8, 2019
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 @rt4914! Other than missing tests (which I'm expecting will be covered in #204) and my comments, this looks good! I like how cleanly everything works together--the code was quite straightforward to review. This is a nice example of a cleanly introduced isolated UI structure component.

app/src/main/java/org/oppia/app/topic/train/SkillSelectionAdapter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/SkillSelectionAdapter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/TopicTrainFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/TopicTrainFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/TopicTrainFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/TopicTrainFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/TopicTrainFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/TopicTrainViewModel.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned rt4914 and unassigned BenHenning Oct 8, 2019
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 8, 2019

Thanks @rt4914! Other than missing tests (which I'm expecting will be covered in #204) and my comments, this looks good! I like how cleanly everything works together--the code was quite straightforward to review. This is a nice example of a cleanly introduced isolated UI structure component.

Thanks @BenHenning
I used your implementation on TopicList UI and from that I improvised my code.

Merging this now as all conversations have been resolved.

@rt4914 rt4914 merged commit a1f53fc into develop Oct 8, 2019
@rt4914 rt4914 deleted the topic-train-low-fi-part-3 branch October 8, 2019 04:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikitamarysolomanpvt nikitamarysolomanpvt nikitamarysolomanpvt approved these changes

@veena14cs veena14cs veena14cs approved these changes

@BenHenning BenHenning BenHenning approved these changes

Assignees

@rt4914 rt4914

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rt4914 @BenHenning @veena14cs @nikitamarysolomanpvt