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

Fixes #4624, #4741, #4461 : Dark mode implementation - Topic Lessons, Topic Revision, Revision Card, Story Activity, Resume Lesson #4796

Merged
merged 65 commits into from
Dec 28, 2022

Conversation

MohitGupta121
Copy link
Member

@MohitGupta121 MohitGupta121 commented Dec 20, 2022

Explanation

Dark mode implementation - Topic Lessons, Topic Revision, Revision Card, Story Activity, Resume Lesson

Fixes #4624 : Add dark mode support to Lesson Tab
Fixes #4741 : Contrast issue in Continue Studying text on revision screen
Fixes #4461 : TextView & Toolbar color changes in Topic screen

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

Topic Lessons

Topic Revision

Revision Card

Story Activity

Resume Lesson

If your PR includes UI-related changes, then:

  • Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
  • For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
  • Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

@rt4914 rt4914 assigned rt4914 and MohitGupta121 and unassigned MohitGupta121 and rt4914 Dec 27, 2022
@MohitGupta121 MohitGupta121 removed their assignment Dec 27, 2022
@MohitGupta121
Copy link
Member Author

@rt4914 I added changes as per your review.
Can you PTAL.
Thanks.

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.

Reviewed again. Reply to all open comments after changes.

@rt4914 rt4914 assigned MohitGupta121 and unassigned rt4914 Dec 28, 2022
@MohitGupta121
Copy link
Member Author

@rt4914 update the changes as per review and screenshots.
PTAL, Thanks.

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. Great work.

@rt4914 rt4914 merged commit 0d96f46 into oppia:develop Dec 28, 2022
@MohitGupta121 MohitGupta121 deleted the dark-mode-implementation-5 branch December 28, 2022 10:58
@MohitGupta121 MohitGupta121 mentioned this pull request May 5, 2023
seanlip pushed a commit that referenced this pull request Jul 14, 2023
…ext, and change button name"" (#5090)

Fixes #5088.
Reverts #4987 which removed styles and added changes
that broke the dark mode support previously correctly implmented in
#4796.

This is a clean revert so it can be merged directly.

| Before - Light Mode | Before - Dark Mode |
| ------ | ------ |
| <img
src="https://github.com/oppia/oppia-android/assets/76530270/8494dcd1-c8cf-441a-9cea-305cc1afdb1e"
height="400" style="max-width: 100%"> | <img
src="https://github.com/oppia/oppia-android/assets/76530270/e823a67e-3eb2-4f4d-86c1-7bbcb4bd4380"
height="400" style="max-width: 100%"> |

| After - Light Mode | After - Dark Mode |
| ------ | ------ |
| <img
src="https://github.com/oppia/oppia-android/assets/76530270/9651500d-3434-4d44-b2b4-9ea3b28c072b"
height="400" style="max-width: 100%"> | <img
src="https://github.com/oppia/oppia-android/assets/76530270/bba4d86f-2ea8-4401-9e81-6d8d3318ac5f"
height="400" style="max-width: 100%"> |

| Before - Dark Mode Landscape | After - Dark Mode Landscape |
| ------ | ------ |
| <img
src="https://github.com/oppia/oppia-android/assets/76530270/36d3fb9d-3388-4c78-ba57-c932f360a7b0"
> | <img
src="https://github.com/oppia/oppia-android/assets/76530270/143434c9-6288-4d44-8390-c4d55f28fc40">
|

| Before - Dark Mode Tab | After - Dark Mode Tab |
| ------ | ------ |
| <img
src="https://github.com/oppia/oppia-android/assets/76530270/a4155c3f-ec4e-4b82-b113-eb7739af70e5"
> | <img
src="https://github.com/oppia/oppia-android/assets/76530270/ff604777-1581-41b7-b738-337814c9ac73"
> |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants