From f8ee55f15d2048da0717e3684d93104b2b968d45 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 25 May 2022 12:47:09 +0530 Subject: [PATCH 1/7] 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/7] 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/7] 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/7] 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/7] 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 01e56e76b05c6182ddc82fb7e46b3949b9376b21 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Thu, 8 Sep 2022 09:49:21 +0530 Subject: [PATCH 6/7] dark_mode:info section --- app/src/main/res/drawable/thumbnail_gradient.xml | 2 +- app/src/main/res/layout/topic_info_fragment.xml | 15 ++++++++------- 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 | 9 +++++++++ 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/drawable/thumbnail_gradient.xml b/app/src/main/res/drawable/thumbnail_gradient.xml index 3ff9c58fb90..2cf6f6c701b 100644 --- a/app/src/main/res/drawable/thumbnail_gradient.xml +++ b/app/src/main/res/drawable/thumbnail_gradient.xml @@ -4,6 +4,6 @@ diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml index b137ca2df02..81e46cdb3ba 100644 --- a/app/src/main/res/layout/topic_info_fragment.xml +++ b/app/src/main/res/layout/topic_info_fragment.xml @@ -14,7 +14,7 @@ @@ -56,7 +56,7 @@ android:layout_marginBottom="8dp" android:fontFamily="sans-serif" android:text="@{viewModel.topic.name}" - android:textColor="@color/oppia_primary_text" + android:textColor="@color/component_color_topic_info_fragment_topic_name_text_color" android:textSize="24sp" app:layout_constraintBottom_toBottomOf="@+id/topic_thumbnail_image_view" app:layout_constraintEnd_toEndOf="parent" @@ -73,7 +73,7 @@ android:layout_marginEnd="32dp" android:fontFamily="sans-serif" android:text="@{viewModel.storyCountText}" - android:textColor="@color/oppia_primary_text" + android:textColor="@color/component_color_topic_info_fragment_story_count_text_color" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -106,7 +106,7 @@ android:onClick="@{(v) -> viewModel.clickSeeMore()}" android:paddingTop="8dp" android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}" - android:textColor="@color/oppia_primary" + android:textColor="@color/component_color_topic_info_fragment_see_more_text_color" android:textSize="16sp" android:textStyle="bold" android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}" @@ -125,7 +125,8 @@ app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/see_more_text_view" /> + app:layout_constraintTop_toBottomOf="@+id/see_more_text_view" + app:tint="@color/component_color_topic_info_fragment_download_status_image_color" /> @color/color_def_accessible_grey @color/color_def_white @color/color_def_oppia_turquoise + @color/color_def_accessible_grey diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 24ea7e5c2df..913e22c45a7 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -88,4 +88,5 @@ @color/color_def_white @color/color_def_stroke_silver @color/color_def_oppia_dark_blue + @color/color_def_white diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 64569c005a3..eec928638b4 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -242,5 +242,14 @@ @color/color_palette_toolbar_color @color/color_palette_secondary_toolbar_color + + @color/color_palette_primary_background_color + @color/color_palette_highlighted_text_color + @color/color_palette_highlighted_text_color + @color/color_palette_thumbnail_gradient_end_color + @color/color_palette_primary_color + @color/color_palette_primary_color + @color/color_palette_show_text_color + @color/color_palette_show_text_color From 061d2c49fb085579d672fef629b693f90e15100d Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Tue, 13 Sep 2022 09:36:14 +0530 Subject: [PATCH 7/7] changes: minor requested --- app/src/main/res/drawable/thumbnail_gradient.xml | 2 +- app/src/main/res/values-night/color_palette.xml | 1 + app/src/main/res/values/color_defs.xml | 1 + app/src/main/res/values/color_palette.xml | 3 ++- app/src/main/res/values/component_colors.xml | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/drawable/thumbnail_gradient.xml b/app/src/main/res/drawable/thumbnail_gradient.xml index 2cf6f6c701b..d3ef4a0fb66 100644 --- a/app/src/main/res/drawable/thumbnail_gradient.xml +++ b/app/src/main/res/drawable/thumbnail_gradient.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index b91f700a808..29042290878 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -92,4 +92,5 @@ @color/color_def_confetti_crystal_blue @color/color_def_oppia_turquoise @color/color_def_accessible_grey + @color/color_def_white_0 diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml index 9c66d1d3ad9..a130067ee01 100644 --- a/app/src/main/res/values/color_defs.xml +++ b/app/src/main/res/values/color_defs.xml @@ -79,4 +79,5 @@ #EA6390 #EFCF24 #49A9E5 + #00FFFFFF diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 2948e5a27db..184d30c62ca 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -87,9 +87,10 @@ @color/color_def_drag_drop_single_item_gradient_center @color/color_def_white @color/color_def_stroke_silver - @color/color_def_oppia_dark_blue @color/color_def_confetti_ruby_red @color/color_def_confetti_light_gold @color/color_def_oppia_dark_blue + @color/color_def_oppia_dark_blue @color/color_def_white + @color/color_def_white_0 diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index f6ee682198f..7ced00ed365 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -246,11 +246,12 @@ @color/color_palette_confetti_red_color @color/color_palette_confetti_yellow_color @color/color_palette_confetti_blue_color - + @color/color_palette_primary_background_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color @color/color_palette_thumbnail_gradient_end_color + @color/color_palette_thumbnail_gradient_start_color @color/color_palette_primary_color @color/color_palette_primary_color @color/color_palette_show_text_color