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

Fixes #4182: Added dark mode support to OptionActivity and OptionWithoutDrawerActivity #4284

Merged
merged 6 commits into from
May 14, 2022
Merged

Fixes #4182: Added dark mode support to OptionActivity and OptionWithoutDrawerActivity #4284

merged 6 commits into from
May 14, 2022

Conversation

Akshatkamboj14
Copy link
Member

@Akshatkamboj14 Akshatkamboj14 commented Apr 2, 2022 •
edited

Explanation

Fixes #4182
Added dark mode support to OptionActivity and OptionWithoutDrawerActivity

I have introduced two drawable resource files general_item_border.xml and general_item_border_cyan.xml as the original drawable resource files general_item_background_border.xml and general_item_background_border_cyan.xml are getting used in 7 different places and to have a consistent UI throughout the application so separate drawable resource files should be preferable.

Default Mode After Dark Mode
image image

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

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

@Akshatkamboj14
Copy link
Member Author

@rt4914 @ayush0402 PTAL, thanks.

@oppiabot
Copy link

oppiabot bot commented Apr 9, 2022

Hi @Akshatkamboj14, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 9, 2022
rt4914
rt4914 suggested changes Apr 12, 2022
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.

@Akshatkamboj14 Suggested changes

app/src/main/res/layout-sw600dp/option_story_text_size.xml Show resolved Hide resolved
app/src/main/res/layout/option_audio_language.xml Outdated Show resolved Hide resolved
@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 12, 2022
@rt4914 rt4914 assigned Akshatkamboj14 and unassigned rt4914 Apr 12, 2022
@rt4914 rt4914 assigned BenHenning and unassigned ayush0402 and Akshatkamboj14 Apr 20, 2022
@Akshatkamboj14
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
5d12834 
… Add-dark-mode-to-OptionActivity-and-OptionWithoutDrawerActivity
@Akshatkamboj14
added 2 drawable resource general_item_border.xml,general_item_border…
0417635 
…_cyan.xml and updated related files
@Akshatkamboj14
Copy link
Member Author

@rt4914 @ayush0402 @BenHenning PTAL.

@BenHenning BenHenning removed their assignment May 3, 2022
@BenHenning
Copy link
Sponsor Member

@ayush0402 can you please take a first pass? I'm otherwise assuming @rt4914 will follow up as the code owner, but please let me know if I need to review anything here.

rt4914
rt4914 approved these changes May 5, 2022
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, just one change in PR description is required.

app/src/main/res/drawable/general_item_border.xml
<stroke
android:width="1dp"
android:color="@color/color_def_black_12" />
</shape>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please mention the in the PR description why this and the other file has been introduced.

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay @rt4914

@rt4914 rt4914 assigned Akshatkamboj14 and unassigned ayush0402 and rt4914 May 5, 2022
@oppiabot
Copy link

oppiabot bot commented May 5, 2022

Assigning @BenHenning for code owner reviews. Thanks!

@rt4914 rt4914 assigned rt4914 and BenHenning and unassigned BenHenning and Akshatkamboj14 May 6, 2022
@BenHenning
Copy link
Sponsor Member

Hi. Since I was requested as a reviewer on this PR: Please note that I will be away & unavailable for reviews starting today until 23 May 2022. Please try to make any progress that you can which doesn't require me, and I'll catch up on my reviews when I return. Thanks for your flexibility--I really appreciate it.

@oppiabot
Copy link

oppiabot bot commented May 13, 2022

Hi @Akshatkamboj14, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 13, 2022
@rt4914 rt4914 merged commit 9a8a746 into oppia:develop May 14, 2022
@Akshatkamboj14 Akshatkamboj14 self-assigned this May 14, 2022
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 Awaiting requested review from BenHenning

Assignees

@rt4914 rt4914

@Akshatkamboj14 Akshatkamboj14

Labels
stale Corresponds to items that haven't seen a recent update and may be automatically closed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add dark mode support to OptionActivity and OptionWithoutDrawerActivity
4 participants
@Akshatkamboj14 @BenHenning @rt4914 @ayush0402