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

Dark mode implementation - Developer Options #4815

Merged
merged 58 commits into from
Jan 1, 2023
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
f8ee55f
fixed text cut off
MohitGupta121 May 25, 2022
d4bcf1d
Merge branch 'oppia:develop' into develop
MohitGupta121 May 25, 2022
bb3d3d4
fix text cutoff in all layouts
MohitGupta121 May 28, 2022
7153aef
Merge branch 'oppia:develop' into develop
MohitGupta121 May 28, 2022
4113302
add proper naming
MohitGupta121 May 28, 2022
c033a39
Merge branch 'develop' of https://github.com/MohitGupta121/oppia-andr…
MohitGupta121 May 28, 2022
9ea9d7c
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 6, 2022
8ba669b
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 8, 2022
7dc1b4a
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 14, 2022
0708dd6
Merge branch 'oppia:develop' into develop
MohitGupta121 Jun 23, 2022
2f3b9ec
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 1, 2022
ce3872a
develop updated
MohitGupta121 Jul 6, 2022
12bb87f
minor changes
MohitGupta121 Jul 6, 2022
690ba7e
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 12, 2022
bce7b61
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 12, 2022
9912ffc
Merge branch 'oppia:develop' into develop
MohitGupta121 Jul 22, 2022
f48f663
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 11, 2022
dacc6ee
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 16, 2022
656c283
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 17, 2022
f40026f
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 24, 2022
5461595
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 24, 2022
57268f3
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 25, 2022
b6b2363
Merge branch 'oppia:develop' into develop
MohitGupta121 Aug 30, 2022
0c77b97
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 3, 2022
53ea822
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 7, 2022
cc61a49
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 7, 2022
da20047
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 8, 2022
119cc0f
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 9, 2022
c39d761
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 13, 2022
bcbbe75
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 15, 2022
0cd7c77
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 16, 2022
af82314
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 20, 2022
9c9325e
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 22, 2022
4afb67f
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 23, 2022
9470168
Merge branch 'oppia:develop' into develop
MohitGupta121 Sep 25, 2022
9f8dc02
Merge branch 'oppia:develop' into develop
MohitGupta121 Oct 3, 2022
77108da
Merge branch 'oppia:develop' into develop
MohitGupta121 Oct 11, 2022
8147a38
Merge branch 'oppia:develop' into develop
MohitGupta121 Oct 18, 2022
c960247
Merge branch 'oppia:develop' into develop
MohitGupta121 Oct 19, 2022
77e6007
Merge branch 'oppia:develop' into develop
MohitGupta121 Oct 31, 2022
96dbf50
Merge branch 'oppia:develop' into develop
MohitGupta121 Nov 1, 2022
863f4ca
Merge branch 'oppia:develop' into develop
MohitGupta121 Nov 12, 2022
bac4eb5
Merge branch 'oppia:develop' into develop
MohitGupta121 Nov 18, 2022
bfb5c2a
Merge branch 'oppia:develop' into develop
MohitGupta121 Nov 22, 2022
fd177db
Merge branch 'oppia:develop' into develop
MohitGupta121 Nov 25, 2022
1c64914
Merge branch 'oppia:develop' into develop
MohitGupta121 Nov 29, 2022
368679b
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 6, 2022
2ccb654
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 9, 2022
d48b4fa
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 11, 2022
0b47109
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 18, 2022
f4e7af8
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 21, 2022
2deecd6
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 22, 2022
713b834
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 28, 2022
b034d82
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 29, 2022
edff0b5
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 29, 2022
b86931b
Merge branch 'oppia:develop' into develop
MohitGupta121 Dec 30, 2022
ae80625
Fixed Dark Mode for Developer Options
MohitGupta121 Dec 30, 2022
9e4b763
Refac: Developer Options Light Mode
MohitGupta121 Dec 31, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions app/src/main/res/color/checkbox_text_color.xml

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable/ic_check_box_checked.xml

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/res/drawable/ic_check_box_disabled.xml

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/drawable/ic_check_box_unchecked.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_check_circle_primary_24dp.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="24dp" />
<solid android:color="@color/color_def_oppia_brown" />
<solid android:color="@color/component_color_shared_replay_button_color" />
</shape>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/selector_checkbox.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/layout/developer_options_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:id="@+id/developer_options_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/component_color_developer_options_activity_background_color"
android:background="@color/component_color_shared_screen_primary_background_color"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="80dp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
android:id="@+id/modify_lesson_progress_text_view"
style="@style/Heading5ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_sub_heading_background_color"
android:background="@color/component_color_shared_screen_secondary_background_color"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_modify_lesson_progress_label"
android:textColor="@color/component_color_developer_options_activity_sub_heading_color"
android:textColor="@color/component_color_shared_active_text_color"
app:layout_constraintBottom_toTopOf="@id/mark_chapters_completed_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -33,14 +33,14 @@
android:id="@+id/mark_chapters_completed_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onMarkChaptersCompletedClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_mark_chapters_completed"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toTopOf="@id/view_divider1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -50,7 +50,7 @@
android:id="@+id/view_divider1"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/component_color_developer_options_activity_view_divider_color"
android:background="@color/component_color_shared_divider_color"
app:layout_constraintBottom_toTopOf="@id/mark_stories_completed_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -60,14 +60,14 @@
android:id="@+id/mark_stories_completed_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onMarkStoriesCompletedClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_mark_stories_completed"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toTopOf="@id/mark_topics_completed_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -77,7 +77,7 @@
android:id="@+id/view_divider2"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/component_color_developer_options_activity_view_divider_color"
android:background="@color/component_color_shared_divider_color"
app:layout_constraintBottom_toTopOf="@id/mark_topics_completed_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -87,14 +87,14 @@
android:id="@+id/mark_topics_completed_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onMarkTopicsCompletedClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_mark_topics_completed"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
android:id="@+id/override_app_behaviors_text_view"
style="@style/Heading5ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_sub_heading_background_color"
android:background="@color/component_color_shared_screen_secondary_background_color"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_override_app_behaviors_label"
android:textColor="@color/component_color_developer_options_activity_sub_heading_color"
android:textColor="@color/component_color_shared_active_text_color"
app:layout_constraintBottom_toTopOf="@id/show_all_hints_solution_constraint_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -33,7 +33,7 @@
android:id="@+id/show_all_hints_solution_constraint_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onShowAllHintsAndSolutionClicked()}"
android:paddingStart="16dp"
android:paddingTop="10dp"
Expand All @@ -48,9 +48,9 @@
android:id="@+id/show_all_hints_solution_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="0dp"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:text="@string/developer_options_show_all_hints_solution"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/show_all_hints_solution_switch"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -78,7 +78,7 @@
android:id="@+id/view_divider1"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/component_color_developer_options_activity_view_divider_color"
android:background="@color/component_color_shared_divider_color"
app:layout_constraintBottom_toTopOf="@id/force_network_type_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -88,14 +88,14 @@
android:id="@+id/force_network_type_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onForceNetworkTypeClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_force_network_type"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toTopOf="@id/view_divider2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -105,7 +105,7 @@
android:id="@+id/view_divider2"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/component_color_developer_options_activity_view_divider_color"
android:background="@color/component_color_shared_divider_color"
app:layout_constraintBottom_toTopOf="@id/force_crash_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -115,14 +115,14 @@
android:id="@+id/force_crash_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onForceCrashClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_force_crash"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@
android:id="@+id/debug_parsers_text_view"
style="@style/Heading5ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_sub_heading_background_color"
android:background="@color/component_color_shared_screen_secondary_background_color"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_test_parsers_label"
android:textColor="@color/component_color_developer_options_activity_sub_heading_color" />
android:textColor="@color/component_color_shared_active_text_color" />

