From f8ee55f15d2048da0717e3684d93104b2b968d45 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 25 May 2022 12:47:09 +0530 Subject: [PATCH 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 864cb4031d9dc43fdfa915c029ed788f79241dd8 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 25 May 2022 12:47:09 +0530 Subject: [PATCH 06/19] fixed text cut off --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 cf5c1595bc1..d3b7dc90363 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.topicTitle}" 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 15c2ff0401e..18ce6736ac5 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.topicTitle}" 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 bb5d6f2043174db7f7856d559981aaa927488d73 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 16:52:02 +0530 Subject: [PATCH 07/19] fix text cutoff in all layouts --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 ++ 5 files changed, 6 insertions(+), 2 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 d3b7dc90363..214e695071a 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.topicTitle}" 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 18ce6736ac5..3bdcea9b98c 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.topicTitle}" 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 578d3179178..d070f29df44 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,4 +542,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 3f60f076e3b..a8a71c9bb7a 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,4 +507,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 b141058e468..80496f8e395 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -506,4 +506,6 @@ 64dp 64dp 4dp + + 24sp From 536eaa3edea4f75ac5709358061681b765fb80b0 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 17:26:40 +0530 Subject: [PATCH 08/19] add proper naming --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 ++- 5 files changed, 10 insertions(+), 5 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 214e695071a..9b425b0af7f 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.topicTitle}" 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 3bdcea9b98c..d2fb9753260 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.topicTitle}" 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 d070f29df44..cf88eaf09fc 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,5 +542,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 a8a71c9bb7a..9b94d77965e 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,5 +507,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 80496f8e395..46c2a75b0af 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -507,5 +507,6 @@ 64dp 4dp - 24sp + + 24sp From 911cd5d9fbe30831a349cc20758dc3be66ca8e88 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 09/19] develop updated --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 --- 5 files changed, 2 insertions(+), 11 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 9b425b0af7f..cf5c1595bc1 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.topicTitle}" 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 d2fb9753260..15c2ff0401e 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.topicTitle}" 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 cf88eaf09fc..578d3179178 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,7 +542,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 9b94d77965e..3f60f076e3b 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,7 +507,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 46c2a75b0af..b141058e468 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -506,7 +506,4 @@ 64dp 64dp 4dp - - - 24sp From bbab289072e16304c863c2cf63c8955e162f9c61 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 25 May 2022 12:47:09 +0530 Subject: [PATCH 10/19] fixed text cut off --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 cf5c1595bc1..d3b7dc90363 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.topicTitle}" 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 15c2ff0401e..18ce6736ac5 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.topicTitle}" 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 a2720753c14673c81cb307decf8ddf440ed72b55 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 16:52:02 +0530 Subject: [PATCH 11/19] fix text cutoff in all layouts --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 ++ 5 files changed, 6 insertions(+), 2 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 d3b7dc90363..214e695071a 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.topicTitle}" 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 18ce6736ac5..3bdcea9b98c 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.topicTitle}" 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 578d3179178..d070f29df44 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,4 +542,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 3f60f076e3b..a8a71c9bb7a 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,4 +507,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 b141058e468..80496f8e395 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -506,4 +506,6 @@ 64dp 64dp 4dp + + 24sp From d2705525473b476f3de598ab3789caeb1f37397a Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 17:26:40 +0530 Subject: [PATCH 12/19] add proper naming --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 ++- 5 files changed, 10 insertions(+), 5 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 214e695071a..9b425b0af7f 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.topicTitle}" 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 3bdcea9b98c..d2fb9753260 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.topicTitle}" 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 d070f29df44..cf88eaf09fc 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,5 +542,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 a8a71c9bb7a..9b94d77965e 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,5 +507,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 80496f8e395..46c2a75b0af 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -507,5 +507,6 @@ 64dp 4dp - 24sp + + 24sp From 07e345fca7de5063ba117cf78c9029915143d6c5 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 13/19] develop updated --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 --- 5 files changed, 2 insertions(+), 11 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 9b425b0af7f..cf5c1595bc1 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.topicTitle}" 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 d2fb9753260..15c2ff0401e 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.topicTitle}" 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 cf88eaf09fc..578d3179178 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,7 +542,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 9b94d77965e..3f60f076e3b 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,7 +507,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 46c2a75b0af..b141058e468 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -506,7 +506,4 @@ 64dp 64dp 4dp - - - 24sp From f2542607f697590b9954dd46fe08a12e133d54f5 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Wed, 25 May 2022 12:47:09 +0530 Subject: [PATCH 14/19] fixed text cut off --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 cf5c1595bc1..d3b7dc90363 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.topicTitle}" 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 15c2ff0401e..18ce6736ac5 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.topicTitle}" 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 0feeb331a58348cccc36b333572516a65092bbd4 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 16:52:02 +0530 Subject: [PATCH 15/19] fix text cutoff in all layouts --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 ++ 5 files changed, 6 insertions(+), 2 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 d3b7dc90363..214e695071a 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.topicTitle}" 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 18ce6736ac5..3bdcea9b98c 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.topicTitle}" 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 578d3179178..d070f29df44 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,4 +542,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 3f60f076e3b..a8a71c9bb7a 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,4 +507,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 b141058e468..80496f8e395 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -506,4 +506,6 @@ 64dp 64dp 4dp + + 24sp From 5ed10dad4c7e398881743cad21e001c4b098d093 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Sat, 28 May 2022 17:26:40 +0530 Subject: [PATCH 16/19] add proper naming --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 ++- 5 files changed, 10 insertions(+), 5 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 214e695071a..9b425b0af7f 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.topicTitle}" 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 3bdcea9b98c..d2fb9753260 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.topicTitle}" 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 d070f29df44..cf88eaf09fc 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,5 +542,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 a8a71c9bb7a..9b94d77965e 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,5 +507,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 80496f8e395..46c2a75b0af 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -507,5 +507,6 @@ 64dp 4dp - 24sp + + 24sp From 7577b1b1fc6ae0960b53b159e916a09f68ff3c4e 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 17/19] develop updated --- app/src/main/res/layout-land/topic_info_fragment.xml | 2 +- app/src/main/res/layout-sw600dp-port/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 --- 5 files changed, 2 insertions(+), 11 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 9b425b0af7f..cf5c1595bc1 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.topicTitle}" 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 d2fb9753260..15c2ff0401e 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.topicTitle}" 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 cf88eaf09fc..578d3179178 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -542,7 +542,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 9b94d77965e..3f60f076e3b 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -507,7 +507,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 46c2a75b0af..b141058e468 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -506,7 +506,4 @@ 64dp 64dp 4dp - - - 24sp From 4d26af1e24b44b5bdb873f724e80da4316f5d1be Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Thu, 12 Jan 2023 23:20:28 +0530 Subject: [PATCH 18/19] Remove Gitter --- .github/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/README.md b/.github/README.md index 0dd3ccc43b9..29bc975ecbf 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,5 +1,5 @@ # [Oppia Android](https://www.oppia.org) -[![Gitter](https://img.shields.io/badge/chat-on%20gitter-ff006f.svg)](https://gitter.im/oppia/oppia-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Mailing List](https://img.shields.io/badge/Mailing%20List-Oppia%20Android-dev.svg)](mailto:oppia-android-dev@googlegroups.com) [![Twitter Follow](https://img.shields.io/twitter/follow/oppiaorg.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/oppiaorg) [![GitHub issues by-label](https://img.shields.io/github/issues-search/oppia/oppia-android?label=Available%20starter%20issues&query=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20no%3Aassignee)](https://github.com/oppia/oppia-android/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+no%3Aassignee) +[![Mailing List](https://img.shields.io/badge/Mailing%20List-Oppia%20Android-dev.svg)](mailto:oppia-android-dev@googlegroups.com) [![Twitter Follow](https://img.shields.io/twitter/follow/oppiaorg.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/oppiaorg) [![GitHub issues by-label](https://img.shields.io/github/issues-search/oppia/oppia-android?label=Available%20starter%20issues&query=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20no%3Aassignee)](https://github.com/oppia/oppia-android/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+no%3Aassignee) [![Unit Tests (Robolectric -- Gradle)](https://github.com/oppia/oppia-android/actions/workflows/main.yml/badge.svg)](https://github.com/oppia/oppia-android/actions/workflows/main.yml) [![Unit Tests (Robolectric - Bazel)](https://github.com/oppia/oppia-android/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/oppia/oppia-android/actions/workflows/unit_tests.yml) [![Build Tests](https://github.com/oppia/oppia-android/actions/workflows/build_tests.yml/badge.svg)](https://github.com/oppia/oppia-android/actions/workflows/build_tests.yml) [![Static Checks](https://github.com/oppia/oppia-android/actions/workflows/static_checks.yml/badge.svg)](https://github.com/oppia/oppia-android/actions/workflows/static_checks.yml) @@ -67,8 +67,6 @@ The Oppia Android code is released under the [Apache v2 license](https://github. * [Discussion forum](http://groups.google.com/group/oppia) * [Announcements mailing list](http://groups.google.com/group/oppia-announce) -We also have public chat rooms on Gitter: [https://gitter.im/oppia/oppia-android](https://gitter.im/oppia/oppia-android). Drop by and say hello! - ## Social Media [][twitter] [][LinkedIn] From fb9b015cdb825bf676f1d4373cf21bf388d903f4 Mon Sep 17 00:00:00 2001 From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:52:09 +0530 Subject: [PATCH 19/19] Refac: Change Discussion Link --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 29bc975ecbf..5e4ad1766b0 100644 --- a/.github/README.md +++ b/.github/README.md @@ -64,7 +64,7 @@ The Oppia Android code is released under the [Apache v2 license](https://github. ## Keeping in touch - * [Discussion forum](http://groups.google.com/group/oppia) + * [Discussion forum](https://github.com/oppia/oppia-android/discussions) * [Announcements mailing list](http://groups.google.com/group/oppia-announce) ## Social Media