From 23297cf000a74d82a7a33fdf8747be0ccc21c44d Mon Sep 17 00:00:00 2001 From: rt4914 Date: Tue, 29 Nov 2022 17:44:34 +0530 Subject: [PATCH 01/14] Profile chooser dark-mode implementation --- .../main/res/layout-land/profile_chooser_add_view.xml | 6 +++--- .../main/res/layout-land/profile_chooser_fragment.xml | 8 ++++---- .../res/layout-land/profile_chooser_profile_view.xml | 10 +++++----- .../layout-sw600dp-land/profile_chooser_add_view.xml | 6 +++--- .../layout-sw600dp-land/profile_chooser_fragment.xml | 8 ++++---- .../profile_chooser_profile_view.xml | 10 +++++----- .../layout-sw600dp-port/profile_chooser_add_view.xml | 6 +++--- .../layout-sw600dp-port/profile_chooser_fragment.xml | 8 ++++---- .../profile_chooser_profile_view.xml | 10 +++++----- app/src/main/res/layout/profile_chooser_add_view.xml | 6 +++--- app/src/main/res/layout/profile_chooser_fragment.xml | 8 ++++---- .../main/res/layout/profile_chooser_profile_view.xml | 10 +++++----- app/src/main/res/values-night/color_palette.xml | 5 +++++ app/src/main/res/values/color_defs.xml | 1 + app/src/main/res/values/color_palette.xml | 5 +++++ app/src/main/res/values/colors_migrating.xml | 2 -- app/src/main/res/values/component_colors.xml | 6 ++++++ 17 files changed, 65 insertions(+), 50 deletions(-) diff --git a/app/src/main/res/layout-land/profile_chooser_add_view.xml b/app/src/main/res/layout-land/profile_chooser_add_view.xml index c2944ecf4c5..d88f39ecfaf 100644 --- a/app/src/main/res/layout-land/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-land/profile_chooser_add_view.xml @@ -35,7 +35,7 @@ android:layout_marginBottom="8dp" app:srcCompat="@{@drawable/ic_add_profile}" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape" - app:strokeColor="@color/avatar_border" + app:strokeColor="@color/component_color_profile_chooser_activity_avatar_border_color" app:strokeWidth="1dp" /> diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml index 7c8ae6203ef..d306b132782 100644 --- a/app/src/main/res/layout-land/profile_chooser_fragment.xml +++ b/app/src/main/res/layout-land/profile_chooser_fragment.xml @@ -16,7 +16,7 @@ @@ -43,7 +43,7 @@ android:minHeight="48dp" android:paddingTop="20dp" android:text="@string/profile_chooser_language" - android:textColor="@color/profile_chooser_grey_text" + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon" app:layout_constraintTop_toTopOf="parent" /> @@ -55,7 +55,7 @@ android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top" android:layout_marginEnd="36dp" android:text="@string/profile_chooser_select" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -103,7 +103,7 @@ android:layout_marginBottom="24dp" android:minHeight="48dp" android:text="@string/profile_chooser_administrator_controls" - android:textColor="@color/profile_chooser_grey_text" /> + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" /> @@ -58,14 +58,14 @@ android:maxLines="2" android:singleLine="false" android:text="@{viewModel.profile.name}" - android:textColor="@color/color_def_white" /> + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/profile_chooser_admin" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" /> @@ -86,7 +86,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/profile_chooser_profile_view_view_margin_top" android:layout_gravity="bottom" - android:background="@color/oppia_profile_chooser_divider" + android:background="@color/component_color_profile_chooser_activity_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="@+id/profile_chooser_item" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml index 7e23d059e07..a0fa9c9839b 100644 --- a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml @@ -41,7 +41,7 @@ android:layout_height="108dp" app:srcCompat="@{@drawable/ic_add_profile}" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_add_view_circular_image_margin_top_profile_already_added : @dimen/space_0dp}" - app:strokeColor="@color/avatar_border" + app:strokeColor="@color/component_color_profile_chooser_activity_avatar_border_color" app:strokeWidth="1dp" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape" /> @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif-medium" android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_add : @string/set_up_multiple_profiles}" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:textSize="20sp" /> diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_fragment.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_fragment.xml index 7f548736aa9..82e17eedc17 100644 --- a/app/src/main/res/layout-sw600dp-land/profile_chooser_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_fragment.xml @@ -20,7 +20,7 @@ @@ -47,7 +47,7 @@ android:minHeight="48dp" android:paddingTop="20dp" android:text="@string/profile_chooser_language" - android:textColor="@color/profile_chooser_grey_text" + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon" app:layout_constraintTop_toTopOf="parent" /> @@ -60,7 +60,7 @@ android:layout_marginTop="80dp" android:fontFamily="sans-serif" android:text="@string/profile_chooser_select" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:textSize="36sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -111,7 +111,7 @@ android:layout_marginBottom="28dp" android:minHeight="48dp" android:text="@string/profile_chooser_administrator_controls" - android:textColor="@color/profile_chooser_grey_text" /> + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" /> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_last_visited_margin_top_profile_already_added : @dimen/profile_chooser_profile_view_last_visited_margin_top_profile_not_added}" profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" /> @@ -93,7 +93,7 @@ android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" android:text="@string/profile_chooser_admin" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_is_admin_margin_top_profile_already_added : @dimen/space_0dp}" /> @@ -104,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="@dimen/profile_chooser_profile_view_divider_margin_top" - android:background="@color/oppia_profile_chooser_divider" + android:background="@color/component_color_profile_chooser_activity_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml index 3cef9d7f218..28e9c956051 100644 --- a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml @@ -43,7 +43,7 @@ app:srcCompat="@{@drawable/ic_add_profile}" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_add_view_circular_image_margin_top_profile_already_added : @dimen/space_0dp}" - app:strokeColor="@color/avatar_border" + app:strokeColor="@color/component_color_profile_chooser_activity_avatar_border_color" app:strokeWidth="1dp" /> diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_fragment.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_fragment.xml index 1c5ce1fb922..b4a75918890 100644 --- a/app/src/main/res/layout-sw600dp-port/profile_chooser_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_fragment.xml @@ -20,7 +20,7 @@ @@ -47,7 +47,7 @@ android:minHeight="48dp" android:paddingTop="20dp" android:text="@string/profile_chooser_language" - android:textColor="@color/profile_chooser_grey_text" + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon" app:layout_constraintTop_toTopOf="parent" /> @@ -60,7 +60,7 @@ android:layout_marginTop="80dp" android:fontFamily="sans-serif" android:text="@string/profile_chooser_select" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:textSize="36sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -111,7 +111,7 @@ android:layout_marginBottom="32dp" android:minHeight="48dp" android:text="@string/profile_chooser_administrator_controls" - android:textColor="@color/profile_chooser_grey_text" /> + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" /> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}" profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" /> @@ -91,7 +91,7 @@ android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" android:text="@string/profile_chooser_admin" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" /> @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="92dp" - android:background="@color/oppia_profile_chooser_divider" + android:background="@color/component_color_profile_chooser_activity_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/profile_chooser_add_view.xml b/app/src/main/res/layout/profile_chooser_add_view.xml index 612d511ede9..4a9a29881a0 100644 --- a/app/src/main/res/layout/profile_chooser_add_view.xml +++ b/app/src/main/res/layout/profile_chooser_add_view.xml @@ -37,7 +37,7 @@ android:layout_height="72dp" app:srcCompat="@{@drawable/ic_add_profile}" app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape" - app:strokeColor="@color/avatar_border" + app:strokeColor="@color/component_color_profile_chooser_activity_avatar_border_color" app:strokeWidth="1dp" /> diff --git a/app/src/main/res/layout/profile_chooser_fragment.xml b/app/src/main/res/layout/profile_chooser_fragment.xml index 3428c516091..c8af2b745f1 100644 --- a/app/src/main/res/layout/profile_chooser_fragment.xml +++ b/app/src/main/res/layout/profile_chooser_fragment.xml @@ -16,7 +16,7 @@ @@ -43,7 +43,7 @@ android:minHeight="48dp" android:paddingTop="20dp" android:text="@string/profile_chooser_language" - android:textColor="@color/profile_chooser_grey_text" + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon" app:layout_constraintTop_toTopOf="parent"/> @@ -55,7 +55,7 @@ android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top" android:layout_marginEnd="36dp" android:text="@string/profile_chooser_select" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -103,7 +103,7 @@ android:layout_marginBottom="24dp" android:minHeight="48dp" android:text="@string/profile_chooser_administrator_controls" - android:textColor="@color/profile_chooser_grey_text" /> + android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" /> @@ -62,7 +62,7 @@ android:maxLines="2" android:singleLine="false" android:text="@{viewModel.profile.name}" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_name_margin_top_profile_already_added : @dimen/space_0dp}" /> @@ -71,7 +71,7 @@ style="@style/SubtitleLight1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}" @@ -86,7 +86,7 @@ android:layout_marginTop="@dimen/profile_chooser_profile_view_is_admin_margin_top" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" android:text="@string/profile_chooser_admin" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_profile_chooser_activity_white_text_color" android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" /> @@ -96,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="@dimen/profile_chooser_profile_view_view_margin_top" - android:background="@color/oppia_profile_chooser_divider" + android:background="@color/component_color_profile_chooser_activity_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index d659f632da3..d4916b53cef 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -127,4 +127,9 @@ @color/color_def_oppia_silver @color/color_def_bright_turquoise @color/color_def_black_12 + @color/color_def_charcoal_black + @color/color_def_oppia_silver + @color/color_def_white + @color/color_def_dark_silver + @color/color_def_dark_silver diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml index 58a698527dd..217d4f7cd53 100644 --- a/app/src/main/res/values/color_defs.xml +++ b/app/src/main/res/values/color_defs.xml @@ -16,6 +16,7 @@ #FFFFFF #CCFFFFFF #F2F2F2 + #222222 #000000 #00000000 #1F000000 diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 5e158b14e8c..c499abeaf8f 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -128,4 +128,9 @@ @color/color_def_accessible_light_grey_2 @color/color_def_black_grey @color/color_def_black_12 + @color/color_def_charcoal_black + @color/color_def_oppia_silver + @color/color_def_white + @color/color_def_dark_silver + @color/color_def_dark_silver diff --git a/app/src/main/res/values/colors_migrating.xml b/app/src/main/res/values/colors_migrating.xml index 85e6e5c8654..06306534b4f 100644 --- a/app/src/main/res/values/colors_migrating.xml +++ b/app/src/main/res/values/colors_migrating.xml @@ -41,8 +41,6 @@ @color/color_def_oppia_dark_blue #707070 - #212121 - #999999 #E5E5E5 #E5E5E5 #E5E5E5 diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 4c62c0db62f..b633e54326b 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -342,4 +342,10 @@ @color/color_palette_primary_background_color @color/color_palette_dark_text_color @color/color_palette_secondary_text_color + + @color/color_palette_profile_chooser_charcoal_black_background_color + @color/color_palette_profile_chooser_silver_text_color + @color/color_palette_profile_chooser_white_text_color + @color/color_palette_profile_chooser_avatar_border_color + @color/color_palette_profile_chooser_divider_color From 94f8d17ffa0ec03acd9bd566f1040cc0f7844a09 Mon Sep 17 00:00:00 2001 From: rt4914 Date: Tue, 29 Nov 2022 18:14:53 +0530 Subject: [PATCH 02/14] Onboarding screen dark mode support --- .../main/res/drawable/ic_arrow_forward_black_24dp.xml | 1 - app/src/main/res/layout-land/onboarding_fragment.xml | 6 ++++-- .../main/res/layout-land/onboarding_slide_final.xml | 6 +++--- .../res/layout-sw600dp-land/onboarding_fragment.xml | 6 ++++-- .../layout-sw600dp-land/onboarding_slide_final.xml | 5 +++-- .../res/layout-sw600dp-port/onboarding_fragment.xml | 6 ++++-- .../layout-sw600dp-port/onboarding_slide_final.xml | 6 +++--- app/src/main/res/layout/onboarding_fragment.xml | 6 ++++-- app/src/main/res/layout/onboarding_slide_final.xml | 11 ++++++----- app/src/main/res/values-night/color_palette.xml | 3 ++- app/src/main/res/values/color_palette.xml | 2 ++ app/src/main/res/values/component_colors.xml | 1 + 12 files changed, 36 insertions(+), 23 deletions(-) diff --git a/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml index e536f3a4e0d..232e2ffbf3a 100644 --- a/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml +++ b/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml @@ -1,7 +1,6 @@ diff --git a/app/src/main/res/layout-land/onboarding_fragment.xml b/app/src/main/res/layout-land/onboarding_fragment.xml index dc154eeb4c3..596438b6832 100644 --- a/app/src/main/res/layout-land/onboarding_fragment.xml +++ b/app/src/main/res/layout-land/onboarding_fragment.xml @@ -43,6 +43,7 @@ android:onClick="@{(v) -> presenter.clickOnSkip()}" android:text="@string/skip" android:textAllCaps="true" + android:textColor="@color/component_color_onboarding_activity_text_color" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -71,9 +72,10 @@ android:minHeight="48dp" android:onClick="@{(v) -> presenter.clickOnNext()}" android:padding="12dp" - app:srcCompat="@drawable/ic_arrow_forward_black_24dp" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:srcCompat="@drawable/ic_arrow_forward_black_24dp" + app:tint="@color/component_color_onboarding_activity_arrow_color" /> diff --git a/app/src/main/res/layout-land/onboarding_slide_final.xml b/app/src/main/res/layout-land/onboarding_slide_final.xml index 365ca188dc6..2697de92197 100644 --- a/app/src/main/res/layout-land/onboarding_slide_final.xml +++ b/app/src/main/res/layout-land/onboarding_slide_final.xml @@ -30,11 +30,11 @@ android:adjustViewBounds="true" android:importantForAccessibility="no" android:scaleType="fitXY" - app:srcCompat="@drawable/ic_landscape_onboarding_3" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="H, 10:9" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_landscape_onboarding_3" /> - diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml index d38768aeb24..60c3f03df45 100644 --- a/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml @@ -75,11 +75,12 @@ android:minHeight="48dp" android:onClick="@{(v) -> presenter.clickOnNext()}" android:scaleType="center" - app:srcCompat="@drawable/ic_arrow_forward_black_24dp" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_arrow_forward_black_24dp" + app:tint="@color/component_color_onboarding_activity_arrow_color" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_landscape_onboarding_3_tablet" /> diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml index 9c3e35176bd..4f8636b6283 100644 --- a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml @@ -74,11 +74,12 @@ android:minHeight="48dp" android:onClick="@{(v) -> presenter.clickOnNext()}" android:scaleType="center" - app:srcCompat="@drawable/ic_arrow_forward_black_24dp" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_arrow_forward_black_24dp" + app:tint="@color/component_color_onboarding_activity_arrow_color" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_portrait_onboarding_3" /> - diff --git a/app/src/main/res/layout/onboarding_fragment.xml b/app/src/main/res/layout/onboarding_fragment.xml index 50f2545d200..e0e7219f844 100644 --- a/app/src/main/res/layout/onboarding_fragment.xml +++ b/app/src/main/res/layout/onboarding_fragment.xml @@ -74,10 +74,11 @@ android:onClick="@{(v) -> presenter.clickOnNext()}" android:paddingStart="12dp" android:paddingEnd="12dp" - app:srcCompat="@drawable/ic_arrow_forward_black_24dp" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/slide_dots_container" /> + app:layout_constraintTop_toTopOf="@+id/slide_dots_container" + app:srcCompat="@drawable/ic_arrow_forward_black_24dp" + app:tint="@color/component_color_onboarding_activity_arrow_color" /> diff --git a/app/src/main/res/layout/onboarding_slide_final.xml b/app/src/main/res/layout/onboarding_slide_final.xml index bda4a4055cf..82bb2ada1c2 100644 --- a/app/src/main/res/layout/onboarding_slide_final.xml +++ b/app/src/main/res/layout/onboarding_slide_final.xml @@ -21,19 +21,19 @@ android:id="@+id/final_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:overScrollMode="always" - android:importantForAccessibility="yes"> + android:importantForAccessibility="yes" + android:overScrollMode="always"> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_portrait_onboarding_3" /> - diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index d4916b53cef..a61600922c2 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -28,7 +28,8 @@ @color/color_def_oppia_light_black @color/color_def_chooser_grey @color/color_def_oppia_silver - @color/color_def_oppia_turquoise + @color/color_def_white + @color/color_def_white @color/color_def_oppia_light_black @color/color_def_oppia_light_black @color/color_def_oppia_grayish_black diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index c499abeaf8f..5b3486756e4 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -5,6 +5,7 @@ @color/color_def_oppia_dark_blue @color/color_def_accessible_grey @color/color_def_accessible_grey + @color/color_def_accessible_grey @color/color_def_oppia_light_yellow @color/color_def_mid_grey_30 @color/color_def_accessible_light_grey @@ -29,6 +30,7 @@ @color/color_def_accessible_grey @color/color_def_accessible_grey @color/color_def_accessible_grey + @color/color_def_accessible_grey @color/color_def_oppia_light_green @color/color_def_oppia_light_green @color/color_def_oppia_reddish_brown diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index b633e54326b..1527fd6d4e6 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -177,6 +177,7 @@ @color/color_palette_onboarding_divider_color @color/color_palette_dots_color @color/color_palette_arrow_color + @color/color_palette_agreement_text_color @color/color_palette_dark_background_color @color/color_palette_container_background_color From c8a5c5e9ba24ce17656af2bfd77c61151602318d Mon Sep 17 00:00:00 2001 From: rt4914 Date: Tue, 29 Nov 2022 19:08:14 +0530 Subject: [PATCH 03/14] AdminPinActivity dark mode implementation --- .../drawable/start_button_transparent_background.xml | 4 ++-- .../res/drawable/state_button_inactive_background.xml | 4 ++-- .../res/drawable/state_button_primary_background.xml | 4 ++-- app/src/main/res/layout/admin_pin_activity.xml | 4 ++-- app/src/main/res/values-night/color_palette.xml | 6 ++++++ app/src/main/res/values/color_defs.xml | 2 +- app/src/main/res/values/color_palette.xml | 10 ++++++++-- app/src/main/res/values/component_colors.xml | 7 ++++++- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/drawable/start_button_transparent_background.xml b/app/src/main/res/drawable/start_button_transparent_background.xml index d70e3bf5c8b..5fed1e4f9bf 100644 --- a/app/src/main/res/drawable/start_button_transparent_background.xml +++ b/app/src/main/res/drawable/start_button_transparent_background.xml @@ -5,10 +5,10 @@ - + + android:color="@color/component_color_shared_button_inactive_stroke_color" /> diff --git a/app/src/main/res/drawable/state_button_inactive_background.xml b/app/src/main/res/drawable/state_button_inactive_background.xml index 9baefb7aa3e..b6899510516 100644 --- a/app/src/main/res/drawable/state_button_inactive_background.xml +++ b/app/src/main/res/drawable/state_button_inactive_background.xml @@ -2,8 +2,8 @@ - + + android:color="@color/component_color_shared_button_inactive_stroke_color" /> diff --git a/app/src/main/res/drawable/state_button_primary_background.xml b/app/src/main/res/drawable/state_button_primary_background.xml index 047d0044abc..4b3b30c74b2 100644 --- a/app/src/main/res/drawable/state_button_primary_background.xml +++ b/app/src/main/res/drawable/state_button_primary_background.xml @@ -2,8 +2,8 @@ - + + android:color="@color/component_color_shared_button_active_stroke_color" /> diff --git a/app/src/main/res/layout/admin_pin_activity.xml b/app/src/main/res/layout/admin_pin_activity.xml index bc63e17ab7c..f25bfff8662 100644 --- a/app/src/main/res/layout/admin_pin_activity.xml +++ b/app/src/main/res/layout/admin_pin_activity.xml @@ -109,12 +109,12 @@ android:layout_marginStart="0dp" android:layout_marginTop="48dp" android:layout_marginEnd="0dp" - android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}" + android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}" android:clickable="@{viewModel.isButtonActive()}" android:enabled="@{viewModel.isButtonActive()}" android:minHeight="48dp" android:text="@string/save" - android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }" + android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_button_active_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin" app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index a61600922c2..db8b7d4faeb 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -57,6 +57,12 @@ @color/color_def_black_grey @color/color_def_bright_turquoise @color/color_def_light_grey + @color/color_def_grey_38 + @color/color_def_bright_turquoise + @color/color_def_light_grey + @color/color_def_forest_green + @color/color_def_bright_turquoise + @color/color_def_white @color/color_def_oppia_grayish_black @color/color_def_dark_mode_question_player_progress_bar_gradient_start @color/color_def_dark_mode_question_player_progress_bar_gradient_center diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml index 217d4f7cd53..9849a35695c 100644 --- a/app/src/main/res/values/color_defs.xml +++ b/app/src/main/res/values/color_defs.xml @@ -60,12 +60,12 @@ #707070 #FFFFF0 #999999 + #61999999 #02655c #923026 #33999999 #8A3D69 #ACFFF8 - #61999999 #00E4F2F1 #E4F2F1 #E4F2F1 diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 5b3486756e4..a46a52e77da 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -56,9 +56,15 @@ @color/color_def_green_shade_80 @color/color_def_light_green @color/color_def_oppia_green - @color/color_def_submit_button_inactive - @color/color_def_submit_button_inactive + @color/color_def_grey_38 + @color/color_def_grey_38 @color/color_def_white + @color/color_def_grey_38 + @color/color_def_grey_38 + @color/color_def_light_grey + @color/color_def_forest_green + @color/color_def_oppia_green + @color/color_def_white @color/color_def_oppia_light_yellow @color/color_def_question_player_progress_bar_gradient_start @color/color_def_question_player_progress_bar_gradient_center diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 1527fd6d4e6..d6c61d1f992 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -40,7 +40,12 @@ @color/color_palette_correct_text_stroke_color @color/color_palette_correct_text_solid_color @color/color_palette_correct_text_color - @color/color_palette_submit_button_inactive_solid_color + @color/color_palette_button_inactive_solid_color + @color/color_palette_button_inactive_stroke_color + @color/color_palette_button_inactive_text_color + @color/color_palette_button_active_solid_color + @color/color_palette_button_active_stroke_color + @color/color_palette_button_active_text_color @color/color_palette_submit_button_inactive_stroke_color @color/color_palette_submit_text_inactive_color @color/color_palette_submit_text_active_color From 670e8bbe43d26bbcc0ccd93ef9282827322bc497 Mon Sep 17 00:00:00 2001 From: rt4914 Date: Tue, 29 Nov 2022 19:12:53 +0530 Subject: [PATCH 04/14] AdminAuthActivity dark mode implementation --- app/src/main/res/layout/admin_auth_activity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml index 0ff58ad52e9..57c3490aeed 100644 --- a/app/src/main/res/layout/admin_auth_activity.xml +++ b/app/src/main/res/layout/admin_auth_activity.xml @@ -117,7 +117,7 @@ android:enabled="@{viewModel.isSubmitButtonActive}" android:minHeight="48dp" android:text="@string/admin_auth_submit" - android:textColor="@{viewModel.isSubmitButtonActive ? @color/color_def_white : @color/submit_button_inactive_text }" + android:textColor="@{viewModel.isSubmitButtonActive() ? @color/component_color_shared_button_active_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="@id/admin_auth_input_pin" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin" /> From 5c1da0d1bae33d88483f838c11027a5fc3966bf2 Mon Sep 17 00:00:00 2001 From: rt4914 Date: Tue, 29 Nov 2022 21:08:01 +0530 Subject: [PATCH 05/14] PinPasswordActivity & AddProfileActivity dark mode implementation --- .../res/color/shared_checkbox_selector.xml | 6 +++++ .../main/res/layout/add_profile_activity.xml | 24 ++++++++++--------- .../main/res/values-night/color_palette.xml | 6 ++++- app/src/main/res/values/color_palette.xml | 4 ++++ app/src/main/res/values/component_colors.xml | 5 ++++ app/src/main/res/values/styles.xml | 1 + 6 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 app/src/main/res/color/shared_checkbox_selector.xml diff --git a/app/src/main/res/color/shared_checkbox_selector.xml b/app/src/main/res/color/shared_checkbox_selector.xml new file mode 100644 index 00000000000..a25ab2bcddf --- /dev/null +++ b/app/src/main/res/color/shared_checkbox_selector.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml index b6e2981f1e3..df96d84d1d0 100644 --- a/app/src/main/res/layout/add_profile_activity.xml +++ b/app/src/main/res/layout/add_profile_activity.xml @@ -17,14 +17,14 @@ android:orientation="vertical"> + android:id="@+id/add_profile_activity_toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/component_color_shared_activity_toolbar_color" + android:minHeight="?attr/actionBarSize" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:titleTextAppearance="@style/ToolbarTitle" /> + app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.RoundedShape" + app:srcCompat="@{@drawable/ic_default_avatar}" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index db8b7d4faeb..447c87531e3 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -3,7 +3,7 @@ @color/color_def_oppia_turquoise @color/color_def_oppia_bangladesh_green @color/color_def_oppia_metallic_blue - @color/color_def_oppia_silver + @color/color_def_white @color/color_def_white @color/color_def_oppia_light_black @color/color_def_oppia_light_black @@ -11,6 +11,7 @@ @color/color_def_oppia_dark_grey @color/color_def_white @color/color_def_oppia_pink + @color/color_def_white @color/color_def_oppia_grayish_black @color/color_def_oppia_green @color/color_def_forest_green @@ -46,6 +47,7 @@ @color/color_def_oppia_pink @color/color_def_forest_green @color/color_def_forest_green + @color/color_def_oppia_silver @color/color_def_black_grey @color/color_def_oppia_turquoise @color/color_def_dark_pink @@ -72,6 +74,8 @@ @color/color_def_white @color/color_def_oppia_turquoise @color/color_def_oppia_turquoise + @color/color_def_oppia_turquoise + @color/color_def_oppia_silver @color/color_def_white @color/color_def_white @color/color_def_accessible_light_grey_2 diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index a46a52e77da..389200b73b0 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -12,6 +12,7 @@ @color/color_def_white @color/color_def_black_87 @color/color_def_oppia_red + @color/color_def_accessible_light_grey_2 @color/color_def_white @color/color_def_oppia_green @color/color_def_oppia_green @@ -48,6 +49,7 @@ @color/color_def_error_text @color/color_def_accessible_grey @color/color_def_accessible_grey + @color/color_def_accessible_grey @color/color_def_black_grey @color/color_def_oppia_dark_blue @color/color_def_oppia_brown_dark @@ -74,6 +76,8 @@ @color/color_def_accessible_grey @color/color_def_accessible_grey @color/color_def_checkbox_green + @color/color_def_oppia_green + @color/color_def_oppia_silver @color/color_def_white @color/color_def_white @color/color_def_accessible_light_grey_2 diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index d6c61d1f992..4157bd841b9 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -53,6 +53,9 @@ @color/color_palette_progress_bar_gradient_start_color @color/color_palette_progress_bar_gradient_center_color @color/color_palette_progress_bar_gradient_end_color + @color/color_palette_checkbox_checked_color + @color/color_palette_checkbox_unchecked_color + @color/color_palette_checkbox_unchecked_color @color/color_palette_status_bar_color @color/color_palette_action_bar_color @@ -65,6 +68,7 @@ @color/color_palette_primary_text_color @color/color_palette_text_input_background_color @color/color_palette_error_color + @color/color_palette_helper_text_color @color/color_palette_container_background_color @color/color_palette_dark_background_color @color/color_palette_stroke_color @@ -74,6 +78,7 @@ @color/color_palette_toolbar_color @color/color_palette_primary_text_color + @color/color_palette_info_icon_color @color/color_palette_dark_text_color @color/color_palette_description_text_color @color/color_palette_background_color diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 26b9f3bbf6f..51008585a75 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -175,6 +175,7 @@ true @color/component_color_shared_text_input_layout_error_color @color/component_color_shared_text_input_layout_error_color + @color/component_color_shared_text_input_layout_helper_text_color @color/component_color_shared_text_input_layout_error_color @color/component_color_shared_text_input_layout_text_color viewStart From 5fd4b72c9252c3d37f04e4667b7aa4000704508a Mon Sep 17 00:00:00 2001 From: rt4914 Date: Thu, 8 Dec 2022 14:58:15 +0530 Subject: [PATCH 06/14] Renaming divider color res --- app/src/main/res/layout-land/profile_chooser_profile_view.xml | 2 +- .../res/layout-sw600dp-land/profile_chooser_profile_view.xml | 2 +- .../res/layout-sw600dp-port/profile_chooser_profile_view.xml | 2 +- app/src/main/res/layout/profile_chooser_profile_view.xml | 2 +- app/src/main/res/values-night/color_palette.xml | 1 - app/src/main/res/values/color_palette.xml | 1 - app/src/main/res/values/component_colors.xml | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/layout-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-land/profile_chooser_profile_view.xml index 8c2c824550c..1a07343a5b0 100644 --- a/app/src/main/res/layout-land/profile_chooser_profile_view.xml +++ b/app/src/main/res/layout-land/profile_chooser_profile_view.xml @@ -86,7 +86,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/profile_chooser_profile_view_view_margin_top" android:layout_gravity="bottom" - android:background="@color/component_color_profile_chooser_activity_divider_color" + android:background="@color/component_color_shared_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="@+id/profile_chooser_item" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml index bc4c7bf7b4c..333679388b0 100644 --- a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml +++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml @@ -104,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="@dimen/profile_chooser_profile_view_divider_margin_top" - android:background="@color/component_color_profile_chooser_activity_divider_color" + android:background="@color/component_color_shared_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml index 1e37c27f09d..456486f4ab7 100644 --- a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml +++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml @@ -101,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="92dp" - android:background="@color/component_color_profile_chooser_activity_divider_color" + android:background="@color/component_color_shared_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/profile_chooser_profile_view.xml b/app/src/main/res/layout/profile_chooser_profile_view.xml index f994eac3f79..c36669d75ba 100644 --- a/app/src/main/res/layout/profile_chooser_profile_view.xml +++ b/app/src/main/res/layout/profile_chooser_profile_view.xml @@ -96,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="@dimen/profile_chooser_profile_view_view_margin_top" - android:background="@color/component_color_profile_chooser_activity_divider_color" + android:background="@color/component_color_shared_divider_color" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 71affbb6acc..0f29c3c624a 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -143,5 +143,4 @@ @color/color_def_oppia_silver @color/color_def_white @color/color_def_dark_silver - @color/color_def_dark_silver diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index e6c640bcf3f..c3e185eecc7 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -145,5 +145,4 @@ @color/color_def_oppia_silver @color/color_def_white @color/color_def_dark_silver - @color/color_def_dark_silver diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 435d560e2b1..605ce607204 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -57,6 +57,7 @@ @color/color_palette_checkbox_checked_color @color/color_palette_checkbox_unchecked_color @color/color_palette_checkbox_unchecked_color + @color/color_palette_divider_color @color/color_palette_status_bar_color @color/color_palette_action_bar_color @@ -359,5 +360,4 @@ @color/color_palette_profile_chooser_silver_text_color @color/color_palette_profile_chooser_white_text_color @color/color_palette_profile_chooser_avatar_border_color - @color/color_palette_profile_chooser_divider_color From 915d7c4933a337566ca5c1c4a9ee7504a755be9d Mon Sep 17 00:00:00 2001 From: rt4914 Date: Thu, 8 Dec 2022 16:04:51 +0530 Subject: [PATCH 07/14] Pin Password Eye icon color --- app/src/main/res/drawable/ic_hide_eye_icon.xml | 1 - .../main/res/drawable/ic_landscape_onboarding_2_tablet.xml | 4 ++-- app/src/main/res/drawable/ic_show_eye_icon.xml | 1 - app/src/main/res/layout/pin_password_activity.xml | 7 ++++--- app/src/main/res/values-night/color_palette.xml | 3 +-- app/src/main/res/values/color_palette.xml | 3 +-- app/src/main/res/values/component_colors.xml | 4 +--- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/drawable/ic_hide_eye_icon.xml b/app/src/main/res/drawable/ic_hide_eye_icon.xml index d0c91d0495e..37a199b7a6b 100644 --- a/app/src/main/res/drawable/ic_hide_eye_icon.xml +++ b/app/src/main/res/drawable/ic_hide_eye_icon.xml @@ -1,7 +1,6 @@ - - @@ -161,7 +161,8 @@ android:layout_height="32dp" android:layout_gravity="center_horizontal" android:contentDescription="@{viewModel.showPassword ? @string/password_shown_icon : @string/password_hidden_icon}" - app:srcCompat="@{viewModel.showPassword ? @drawable/ic_show_eye_icon : @drawable/ic_hide_eye_icon}" /> + app:srcCompat="@{viewModel.showPassword ? @drawable/ic_show_eye_icon : @drawable/ic_hide_eye_icon}" + app:tint="@color/component_color_pin_password_activity_show_hide_color" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 0f29c3c624a..acb7811a4c0 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -46,8 +46,7 @@ @color/color_def_oppia_turquoise @color/color_def_oppia_turquoise @color/color_def_oppia_pink - @color/color_def_forest_green - @color/color_def_forest_green + @color/color_def_oppia_turquoise @color/color_def_oppia_silver @color/color_def_black_grey @color/color_def_oppia_turquoise diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index c3e185eecc7..88939ee672b 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -48,8 +48,7 @@ @color/color_def_oppia_green @color/color_def_accessible_grey @color/color_def_error_text - @color/color_def_accessible_grey - @color/color_def_accessible_grey + @color/color_def_oppia_green @color/color_def_accessible_grey @color/color_def_black_grey @color/color_def_oppia_dark_blue diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 605ce607204..2223a0bff4a 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -101,10 +101,8 @@ @color/color_palette_highlighted_text_color @color/color_palette_primary_text_color @color/color_palette_forgot_pin_color - @color/color_palette_show_text_color + @color/color_palette_show_hide_color @color/color_palette_error_text_color - @color/color_palette_show_eye_icon_color - @color/color_palette_hide_eye_icon_color @color/color_palette_dark_background_color @color/color_palette_container_background_color From ad3ce14c3a18d0d0ac858b1755adfdbdacf67398 Mon Sep 17 00:00:00 2001 From: rt4914 Date: Thu, 8 Dec 2022 16:13:03 +0530 Subject: [PATCH 08/14] Onboarding download icon color fix --- app/src/main/res/drawable/ic_landscape_onboarding_2.xml | 2 +- app/src/main/res/drawable/ic_landscape_onboarding_2_tablet.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/drawable/ic_landscape_onboarding_2.xml b/app/src/main/res/drawable/ic_landscape_onboarding_2.xml index 174ec0aca06..a91c4cc5d97 100644 --- a/app/src/main/res/drawable/ic_landscape_onboarding_2.xml +++ b/app/src/main/res/drawable/ic_landscape_onboarding_2.xml @@ -35,5 +35,5 @@ + android:fillColor="#00645c"/> diff --git a/app/src/main/res/drawable/ic_landscape_onboarding_2_tablet.xml b/app/src/main/res/drawable/ic_landscape_onboarding_2_tablet.xml index 981bc56567d..fc4f156ee08 100644 --- a/app/src/main/res/drawable/ic_landscape_onboarding_2_tablet.xml +++ b/app/src/main/res/drawable/ic_landscape_onboarding_2_tablet.xml @@ -42,6 +42,6 @@ android:pathData="M0,-12h320v360h-320z"/> + android:fillColor="#00645c"/> From 6de90647e3cba7d008d9a2c0ad5f7d07c9357f5b Mon Sep 17 00:00:00 2001 From: rt4914 Date: Thu, 8 Dec 2022 16:51:56 +0530 Subject: [PATCH 09/14] Onboarding screen fixes --- app/src/main/res/drawable/primary_rounded_button.xml | 2 +- app/src/main/res/layout-land/onboarding_fragment.xml | 2 +- app/src/main/res/layout-land/onboarding_slide.xml | 6 ++++-- app/src/main/res/layout-land/onboarding_slide_final.xml | 7 +++++-- .../main/res/layout-sw600dp-land/onboarding_fragment.xml | 4 ++-- app/src/main/res/layout-sw600dp-land/onboarding_slide.xml | 6 ++++-- .../res/layout-sw600dp-land/onboarding_slide_final.xml | 7 +++++-- .../main/res/layout-sw600dp-port/onboarding_fragment.xml | 4 ++-- app/src/main/res/layout-sw600dp-port/onboarding_slide.xml | 6 ++++-- .../res/layout-sw600dp-port/onboarding_slide_final.xml | 7 +++++-- .../layout-sw600dp/administrator_controls_activity.xml | 2 +- app/src/main/res/layout-sw600dp/help_activity.xml | 2 +- app/src/main/res/layout-sw600dp/option_activity.xml | 2 +- .../layout-sw600dp/options_without_drawer_activity.xml | 2 +- app/src/main/res/layout/onboarding_fragment.xml | 4 ++-- app/src/main/res/layout/onboarding_slide.xml | 6 ++++-- app/src/main/res/layout/onboarding_slide_final.xml | 8 +++++--- app/src/main/res/values-night/color_palette.xml | 6 ++++-- app/src/main/res/values/color_palette.xml | 6 ++++-- app/src/main/res/values/colors_migrating.xml | 1 - app/src/main/res/values/component_colors.xml | 7 ++++--- 21 files changed, 60 insertions(+), 37 deletions(-) diff --git a/app/src/main/res/drawable/primary_rounded_button.xml b/app/src/main/res/drawable/primary_rounded_button.xml index 52724ab97dd..bceb2871ecd 100644 --- a/app/src/main/res/drawable/primary_rounded_button.xml +++ b/app/src/main/res/drawable/primary_rounded_button.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/layout-land/onboarding_fragment.xml b/app/src/main/res/layout-land/onboarding_fragment.xml index 596438b6832..4e7f327325f 100644 --- a/app/src/main/res/layout-land/onboarding_fragment.xml +++ b/app/src/main/res/layout-land/onboarding_fragment.xml @@ -43,7 +43,7 @@ android:onClick="@{(v) -> presenter.clickOnSkip()}" android:text="@string/skip" android:textAllCaps="true" - android:textColor="@color/component_color_onboarding_activity_text_color" + android:textColor="@color/component_color_shared_primary_text_color" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-land/onboarding_slide.xml b/app/src/main/res/layout-land/onboarding_slide.xml index 6866c505baf..f6527709241 100644 --- a/app/src/main/res/layout-land/onboarding_slide.xml +++ b/app/src/main/res/layout-land/onboarding_slide.xml @@ -29,11 +29,11 @@ android:adjustViewBounds="true" android:importantForAccessibility="no" android:scaleType="fitXY" - app:srcCompat="@{viewModel.slideImage}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="H, 10:9" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@{viewModel.slideImage}" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@{viewModel.slideImage}" /> diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml index ce567b5fa8e..673d9643694 100644 --- a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml +++ b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml @@ -42,6 +42,7 @@ android:layout_marginBottom="12dp" android:fontFamily="sans-serif-medium" android:text="@string/onboarding_slide_3_title" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="32sp" app:layout_constraintBottom_toTopOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="@+id/slide_description_text_view" @@ -54,6 +55,7 @@ android:layout_width="0dp" android:layout_marginTop="12dp" android:text="@string/onboarding_slide_3_description" + android:textColor="@color/color_palette_secondary_1_text_color" android:textSize="24sp" app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintStart_toStartOf="@+id/guideline4" @@ -69,7 +71,7 @@ android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickOnGetStarted()}" android:text="@string/get_started" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_shared_primary_button_text_color" android:textSize="14sp" app:layout_constraintEnd_toEndOf="@+id/slide_title_text_view" app:layout_constraintStart_toStartOf="@+id/slide_title_text_view" @@ -81,7 +83,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:textColor="@color/component_color_onboarding_activity_agreement_text_color" + android:textColor="@color/component_color_shared_primary_text_color" + android:textColorLink="@color/component_color_shared_primary_text_color" app:layout_constraintEnd_toEndOf="@+id/slide_title_text_view" app:layout_constraintStart_toStartOf="@+id/slide_title_text_view" app:layout_constraintTop_toBottomOf="@id/get_started_button" /> diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml index 4f8636b6283..7c29c049f17 100644 --- a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="16dp" - android:background="@color/oppia_onboarding_divider" + android:background="@color/component_color_shared_divider_color" app:layout_constraintBottom_toTopOf="@id/slide_dots_container" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@{viewModel.slideImage}" /> diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml index 384856488f7..ecb61bac498 100644 --- a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml +++ b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml @@ -44,6 +44,7 @@ android:fontFamily="sans-serif-medium" android:gravity="center_horizontal" android:text="@string/onboarding_slide_3_title" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="32sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -59,6 +60,7 @@ android:maxLines="2" android:minLines="2" android:text="@string/onboarding_slide_3_description" + android:textColor="@color/color_palette_secondary_1_text_color" android:textSize="24sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -76,7 +78,7 @@ android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickOnGetStarted()}" android:text="@string/get_started" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_shared_primary_button_text_color" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -90,7 +92,8 @@ android:layout_marginStart="192dp" android:layout_marginTop="24dp" android:layout_marginEnd="192dp" - android:textColor="@color/component_color_onboarding_activity_agreement_text_color" + android:textColor="@color/component_color_shared_primary_text_color" + android:textColorLink="@color/component_color_shared_primary_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/get_started_button" /> diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml index b3031fae8ab..5839d07ba63 100644 --- a/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml +++ b/app/src/main/res/layout-sw600dp/administrator_controls_activity.xml @@ -45,7 +45,7 @@ android:id="@+id/administrator_controls_separator" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/oppia_onboarding_divider" + android:background="@color/component_color_shared_divider_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/administrator_controls_guideline" app:layout_constraintTop_toBottomOf="@id/administrator_controls_activity_toolbar" /> diff --git a/app/src/main/res/layout-sw600dp/help_activity.xml b/app/src/main/res/layout-sw600dp/help_activity.xml index f39a382d510..d3c04c10838 100644 --- a/app/src/main/res/layout-sw600dp/help_activity.xml +++ b/app/src/main/res/layout-sw600dp/help_activity.xml @@ -83,7 +83,7 @@ android:id="@+id/options_separator" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/oppia_onboarding_divider" + android:background="@color/component_color_shared_divider_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/multipane_guideline" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-sw600dp/option_activity.xml b/app/src/main/res/layout-sw600dp/option_activity.xml index abb585e8a4c..ccad100499d 100644 --- a/app/src/main/res/layout-sw600dp/option_activity.xml +++ b/app/src/main/res/layout-sw600dp/option_activity.xml @@ -69,7 +69,7 @@ android:id="@+id/options_separator" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/oppia_onboarding_divider" + android:background="@color/component_color_shared_divider_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/multipane_guideline" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml b/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml index e33d691e123..c8dde6bde96 100644 --- a/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml +++ b/app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml @@ -68,7 +68,7 @@ android:id="@+id/options_separator" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/oppia_onboarding_divider" + android:background="@color/component_color_shared_divider_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/multipane_guideline" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/onboarding_fragment.xml b/app/src/main/res/layout/onboarding_fragment.xml index e0e7219f844..7aa20c56236 100644 --- a/app/src/main/res/layout/onboarding_fragment.xml +++ b/app/src/main/res/layout/onboarding_fragment.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="16dp" - android:background="@color/component_color_onboarding_activity_divider_color" + android:background="@color/component_color_shared_divider_color" app:layout_constraintBottom_toTopOf="@+id/slide_dots_container" /> diff --git a/app/src/main/res/layout/onboarding_slide.xml b/app/src/main/res/layout/onboarding_slide.xml index 44f5aced520..bad5a9eadc7 100644 --- a/app/src/main/res/layout/onboarding_slide.xml +++ b/app/src/main/res/layout/onboarding_slide.xml @@ -27,11 +27,11 @@ android:layout_width="0dp" android:layout_height="0dp" android:importantForAccessibility="no" - app:srcCompat="@{viewModel.slideImage}" app:layout_constraintDimensionRatio="5:4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@{viewModel.slideImage}" /> @@ -58,6 +59,7 @@ android:maxLines="2" android:minLines="2" android:text="@{viewModel.description}" + android:textColor="@color/color_palette_secondary_1_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/slide_title_text_view" /> diff --git a/app/src/main/res/layout/onboarding_slide_final.xml b/app/src/main/res/layout/onboarding_slide_final.xml index 82bb2ada1c2..7856e09640d 100644 --- a/app/src/main/res/layout/onboarding_slide_final.xml +++ b/app/src/main/res/layout/onboarding_slide_final.xml @@ -46,6 +46,7 @@ android:fontFamily="sans-serif-medium" android:gravity="center_horizontal" android:text="@string/onboarding_slide_3_title" + android:textColor="@color/component_color_shared_primary_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/slide_image_view" /> @@ -60,6 +61,7 @@ android:maxLines="2" android:minLines="2" android:text="@string/onboarding_slide_3_description" + android:textColor="@color/color_palette_secondary_1_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/slide_title_text_view" /> @@ -77,7 +79,7 @@ android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickOnGetStarted()}" android:text="@string/get_started" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_shared_primary_button_text_color" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -91,8 +93,8 @@ android:layout_marginTop="24dp" android:layout_marginEnd="48dp" android:fontFamily="sans-serif" - android:textColor="@color/component_color_onboarding_activity_agreement_text_color" - android:textColorLink="@color/component_color_onboarding_activity_agreement_text_color" + android:textColor="@color/component_color_shared_primary_text_color" + android:textColorLink="@color/component_color_shared_primary_text_color" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index acb7811a4c0..7ede4516fdf 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -28,10 +28,8 @@ @color/color_def_bright_turquoise @color/color_def_dark_silver @color/color_def_oppia_light_black - @color/color_def_chooser_grey @color/color_def_oppia_silver @color/color_def_white - @color/color_def_white @color/color_def_oppia_light_black @color/color_def_oppia_light_black @color/color_def_oppia_grayish_black @@ -59,6 +57,8 @@ @color/color_def_black_grey @color/color_def_bright_turquoise @color/color_def_light_grey + @color/color_def_oppia_green + @color/color_def_white @color/color_def_grey_38 @color/color_def_bright_turquoise @color/color_def_light_grey @@ -136,6 +136,8 @@ @color/color_def_oppia_turquoise @color/color_def_forest_green @color/color_def_oppia_silver + @color/color_def_oppia_silver + @color/color_def_oppia_silver @color/color_def_bright_turquoise @color/color_def_black_12 @color/color_def_charcoal_black diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 88939ee672b..00e8cd1d0ef 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -29,10 +29,8 @@ @color/color_def_oppia_green @color/color_def_dark_silver @color/color_def_yellow_ivory - @color/color_def_accessible_grey @color/color_def_accessible_grey @color/color_def_accessible_grey - @color/color_def_accessible_grey @color/color_def_oppia_light_green @color/color_def_oppia_light_green @color/color_def_oppia_reddish_brown @@ -61,6 +59,8 @@ @color/color_def_grey_38 @color/color_def_grey_38 @color/color_def_white + @color/color_def_oppia_green + @color/color_def_white @color/color_def_grey_38 @color/color_def_grey_38 @color/color_def_light_grey @@ -138,6 +138,8 @@ @color/color_def_accessible_light_grey @color/color_def_oppia_green @color/color_def_accessible_light_grey_2 + @color/color_def_accessible_grey + @color/color_def_accessible_light_grey_2 @color/color_def_black_grey @color/color_def_black_12 @color/color_def_charcoal_black diff --git a/app/src/main/res/values/colors_migrating.xml b/app/src/main/res/values/colors_migrating.xml index 06306534b4f..aebb0c001ea 100644 --- a/app/src/main/res/values/colors_migrating.xml +++ b/app/src/main/res/values/colors_migrating.xml @@ -23,7 +23,6 @@ #E7AC9B #999999 #555555 - #707070 #33999999 #1F000000 #DDDDDD diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 2223a0bff4a..2cf028420b8 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -41,6 +41,8 @@ @color/color_palette_correct_text_stroke_color @color/color_palette_correct_text_solid_color @color/color_palette_correct_text_color + @color/color_palette_primary_button_background_color + @color/color_palette_primary_button_text_color @color/color_palette_button_inactive_solid_color @color/color_palette_button_inactive_stroke_color @color/color_palette_button_inactive_text_color @@ -63,6 +65,8 @@ @color/color_palette_action_bar_color @color/color_palette_primary_text_color + @color/color_palette_primary_text_color + @color/color_palette_secondary_1_text_color @color/color_palette_highlighted_text_color @color/color_palette_primary_text_color @color/color_palette_primary_text_color @@ -183,11 +187,8 @@ @color/color_palette_light_background_color @color/color_palette_primary_text_color - @color/color_palette_highlighted_text_color - @color/color_palette_onboarding_divider_color @color/color_palette_dots_color @color/color_palette_arrow_color - @color/color_palette_agreement_text_color @color/color_palette_dark_background_color @color/color_palette_container_background_color From 12f68dd1759b0f3b4e881143d5b8e8f96ef187ff Mon Sep 17 00:00:00 2001 From: rt4914 Date: Thu, 8 Dec 2022 17:08:19 +0530 Subject: [PATCH 10/14] Profile chooser screen finished --- .../res/layout-land/profile_chooser_fragment.xml | 4 ++-- .../layout-sw600dp-land/profile_chooser_fragment.xml | 4 ++-- .../layout-sw600dp-port/profile_chooser_fragment.xml | 4 ++-- app/src/main/res/layout/admin_pin_activity.xml | 2 ++ app/src/main/res/layout/profile_chooser_fragment.xml | 12 ++++++------ 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml index d306b132782..7eedba72455 100644 --- a/app/src/main/res/layout-land/profile_chooser_fragment.xml +++ b/app/src/main/res/layout-land/profile_chooser_fragment.xml @@ -33,10 +33,10 @@ android:paddingStart="4dp" android:paddingTop="20dp" android:paddingEnd="20dp" - app:srcCompat="@drawable/ic_language_icon_grey_24dp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_language_icon_grey_24dp" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_language_icon_grey_24dp" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_language_icon_grey_24dp" /> @@ -51,6 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/admin_pin_pin_description" + android:textColor="@color/component_color_shared_secondary_1_text_color" app:layout_constraintEnd_toEndOf="@id/admin_pin_main_text" app:layout_constraintStart_toStartOf="@+id/admin_pin_main_text" app:layout_constraintTop_toBottomOf="@+id/admin_pin_main_text" /> diff --git a/app/src/main/res/layout/profile_chooser_fragment.xml b/app/src/main/res/layout/profile_chooser_fragment.xml index c8af2b745f1..d49e7676114 100644 --- a/app/src/main/res/layout/profile_chooser_fragment.xml +++ b/app/src/main/res/layout/profile_chooser_fragment.xml @@ -33,10 +33,10 @@ android:paddingStart="4dp" android:paddingTop="20dp" android:paddingEnd="20dp" - app:srcCompat="@drawable/ic_language_icon_grey_24dp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_language_icon_grey_24dp" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> Date: Thu, 8 Dec 2022 18:05:42 +0530 Subject: [PATCH 11/14] Add profile UI fixes --- .../main/res/layout/add_profile_activity.xml | 10 +++++----- app/src/main/res/layout/admin_auth_activity.xml | 8 ++++---- app/src/main/res/layout/admin_pin_activity.xml | 2 +- .../main/res/layout/pin_password_activity.xml | 12 ++++++------ app/src/main/res/values-night/color_palette.xml | 1 + app/src/main/res/values/color_palette.xml | 7 ++++--- app/src/main/res/values/component_colors.xml | 17 ++++------------- app/src/main/res/values/styles.xml | 10 +++++----- 8 files changed, 30 insertions(+), 37 deletions(-) diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml index df96d84d1d0..6e930ed60d1 100644 --- a/app/src/main/res/layout/add_profile_activity.xml +++ b/app/src/main/res/layout/add_profile_activity.xml @@ -34,7 +34,7 @@ android:id="@+id/add_profile_activity_scroll_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/component_color_add_profile_activity_layout_background_color"> + android:background="@color/component_color_shared_screen_secondary_background_color"> @@ -198,7 +198,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@string/add_profile_allow_download_heading" - android:textColor="@{viewModel.validPin ? @color/component_color_add_profile_activity_switch_text_color : @color/component_color_add_profile_activity_switch_description_color}" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -210,7 +210,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@string/add_profile_allow_download_sub" - android:textColor="@color/component_color_add_profile_activity_switch_description_color" + android:textColor="@color/component_color_shared_secondary_2_text_color" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_allow_download_heading_text_view" @@ -238,7 +238,7 @@ android:gravity="center" android:text="@string/add_profile_create_btn" android:textAllCaps="true" - android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }" + android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_button_active_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_pin_constraint_layout" /> diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml index 57c3490aeed..813b1528b97 100644 --- a/app/src/main/res/layout/admin_auth_activity.xml +++ b/app/src/main/res/layout/admin_auth_activity.xml @@ -13,7 +13,7 @@ android:id="@+id/admin_auth_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/component_color_admin_auth_layout_background_color"> + android:background="@color/component_color_shared_screen_secondary_background_color"> + app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" /> diff --git a/app/src/main/res/layout/admin_pin_activity.xml b/app/src/main/res/layout/admin_pin_activity.xml index 8488ef355cd..1a4538b4e32 100644 --- a/app/src/main/res/layout/admin_pin_activity.xml +++ b/app/src/main/res/layout/admin_pin_activity.xml @@ -17,7 +17,7 @@ android:id="@+id/scrollViewAdminPin" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/component_color_admin_pin_activity_layout_background_color" + android:background="@color/component_color_shared_screen_secondary_background_color" android:fillViewport="true" android:overScrollMode="never" android:scrollbars="none"> diff --git a/app/src/main/res/layout/pin_password_activity.xml b/app/src/main/res/layout/pin_password_activity.xml index da8c858e2ea..643c33b4adb 100644 --- a/app/src/main/res/layout/pin_password_activity.xml +++ b/app/src/main/res/layout/pin_password_activity.xml @@ -17,7 +17,7 @@ android:id="@+id/pin_password_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/component_color_pin_password_activity_layout_background_color"> + android:background="@color/component_color_shared_screen_secondary_background_color"> + app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 7ede4516fdf..d507f2a7315 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -15,6 +15,7 @@ @color/color_def_white @color/color_def_oppia_grayish_black @color/color_def_oppia_green + @color/color_def_white @color/color_def_forest_green @color/color_def_dark_green @color/color_def_oppia_green diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 00e8cd1d0ef..80376ed938f 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -16,6 +16,7 @@ @color/color_def_accessible_light_grey_2 @color/color_def_white @color/color_def_oppia_green + @color/color_def_white @color/color_def_oppia_green @color/color_def_dark_green @color/color_def_oppia_green @@ -23,7 +24,7 @@ @color/color_def_accessible_light_grey_2 @color/color_def_white @color/color_def_spanish_grey - @color/color_def_bright_grey + @color/color_def_yellow_ivory @color/color_def_white @color/color_def_black @color/color_def_oppia_green @@ -77,7 +78,7 @@ @color/color_def_accessible_grey @color/color_def_checkbox_green @color/color_def_oppia_green - @color/color_def_oppia_silver + @color/color_def_dark_silver @color/color_def_white @color/color_def_white @color/color_def_accessible_light_grey_2 @@ -139,7 +140,7 @@ @color/color_def_oppia_green @color/color_def_accessible_light_grey_2 @color/color_def_accessible_grey - @color/color_def_accessible_light_grey_2 + @color/color_def_accessible_light_grey @color/color_def_black_grey @color/color_def_black_12 @color/color_def_charcoal_black diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 2cf028420b8..de40e6050c4 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -2,6 +2,9 @@ @color/color_palette_cursor_color @color/color_palette_toolbar_color + @color/color_palette_toolbar_text_color + @color/color_palette_primary_background_color + @color/color_palette_secondary_background_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color @color/color_palette_exploration_background_color @@ -67,7 +70,7 @@ @color/color_palette_primary_text_color @color/color_palette_primary_text_color @color/color_palette_secondary_1_text_color - @color/color_palette_highlighted_text_color + @color/color_palette_secondary_2_text_color @color/color_palette_primary_text_color @color/color_palette_primary_text_color @color/color_palette_primary_text_color @@ -78,16 +81,10 @@ @color/color_palette_container_background_color @color/color_palette_dark_background_color @color/color_palette_stroke_color - - @color/color_palette_description_text_color - @color/color_palette_background_color - @color/color_palette_toolbar_color - @color/color_palette_primary_text_color @color/color_palette_info_icon_color @color/color_palette_dark_text_color @color/color_palette_description_text_color - @color/color_palette_background_color @color/color_palette_dark_background_color @color/color_palette_container_background_color @@ -97,13 +94,7 @@ @color/color_palette_dark_text_color @color/color_palette_dark_background_color @color/color_palette_dark_background_color - - @color/color_palette_background_color - @color/color_palette_background_color - @color/color_palette_toolbar_color - @color/color_palette_highlighted_text_color - @color/color_palette_primary_text_color @color/color_palette_forgot_pin_color @color/color_palette_show_hide_color @color/color_palette_error_text_color diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 51008585a75..e08ac9d2eee 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -197,7 +197,7 @@ sans-serif 24sp sans-serif - @color/component_color_shared_text_view_heading_text_color + @color/component_color_shared_primary_text_color