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 2) #202

Merged
merged 7 commits into from
Oct 4, 2019
Merged

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

merged 7 commits into from
Oct 4, 2019

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented Oct 3, 2019 •
edited
Loading

Explanation

Replicated from #197

Part 1: #200
Part 2: This PR contains the skill item implementation which will be used inside recyclerview.
Part 3: #203
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 mentioned this pull request Oct 3, 2019
Merged
6 tasks
@rt4914 rt4914 changed the base branch from develop to topic-train-low-fi-part-1 October 3, 2019 10:06
@rt4914 rt4914 mentioned this pull request Oct 3, 2019
Merged
6 tasks
This was referenced Oct 3, 2019
Merged
Closed
@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 •
edited
Loading

Choose a reason for hiding this comment

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

Correct javadoc comment and go ahead.

@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 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 changed the base branch from topic-train-low-fi-part-1 to develop October 3, 2019 12:47
@rt4914 rt4914 changed the base branch from develop to topic-train-low-fi-part-1 October 3, 2019 13:01
@rt4914 rt4914 mentioned this pull request Oct 3, 2019
Merged
BenHenning
BenHenning approved these changes Oct 4, 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!

app/src/main/java/org/oppia/app/topic/train/SkillInterface.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/train/SkillSelectionAdapter.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning removed their assignment Oct 4, 2019
@rt4914 rt4914 changed the base branch from topic-train-low-fi-part-1 to develop October 4, 2019 09:55
@rt4914
Copy link
Contributor Author

rt4914 commented Oct 4, 2019

Merging after resolving all the conversations.

@rt4914 rt4914 merged commit 8efee4b into develop Oct 4, 2019
@rt4914 rt4914 changed the title Fix (#138): Topic train fragment Low-fi UI (Part 2) Fix part of #138: Topic train fragment Low-fi UI (Part 2) Oct 4, 2019
@rt4914 rt4914 deleted the topic-train-low-fi-part-2 branch October 5, 2019 10:29
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