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

updating my fork #4

Merged
merged 94 commits into from
Dec 23, 2020
Merged

updating my fork #4

merged 94 commits into from
Dec 23, 2020

Conversation

chrk2205
Copy link
Owner

Explanation

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.

chrk2205 and others added 30 commits October 29, 2020 02:31
@chrk2205
Fix #1810: Renaming the admin profile creates new one (#2051)
4b54071 
* commit 1

* commit 2

* commit 3
Test Case Added

* commit 4
nit changes
@MaskedCarrot
Fix #2039: Fix file formatting under ratioinput package (#2050)
d273165 
* fixed code under ratioInputPackage

* removed access specifer from interationObjectTestBuilder
@Arjupta
Fix #2037: file formatting under multiplechoiceinput package (#2049)
7a2a6f7 
* Fix #2037: file formatting under multiplechoiceinput package

Removed the oneline functions to segregate the initialisation logic in the starting of file

* Edits suggested by @anandwana001

* Edits of Indentation and Renamed Variables

* Edits for changed variable names

* Corrected the failing lint check
@peculiaruc
Fix #1892: Format FractionInputIsEquivalentToRuleClassifier (#2024)
ec2524c 
* {{Fix #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fix #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fix #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fix #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fix #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fix #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fixes #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier
}}

