From 58845adfde3e0db39c56164b0ea03749acf0b0f6 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Mon, 19 Feb 2024 16:24:15 +0530
Subject: [PATCH] Fix #2749: Fixes Home Card UI (#5185)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #2749

Modifies margin and padding values

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

## Tablet Screenshots

### 1920 x 1200
|Before|After|
|--|--|
|![1920 x 1200 port
before](https://github.com/oppia/oppia-android/assets/84731134/dbfc50df-4ced-48f9-85bd-11ed2ca9d60f)|![1920
x 1200 port
after](https://github.com/oppia/oppia-android/assets/84731134/ef208183-3198-442b-958e-7d2f85a37b9f)|
|![1920 x 1200
before](https://github.com/oppia/oppia-android/assets/84731134/344d0ef7-1fac-4117-9adb-b85877a40b3f)|![1920
x 1200
after](https://github.com/oppia/oppia-android/assets/84731134/fa8faa1c-9337-4741-86d1-32a655275768)|

### 2560 x 1800
|Before|After|
|--|--|
|![2560 x 1800 port
before](https://github.com/oppia/oppia-android/assets/84731134/700abf1e-951f-42a3-a465-1ee6852685e6)|![2560
x 1800 port
after](https://github.com/oppia/oppia-android/assets/84731134/b34f72ae-0d0b-4e67-af54-cf9bf292036f)|
|![2560 x 1800
before](https://github.com/oppia/oppia-android/assets/84731134/f05fee95-9d8d-4310-a9e0-c8223b2c4ed4)|![2560
x 1800
after](https://github.com/oppia/oppia-android/assets/84731134/a9a2cb09-bcd8-4b50-888c-fdfa89d23274)|

### 1024 x 600
|Before|After|
|--|--|
|![1024 x 600
before](https://github.com/oppia/oppia-android/assets/84731134/59f77ffd-5ac6-46e9-8c20-33287848acc1)|![1024
x 600
after](https://github.com/oppia/oppia-android/assets/84731134/bdc14f4a-9656-4549-8e98-28535c214a71)|

## Phone Screenshots

|dpi|Screenshots|
|--|--|

|ldpi|![image](https://github.com/oppia/oppia-android/assets/84731134/eae24f4d-5245-4f23-8b22-734b6c363c95)|

|mdpi|![image](https://github.com/oppia/oppia-android/assets/84731134/d38ef410-8cb1-4225-bb43-532db99d483f)|

|hdpi|![image](https://github.com/oppia/oppia-android/assets/84731134/1dd8ae92-1fc8-4ece-827e-0ad09cf06e0e)|

|xhdpi|![image](https://github.com/oppia/oppia-android/assets/84731134/01f7f665-c2e2-4e70-b679-2d81f5b18b07)![image](https://github.com/oppia/oppia-android/assets/84731134/5f0499ff-9bcd-4ec2-8d32-685420feabe4)|

|xxhdpi|![image](https://github.com/oppia/oppia-android/assets/84731134/dc727cd4-eb60-4736-aab1-e280a33933df)![image](https://github.com/oppia/oppia-android/assets/84731134/3baebd40-402c-4fe0-a7cd-5c339bf786b2)|

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 .../main/res/values-sw600dp-land/dimens.xml    | 14 +++++++-------
 .../main/res/values-sw600dp-port/dimens.xml    | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index 3f60f076e3b..d24a8c3c4e8 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <dimen name="home_padding_end">64dp</dimen>
-  <dimen name="home_padding_start">96dp</dimen>
-  <dimen name="home_outer_margin">96dp</dimen>
-  <dimen name="home_welcome_outer_padding">96dp</dimen>
+  <dimen name="home_padding_start">72dp</dimen>
+  <dimen name="home_outer_margin">72dp</dimen>
+  <dimen name="home_welcome_outer_padding">72dp</dimen>
   <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
-  <dimen name="home_inner_margin">64dp</dimen>
+  <dimen name="home_inner_margin">48dp</dimen>
   <dimen name="recently_played_margin_max">96dp</dimen>
   <dimen name="recently_played_margin_min">64dp</dimen>
   <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
@@ -276,7 +276,7 @@
   <dimen name="concept_card_explanation_text_margin_end">176dp</dimen>
 
   <!-- All Topics -->
-  <dimen name="all_topics_text_margin_start">96dp</dimen>
+  <dimen name="all_topics_text_margin_start">72dp</dimen>
   <dimen name="all_topics_text_margin_top">68dp</dimen>
   <dimen name="all_topics_text_margin_end">76dp</dimen>
   <dimen name="all_topics_text_margin_bottom">24dp</dimen>
@@ -444,8 +444,8 @@
   <dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>
 
   <!--  PromotedStoryList-->
-  <dimen name="promoted_story_list_layout_margin_end">96dp</dimen>
-  <dimen name="promoted_story_list_layout_margin_start">96dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_end">72dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_start">72dp</dimen>
 
   <!-- AudioLanguageFragment -->
   <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 681f7e8b90e..325532ede04 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <dimen name="home_padding_end">96dp</dimen>
-  <dimen name="home_padding_start">120dp</dimen>
-  <dimen name="home_outer_margin">120dp</dimen>
-  <dimen name="home_welcome_outer_padding">120dp</dimen>
+  <dimen name="home_padding_start">56dp</dimen>
+  <dimen name="home_outer_margin">64dp</dimen>
+  <dimen name="home_welcome_outer_padding">60dp</dimen>
   <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
-  <dimen name="home_inner_margin">60dp</dimen>
+  <dimen name="home_inner_margin">32dp</dimen>
   <dimen name="recently_played_margin_max">120dp</dimen>
   <dimen name="recently_played_margin_min">60dp</dimen>
   <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
@@ -281,10 +281,10 @@
   <dimen name="concept_card_explanation_text_margin_end">128dp</dimen>
 
   <!-- All Topics -->
-  <dimen name="all_topics_text_margin_start">120dp</dimen>
-  <dimen name="all_topics_text_margin_top">68dp</dimen>
+  <dimen name="all_topics_text_margin_start">60dp</dimen>
+  <dimen name="all_topics_text_margin_top">52dp</dimen>
   <dimen name="all_topics_text_margin_end">76dp</dimen>
-  <dimen name="all_topics_text_margin_bottom">24dp</dimen>
+  <dimen name="all_topics_text_margin_bottom">16dp</dimen>
 
   <!-- Coming Soon Topic List -->
   <dimen name="coming_soon_topic_list_constraint_layout_padding_start">120dp</dimen>
@@ -441,8 +441,8 @@
   <dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>
 
   <!--  PromotedStoryList-->
-  <dimen name="promoted_story_list_layout_margin_end">120dp</dimen>
-  <dimen name="promoted_story_list_layout_margin_start">120dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_end">60dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_start">60dp</dimen>
 
   <!-- AudioLanguageFragment -->
   <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>