<TextView
android:id="@+id/math_expressions_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onMathExpressionsClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_math_expressions"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color" />
android:textColor="@color/component_color_shared_primary_dark_text_color" />

</LinearLayout>
</layout>
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
android:id="@+id/view_logs_text_view"
style="@style/Heading5ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_sub_heading_background_color"
android:background="@color/component_color_shared_screen_secondary_background_color"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_view_logs_label"
android:textColor="@color/component_color_developer_options_activity_sub_heading_color"
android:textColor="@color/component_color_shared_active_text_color"
app:layout_constraintBottom_toTopOf="@id/event_logs_text_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -33,14 +33,14 @@
android:id="@+id/event_logs_text_view"
style="@style/Subtitle1ViewStart"
android:layout_width="match_parent"
android:background="@color/component_color_developer_options_activity_options_background_color"
android:background="@color/component_color_shared_item_background_solid_color"
android:onClick="@{(v) -> viewModel.onEventLogsClicked()}"
android:paddingStart="16dp"
android:paddingTop="20dp"
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:text="@string/developer_options_event_logs"
android:textColor="@color/component_color_developer_options_activity_menu_options_text_color"
android:textColor="@color/component_color_shared_primary_dark_text_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/layout/force_network_type_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:id="@+id/force_network_type_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_def_white">
android:background="@color/component_color_shared_screen_primary_background_color">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/force_network_type_app_bar_layout"
Expand All @@ -28,15 +28,14 @@
android:id="@+id/force_network_type_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/oppia_primary"
android:background="@color/component_color_shared_activity_toolbar_color"
android:minHeight="?attr/actionBarSize"
android:textSize="20sp"
app:navigationContentDescription="@string/navigate_up"
app:navigationIcon="?attr/homeAsUpIndicator"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:title="@string/developer_options_force_network_type"
app:titleTextAppearance="@style/ToolbarTextAppearance"
app:titleTextColor="@color/color_def_white" />
app:titleTextAppearance="@style/ToolbarTextAppearance" />
</com.google.android.material.appbar.AppBarLayout>

<FrameLayout
Expand All @@ -52,7 +51,7 @@
list="@{viewModel.networkTypeList}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/component_color_force_network_type_activity_background_color"
android:background="@color/component_color_shared_screen_tertiary_background_color"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="40dp"
Expand Down
Loading