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 part of #151:Text input lowfi UI part 1 #220

Merged
merged 28 commits into from
Oct 9, 2019

Conversation

nikitamarysolomanpvt
Copy link
Contributor

@nikitamarysolomanpvt nikitamarysolomanpvt commented Oct 9, 2019

Replicated from #190
Part 1: This PR contains basic XML files for creating edit text of input type views.

Reference Mocks & Reference Design Doc

#190

BenHenning and others added 27 commits September 24, 2019 23:47
tests to verify correctness.

Also, added a method to facilitate notifying of DataProvider changes on
the UI thread.
… it up to

the data controller, and start adding tests.
Conflicts:
	domain/build.gradle
	domain/src/main/java/org/oppia/domain/exploration/ExplorationDataController.kt

Also, migrate the data controller to the retriever.
AnswerClassificationController, and attempted to make
ExplorationProgressController thread-safe.

The thread-safety led to significant interface changes in the progress
controller, and led to discovering some issues with the mediator live data
approach to interop coroutines and LiveData. This locking mechanism will
need to change since the optimal solution requires resolving #90.
with the current MediatorLiveData implementation (see #90 for more
context). Fix existing progress controller tests and add a few more. All
current progress controller tests are passing.
…ation

support for the second test exploration (about_oppia).
…-controller' into introduce-load-exploration-part-1
added items in
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/dimens.xml
added items in
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/dimens.xml
@rt4914 rt4914 changed the base branch from develop to introduce-load-exploration-part-1 October 9, 2019 10:09
@rt4914 rt4914 changed the base branch from introduce-load-exploration-part-1 to develop October 9, 2019 10:09
@rt4914 rt4914 changed the base branch from develop to introduce-load-exploration-part-1 October 9, 2019 10:10
@@ -17,4 +17,11 @@
<color name="audioComponentBackground">@color/oppiaDarkBlue</color>
<!-- SUBMIT BUTTON INACTIVE -->
<color name="submitButtonInactive">#56000000</color>
<color name="grey">#CCCCCC</color>
<!-- INPUT LAYOUT EDITTEXT-->
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit:
<!-- INPUT LAYOUT EDITTEXT -->

@nikitamarysolomanpvt nikitamarysolomanpvt changed the title Text input lowfi UI part 1 Fix part of #151:Text input lowfi UI part 1 Oct 9, 2019
@nikitamarysolomanpvt nikitamarysolomanpvt changed the base branch from introduce-load-exploration-part-1 to develop October 9, 2019 10:24
@nikitamarysolomanpvt nikitamarysolomanpvt merged commit d542ca7 into develop Oct 9, 2019
@nikitamarysolomanpvt nikitamarysolomanpvt deleted the text-input-lowfi-xml-part-1 branch October 9, 2019 10:25
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.

3 participants