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

merged 128 commits into from
Aug 22, 2021

Conversation

MaskedCarrot
Copy link
Contributor

@MaskedCarrot MaskedCarrot commented Aug 12, 2021 •
edited
Loading

Explanation

Fixes #3490

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.

Final result

Mobile

Tablet

Espresso test

ResumeLessonActivityTest

Screenshot from 2021-08-20 14-57-26

ResumeLessonFragmentTest

Screenshot from 2021-08-20 14-56-19
Screenshot from 2021-08-20 15-11-46

MaskedCarrot and others added 30 commits August 9, 2021 02:43
@MaskedCarrot
moved hint handler to domain layer
d66c014
@yashraj-01
fixed app layer espresso tests
3b0bfb6
@yashraj-01
fix app layer robolectric tests
dc7c513
@yashraj-01
fixed domain layer tests
5a64024
@yashraj-01
Added annotations to test exemptions
f4aa847
@yashraj-01
proto lint fix
77c4fb7
@MaskedCarrot
fixed hint handler for training sessions
0deb650
@MaskedCarrot
nit and removed test excemptions
a7b78d1
@MaskedCarrot
added hint tests for config change
1036c25
@MaskedCarrot
fixed test file exemptions
46e35f0
@MaskedCarrot
fixed failing test
846d808
@yashraj-01
made HintHandler injectable
863688f
@yashraj-01
Merge remote-tracking branch 'upstream/move-hint-handler-to-domain' i…
c042529 
…nto move-hint-handler-to-domain
@yashraj-01
fixed ktlint error
218e070
@yashraj-01
Added tests for hint handler
ebeb0e5
@MaskedCarrot
Merge branch 'develop' into move-hint-handler-to-domain
1ed2323
@MaskedCarrot
nits
c41c23a
@MaskedCarrot
Merge remote-tracking branch 'origin/move-hint-handler-to-domain' int…
496aff7 
…o move-hint-handler-to-domain
@MaskedCarrot
fixed failing build
05ff962
@MaskedCarrot
fixed failing build
8437561
@MaskedCarrot
fix build
5e264a0
@MaskedCarrot
fixed imports
8c3f432
@MaskedCarrot
Merge branch 'develop' into move-hint-handler-to-domain
5738c09
@MaskedCarrot
completed mechansim to resume exploration
9245e51
@MaskedCarrot
nits and improved testing
641e8de
@MaskedCarrot
updated exploration.proto
da6d065
@MaskedCarrot
removed progress controller from kdoc exemptions
2955c0c
@MaskedCarrot
Merge branch 'move-hint-handler-to-domain' into resume-exploration-in…
bf3fcb4 
…-domain-module
@MaskedCarrot
added kdoc
c5aba93
@MaskedCarrot
fixed failing build
4e648ea
BenHenning
BenHenning reviewed Aug 21, 2021
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @MaskedCarrot. LGTM, but waiting on approving until it's based on develop with passing CI. Please assign back at that point.

Base automatically changed from resume-exploration-in-domain-module to develop August 21, 2021 22:16
anandwana001
anandwana001 approved these changes Aug 22, 2021
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

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

Approving my last suggestion got fixed. LGTM

@anandwana001 anandwana001 removed their assignment Aug 22, 2021
BenHenning
BenHenning approved these changes Aug 22, 2021
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @MaskedCarrot. LGTM!

@BenHenning
Copy link
Sponsor Member

Merging since everyone has approved, CI is passing, branch is up-to-date & looks good, and no conversation threads are open anymore.

@BenHenning BenHenning merged commit 43e1461 into develop Aug 22, 2021
@BenHenning BenHenning deleted the add-resume-lesson-activity branch August 22, 2021 04:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

@BenHenning BenHenning BenHenning approved these changes

@anandwana001 anandwana001 anandwana001 approved these changes

Assignees

@BenHenning BenHenning

@aggarwalpulkit596 aggarwalpulkit596

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Create activity to resume explorations
7 participants
@MaskedCarrot @BenHenning @aggarwalpulkit596 @rt4914 @vinitamurthi @anandwana001 @yashraj-01