Fix #150, #151, #155: TextInputInteractionView, NumericInputInteractionView, FractionInputInteractionView #190
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
…ractionView Kdoc for inputinteractioncustomviews added color resourses for edittext Merge branches 'develop' and 'exploration-player-3-interaction' of https://github.com/oppia/oppia-android into exploration-player-3-interaction # Conflicts: # app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt # app/src/main/java/org/oppia/app/player/state/StateFragment.kt # app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt # app/src/main/res/layout/exploration_fragment.xml # app/src/main/res/layout/state_fragment.xml # app/src/main/res/values/dimens.xml # app/src/sharedTest/java/org/oppia/app/player/exploration/ExplorationActivityTest.kt
nikitamarysolomanpvt
requested review from
rt4914,
BenHenning and
veena14cs
rt4914
reviewed
Sep 27, 2019
app/src/main/java/org/oppia/app/customview/inputInteractionView/FractionInputInteractionView.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/customview/inputInteractionView/FractionInputInteractionView.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/app/customview/inputInteractionView/FractionInputInteractionView.kt
Outdated
Show resolved
Hide resolved
app/src/sharedTest/java/org/oppia/app/player/state/StateFragmentPresenterTest.kt
Outdated
Show resolved
Hide resolved
app/src/sharedTest/java/org/oppia/app/player/state/StateFragmentPresenterTest.kt
Outdated
Show resolved
Hide resolved
…ractionView Kdoc for inputinteractioncustomviews added color resourses for edittext Merge branches 'develop' and 'exploration-player-3-interaction' of https://github.com/oppia/oppia-android into exploration-player-3-interaction # Conflicts: # app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt # app/src/main/java/org/oppia/app/player/state/StateFragment.kt # app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt # app/src/main/res/layout/exploration_fragment.xml # app/src/main/res/layout/state_fragment.xml # app/src/main/res/values/dimens.xml # app/src/sharedTest/java/org/oppia/app/player/exploration/ExplorationActivityTest.kt
|
@nikitamarysolomanpvt Please update your PR title to point to issues. |
|
Resolve merge conflicts |
…tps://github.com/oppia/oppia-android into exploration-player-3-interaction-input-type # Conflicts: # app/src/main/java/org/oppia/app/player/state/StateFragment.kt # app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt # app/src/main/res/values/colors.xml # app/src/main/res/values/dimens.xml
rt4914
reviewed
Oct 7, 2019
| // The function to test text,number,and fraction inputs in interaction views. | ||
| @Test | ||
| fun testTextInputContentCard_displaySoftInputAccordingToInputType_userTypeInput() { | ||
| ActivityScenario.launch(HomeActivity::class.java).use { |
There was a problem hiding this comment.
First, remove pause. We don't need this pause as a developer.
Also, break down this test case in multiple test-cases to check TextInput, FractionInput and NumberInput separately.
This was referenced Oct 9, 2019
This was referenced Oct 16, 2019
|
@nikitamarysolomanpvt If you are not using this PR anymore, please deassign and close this PR. |
6 tasks
|
#263 is Duplicate PR of this |
4 tasks
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
This PR contains Low-fi TextInputInteractionView, NumberInputInteractionView, FractionInputInteractionView with dummy call implementation in StateFragmentPresenter. #150, #151, #155.
Reference Mocks
https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/4d4e4bd8-3755-41fc-bf83-3dcff5d5eee1/Lesson-1-a-ii-Exploration-Player-Text-Input-No-Ans
https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/eeed0f6c-54ca-4371-ab23-5199abd87f28/Lesson-1-a-ii-Exploration-Player-Text-Input-Keyboa
https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/d66097bf-8421-41d8-bfda-2450d6e98dea/Lesson-1-a-i-Exploration-Player-Fraction-Input-No-
https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/249c3349-605b-4569-bbe9-1a017ab90101/Lesson-1-a-i-Exploration-Player-Fraction-Input-No-
https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/c4b0dfb3-53b4-491e-a759-818e096183fd/Lesson-1-a-v-Exploration-Player-Numeric-Input-No-A
Reference Design Doc
https://docs.google.com/document/d/1QigNdZeMBy-JjHW26QH4qT0UtCyzfvW0xEaStSdY9gM/edit?usp=sharing