Fixes #160: Integrating topic controller into Concept Card #198
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
have yet been added.
…ully working yet.
…view-adapter' into concept-card-topic-controller
BenHenning
requested changes
Oct 1, 2019
app/src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragment.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardPresenter.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/testing/ConceptCardFragmentTestActivity.kt
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/topic/conceptcard/testing/ConceptCardFragmentTestActivity.kt
Outdated
Show resolved
Hide resolved
app/src/main/res/layout/concept_card_fragment_test_activity.xml
Outdated
Show resolved
Hide resolved
app/src/main/res/layout/concept_card_fragment_test_activity.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/conceptcard/ConceptCardFragmentTest.kt
Show resolved
Hide resolved
jamesxu0
changed the base branch from
develop
to
introduce-data-binding-recycler-view-adapter
|
@BenHenning PTAL. Add test cases for ConceptCard using ActivityTestRule (for screen rotation). |
BenHenning
requested changes
Oct 4, 2019
| @@ -0,0 +1,551 @@ | |||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="305dp" | |||
There was a problem hiding this comment.
Aren't these already imported per https://github.com/oppia/oppia-android/blob/develop/app/src/main/res/drawable/lesson_thumbnail_graphic_baker.xml?
Conflicts: app/build.gradle app/src/main/AndroidManifest.xml app/src/main/java/org/oppia/app/activity/ActivityComponent.kt app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt
jamesxu0
changed the base branch from
introduce-data-binding-recycler-view-adapter
to
develop
Conflicts: app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
…view-adapter' into concept-card-topic-controller
|
@BenHenning PTAL. I merged in the bindable recyclerview to this branch again, so only my changes show in the diff. |
BenHenning
approved these changes
Oct 9, 2019
There was a problem hiding this comment.
Thanks @jamesxu0! I only had one concern around the configuration testing, but otherwise this LGTM!
| @Test | ||
| fun testConceptCardFragment_openDialogFragmentWithSkill2_afterConfigurationChange_workedExamplesAreDisplayed() { | ||
| onView(withId(R.id.open_dialog_2)).perform(click()) | ||
| activityTestRule.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE |
There was a problem hiding this comment.
Does this work as-is or do you also need to call recreate on the activity scenario? Did you verify via step debugging that the activity is recreated? Please update test accordingly to make sure that it does go through the rotation as expected.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
Fixes #160: Integrates the topic controller into Concept Card. Concept Card uses data binding to bind the explanation and worked examples into text views (blocked on #26). Uses the binable recyclerview introduced in PR #172, which has not been merged yet.
Checklist