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.

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

Fix #359: Add descriptions for fractions & ratios topics #394

Merged
merged 4 commits into from
Nov 20, 2019

Conversation

BenHenning
Copy link
Sponsor Member

@BenHenning BenHenning commented Nov 17, 2019

Fix #359.

This adds descriptions for the fractions & ratios lessons, and updates our topic description parsing to support HTML.

This change includes a new test which has been verified to pass on Espresso. It does not run on Robolectric due to the legacy looper having issues. Unfortunately, since we share code between Espresso and Robolectric we can't properly annotated the class for Robolectric (since it puts a dependency on Robolectric when running the tests in an Espresso context).

This change also fixes a small issue in TopicActivity where it wasn't properly checking for topic ID to be present. Miscellaneous other fix-ups, including using the child fragment manager for the view pager.

Copy link
Contributor

@vinitamurthi vinitamurthi left a comment

Choose a reason for hiding this comment

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

LGTM! Just one comment about adding domain tests

@vinitamurthi vinitamurthi removed their assignment Nov 19, 2019
Copy link
Contributor

@jamesxu0 jamesxu0 left a comment

Choose a reason for hiding this comment

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

LGTM.

@jamesxu0 jamesxu0 assigned BenHenning and unassigned jamesxu0 Nov 19, 2019
Conflicts:
	app/src/main/java/org/oppia/app/topic/overview/TopicOverviewViewModel.kt
	app/src/sharedTest/java/org/oppia/app/topic/overview/TopicOverviewFragmentTest.kt
@BenHenning
Copy link
Sponsor Member Author

Thanks! I added two new tests, and fixed an existing test that I likely broke in one of my recent PR merges.

@BenHenning BenHenning merged commit c23f31f into develop Nov 20, 2019
@BenHenning BenHenning deleted the add-topic-descriptions branch November 20, 2019 00:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add descriptions for topics
3 participants