From cfc4e30ad78f7894bdbb7f392e90959e1388cabd Mon Sep 17 00:00:00 2001 From: shivambh12 Date: Sat, 4 Dec 2021 22:20:47 +0530 Subject: [PATCH 1/7] topic_lessons_title port and land merged --- .../res/layout-land/topic_lessons_title.xml | 29 ------------------- .../main/res/layout/topic_lessons_title.xml | 8 ++--- app/src/main/res/values-land/dimens.xml | 5 +++- app/src/main/res/values/dimens.xml | 5 +++- 4 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/res/layout-land/topic_lessons_title.xml diff --git a/app/src/main/res/layout-land/topic_lessons_title.xml b/app/src/main/res/layout-land/topic_lessons_title.xml deleted file mode 100644 index 360b9aa809a..00000000000 --- a/app/src/main/res/layout-land/topic_lessons_title.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/topic_lessons_title.xml b/app/src/main/res/layout/topic_lessons_title.xml index 1f3ef752d58..0946e9c0f04 100644 --- a/app/src/main/res/layout/topic_lessons_title.xml +++ b/app/src/main/res/layout/topic_lessons_title.xml @@ -18,11 +18,11 @@ android:id="@+id/topic_play_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:layout_marginTop="32dp" - android:layout_marginEnd="32dp" + android:layout_marginStart="@dimen/topic_lessons_title_margin_start" + android:layout_marginTop="@dimen/topic_lessons_title_margin_top" + android:layout_marginEnd="@dimen/topic_lessons_title_margin_end" android:fontFamily="sans-serif-medium" - android:text="@string/stories_you_can_play" + android:text="stories_you_can_play" android:textColor="@color/oppiaPrimaryText" android:textSize="20sp" /> diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 89299969c1f..9254af51778 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -383,5 +383,8 @@ 32dp 168dp 168dp - + + 100dp + 32dp + 100dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index cca29d74ad9..2b792864a6e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -583,5 +583,8 @@ 28dp 28dp 28dp - + + 32dp + 32dp + 32dp From 2ef505c6defb90e290fbfc4aa809211454cfff4e Mon Sep 17 00:00:00 2001 From: shivambh12 Date: Sat, 4 Dec 2021 22:23:59 +0530 Subject: [PATCH 2/7] No such changes --- app/src/main/res/layout/topic_lessons_title.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/topic_lessons_title.xml b/app/src/main/res/layout/topic_lessons_title.xml index 0946e9c0f04..f5f22b3a1b0 100644 --- a/app/src/main/res/layout/topic_lessons_title.xml +++ b/app/src/main/res/layout/topic_lessons_title.xml @@ -22,7 +22,7 @@ android:layout_marginTop="@dimen/topic_lessons_title_margin_top" android:layout_marginEnd="@dimen/topic_lessons_title_margin_end" android:fontFamily="sans-serif-medium" - android:text="stories_you_can_play" + android:text="@string/stories_you_can_play" android:textColor="@color/oppiaPrimaryText" android:textSize="20sp" /> From 34db09699db4d77eb787dddd78e9bf50636619f2 Mon Sep 17 00:00:00 2001 From: Shivam Bhardwaj Date: Thu, 9 Dec 2021 19:53:17 +0530 Subject: [PATCH 3/7] topic_lessons_title merged into 2 xml. And, Required changes applied to dimens.xml --- .../topic_lessons_title.xml | 28 ------------------- .../topic_lessons_title.xml | 0 app/src/main/res/values-land/dimens.xml | 1 + app/src/main/res/values/dimens.xml | 1 + 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml rename app/src/main/res/{layout-sw600dp-port => layout-sw600dp}/topic_lessons_title.xml (100%) diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml deleted file mode 100644 index 22bf62179d9..00000000000 --- a/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp/topic_lessons_title.xml similarity index 100% rename from app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml rename to app/src/main/res/layout-sw600dp/topic_lessons_title.xml diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 9254af51778..6c378e7ebcc 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -383,6 +383,7 @@ 32dp 168dp 168dp + 100dp 32dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 2b792864a6e..198793a8454 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -583,6 +583,7 @@ 28dp 28dp 28dp + 32dp 32dp From b2afe62ec5843c02c62e0b92cb6185e21f137223 Mon Sep 17 00:00:00 2001 From: Shivam Bhardwaj Date: Mon, 3 Jan 2022 17:52:19 +0530 Subject: [PATCH 4/7] No such changes --- app/src/main/res/values/dimens.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 198793a8454..0a6d841b5f3 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -588,4 +588,5 @@ 32dp 32dp 32dp + From a021c568a0c854a1934c282449818ec20fbed75f Mon Sep 17 00:00:00 2001 From: Shivam Bhardwaj Date: Mon, 3 Jan 2022 17:53:05 +0530 Subject: [PATCH 5/7] Removed extra space --- app/src/main/res/values/dimens.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 0a6d841b5f3..198793a8454 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -588,5 +588,4 @@ 32dp 32dp 32dp - From 18b90fabb6f4895e73d1ee9a2a7a4f20af07b50d Mon Sep 17 00:00:00 2001 From: Shivam Bhardwaj Date: Sun, 9 Jan 2022 19:19:55 +0530 Subject: [PATCH 6/7] Required Changes Applied --- .../res/layout-land/topic_lessons_title.xml | 25 ------------------- .../topic_lessons_title.xml | 25 ------------------- .../main/res/layout/topic_lessons_title.xml | 6 ++--- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 app/src/main/res/layout-land/topic_lessons_title.xml delete mode 100644 app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml diff --git a/app/src/main/res/layout-land/topic_lessons_title.xml b/app/src/main/res/layout-land/topic_lessons_title.xml deleted file mode 100644 index 1468f695b18..00000000000 --- a/app/src/main/res/layout-land/topic_lessons_title.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml deleted file mode 100644 index db76253a349..00000000000 --- a/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/topic_lessons_title.xml b/app/src/main/res/layout/topic_lessons_title.xml index b004252b222..1f54796bd90 100644 --- a/app/src/main/res/layout/topic_lessons_title.xml +++ b/app/src/main/res/layout/topic_lessons_title.xml @@ -17,9 +17,9 @@ From 3dfde905b1f0e06ce375a7009c59fc07c8cc7321 Mon Sep 17 00:00:00 2001 From: Shivam Bhardwaj Date: Sun, 16 Jan 2022 10:21:48 +0530 Subject: [PATCH 7/7] Nit Changes --- app/src/main/res/layout-sw600dp/topic_lessons_title.xml | 2 +- app/src/main/res/values-land/dimens.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout-sw600dp/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp/topic_lessons_title.xml index db76253a349..51e44a66950 100644 --- a/app/src/main/res/layout-sw600dp/topic_lessons_title.xml +++ b/app/src/main/res/layout-sw600dp/topic_lessons_title.xml @@ -13,7 +13,7 @@ + android:layout_marginTop="@dimen/topic_lessons_title_margin_top"> 100dp - 32dp 100dp