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

Fix #3490 Add resume lesson activity [Blocked on #3488] #3670

Merged
merged 128 commits into from
Aug 22, 2021
Merged

Fix #3490 Add resume lesson activity [Blocked on #3488] #3670

Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
d66c014
moved hint handler to domain layer
MaskedCarrot Aug 8, 2021
3b0bfb6
fixed app layer espresso tests
yashraj-01 Aug 9, 2021
dc7c513
fix app layer robolectric tests
yashraj-01 Aug 9, 2021
5a64024
fixed domain layer tests
yashraj-01 Aug 9, 2021
f4aa847
Added annotations to test exemptions
yashraj-01 Aug 9, 2021
77c4fb7
proto lint fix
yashraj-01 Aug 9, 2021
0deb650
fixed hint handler for training sessions
MaskedCarrot Aug 9, 2021
a7b78d1
nit and removed test excemptions
MaskedCarrot Aug 9, 2021
1036c25
added hint tests for config change
MaskedCarrot Aug 9, 2021
46e35f0
fixed test file exemptions
MaskedCarrot Aug 9, 2021
846d808
fixed failing test
MaskedCarrot Aug 9, 2021
863688f
made HintHandler injectable
yashraj-01 Aug 9, 2021
c042529
Merge remote-tracking branch 'upstream/move-hint-handler-to-domain' i…
yashraj-01 Aug 9, 2021
218e070
fixed ktlint error
yashraj-01 Aug 9, 2021
ebeb0e5
Added tests for hint handler
yashraj-01 Aug 9, 2021
1ed2323
Merge branch 'develop' into move-hint-handler-to-domain
MaskedCarrot Aug 10, 2021
c41c23a
nits
MaskedCarrot Aug 10, 2021
496aff7
Merge remote-tracking branch 'origin/move-hint-handler-to-domain' int…
MaskedCarrot Aug 10, 2021
05ff962
fixed failing build
MaskedCarrot Aug 10, 2021
8437561
fixed failing build
MaskedCarrot Aug 10, 2021
5e264a0
fix build
MaskedCarrot Aug 10, 2021
8c3f432
fixed imports
MaskedCarrot Aug 10, 2021
5738c09
Merge branch 'develop' into move-hint-handler-to-domain
MaskedCarrot Aug 11, 2021
9245e51
completed mechansim to resume exploration
MaskedCarrot Aug 11, 2021
641e8de
nits and improved testing
MaskedCarrot Aug 11, 2021
da6d065
updated exploration.proto
MaskedCarrot Aug 11, 2021
2955c0c
removed progress controller from kdoc exemptions
MaskedCarrot Aug 11, 2021
bf3fcb4
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
MaskedCarrot Aug 11, 2021
c5aba93
added kdoc
MaskedCarrot Aug 11, 2021
4e648ea
fixed failing build
MaskedCarrot Aug 11, 2021
6de5ec1
added resume lesson activity
MaskedCarrot Aug 12, 2021
2768cfc
nit fix
MaskedCarrot Aug 12, 2021
7071c0b
Merge remote-tracking branch 'origin/develop' into move-hint-handler-…
MaskedCarrot Aug 12, 2021
2b02375
fix failing test
MaskedCarrot Aug 12, 2021
a6ce739
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
MaskedCarrot Aug 12, 2021
42e80c5
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 12, 2021
6ba0249
fixed failing build
MaskedCarrot Aug 12, 2021
c2dd1e9
Revert "fixed failing build"
MaskedCarrot Aug 12, 2021
033412b
fixed failing build
MaskedCarrot Aug 12, 2021
739d72b
fix failing build
MaskedCarrot Aug 12, 2021
9d7b970
updated layout files
MaskedCarrot Aug 12, 2021
85c4407
moved timer to domain
MaskedCarrot Aug 14, 2021
c2a3373
fixed build and nits
MaskedCarrot Aug 14, 2021
591b45b
merge base branch
MaskedCarrot Aug 14, 2021
c568b6e
moved functions to ExplorationProgress.kt
MaskedCarrot Aug 14, 2021
85ff535
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 14, 2021
0d666ed
nit
MaskedCarrot Aug 14, 2021
c01d2cc
nit
MaskedCarrot Aug 14, 2021
80ec45a
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
MaskedCarrot Aug 14, 2021
be2cfd4
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 14, 2021
6c0e331
added tests
MaskedCarrot Aug 14, 2021
d43f9ca
updated exemptions
MaskedCarrot Aug 14, 2021
4aeb1b8
added listener back to test exemptions
MaskedCarrot Aug 14, 2021
8014e80
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
MaskedCarrot Aug 14, 2021
38c5396
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 14, 2021
1403ccd
nit
MaskedCarrot Aug 14, 2021
17c08b6
nit
MaskedCarrot Aug 16, 2021
22fd63e
updated proto
MaskedCarrot Aug 16, 2021
de49a31
nit fixes and added more tests
MaskedCarrot Aug 16, 2021
6659858
lint fix
MaskedCarrot Aug 16, 2021
3787fe8
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
MaskedCarrot Aug 16, 2021
d3142aa
nit fix
MaskedCarrot Aug 16, 2021
4332ff2
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 16, 2021
4328964
nit fix
MaskedCarrot Aug 16, 2021
8526167
removed unused fun
MaskedCarrot Aug 16, 2021
df2a2e2
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 16, 2021
551720e
updated xml
MaskedCarrot Aug 16, 2021
abecc74
First round: make HintHandler independent.
BenHenning Aug 17, 2021
109c346
Simplify HelpIndex in proto.
BenHenning Aug 17, 2021
994cdea
Simplify hints & solutions.
BenHenning Aug 17, 2021
41294d0
Clean up dead code paths & improve handler API.
BenHenning Aug 17, 2021
a3f2854
updated xml and nits
MaskedCarrot Aug 17, 2021
1a905c7
fixed test modules and lint
yashraj-01 Aug 17, 2021
ff73409
renamed HintHandlerTest to HintHandlerImplTest
yashraj-01 Aug 17, 2021
1d4dcfc
Add tests for HintHandler.
BenHenning Aug 18, 2021
b9e9c79
updated xml
MaskedCarrot Aug 18, 2021
465711d
Add remaining tests/exemptions for new files.
BenHenning Aug 18, 2021
15ea368
Lint fixes.
BenHenning Aug 18, 2021
9199b73
nit
MaskedCarrot Aug 18, 2021
028e4ce
Merge branch 'develop' into move-hint-handler-to-domain
BenHenning Aug 18, 2021
486cf5b
Post-merge fixes (including lint fixes).
BenHenning Aug 18, 2021
8f7beb3
Merge branch 'develop' into move-hint-handler-to-domain
BenHenning Aug 18, 2021
0e5b945
Post-merge maven_install fix.
BenHenning Aug 18, 2021
e2fea90
Merge branch 'develop' into move-hint-handler-to-domain
MaskedCarrot Aug 18, 2021
b1622c0
Revert "Merge branch 'develop' into move-hint-handler-to-domain"
MaskedCarrot Aug 18, 2021
d531024
Post-merge Gradle-discovered fixes.
BenHenning Aug 18, 2021
40f07ba
Revert "Revert "Merge branch 'develop' into move-hint-handler-to-doma…
BenHenning Aug 18, 2021
a89640e
Merge branch 'attempt-to-fix-move-hint-handler-to-domain' into move-h…
BenHenning Aug 18, 2021
958932f
Additional post-merge fixes.
BenHenning Aug 18, 2021
92347bd
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
MaskedCarrot Aug 18, 2021
1aa94c9
updated appraoch to resume hints to work with the new hint handler.
MaskedCarrot Aug 18, 2021
777afbb
nit fix
MaskedCarrot Aug 18, 2021
c161cd9
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 18, 2021
62bd9ba
updated fragment component
MaskedCarrot Aug 18, 2021
2993db9
updated topic controller
MaskedCarrot Aug 18, 2021
f8b95b8
updated xml and tests
MaskedCarrot Aug 18, 2021
740f8e3
nit
MaskedCarrot Aug 19, 2021
ae66b51
nit
MaskedCarrot Aug 19, 2021
4b68d28
nit
MaskedCarrot Aug 19, 2021
19c9e09
nit
MaskedCarrot Aug 19, 2021
335e216
Merge remote-tracking branch 'origin/develop' into resume-exploration…
MaskedCarrot Aug 19, 2021
94d6963
fixed merge
MaskedCarrot Aug 19, 2021
1b77adc
test and lint fix
MaskedCarrot Aug 19, 2021
e8a40a6
updated
MaskedCarrot Aug 19, 2021
21b44b0
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 19, 2021
0493d5b
nit fix
MaskedCarrot Aug 19, 2021
2155609
lint fix
MaskedCarrot Aug 19, 2021
5ab0cd3
fix failing tests
MaskedCarrot Aug 19, 2021
c601426
fixed tests
MaskedCarrot Aug 19, 2021
539cce0
lint fix
MaskedCarrot Aug 19, 2021
1028d9c
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 19, 2021
d2cad66
nit
MaskedCarrot Aug 20, 2021
ab8f548
lint fix
MaskedCarrot Aug 20, 2021
0adcd65
Merge branch 'develop' into resume-exploration-in-domain-module
MaskedCarrot Aug 21, 2021
021446e
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 21, 2021
20f61e5
improved testing and nit fix
MaskedCarrot Aug 21, 2021
1f5a196
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 21, 2021
af955c8
nit
MaskedCarrot Aug 21, 2021
8145242
Merge remote-tracking branch 'origin/develop' into resume-exploration…
MaskedCarrot Aug 21, 2021
fe2450e
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 21, 2021
643ba88
nit
MaskedCarrot Aug 21, 2021
f44b274
nit
MaskedCarrot Aug 21, 2021
e19051a
nit
MaskedCarrot Aug 21, 2021
67e7bbd
fix failing test
MaskedCarrot Aug 21, 2021
770c16a
Merge branch 'resume-exploration-in-domain-module' into add-resume-le…
MaskedCarrot Aug 21, 2021
cc2d2c0
fix tests
MaskedCarrot Aug 21, 2021
9c89eb4
fixed tests
MaskedCarrot Aug 21, 2021
aa86a2e
Merge remote-tracking branch 'origin/develop' into add-resume-lesson-…
MaskedCarrot Aug 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed progress controller from kdoc exemptions
  • Loading branch information
@MaskedCarrot
MaskedCarrot committed Aug 11, 2021
commit 2955c0cb67a52e538e64b405c082145e08b9a50b
1 change: 0 additions & 1 deletion scripts/assets/kdoc_validity_exemptions.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ exempted_file_path: "domain/src/main/java/org/oppia/android/domain/classify/rule
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt"
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt"
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt"
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt"
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointController.kt"
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationStorageModule.kt"
exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt"
Expand Down