-
Notifications
You must be signed in to change notification settings - Fork 528
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
… Topic Revision, Revision Card, Story Activity, Resume Lesson (#4796) <!-- READ ME FIRST: Please fill in the explanation section below and check off every point from the Essential Checklist! --> ## 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 <!-- - Explain what your PR does. If this PR fixes an existing bug, please include - "Fixes #bugnum:" in the explanation so that GitHub can auto-close the issue - when this PR is merged. --> ## Essential Checklist <!-- Please tick the relevant boxes by putting an "x" in them. --> - [x] 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](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only ### Topic Lessons <img src="https://user-images.githubusercontent.com/76530270/209782570-1b554b99-878d-4231-93ab-932a8392339f.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209782638-1498b3bc-b34b-4f6e-b59c-5eb75585fdeb.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209782928-aa3d63e0-77f6-454f-8a96-4ca0a79dcf2d.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209783008-1e7431d5-4d38-4743-bae4-2efee687d962.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209783226-440a9735-be10-4357-acd4-0a4fdffb2673.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209783291-8f08c34a-7df4-4942-8a59-821946acb054.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209783403-d18e5f83-9f25-4fd0-a789-05cffdccad72.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209783480-47cea3e2-f25c-46b2-995b-39c624a5d4bd.png" height="400" style="max-width: 100%"> ### Topic Revision <img src="https://user-images.githubusercontent.com/76530270/208653330-185d700c-23d7-4387-8dad-0a37b410a99d.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209088065-daf5ffd7-9c36-46a8-8d20-a8827204e2ca.png" height="400" style="max-width: 100%"> ### Revision Card <img src="https://user-images.githubusercontent.com/76530270/208653637-65a63055-59e0-4f6c-be4d-98e1a05cafb7.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209088213-5a967191-a58f-4cfc-a6c4-611e67ff2dbe.png" height="400" style="max-width: 100%"> ### Story Activity <img src="https://user-images.githubusercontent.com/76530270/208654191-535ab103-4cb0-4e15-9aac-73c238da7e5a.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/208654157-245c22a6-ca76-4b6e-991c-045b0209a4f4.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/208654553-bbf2953f-e180-42fa-b6bd-2a0ec28911af.png" height="200" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209088439-07b16179-ce9e-4cef-9f5f-4b2e2be9e691.png" height="200" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209537829-dbd65e33-e1f2-40ff-8f70-c500e7d4883b.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209784301-f024dbcd-3526-4068-a698-f1cae25dde9a.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209538237-2409c6b1-e881-4e8c-8b20-25bce10868e3.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/209784484-4eb2ce01-721d-4364-91c2-d64510ff6da6.png" height="400" style="max-width: 100%"> ### Resume Lesson <img src="https://user-images.githubusercontent.com/76530270/208655056-2bf2a66b-a6eb-4ba3-b5ff-371f27427452.png" height="400" style="max-width: 100%"> <img src="https://user-images.githubusercontent.com/76530270/208655045-6ebaf554-bc42-47f9-b03e-3ad831ab78b1.png" height="400" style="max-width: 100%"> <!-- Delete these section if this PR does not include UI-related changes. --> 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](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines)) - Add a video showing the full UX flow with a screen reader enabled (see [accessibility guide](https://github.com/oppia/oppia-android/wiki/Accessibility-(A11y)-Guide)) - Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing
- Loading branch information
1 parent
b7f0588
commit 0d96f46
Showing
41 changed files
with
286 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
app/src/main/res/drawable/chapter_white_bg_with_bright_green_border.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:shape="rectangle"> | ||
<stroke android:color="@color/color_def_bright_green" android:width="4dp"/> | ||
<solid android:color="@color/color_def_white"/> | ||
<stroke android:color="@color/component_color_lessons_tab_activity_lesson_not_started_stroke_color" android:width="4dp"/> | ||
<solid android:color="@color/component_color_lessons_tab_activity_lesson_not_started_chapter_name_background_color"/> | ||
</shape> |
2 changes: 1 addition & 1 deletion
2
app/src/main/res/drawable/circular_solid_color_primary_32dp.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
app/src/main/res/drawable/circular_stroke_2dp_color_primary_32dp.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:shape="line"> | ||
<solid android:color="@android:color/transparent" /> | ||
<solid android:color="@color/component_color_shared_transparent_background_color" /> | ||
<stroke | ||
android:width="1dp" | ||
android:color="@color/oppia_dashed_divider" | ||
android:color="@color/component_color_lessons_tab_activity_lesson_card_dashed_divider_color" | ||
android:dashWidth="8dp" | ||
android:dashGap="6dp" /> | ||
</shape> |
2 changes: 1 addition & 1 deletion
2
app/src/main/res/drawable/grey_recycler_view_item_decoration_divider.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:shape="rectangle"> | ||
<solid android:color="@color/color_def_accessible_light_grey_2" /> | ||
<solid android:color="@color/component_color_shared_divider_color" /> | ||
<size android:height="1dp" /> | ||
</shape> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.