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 #3298, #3299 and #3301: Introduce UI for MarkChaptersCompleted, MarkStoriesCompleted and MarkTopicsCompleted #3347

Merged
merged 133 commits into from
Jul 10, 2021

Conversation

yashraj-01
Copy link
Contributor

@yashraj-01 yashraj-01 commented Jun 19, 2021

Explanation

Fixes #3298, #3299 and #3301: Introduced UI for MarkChaptersCompleted, MarkStoriesCompleted and MarkTopicsCompleted.

Note:

  1. DeveloperOptionsActivity
  2. MarkChaptersCompletedActivity
  3. MarkStoriesCompletedActivity
  4. MarkTopicsCompletedActivity
  5. ViewEventLogsActivity
  • This is to prevent CI checks from failing.

Mock links:

MarkChaptersCompleted MarkStoriesCompleted MarkTopicsCompleted
https://xd.adobe.com/view/e8aa4198-3940-47f9-514a-f41cc54457f6-9e9b/screen/ae50eed5-c5c5-4fc4-b5a8-fef1748f782a/ https://xd.adobe.com/view/e8aa4198-3940-47f9-514a-f41cc54457f6-9e9b/screen/8a5fe55c-6244-4702-970d-97eea6f3bb2a/ https://xd.adobe.com/view/e8aa4198-3940-47f9-514a-f41cc54457f6-9e9b/screen/db9d6aaf-5588-4963-8f32-1351677bcf47/

Screenshots

MarkChaptersCompleted MarkStoriesCompleted MarkTopicsCompleted
  • DeveloperOptionsActivityTest
Espresso Robolectric
Screenshot from 2021-07-07 00-11-42 Screenshot from 2021-07-07 00-12-57
  • MarkChaptersCompletedActivityTest
Espresso Robolectric
Screenshot from 2021-07-06 02-32-45 Screenshot from 2021-07-06 03-50-05
  • MarkStoriesCompletedActivityTest
Espresso Robolectric
Screenshot from 2021-07-07 00-19-02 Screenshot from 2021-07-07 00-19-34
  • MarkTopicsCompletedActivityTest
Espresso Robolectric
Screenshot from 2021-07-07 00-25-43 Screenshot from 2021-07-07 00-26-15
  • Robolectric test results for ModifyLessonProgressControllerTest
    Screenshot from 2021-07-05 22-50-48

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.

@anandwana001 anandwana001 removed their assignment Jul 8, 2021
@yashraj-01
Copy link
Contributor Author

Thanks @yashraj-01. LGTM for codeowners. Just had one small nit comment--no need for me to verify it.

Thanks @BenHenning for the reviews. Also, I have made the last nit change you mentioned.

@yashraj-01
Copy link
Contributor Author

yashraj-01 commented Jul 8, 2021

@yashraj-01 Is my approval required here, as I am not the code owner?

Ah! Actually, when I requested you for review, I didn't know about the code owner thing. Also, since you have requested changes on this PR I think you have to approve them also. Assigning you now. Thanks.

@yashraj-01 yashraj-01 removed the request for review from anandwana001 July 8, 2021 13:04
@yashraj-01 yashraj-01 removed their assignment Jul 8, 2021
@vinitamurthi vinitamurthi removed their assignment Jul 8, 2021
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. One nit suggested.

) {
bindingAdapter.notifyItemRangeChanged(
chapterIndex,
/*itemCount = */nextStoryIndex - chapterIndex
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit space /*itemCount = */ nextStoryIndex - chapterIndex

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Also, thanks for the review.

@rt4914 rt4914 assigned yashraj-01 and unassigned rt4914 and anandwana001 Jul 8, 2021
@oppiabot
Copy link

oppiabot bot commented Jul 8, 2021

Assigning @anandwana001 for code owner reviews. Thanks!

@yashraj-01 yashraj-01 removed their assignment Jul 8, 2021
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 aff7827 into develop Jul 10, 2021
@Sarthak2601 Sarthak2601 deleted the ui-modify-lesson-progress branch July 10, 2021 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
7 participants