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

Fixes #160: Add HTML parsing to ConceptCardFragment #331

Merged
merged 19 commits into from
Nov 19, 2019
Merged

Fixes #160: Add HTML parsing to ConceptCardFragment #331

merged 19 commits into from
Nov 19, 2019

Conversation

jamesxu0
Copy link
Contributor

Explanation

Fixes #160: Add HTML parsing to ConceptCardFragment

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.

@BenHenning BenHenning assigned jamesxu0 and unassigned BenHenning Nov 12, 2019
@jamesxu0
Copy link
Contributor Author

@BenHenning PTAL

@jamesxu0 jamesxu0 assigned BenHenning and unassigned jamesxu0 Nov 15, 2019
@jamesxu0 jamesxu0 mentioned this pull request Nov 15, 2019
Closed
8 tasks
BenHenning
BenHenning requested changes Nov 16, 2019
View reviewed changes
Copy link
Sponsor 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.

As discussed, we shouldn't be showing the worked examples since the design isn't finalized for them.

app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned jamesxu0 and unassigned BenHenning Nov 16, 2019
@jamesxu0
Copy link
Contributor Author

@BenHenning PTAL. I removed the recyclerview with worked examples. Also, I created an interface for hosting activities to inherit to dismiss the concept card fragment.

@jamesxu0 jamesxu0 assigned BenHenning and unassigned jamesxu0 Nov 18, 2019
BenHenning
BenHenning approved these changes Nov 19, 2019
View reviewed changes
Copy link
Sponsor 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 @jamesxu0! LGTM, just a few small nits to fix.

app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardListener.kt Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardListener.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardListener.kt Outdated Show resolved Hide resolved
app/src/main/res/layout/concept_card_fragment.xml Outdated Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentTest.kt Outdated Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/app/topic/review/TopicReviewFragmentTest.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned jamesxu0 and unassigned BenHenning Nov 19, 2019
@BenHenning
Copy link
Sponsor Member

HTML formatting appears to be cut off. Please fix:

image

@jamesxu0 jamesxu0 merged commit b60a8e1 into develop Nov 19, 2019
@jamesxu0 jamesxu0 deleted the concept-card-parsing branch November 19, 2019 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenHenning BenHenning BenHenning approved these changes

Assignees

@jamesxu0 jamesxu0

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

UI Structure: ConceptCardFragment
2 participants
@jamesxu0 @BenHenning