* {{Fixes #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fixes #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fixes #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fixes #1892: Thoroughly test FractionInputIsEquivalentToRuleClassifier}}

* {{Fixes #1892: Format FractionInputIsEquivalentToRuleClassifier}}

* {{Fixes #1892: Format FractionInputIsEquivalentToRuleClassifier}}

* Test Updated

* Test updated

* Unnecessary functions removed

* Unnecessary functions removed

* Additional text added

* Typos Corrected

* Typos Corrected

* Removed TODO

* Lines updated

Co-authored-by: pecpaker <[email protected]>
@anandwana001
fix TopicFragmentTest for robolectric (#2072)
eb9ea72
@anandwana001
fix few RecentlyPlayedFragment test for robolectric (#2071)
29966c0
@anandwana001
Fix #2059: Fix Walkthrough Tests for Robolectric (#2060)
93ec2c9 
* fix WalkthroughFinalFragmentTest for robolectric

* remove todo

* fix WalkthroughTopicListFragmentTest for robolectric

* Fix WalkthroughWelcomeFragmentTest for robolectric

* fix ktlint issue
@anandwana001
Fix part of #1870: Fix ProfileRenameActivityTest for Robolectric (#2067)
66c1735 
* Fix ProfileRenameActivityTest for Robolectric

* added top level comment
@anandwana001
fix ConceptCardFragmentTest for robolectric (#2075)
f6b26ab
@anandwana001
Fix part of #1868: Fixed few TopicRevisionFragmentTest for Robolectric (
b49d993 
#2074)

* Fix few TopicRevisionFragmentTest for robolectric

* nit fix
@anandwana001
Fix AdministratorControlsFragmentTest for robolectric (#2077)
f8cd7c4
@Aditiwebd
Fix #1895: Thoroughly Tests for NumberWithUnitsInputIsEquivalentToRul…
e339a70 
…eClassifier (#2042)

* tests for numberwithunits

* removed To-Do

* updates

* changed accordingly

* changed variable names

* removed some files

* updates

* more functions

* more tests

* changed names

* added kdocs

* changed names

* kdocs changed

* changes

* spaces

* changed the names

* spaces(2)
@anandwana001
format fix (#2082)
4658167
@anandwana001
Fix ProfileChooserSpanTest for Robolectric (#2079)
b01a502
@anandwana001
Fix part of #1874: Fix AdministratorControlsActivityTest for robolect…
69aa608 
…ric (#2084)

* Fix AdministratorControlsActivityTest for robolectric

* nit change
@anandwana001
Fix #2087: Fix ExplorationActivityLocalTest (#2088)
959f0c5 
* Fix ExplorationActivityLocalTest for robolectric

* unused var removed

* todo remove
@anandwana001
Fix HomeActivityTest for robolectric (#2086)
0a69910
@ShridharGoel
Fix #2080: Remove injected TestCoroutineDispatchers if not in use (#2083
39ade7b 
)

* Remove injected TestCoroutineDispatchers if not in use

* Remove unused imports

* Update with required changes

* Remove unused import
@prudhvir3ddy
Fix #2090: avoid bang bang operator in networkinterceptor (#2091)
3b3748f 
* removed bang bang operator in NetworkInterceptor.kt and used let for null check

* renamed it to responseBody for higher order function
@anandwana001
Fix few test from NavigationDrawerTestActivityTest for robolectric (#…
01c4980 
…2099)
@Arjupta
Fix #2040: Reformating files under TextInput Package (#2070)
40568f0 
* Fixes #2040: Reformating files under TextInput Package

* Fixing for lint check

* Suggested Renaming Variables Edits

* Changed Variable Names in TextInputContainsRuleClassifierProviderTest.kt

* Renaming Variables

* Commit for lint issues

* Renaming variables in TextInputStartsWithRuleClassifierProviderTest
@peculiaruc
Fix #1957: Optimise code in profile_chooser_profile_view.xml (#2100)
6dbde25 
* Last Update

* Fix #1957: Optimise codes in profile_chooser_profile_view
@Arjupta
Fix part of #2003: Replacing space_80dp (#2112)
2b6f344 
Fixes part of #2003
This PR replaces the use of space_80dp with the dimensions having
contextful names.
@KMaragh
Updated package names in the kdocs for RuleQualifiers class (#2108)
718e9b6
@Arjupta
Fix part of #2003: Replacing space_72dp (#2113)
66f8ea0 
Fixes part of #2003
This PR replaces the use of space_72dp with dimensions having contextful names
@Arjupta
Fix part of #2003: Replacing elevation_0dp, elevation_4dp and space_2…
840a0e8 
…24dp (#2110)

* Fixes part of #2003

This PR replaces the use of elevation_0dp , elevation_4dp and
space_224dp with the dimensions of contextful names.

* Hardcoding 0dp where needed
@prayutsu
Fix #1538: "Tick Icon" in the QuestionPlayer disappears if the submit…
6e550ed 
…ted answer is too long (#1923)

* test answer tick

* test on recyclerview

* revert recyclerview changes

* add maxWidth

* fixed major part of bug

* fix bug for portrait layout

* add binding adapter

* try fixing new bug

* try fixing errors

* fix extra space when answer is incorrect

* fix reviewed changes

* fix nit change

* annotated binding function with proper annotations

* fix error in BUILD.bazel

* fix all checks

* fix bug for all layouts

* fixed suggested changes

* update guideline name

* fix failing checks

* add tests case

* add test

* fix tickicontest

* tried adding a complete test

* Try removing Linearlayout

* corrected errors in testcase

* corrected errors in testcase

* tried adding position assertion

* resolved merge conflicts successfully

* removed LinearLayout from portrait phone layout

* fix test case

* try adding position assertion

* fixed test case for phone portrait-layout

* removed LinearLayout from all the layouts

* fix suggested changes

* fix reviewed changes

* fixed nit changes

* fixed errors in landscape and tablet layouts

* fixed nit

* add new case to test

* update test case

* move test case to QuestionPlayerActivityTest.kt

* fix reviewed changes

* fix suggested changes

* fix nits

* fix nits

* remove extra line

* Added TODOs and RunOn(ESPRESSO) annotation

* fix lint errors

* fix nits

* fix nits
@Arjupta
Fix part of #2003: Replacing space_48dp,space_36dp (#2115)
8337af7 
Fixes part of #2003
This PR replaces the use of space_48dp and space_36dp with the
dimensions having contextful names.
@Arjupta
Fix Part of #2003: Replacing space_64dp (#2114)
7c38b95 
* Fix Part of #2003: Replacing space_64dp

Fixes part of #2003
This PR replaces the use of space_64dp with the dimensions of having
contextful names

* Failing test
@navneetsaluja
Fixes #1896: Thoroughly test ItemSelectionInputContainsAtLeastOneOfRu…
5724bca 
…leClassifier (#2073)

* Created a test for ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider

* Fixed lint errors

* Fixed lint errors(2)

* Added tests for more than one element and an empty set test

* Fixed lint error.

* Added function from InteractionObjectTestBuilder

* Moved function to the Builder class.
BenHenning and others added 29 commits December 2, 2020 19:26
@BenHenning
Remove extra '>' in content description (#2212)
62beb85 
Remove extra '>' in drawer_close_content_description. This seems wrong--it doesn't add anything, and I'm not even sure if TalkBack will read this correctly with the symbol present.
@FareesHussain
Fix #2202: Adding bullet points in FAQ answers (#2203)
cb6d845 
* RTL support for completed_story_item.xml

* reverting the removed onClick attribute

* RTL support for TopicPractice tab

* Reformating xml

* resolving requested changes

* Added space before closing tag

* fixing #2202
@MaskedCarrot
Fix #2148: [RTL] High fi Topic-Info tab (#2168)
4f23e9d 
* add rtl to topic_info

* added rtl

* changed 1 story to Story 1
@Aditiwebd
rtl-revision (#2200)
8ad2bdd
@ShridharGoel
Fix #2035: Update file formatting under dragAndDropSortInput package (#…
4be56ff 
…2211)

* Fix #2035: Update file formatting under dragAndDropSortInput package

* Fix lint issues

* Fix lint issues

* Update with required changes

* Update with required changes
@FareesHussain
Fix #2192: Fixes delete profile in tablet (#2195)
33f4736 
* fixes delete profile in tablet

* ktlint approval changes

* Resolving requested changes

* removing unused variables

* Resolving requested changes

* avoiding ktlint disable max line
@FareesHussain
Fix #1959: Optimize admin_auth_activity.xml (#2225)
408c48e 
* Optimize admin_auth_activity.xml

* resolving requested changes
@ForgottenProgramme
Fix #2176: Added RTL Support for Profile List Screen (profile_view_pr…
71935a0 
…ofile_list.xml file) (#2199)

* RTL Support for ongoing_topic_item

Added RTL Support in the ongoing_topic_item

* Update Project.xml

* Update Project.xml

* RTL support Profile List

* Update Project.xml

* Update build.gradle

* Update gradle-wrapper.properties

* Update gradle-wrapper.properties
@jcqli
Fix part of #210: Fix name and test inconsistencies for FractionInput…
49b3f3c 
…IsEquivalentToRuleClassifierProviderTest (#2221)

* Update so test names and numbers match what is tested

* Update so test names and numbers match what is tested

* Rename test to fit line limit

* Add test for equivalent mixed num & fraction, clarify test naming, remove redundant tests

* Shorten test name
@anandwana001
Fix #1871: Fix ProfileChooserFragmentTest for Robolectric (#2045)
893f017 
* fix ProfileChooserFragmentTest for robolectric test

* nit fix

* removed e2e test, shifted to other issue

* shift span test to ProfileChooserSpanTest

* undo gradle.xml

* make tests more readable

* added observer in profile test helper

* nit fix

* fix 2 test case

* kdocs formatting

* fix kdocs

* kdocs fix
@BenHenning
Add self as global codeowners while Rajat is out (#2224)
f616e85
@FareesHussain
Fix #2239: Added Missing tests in BUILD.bazel (#2240)
fd485ee 
* Added Missing tests in BUILD.bazel

* resolving bazel build CI
@FareesHussain
Fix #2058: Intent Key Checks ProfileChooserFragmentTest.kt (#2247)
47ca02f 
* Intent Key Checks ProfileChooserFragmentTest.kt

* resolving ktlint checks

* Resolving requested changes

* avoiding max line limit
@anandwana001
Fix #1968: Fix NavigationDrawerTestActivityTest for Robolectric (#2204)
466eb81 
* checking one test case

* adding ben's solution

* added a test

* nit fix

* removed ktlint char length disable

* nit fix naming

* rename file and function
@BenHenning
Add .bazelrc (#2261)
72c5d30 
This file comes from #1904. We need it to simplify Bazel build commands locally (bazelrc lets us automatically add arguments to certain commands like build to make it easier to type the commands in CLI locally). This file will also be used by Android Studio when using the Android Studio-with-Bazel plugin.
@BenHenning
Migrate getTopicList() to DataProvider [Blocked: #2261] (#2253)
f2c3b31 
* Migrate getTopicList() to DataProvider.

TopicListController.getTopicList() was just a LiveData before, and this
disallows us from leveraging other DataProviders tools. Plus, the
general pattern now is for all asynchronous data in controllers to be
given as DataProviders.

* Fix broken reference to nav drawer test.

* Add .bazelrc

This file comes from #1904. We need it to simplify Bazel build commands locally (bazelrc lets us automatically add arguments to certain commands like build to make it easier to type the commands in CLI locally). This file will also be used by Android Studio when using the Android Studio-with-Bazel plugin.

* Fix broken tests.

These new syncs are needed since we're no longer using an immediate
LiveData for the topic list--background threads need to be sync'd
against the UI.
@jcqli
Fix #1890: Add tests for FractionInputIsEquivalentToAndInSimplestForm…
05ccbc9 
…RuleClassifierProvider (#2222)

* Add tests for FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider

* Add test to check that equal but not simplest form is false

* Fix linter issues

* Specify Truth.assertThat import

* Add test case for correct input / answer types

* Add test to bazel build

* Fix typo, add FractionInput tests to bazel build

* Resolve merge conflicts
@fsharpasharp
Fix #2237: Remove orientation attribute from ConstraintLayout and Fra…
ddbab96 
…meLayout. (#2242)

* Remove orientation attribute from ConstraintLayout and FrameLayout.

* Remove orientation from tags that don't need it.

* Add missing angle bracket.
@fsharpasharp
Fix #1897: Add tests for ItemSelectionInputDoesNotContainAtLeastOneOf…
6131e0a 
…RuleClassifierProvider (#2243)

* Add tests for ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.

* Add additional tests and rename variables.
@Luffy18346
High-fi Topic Revision Cards RTL issue resolved (#2275)
28596d8
@viktoriias
Fix part of #2132: Chapter List Page Issues (#2232)
f80a8c2 
* Fix part of #2132

* Fix part of #2132

* Fix part of #2132

* Fix part of #2132

* Fix part of #2132

* Fix part of #2132

* Fix part of #2132

* Pass a ChapterSummary object as a prerequisite to unlock this chapter.
Remove blurring thumbnails of inactive cards - this change will be done separately.

* Added tests.

* Added tests.

* Set missingPrerequisiteChapter in setFirstChapterAsNotStarted function.

* Add a UI-facing test.

* Add more test coverage for a completed chapter.

* Move landscape test below the portrait one.

* Added long summary test + reformatting.

* Formatting.

* Lint

* Renaming
@ShridharGoel
Fix part of #2234: Shift assertThrows functions in the app module to …
a2fe9ad 
…the testing module (#2235)

* Shift assertThrows functions in the app module to the testing module

* Shift assertThrows functions in the app module to the testing module

* Update with required changes

* Rearrange imports

* Update docs in AssertionHelpers

* Update documentation

* Update BUILD.bazel
@ForgottenProgramme
Fix #2259 : Disabled split APKs (#2273)
909847c 
* Update build.gradle

apk split

* Update build.gradle

* Update build.gradle
@FareesHussain
Fix #1900: Thoroughly tested ItemSelectionInputIsProperSubsetOfRuleCl…
6fba457 
…assifierProvider.kt (#2244)

* Thoroughly tested ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt

* resolving ktlint checks

* resolving ktlint checks

* resolving requested changes

* better variables and more tests

* ktlint checks

* updated false test

* resolving requested changes

* resolving requested changes
@FareesHussain
Fix #2263: Fixes App crashes in Lessons Tab and Espresso tests in Top…
f29299a 
…icLessonFragmentTest (#2264)

* fixing crashes

* Resolving requested changes

* fix ktlint check

* Added config change for espresso

* Adding requested tests
@BenHenning
Introduce proper codeowners. (#2301)
dcfcf47 
Introduce codeowners per the approved document: https://docs.google.com/document/d/1OtGIwG-VMZkE8F5uGU0OMlmT20BjW0sQllWsQryAkiA/edit#.
@ShridharGoel
Fix part of #2234: Shift assertThrows function in testing module (#2286)
acf6f62
@ShridharGoel
Fix part of #2234: Shift assertThrows function from utility module to…
ac0bbbf 
… testing module (#2285)

* Fix part of #2234: Shift assertThrows function from utility module to testing module

* Remove dependency on kotlin-reflect
@ShridharGoel
Fix part of #2234: Shift assertThrows function from domain module to …
99b0db8 
…testing module (#2284)

* Fix part of #2234: Shift assertThrows function in the domain module to testing module

* Fix lint issues

* Remove dependency on kotlin-reflect

* Update according to changes in develop
@chrk2205 chrk2205 merged commit 1a6c261 into chrk2205:develop Dec 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.