From f8ee55f15d2048da0717e3684d93104b2b968d45 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 25 May 2022 12:47:09 +0530 Subject: [PATCH 1/9] fixed text cut off --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- app/src/main/res/layout/topic_info_fragment.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml index 622a1b2e2e9..da59f69a09d 100644 --- a/app/src/main/res/layout-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-land/topic_info_fragment.xml @@ -35,7 +35,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="24sp" + android:textSize="23sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml index c0bfc58d401..a79434b34c9 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml @@ -33,7 +33,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="24sp" + android:textSize="23sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml index fd57d47748e..807fbe9d09b 100644 --- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml @@ -53,7 +53,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="24sp" + android:textSize="23sp" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml index a7b9a6b86bb..05967f6cb04 100644 --- a/app/src/main/res/layout/topic_info_fragment.xml +++ b/app/src/main/res/layout/topic_info_fragment.xml @@ -57,7 +57,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="24sp" + android:textSize="23sp" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" From bb3d3d490654411ba0c36f324d4b490a8a9e6e72 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 16:52:02 +0530 Subject: [PATCH 2/9] fix text cutoff in all layouts --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- app/src/main/res/layout/topic_info_fragment.xml | 2 +- app/src/main/res/values-land/dimens.xml | 1 + app/src/main/res/values-sw600dp-land/dimens.xml | 1 + app/src/main/res/values-sw600dp-port/dimens.xml | 2 ++ app/src/main/res/values-xxhdpi/dimens.xml | 1 + app/src/main/res/values/dimens.xml | 1 + 9 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml index da59f69a09d..0407ba98aa7 100644 --- a/app/src/main/res/layout-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-land/topic_info_fragment.xml @@ -35,7 +35,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="23sp" + android:textSize="@dimen/topic_name_text_view_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml index a79434b34c9..3a512cd180c 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml @@ -33,7 +33,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="23sp" + android:textSize="@dimen/topic_name_text_view_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml index 807fbe9d09b..02551c06609 100644 --- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml @@ -53,7 +53,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="23sp" + android:textSize="@dimen/topic_name_text_view_size" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml index 05967f6cb04..2d7de0ad291 100644 --- a/app/src/main/res/layout/topic_info_fragment.xml +++ b/app/src/main/res/layout/topic_info_fragment.xml @@ -57,7 +57,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="23sp" + android:textSize="@dimen/topic_name_text_view_size" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 11b85a0c343..78e7a633993 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -539,4 +539,5 @@ 108dp + 24sp diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index 56a25485afd..697d599a493 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -503,4 +503,5 @@ 192dp 192dp 4dp + 24sp diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index 08d754735cf..2a2d5cc0f6a 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -502,4 +502,6 @@ 64dp 64dp 4dp + + 24sp diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml index 21e07668b22..46bba15f95d 100644 --- a/app/src/main/res/values-xxhdpi/dimens.xml +++ b/app/src/main/res/values-xxhdpi/dimens.xml @@ -5,4 +5,5 @@ 36dp 60dp 60dp + 21sp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b8e169e7f2e..6fcc67ace4b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -748,4 +748,5 @@ 40dp + 24sp From 41133020a37c42262c905d61b61623adcf3deb09 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 17:26:40 +0530 Subject: [PATCH 3/9] add proper naming --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- app/src/main/res/layout/topic_info_fragment.xml | 2 +- app/src/main/res/values-land/dimens.xml | 4 +++- app/src/main/res/values-sw600dp-land/dimens.xml | 4 +++- app/src/main/res/values-sw600dp-port/dimens.xml | 3 ++- app/src/main/res/values-xxhdpi/dimens.xml | 4 +++- app/src/main/res/values/dimens.xml | 4 +++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml index 0407ba98aa7..e1bf3fef743 100644 --- a/app/src/main/res/layout-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-land/topic_info_fragment.xml @@ -35,7 +35,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_name_text_view_size" + android:textSize="@dimen/topic_info_fragment_topic_name_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml index 3a512cd180c..9a03b461449 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml @@ -33,7 +33,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_name_text_view_size" + android:textSize="@dimen/topic_info_fragment_topic_name_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml index 02551c06609..af13a409184 100644 --- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml @@ -53,7 +53,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_name_text_view_size" + android:textSize="@dimen/topic_info_fragment_topic_name_size" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml index 2d7de0ad291..98bf2347119 100644 --- a/app/src/main/res/layout/topic_info_fragment.xml +++ b/app/src/main/res/layout/topic_info_fragment.xml @@ -57,7 +57,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_name_text_view_size" + android:textSize="@dimen/topic_info_fragment_topic_name_size" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 78e7a633993..c60fe7a6056 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -539,5 +539,7 @@ 108dp - 24sp + + + 24sp diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index 697d599a493..a27f117270f 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -503,5 +503,7 @@ 192dp 192dp 4dp - 24sp + + + 24sp diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index 2a2d5cc0f6a..b881feebd20 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -503,5 +503,6 @@ 64dp 4dp - 24sp + + 24sp diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml index 46bba15f95d..4bf0f31646e 100644 --- a/app/src/main/res/values-xxhdpi/dimens.xml +++ b/app/src/main/res/values-xxhdpi/dimens.xml @@ -5,5 +5,7 @@ 36dp 60dp 60dp - 21sp + + + 21sp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 6fcc67ace4b..70d9fc5f4ef 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -748,5 +748,7 @@ 40dp - 24sp + + + 24sp From ce3872acddf087fb204b9c819a270c2944ebe922 Mon Sep 17 00:00:00 2001 From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:38:06 +0530 Subject: [PATCH 4/9] develop updated --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- app/src/main/res/layout/topic_info_fragment.xml | 2 +- app/src/main/res/values-land/dimens.xml | 3 --- app/src/main/res/values-sw600dp-land/dimens.xml | 3 --- app/src/main/res/values-sw600dp-port/dimens.xml | 3 --- app/src/main/res/values-xxhdpi/dimens.xml | 5 +---- app/src/main/res/values/dimens.xml | 3 --- 9 files changed, 5 insertions(+), 20 deletions(-) diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml index d10d664078e..3f05c2cfce6 100644 --- a/app/src/main/res/layout-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-land/topic_info_fragment.xml @@ -35,7 +35,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_info_fragment_topic_name_size" + android:textSize="24sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml index 9a03b461449..c0bfc58d401 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml @@ -33,7 +33,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_info_fragment_topic_name_size" + android:textSize="24sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml index af13a409184..fd57d47748e 100644 --- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml @@ -53,7 +53,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_info_fragment_topic_name_size" + android:textSize="24sp" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml index ef044f93037..b137ca2df02 100644 --- a/app/src/main/res/layout/topic_info_fragment.xml +++ b/app/src/main/res/layout/topic_info_fragment.xml @@ -57,7 +57,7 @@ android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" android:textColor="@color/oppia_primary_text" - android:textSize="@dimen/topic_info_fragment_topic_name_size" + android:textSize="24sp" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index c60fe7a6056..11b85a0c343 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -539,7 +539,4 @@ 108dp - - - 24sp diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index a27f117270f..56a25485afd 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -503,7 +503,4 @@ 192dp 192dp 4dp - - - 24sp diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index b881feebd20..08d754735cf 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -502,7 +502,4 @@ 64dp 64dp 4dp - - - 24sp diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml index 4bf0f31646e..7cad9c6685b 100644 --- a/app/src/main/res/values-xxhdpi/dimens.xml +++ b/app/src/main/res/values-xxhdpi/dimens.xml @@ -5,7 +5,4 @@ 36dp 60dp 60dp - - - 21sp - + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 70d9fc5f4ef..b8e169e7f2e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -748,7 +748,4 @@ 40dp - - - 24sp From 12bb87f7745903c171aed71a0d8de457ea38cff7 Mon Sep 17 00:00:00 2001 From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:41:59 +0530 Subject: [PATCH 5/9] minor changes --- app/src/main/res/values-xxhdpi/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml index 7cad9c6685b..21e07668b22 100644 --- a/app/src/main/res/values-xxhdpi/dimens.xml +++ b/app/src/main/res/values-xxhdpi/dimens.xml @@ -5,4 +5,4 @@ 36dp 60dp 60dp - \ No newline at end of file + From 42a8a47bf03dae9f26e111a09a0125221b7f44aa Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Mon, 12 Dec 2022 10:13:55 +0530 Subject: [PATCH 6/9] Home,RecentlyPlayed,Promotion,ProfileProgress,OngoingTopic,CompletedStory Dark Mode Implement --- .../bottom_rounded_rect_white_background.xml | 2 +- ...interaction_read_only_white_background.xml | 2 +- .../layout-land/profile_progress_header.xml | 25 +++++++++-------- .../profile_progress_header.xml | 25 +++++++++-------- .../main/res/layout/completed_story_item.xml | 6 ++--- .../layout/completed_story_list_fragment.xml | 4 +-- app/src/main/res/layout/home_fragment.xml | 2 +- .../main/res/layout/ongoing_topic_item.xml | 6 ++--- .../layout/ongoing_topic_list_fragment.xml | 4 +-- .../res/layout/profile_progress_fragment.xml | 4 +-- .../res/layout/profile_progress_header.xml | 25 +++++++++-------- ...le_progress_recently_played_story_card.xml | 9 +++---- .../main/res/layout/promoted_story_card.xml | 6 ++--- .../main/res/layout/promoted_story_list.xml | 2 +- .../res/layout/recently_played_activity.xml | 7 +++-- .../res/layout/recently_played_fragment.xml | 2 +- .../res/layout/recently_played_story_card.xml | 10 +++---- app/src/main/res/layout/section_title.xml | 2 +- .../main/res/layout/topic_summary_view.xml | 6 ++--- app/src/main/res/layout/welcome.xml | 4 +-- .../main/res/values-night/color_palette.xml | 13 ++++----- app/src/main/res/values/color_defs.xml | 3 ++- app/src/main/res/values/color_palette.xml | 15 +++++------ app/src/main/res/values/component_colors.xml | 27 ++++--------------- 24 files changed, 98 insertions(+), 113 deletions(-) diff --git a/app/src/main/res/drawable/bottom_rounded_rect_white_background.xml b/app/src/main/res/drawable/bottom_rounded_rect_white_background.xml index 37443f7e564..b535938b991 100644 --- a/app/src/main/res/drawable/bottom_rounded_rect_white_background.xml +++ b/app/src/main/res/drawable/bottom_rounded_rect_white_background.xml @@ -5,5 +5,5 @@ android:bottomRightRadius="4dp" android:topLeftRadius="0dp" android:topRightRadius="0dp" /> - + diff --git a/app/src/main/res/drawable/interaction_read_only_white_background.xml b/app/src/main/res/drawable/interaction_read_only_white_background.xml index 6c2d6e2f614..48c0499a9b9 100644 --- a/app/src/main/res/drawable/interaction_read_only_white_background.xml +++ b/app/src/main/res/drawable/interaction_read_only_white_background.xml @@ -4,7 +4,7 @@ android:shape="rectangle"> + android:color="@color/color_def_black_80"/> + app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view" + app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color" + app:strokeWidth="0.5dp"> @@ -123,13 +124,15 @@ android:clickable="@{viewModel.completedStoryCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}" - app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color" + app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color" app:cardElevation="4dp" app:contentPadding="8dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/ongoing_topics_container" - app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"> + app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view" + app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color" + app:strokeWidth="0.5dp"> @@ -170,7 +173,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:text="@string/recently_played_stories" - android:textColor="@color/component_color_profile_progress_activity_recently_played_stories_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp/profile_progress_header.xml b/app/src/main/res/layout-sw600dp/profile_progress_header.xml index 42a6ef0ac7e..5bb605c7197 100644 --- a/app/src/main/res/layout-sw600dp/profile_progress_header.xml +++ b/app/src/main/res/layout-sw600dp/profile_progress_header.xml @@ -23,7 +23,6 @@ android:layout_width="160dp" android:layout_height="160dp" android:layout_marginStart="@dimen/profile_edit_image_layout_margin_start" - android:background="@color/color_def_white_light" android:clickable="true" android:contentDescription="@string/current_profile_picture_content_description" android:focusable="true" @@ -58,7 +57,7 @@ android:layout_marginEnd="@dimen/profile_name_text_view_layout_margin_end" android:fontFamily="sans-serif-medium" android:text="@{viewModel.profile.name}" - android:textColor="@color/component_color_profile_progress_activity_profile_name_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="28sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/profile_edit_image" @@ -75,13 +74,15 @@ android:clickable="@{viewModel.ongoingTopicCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnOngoingTopicCount()}" - app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color" + app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color" app:cardElevation="4dp" app:contentPadding="8dp" app:layout_constraintEnd_toStartOf="@+id/completed_stories_container" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="@+id/profile_name_text_view" - app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"> + app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view" + app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color" + app:strokeWidth="0.5dp"> @@ -123,13 +124,15 @@ android:clickable="@{viewModel.completedStoryCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}" - app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color" + app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color" app:cardElevation="4dp" app:contentPadding="8dp" app:layout_constraintEnd_toEndOf="@+id/profile_name_text_view" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/ongoing_topics_container" - app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"> + app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view" + app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color" + app:strokeWidth="0.5dp"> @@ -171,7 +174,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:text="@string/recently_played_stories" - android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" app:layout_constraintEnd_toStartOf="@+id/view_all_text_view" diff --git a/app/src/main/res/layout/completed_story_item.xml b/app/src/main/res/layout/completed_story_item.xml index 5ddf4c84f47..09ed287a71d 100755 --- a/app/src/main/res/layout/completed_story_item.xml +++ b/app/src/main/res/layout/completed_story_item.xml @@ -49,7 +49,7 @@ android:id="@+id/constraintLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/component_color_completed_progress_activity_completed_story_card_color" + android:background="@color/component_color_shared_rounded_rect_background_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +69,7 @@ android:maxLines="2" android:minLines="2" android:text="@{viewModel.completedStoryName}" - android:textColor="@color/component_color_completed_progress_activity_completed_story_card_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -90,7 +90,7 @@ android:paddingBottom="12dp" android:text="@{viewModel.topicName}" android:textAllCaps="true" - android:textColor="@color/component_color_completed_progress_activity_completed_story_card_text_color" + android:textColor="@color/component_color_shared_story_card_topic_name_text_color" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/completed_story_name_text_view" /> diff --git a/app/src/main/res/layout/completed_story_list_fragment.xml b/app/src/main/res/layout/completed_story_list_fragment.xml index 141cfbb9a54..c641f60675e 100644 --- a/app/src/main/res/layout/completed_story_list_fragment.xml +++ b/app/src/main/res/layout/completed_story_list_fragment.xml @@ -12,7 +12,7 @@ + android:background="@color/component_color_shared_screen_primary_background_color"> + android:background="@color/component_color_shared_screen_primary_background_color"> + android:background="@color/component_color_shared_screen_primary_background_color"> + app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view" + app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color" + app:strokeWidth="0.5dp"> @@ -126,13 +127,15 @@ android:clickable="@{viewModel.completedStoryCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}" - app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color" + app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color" app:cardElevation="2dp" app:contentPadding="8dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toEndOf="@+id/ongoing_topics_container" - app:layout_constraintTop_toTopOf="@+id/ongoing_topics_container"> + app:layout_constraintTop_toTopOf="@+id/ongoing_topics_container" + app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color" + app:strokeWidth="0.5dp"> @@ -175,7 +178,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:text="@string/recently_played_stories" - android:textColor="@color/component_color_profile_progress_activity_recently_played_stories_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" app:layout_constraintEnd_toStartOf="@+id/view_all_text_view" diff --git a/app/src/main/res/layout/profile_progress_recently_played_story_card.xml b/app/src/main/res/layout/profile_progress_recently_played_story_card.xml index 4b00558b9be..380827a30eb 100755 --- a/app/src/main/res/layout/profile_progress_recently_played_story_card.xml +++ b/app/src/main/res/layout/profile_progress_recently_played_story_card.xml @@ -21,7 +21,7 @@ android:clickable="true" android:focusable="true" android:onClick="@{(v) -> viewModel.onStoryItemClicked()}" - app:cardBackgroundColor="@color/color_def_white" + app:cardBackgroundColor="@color/component_color_shared_white_background_color" app:cardCornerRadius="4dp" app:cardElevation="4dp"> @@ -47,7 +47,7 @@ diff --git a/app/src/main/res/layout/promoted_story_list.xml b/app/src/main/res/layout/promoted_story_list.xml index c201f2b6bab..2f9a03f42e7 100644 --- a/app/src/main/res/layout/promoted_story_list.xml +++ b/app/src/main/res/layout/promoted_story_list.xml @@ -32,7 +32,7 @@ android:layout_weight="1" android:fontFamily="sans-serif-medium" android:text="@{viewModel.getHeader()}" - android:textColor="@color/component_color_home_activity_recently_played_stories_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="18sp" /> + android:background="@color/component_color_shared_screen_primary_background_color"> + app:titleTextAppearance="@style/ToolbarTextAppearance"/> diff --git a/app/src/main/res/layout/topic_summary_view.xml b/app/src/main/res/layout/topic_summary_view.xml index 7ada7c44bf7..877f2c7822e 100755 --- a/app/src/main/res/layout/topic_summary_view.xml +++ b/app/src/main/res/layout/topic_summary_view.xml @@ -43,7 +43,7 @@ android:id="@+id/constraintLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/topic_title_background" + android:background="@color/component_color_shared_topic_card_item_background_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -63,7 +63,7 @@ android:paddingStart="8dp" android:paddingEnd="8dp" android:text="@{viewModel.title}" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_shared_topic_card_primary_text_view_color" android:textSize="14sp" android:textStyle="bold" app:layout_constraintHorizontal_bias="0" @@ -81,7 +81,7 @@ android:fontFamily="sans-serif-light" android:paddingBottom="@dimen/topic_summary_lesson_count_text_view_padding_bottom" android:text="@{viewModel.computeLessonCountText()}" - android:textColor="@color/color_def_white_80" + android:textColor="@color/component_color_shared_topic_card_primary_text_view_color" android:textSize="14sp" android:textStyle="italic" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/welcome.xml b/app/src/main/res/layout/welcome.xml index 597be2ec38d..2c29f6157ea 100644 --- a/app/src/main/res/layout/welcome.xml +++ b/app/src/main/res/layout/welcome.xml @@ -34,7 +34,7 @@ android:layout_marginEnd="@dimen/home_welcome_text_view_margin_end" android:fontFamily="sans-serif" android:text="@{viewModel.greeting}" - android:textColor="@color/component_color_home_activity_greeting_text_color" + android:textColor="@color/component_color_shared_content_item_text_view_color" android:textSize="24sp" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index a92f97f7b20..d6177b905ea 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -9,8 +9,10 @@ @color/color_def_oppia_light_black @color/color_def_transparent @color/color_def_oppia_silver + @color/color_def_white_80 @color/color_def_oppia_dark_grey @color/color_def_white + @color/color_def_white @color/color_def_oppia_pink @color/color_def_white @color/color_def_oppia_grayish_black @@ -104,11 +106,8 @@ @color/color_def_confetti_crystal_blue @color/color_def_oppia_turquoise @color/color_def_oppia_light_black - @color/color_def_oppia_light_black @color/color_def_oppia_turquoise - @color/color_def_white @color/color_def_white - @color/color_def_white @color/color_def_dark_turquoise @color/color_def_accessible_grey @color/color_def_white_0 @@ -125,12 +124,7 @@ @color/color_def_oppia_metallic_blue @color/color_def_dark_purple @color/color_def_oppia_light_black - @color/color_def_oppia_light_black - @color/color_def_white - @color/color_def_oppia_light_black - @color/color_def_oppia_light_black @color/color_def_oppia_light_black - @color/color_def_white @color/color_def_oppia_light_black @color/color_def_oppia_silver @color/color_def_white @@ -145,4 +139,7 @@ @color/color_def_oppia_silver @color/color_def_white @color/color_def_dark_silver + @color/color_def_oppia_metallic_blue + @color/color_def_white + @color/color_def_grey diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml index 9849a35695c..a1b7822a696 100644 --- a/app/src/main/res/values/color_defs.xml +++ b/app/src/main/res/values/color_defs.xml @@ -11,7 +11,7 @@ #E76F51 #4D395FD0 #4DA5D3EC - #CC333333 + #CC333333 #B92D00 #FFFFFF #CCFFFFFF @@ -94,4 +94,5 @@ #A6503A #441530 #F2F2F2 + #205D86 diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 80376ed938f..a4123805bb9 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -10,7 +10,9 @@ @color/color_def_mid_grey_30 @color/color_def_transparent @color/color_def_accessible_light_grey + @color/color_def_black_80 @color/color_def_white + @color/color_def_white @color/color_def_black_87 @color/color_def_oppia_red @color/color_def_accessible_light_grey_2 @@ -106,11 +108,8 @@ @color/color_def_oppia_dark_blue @color/color_def_oppia_dark_blue @color/color_def_oppia_white - @color/color_def_white - @color/color_def_accessible_grey @color/color_def_accessible_grey - @color/color_def_accessible_grey - @color/color_def_oppia_light_brown + @color/color_def_oppia_brown_dark @color/color_def_white @color/color_def_white_0 @color/color_def_white @@ -126,13 +125,8 @@ @color/color_def_teal_blue @color/color_def_dark_red @color/color_def_oppia_white_2 - @color/color_def_transparent - @color/color_def_accessible_grey @color/color_def_oppia_green - @color/color_def_white - @color/color_def_white @color/color_def_white - @color/color_def_oppia_stroke_black @color/color_def_oppia_white_2 @color/color_def_accessible_light_grey_2 @color/color_def_accessible_grey @@ -147,4 +141,7 @@ @color/color_def_oppia_silver @color/color_def_white @color/color_def_dark_silver + @color/color_def_blue_sapphire + @color/color_def_white + @color/color_def_grey diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 27d432074d9..72ee049f1e3 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -5,11 +5,15 @@ @color/color_palette_toolbar_text_color @color/color_palette_primary_background_color @color/color_palette_secondary_background_color + @color/color_palette_topic_card_item_background_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color + @color/color_palette_topic_card_text_color + @color/color_palette_card_topic_name_text_color @color/color_palette_exploration_background_color @color/color_palette_highlighted_text_color @color/color_palette_transparent_background_color + @color/color_palette_shared_white_background_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color @color/color_palette_input_error_color @@ -243,11 +247,8 @@ @color/color_palette_dark_text_color - @color/color_palette_home_activity_background_color @color/color_palette_view_all_text_color - @color/color_palette_recently_played_stories_text_color @color/color_palette_select_a_topic_to_start_text_color - @color/color_palette_greeting_text_color @color/color_palette_layout_below_greeting_text_color @color/color_palette_toolbar_color @@ -292,26 +293,8 @@ @color/color_palette_topic_revision_background_color - @color/color_palette_profile_progress_activity_background_color - @color/color_palette_profile_progress_activity_profile_name_text_color - @color/color_palette_rounded_rect_background_color - @color/color_palette_highlighted_text_color - @color/color_palette_highlighted_text_color @color/color_palette_view_all_text_color - - @color/color_palette_toolbar_color - @color/color_palette_recently_played_activity_background_color - @color/color_palette_rounded_rect_background_color - @color/color_palette_highlighted_text_color - @color/color_palette_highlighted_text_color - - @color/color_palette_toolbar_color - @color/color_palette_ongoing_progress_activity_background_color - - @color/color_palette_toolbar_color - @color/color_palette_completed_progress_activity_background_color - @color/color_palette_rounded_rect_background_color - @color/color_palette_completed_progress_activity_completed_story_card_text_color + @color/color_palette_profile_progress_activity_story_count_card_stroke_color @color/color_palette_topic_fragments_background_color @color/color_palette_topic_practice_header_description_color From cc9cdf546c3e1a40d90db9fbba1bf45699993d7b Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 14 Dec 2022 14:27:16 +0530 Subject: [PATCH 7/9] Remove unused drawables. --- .../main/res/drawable/grey_card_rounded_border.xml | 9 --------- .../interaction_read_only_white_background.xml | 12 ------------ .../main/res/layout-land/profile_progress_header.xml | 2 -- .../res/layout-sw600dp/profile_progress_header.xml | 2 -- app/src/main/res/layout/profile_progress_header.xml | 2 -- .../main/res/layout/recently_played_story_card.xml | 2 +- 6 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 app/src/main/res/drawable/grey_card_rounded_border.xml delete mode 100644 app/src/main/res/drawable/interaction_read_only_white_background.xml diff --git a/app/src/main/res/drawable/grey_card_rounded_border.xml b/app/src/main/res/drawable/grey_card_rounded_border.xml deleted file mode 100644 index 4c943c52313..00000000000 --- a/app/src/main/res/drawable/grey_card_rounded_border.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/interaction_read_only_white_background.xml b/app/src/main/res/drawable/interaction_read_only_white_background.xml deleted file mode 100644 index 48c0499a9b9..00000000000 --- a/app/src/main/res/drawable/interaction_read_only_white_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-land/profile_progress_header.xml b/app/src/main/res/layout-land/profile_progress_header.xml index 4318c016793..8594cb0dee8 100644 --- a/app/src/main/res/layout-land/profile_progress_header.xml +++ b/app/src/main/res/layout-land/profile_progress_header.xml @@ -69,7 +69,6 @@ android:layout_marginTop="20dp" android:layout_marginEnd="20dp" android:layout_weight="1" - android:background="@drawable/grey_card_rounded_border" android:clickable="@{viewModel.ongoingTopicCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnOngoingTopicCount()}" @@ -120,7 +119,6 @@ android:layout_marginTop="20dp" android:layout_marginEnd="4dp" android:layout_weight="1" - android:background="@drawable/grey_card_rounded_border" android:clickable="@{viewModel.completedStoryCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}" diff --git a/app/src/main/res/layout-sw600dp/profile_progress_header.xml b/app/src/main/res/layout-sw600dp/profile_progress_header.xml index 5bb605c7197..3e6d826defd 100644 --- a/app/src/main/res/layout-sw600dp/profile_progress_header.xml +++ b/app/src/main/res/layout-sw600dp/profile_progress_header.xml @@ -70,7 +70,6 @@ android:layout_marginTop="20dp" android:layout_marginEnd="24dp" android:layout_weight="1" - android:background="@drawable/grey_card_rounded_border" android:clickable="@{viewModel.ongoingTopicCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnOngoingTopicCount()}" @@ -120,7 +119,6 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_weight="1" - android:background="@drawable/grey_card_rounded_border" android:clickable="@{viewModel.completedStoryCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}" diff --git a/app/src/main/res/layout/profile_progress_header.xml b/app/src/main/res/layout/profile_progress_header.xml index 7bfe4d95c32..b219bb7a7e5 100644 --- a/app/src/main/res/layout/profile_progress_header.xml +++ b/app/src/main/res/layout/profile_progress_header.xml @@ -71,7 +71,6 @@ android:layout_marginTop="32dp" android:layout_marginEnd="24dp" android:layout_weight="1" - android:background="@drawable/grey_card_rounded_border" android:clickable="@{viewModel.ongoingTopicCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnOngoingTopicCount()}" @@ -123,7 +122,6 @@ android:layout_height="wrap_content" android:layout_marginEnd="28dp" android:layout_weight="1" - android:background="@drawable/grey_card_rounded_border" android:clickable="@{viewModel.completedStoryCount > 0}" android:importantForAccessibility="yes" android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}" diff --git a/app/src/main/res/layout/recently_played_story_card.xml b/app/src/main/res/layout/recently_played_story_card.xml index f417d933c39..41682ecc791 100755 --- a/app/src/main/res/layout/recently_played_story_card.xml +++ b/app/src/main/res/layout/recently_played_story_card.xml @@ -73,8 +73,8 @@ Date: Thu, 15 Dec 2022 20:35:20 +0530 Subject: [PATCH 8/9] Fixed color naming and toolbar title color naming with proper shared colors. --- .../main/res/layout-land/profile_progress_header.xml | 12 ++++++------ .../res/layout-sw600dp/profile_progress_header.xml | 12 ++++++------ app/src/main/res/layout/all_topics.xml | 2 +- app/src/main/res/layout/completed_story_item.xml | 2 +- .../res/layout/completed_story_list_fragment.xml | 2 +- app/src/main/res/layout/content_item.xml | 2 +- app/src/main/res/layout/home_activity.xml | 2 +- app/src/main/res/layout/ongoing_topic_item.xml | 4 ++-- .../main/res/layout/ongoing_topic_list_fragment.xml | 2 +- .../main/res/layout/profile_progress_activity.xml | 2 +- .../main/res/layout/profile_progress_fragment.xml | 1 - app/src/main/res/layout/profile_progress_header.xml | 12 ++++++------ .../profile_progress_recently_played_story_card.xml | 5 +++-- app/src/main/res/layout/promoted_story_card.xml | 6 +++--- app/src/main/res/layout/promoted_story_list.xml | 2 +- .../main/res/layout/recently_played_story_card.xml | 2 +- app/src/main/res/layout/section_title.xml | 4 ++-- app/src/main/res/layout/topic_summary_view.xml | 4 ++-- app/src/main/res/layout/welcome.xml | 4 ++-- app/src/main/res/values-night/color_palette.xml | 2 +- app/src/main/res/values/color_palette.xml | 2 +- app/src/main/res/values/component_colors.xml | 5 +++-- app/src/main/res/values/styles.xml | 2 +- 23 files changed, 47 insertions(+), 46 deletions(-) diff --git a/app/src/main/res/layout-land/profile_progress_header.xml b/app/src/main/res/layout-land/profile_progress_header.xml index 8594cb0dee8..dda7af7e0ef 100644 --- a/app/src/main/res/layout-land/profile_progress_header.xml +++ b/app/src/main/res/layout-land/profile_progress_header.xml @@ -55,7 +55,7 @@ android:layout_marginTop="12dp" android:fontFamily="sans-serif-medium" android:text="@{viewModel.profile.name}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="28sp" app:layout_constraintEnd_toEndOf="@id/completed_stories_container" app:layout_constraintStart_toStartOf="@+id/ongoing_topics_container" @@ -97,7 +97,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@{Integer.toString(viewModel.ongoingTopicCount)}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" /> @@ -147,7 +147,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@{Integer.toString(viewModel.completedStoryCount)}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" /> @@ -171,7 +171,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:text="@string/recently_played_stories" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-sw600dp/profile_progress_header.xml b/app/src/main/res/layout-sw600dp/profile_progress_header.xml index 3e6d826defd..488512041d8 100644 --- a/app/src/main/res/layout-sw600dp/profile_progress_header.xml +++ b/app/src/main/res/layout-sw600dp/profile_progress_header.xml @@ -57,7 +57,7 @@ android:layout_marginEnd="@dimen/profile_name_text_view_layout_margin_end" android:fontFamily="sans-serif-medium" android:text="@{viewModel.profile.name}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="28sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/profile_edit_image" @@ -98,7 +98,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@{Integer.toString(viewModel.ongoingTopicCount)}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" /> @@ -147,7 +147,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@{Integer.toString(viewModel.completedStoryCount)}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" /> @@ -172,7 +172,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:text="@string/recently_played_stories" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" app:layout_constraintEnd_toStartOf="@+id/view_all_text_view" diff --git a/app/src/main/res/layout/all_topics.xml b/app/src/main/res/layout/all_topics.xml index 6d276fd73b6..6d6d101d3dd 100644 --- a/app/src/main/res/layout/all_topics.xml +++ b/app/src/main/res/layout/all_topics.xml @@ -23,7 +23,7 @@ android:layout_marginBottom="@dimen/all_topics_text_margin_bottom" android:fontFamily="sans-serif-medium" android:text="@string/select_a_topic_to_start" - android:textColor="@color/component_color_home_activity_select_a_topic_to_start_text_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" /> diff --git a/app/src/main/res/layout/completed_story_item.xml b/app/src/main/res/layout/completed_story_item.xml index 09ed287a71d..9ae11d0a2ac 100755 --- a/app/src/main/res/layout/completed_story_item.xml +++ b/app/src/main/res/layout/completed_story_item.xml @@ -69,7 +69,7 @@ android:maxLines="2" android:minLines="2" android:text="@{viewModel.completedStoryName}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/completed_story_list_fragment.xml b/app/src/main/res/layout/completed_story_list_fragment.xml index c641f60675e..c1d2f5c0a9b 100644 --- a/app/src/main/res/layout/completed_story_list_fragment.xml +++ b/app/src/main/res/layout/completed_story_list_fragment.xml @@ -34,7 +34,7 @@ app:navigationIcon="?attr/homeAsUpIndicator" app:title="@string/completed_story_list_activity_title" app:titleTextAppearance="@style/ToolbarTextAppearance" - app:titleTextColor="@color/color_def_white" /> + app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" /> + app:titleTextAppearance="@style/ToolbarTextAppearance" /> + app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" /> + app:titleTextAppearance="@style/ToolbarTextAppearance" /> @@ -150,7 +150,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:text="@{Integer.toString(viewModel.completedStoryCount)}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" /> @@ -176,7 +176,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:text="@string/recently_played_stories" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" app:layout_constraintEnd_toStartOf="@+id/view_all_text_view" diff --git a/app/src/main/res/layout/profile_progress_recently_played_story_card.xml b/app/src/main/res/layout/profile_progress_recently_played_story_card.xml index 380827a30eb..78a4576dbdd 100755 --- a/app/src/main/res/layout/profile_progress_recently_played_story_card.xml +++ b/app/src/main/res/layout/profile_progress_recently_played_story_card.xml @@ -21,7 +21,7 @@ android:clickable="true" android:focusable="true" android:onClick="@{(v) -> viewModel.onStoryItemClicked()}" - app:cardBackgroundColor="@color/component_color_shared_white_background_color" + app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color" app:cardCornerRadius="4dp" app:cardElevation="4dp"> @@ -65,7 +65,7 @@ android:fontFamily="sans-serif" android:lines="2" android:text="@{viewModel.storyTitle}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="14sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -74,6 +74,7 @@ diff --git a/app/src/main/res/layout/topic_summary_view.xml b/app/src/main/res/layout/topic_summary_view.xml index 877f2c7822e..f590946dfe2 100755 --- a/app/src/main/res/layout/topic_summary_view.xml +++ b/app/src/main/res/layout/topic_summary_view.xml @@ -63,7 +63,7 @@ android:paddingStart="8dp" android:paddingEnd="8dp" android:text="@{viewModel.title}" - android:textColor="@color/component_color_shared_topic_card_primary_text_view_color" + android:textColor="@color/component_color_shared_topic_card_text_view_color" android:textSize="14sp" android:textStyle="bold" app:layout_constraintHorizontal_bias="0" @@ -81,7 +81,7 @@ android:fontFamily="sans-serif-light" android:paddingBottom="@dimen/topic_summary_lesson_count_text_view_padding_bottom" android:text="@{viewModel.computeLessonCountText()}" - android:textColor="@color/component_color_shared_topic_card_primary_text_view_color" + android:textColor="@color/component_color_shared_topic_card_text_view_color" android:textSize="14sp" android:textStyle="italic" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/welcome.xml b/app/src/main/res/layout/welcome.xml index 2c29f6157ea..e4a87b27e94 100644 --- a/app/src/main/res/layout/welcome.xml +++ b/app/src/main/res/layout/welcome.xml @@ -34,7 +34,7 @@ android:layout_marginEnd="@dimen/home_welcome_text_view_margin_end" android:fontFamily="sans-serif" android:text="@{viewModel.greeting}" - android:textColor="@color/component_color_shared_content_item_text_view_color" + android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index d6177b905ea..2f38c5abb33 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -107,7 +107,6 @@ @color/color_def_oppia_turquoise @color/color_def_oppia_light_black @color/color_def_oppia_turquoise - @color/color_def_white @color/color_def_dark_turquoise @color/color_def_accessible_grey @color/color_def_white_0 @@ -142,4 +141,5 @@ @color/color_def_oppia_metallic_blue @color/color_def_white @color/color_def_grey + @color/color_def_white diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index a4123805bb9..ed477080af4 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -108,7 +108,6 @@ @color/color_def_oppia_dark_blue @color/color_def_oppia_dark_blue @color/color_def_oppia_white - @color/color_def_accessible_grey @color/color_def_oppia_brown_dark @color/color_def_white @color/color_def_white_0 @@ -144,4 +143,5 @@ @color/color_def_blue_sapphire @color/color_def_white @color/color_def_grey + @color/color_def_light_grey diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 72ee049f1e3..182e8f6ef16 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -8,7 +8,7 @@ @color/color_palette_topic_card_item_background_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color - @color/color_palette_topic_card_text_color + @color/color_palette_topic_card_text_color @color/color_palette_card_topic_name_text_color @color/color_palette_exploration_background_color @color/color_palette_highlighted_text_color @@ -248,7 +248,6 @@ @color/color_palette_dark_text_color @color/color_palette_view_all_text_color - @color/color_palette_select_a_topic_to_start_text_color @color/color_palette_layout_below_greeting_text_color @color/color_palette_toolbar_color @@ -332,4 +331,6 @@ @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_section_title_divider_color diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e08ac9d2eee..0833da624c4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -108,7 +108,7 @@