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 #3303, #3305 and #3306: Implement logic to modify lesson progress #3445

Merged
merged 152 commits into from
Jul 11, 2021
Merged

Fix #3303, #3305 and #3306: Implement logic to modify lesson progress #3445

merged 152 commits into from
Jul 11, 2021

Conversation

yashraj-01
Copy link
Contributor

Explanation

Fixes #3303, #3305 and #3306: Implement logic to modify lesson progress.

Scrrenshots

  • MarkChaptersCompletedActivityTest
Espresso Robolectric
Screenshot from 2021-07-08 17-53-38 Screenshot from 2021-07-08 17-56-12
  • MarkStoriesCompletedActivityTest
Espresso Robolectric
Screenshot from 2021-07-08 18-01-23 Screenshot from 2021-07-08 18-02-14
  • MarkTopicsCompletedActivityTest
Espresso Robolectric
Screenshot from 2021-07-08 18-07-59 Screenshot from 2021-07-08 18-08-43
  • Robolectric test results for ModifyLessonProgressControllerTest
    Screenshot from 2021-07-08 18-10-44

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.

@yashraj-01
Implement Developer Options Starter
5dc378f
@yashraj-01
Fix lint issues
a29b60f
@yashraj-01
Implement Developer Options Menu Item in Nav Drawer
483bc61
@yashraj-01
Fix lint issues
72a0173
@yashraj-01
Merge branch 'develop' into developer-options-starter
c6d697c
@yashraj-01
Added Kdoc. abstract class -> interface
da4a535
@yashraj-01
Merge branch 'developer-options-starter' into developer-options-menu-…
a1bf92f 
…item
@yashraj-01
Added tests for Developer Options menu item
5917850
@yashraj-01
Fixed lint issues
be028fd
@yashraj-01
Merge branch 'develop' into developer-options-starter
55bf1ca
@yashraj-01
Introduced ApplicationComponentForDevMode
e9cd1a8
@yashraj-01
Merge branch 'developer-options-starter' into developer-options-menu-…
853fdf9 
…item
@yashraj-01
Added KDocs and fixed lint issues
1259636
@yashraj-01
Merge branch 'developer-options-starter' into developer-options-menu-…
9738bcf 
…item
@yashraj-01
Added test to check unavailibility of Dev Options menu item when not …
fdb2f5e 
…in dev mode
@yashraj-01
Added initial test for DeveloperOptionsActivity. Added KDocs. Fixed l…
8ee761d 
…int issues
@yashraj-01
Introduced DebugApplicationComponent
6ceb61c
@yashraj-01
Merge branch 'developer-options-starter' into developer-options-menu-…
5d928f5 
…item
@yashraj-01
Implement developer options menu ui
20f8e4d
@yashraj-01
Modified way of passing data to recycler view
5a134dc
@yashraj-01
removed unnecessary isMultipane boolean
79ac431
@yashraj-01
added view models to app/BUILD.bazel
4c35003
@yashraj-01
Added tests for DeveloperOptionsActivityTest
adf4152
@yashraj-01
Fixed lint issues
7a1b7a1
@yashraj-01
Merge branch 'develop' into developer-options-starter
bfed4c8
@yashraj-01
Merge branch 'developer-options-starter' into developer-options-menu-…
d4aad8f 
…item
@yashraj-01
Merge branch 'developer-options-menu-item' into developer-options-menu
c4878e9
@yashraj-01
Corrected key mismatch error. Changed isDevMode to isDebugMode. Nit f…
81f538e 
…ixes
@yashraj-01
Fixed Robolectric test for NavigationDrawerActivityTest
bda3cff
@yashraj-01
Updated developer_options_fragment layout
3df7e3a
@yashraj-01
Copy link
Contributor Author

@rt4914 @anandwana001 @Sarthak2601 I have updated the PR. PTAL. Thanks.

@oppiabot oppiabot bot assigned anandwana001 and unassigned yashraj-01 Jul 9, 2021
@oppiabot
Copy link

oppiabot bot commented Jul 9, 2021

Unassigning @yashraj-01 since a re-review was requested. @yashraj-01, please make sure you have addressed all review comments. Thanks!

Sarthak2601
Sarthak2601 suggested changes Jul 9, 2021
View reviewed changes
Copy link
Contributor

@Sarthak2601 Sarthak2601 left a comment

Choose a reason for hiding this comment

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

Thanks @yashraj-01. Overall LGTM, suggested a few nits.

...oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt Show resolved Hide resolved
domain/src/main/java/org/oppia/android/domain/devoptions/ModifyLessonProgressController.kt Outdated Show resolved Hide resolved
domain/src/main/java/org/oppia/android/domain/devoptions/ModifyLessonProgressController.kt Outdated Show resolved Hide resolved
@Sarthak2601 Sarthak2601 removed their assignment Jul 9, 2021
@oppiabot
Copy link

oppiabot bot commented Jul 9, 2021

Hi @yashraj-01, it looks like some changes were requested on this pull request by @Sarthak2601. PTAL. Thanks!

@yashraj-01 yashraj-01 assigned Sarthak2601 and unassigned yashraj-01 Jul 10, 2021
Base automatically changed from ui-modify-lesson-progress to develop July 10, 2021 14:50
@yashraj-01 yashraj-01 changed the title Fix #3303, #3305 and #3306: Implement logic to modify lesson progress [BLOCKED on #3347] Fix #3303, #3305 and #3306: Implement logic to modify lesson progress Jul 10, 2021
@yashraj-01 yashraj-01 removed the request for review from BenHenning July 10, 2021 17:52
@yashraj-01
Copy link
Contributor Author

Removing @BenHenning from review as he is no longer a code-owner after the merge. Thanks,

rt4914
rt4914 approved these changes Jul 10, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@oppiabot oppiabot bot unassigned rt4914 Jul 10, 2021
@oppiabot
Copy link

oppiabot bot commented Jul 10, 2021

Unassigning @rt4914 since they have already approved the PR.

Sarthak2601
Sarthak2601 approved these changes Jul 11, 2021
View reviewed changes
Copy link
Contributor

@Sarthak2601 Sarthak2601 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @yashraj-01!

@Sarthak2601 Sarthak2601 removed their assignment Jul 11, 2021
anandwana001
anandwana001 approved these changes Jul 11, 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.

LGTM

@Sarthak2601 Sarthak2601 merged commit d685571 into develop Jul 11, 2021
@Sarthak2601 Sarthak2601 deleted the logic-modify-lesson-progress branch July 11, 2021 06:06
This was referenced Jul 27, 2021
Merged
Merged
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

@vinitamurthi vinitamurthi vinitamurthi approved these changes

@anandwana001 anandwana001 anandwana001 approved these changes

@Sarthak2601 Sarthak2601 Sarthak2601 approved these changes

Assignees

@anandwana001 anandwana001

Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@yashraj-01 @rt4914 @vinitamurthi @anandwana001 @Sarthak2601