From 3a42196e3a95bcab8d58edcfc9b2627151bc5d46 Mon Sep 17 00:00:00 2001
From: Mostafa <Mostafa0Mohamed2002@gmail.com>
Date: Mon, 14 Oct 2024 21:11:08 +0300
Subject: [PATCH] Add layout margin to improve spacing for best visualizing

---
 app/src/main/res/layout/card_view_text.xml    |   2 +-
 .../main/res/layout/card_view_with_image.xml  |   2 +-
 .../main/res/layout/card_view_with_switch.xml |   5 +-
 app/src/main/res/layout/fragment_about.xml    | 122 +++++++++---------
 .../res/layout/fragment_language_settings.xml |  24 ++--
 app/src/main/res/layout/fragment_main.xml     |  82 ++++++++----
 .../res/layout/fragment_privacy_policy.xml    |   4 +-
 app/src/main/res/layout/fragment_settings.xml |   3 +-
 .../main/res/layout/fragment_third_party.xml  |   3 +-
 .../res/layout/fragment_wikimedia_scribe.xml  |   4 +-
 10 files changed, 142 insertions(+), 109 deletions(-)

diff --git a/app/src/main/res/layout/card_view_text.xml b/app/src/main/res/layout/card_view_text.xml
index e517b7c6..4948c63e 100644
--- a/app/src/main/res/layout/card_view_text.xml
+++ b/app/src/main/res/layout/card_view_text.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="12dp">
+        android:padding="14dp">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_view_with_image.xml b/app/src/main/res/layout/card_view_with_image.xml
index b7447138..3db11ee9 100644
--- a/app/src/main/res/layout/card_view_with_image.xml
+++ b/app/src/main/res/layout/card_view_with_image.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="12dp">
+        android:padding="16dp">
 
         <ImageView
             android:id="@+id/imgView1"
diff --git a/app/src/main/res/layout/card_view_with_switch.xml b/app/src/main/res/layout/card_view_with_switch.xml
index 4aad215a..2a155346 100644
--- a/app/src/main/res/layout/card_view_with_switch.xml
+++ b/app/src/main/res/layout/card_view_with_switch.xml
@@ -7,10 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingTop="12dp"
-        android:paddingBottom="6dp"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp">
+        android:padding="14dp">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 3d3b2bc8..6156f0dc 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -5,71 +5,71 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="15dp"
+    android:paddingBottom="50dp"
     android:background="@color/you_background_color">
-        <LinearLayout
-            android:id="@+id/linearLayout"
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp"
+        android:orientation="vertical"
+        android:padding="10dp">
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:paddingTop="24dp"
+            android:text="@string/app.about.community.title"
+            android:textColor="@color/text_color"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycleView2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="10dp"
-            android:orientation="vertical"
-            android:padding="10dp">
-            <TextView
-                android:id="@+id/tvTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:paddingTop="10dp"
-                android:text="@string/app.about.community.title"
-                android:textColor="@color/text_color"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycleView2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:background="@drawable/rounded_all_corners"
-                android:layout_marginTop="10dp" />
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/rounded_all_corners"
+            android:layout_marginTop="10dp" />
 
-            <TextView
-                android:id="@+id/tvTitle2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/app.about.feedback.title"
-                android:textColor="@color/text_color"
-                android:textSize="20sp"
-                android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tvTitle2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/app.about.feedback.title"
+            android:textColor="@color/text_color"
+            android:textSize="20sp"
+            android:textStyle="bold" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycleView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:background="@drawable/rounded_all_corners"
-                android:layout_marginTop="10dp" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycleView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/rounded_all_corners"
+            android:layout_marginTop="10dp" />
 
-            <TextView
-                android:id="@+id/tvTitle3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginStart="16dp"
-                android:text="@string/app.about.legal.title"
-                android:textColor="@color/text_color"
-                android:textSize="20sp"
-                android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tvTitle3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="16dp"
+            android:text="@string/app.about.legal.title"
+            android:textColor="@color/text_color"
+            android:textSize="20sp"
+            android:textStyle="bold" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycleView3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:background="@drawable/rounded_all_corners"
-                android:layout_marginTop="10dp"/>
-        </LinearLayout>
-    </ScrollView>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycleView3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/rounded_all_corners" />
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_language_settings.xml b/app/src/main/res/layout/fragment_language_settings.xml
index 6fd30a2b..a3016169 100644
--- a/app/src/main/res/layout/fragment_language_settings.xml
+++ b/app/src/main/res/layout/fragment_language_settings.xml
@@ -11,8 +11,9 @@
         android:id="@+id/functionalitySettingsTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/app.settings.keyboard.functionality.title"
         android:layout_marginStart="3dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/app.settings.keyboard.functionality.title"
         android:textColor="@color/app_text_color"
         android:textSize="20sp"
         android:textStyle="bold"
@@ -27,46 +28,45 @@
         android:id="@+id/functionalityRecyclerView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:padding="12dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:padding="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/functionalitySettingsTitle" />
 
     <TextView
         android:id="@+id/layoutSettingsTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/app.settings.keyboard.layout.title"
         android:layout_marginStart="3dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/app.settings.keyboard.layout.title"
         android:textColor="@color/app_text_color"
         android:textSize="20sp"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/functionalityRecyclerView"
         app:layout_constraintBottom_toTopOf="@id/layoutRecyclerView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.054"
         app:layout_constraintStart_toStartOf="parent"
 
+        app:layout_constraintTop_toBottomOf="@id/functionalityRecyclerView"
         app:layout_constraintVertical_bias="0.022" />
 
 
-
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/layoutRecyclerView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:padding="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/functionalityRecyclerView" />
+        app:layout_constraintTop_toBottomOf="@+id/layoutSettingsTitle" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index e4cd4ec2..c0d7a15f 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,30 +1,32 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/clBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/you_background_color"
     android:fitsSystemWindows="true">
+
     <ImageView
         android:id="@+id/scribe_logo"
         android:layout_width="222dp"
         android:layout_height="107dp"
-        android:layout_marginTop="0dp"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="0dp"
         android:src="@drawable/scribe_logo" />
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/scribe_logo"
-        android:layout_marginTop="25dp"
         android:layout_marginStart="20dp"
+        android:layout_marginTop="25dp"
         android:layout_marginEnd="16dp"
         android:text="@string/app.installation.keyboard.title"
         android:textColor="@color/app_text_color"
         android:textSize="20sp"
         android:textStyle="bold" />
+
     <androidx.cardview.widget.CardView
         android:id="@+id/cardView"
         android:layout_width="match_parent"
@@ -37,61 +39,75 @@
         android:background="@color/card_view_color"
         app:cardBackgroundColor="@color/card_view_color"
         app:cardCornerRadius="20dp">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingTop="4dp">
+
                 <TextView
-                    android:layout_marginEnd="4dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginEnd="4dp"
                     android:text="1."
                     android:textSize="16sp" />
+
                 <TextView
                     android:id="@+id/keyboard_settings"
                     android:layout_width="304dp"
                     android:layout_height="wrap_content"
                     android:text="@string/app.installation.keyboard.keyboard_settings"
-                    android:textStyle="bold"
                     android:textColor="@color/dark_scribe_blue"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingTop="8dp">
+
                 <TextView
-                    android:layout_marginEnd="4dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginEnd="4dp"
                     android:text="2."
                     android:textSize="16sp" />
+
                 <TextView
                     android:layout_width="304dp"
                     android:layout_height="wrap_content"
                     android:text="@string/app.installation.keyboard.text_2"
                     android:textSize="16sp" />
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingTop="8dp">
+
                 <TextView
-                    android:layout_marginEnd="4dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginEnd="4dp"
                     android:text="3."
                     android:textSize="16sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/app.installation.keyboard.text_3"
                     android:textSize="16sp" />
+
                 <ImageView
                     android:id="@+id/keyboard_mode"
                     android:layout_width="25dp"
@@ -100,6 +116,7 @@
                     android:layout_marginEnd="4dp"
                     android:alpha="0.9"
                     android:src="@drawable/keyboard_light" />
+
                 <TextView
                     android:layout_width="304dp"
                     android:layout_height="wrap_content"
@@ -107,12 +124,14 @@
                     android:textSize="16sp" />
             </LinearLayout>
         </LinearLayout>
+
         <ImageView
             android:layout_width="75dp"
             android:layout_height="76dp"
             android:layout_gravity="top|end"
             android:alpha="0.9"
             android:src="@drawable/corner_polygon" />
+
         <ImageView
             android:layout_width="26dp"
             android:layout_height="25dp"
@@ -121,18 +140,20 @@
             android:src="@drawable/cog"
             app:tint="@color/button_text_color" />
     </androidx.cardview.widget.CardView>
+
     <TextView
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/cardView"
         android:layout_marginStart="20dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginTop="10dp"
+        android:layout_marginEnd="16dp"
         android:text="@string/app.download.menu_option.scribe_title"
         android:textColor="@color/app_text_color"
         android:textSize="20sp"
         android:textStyle="bold" />
+
     <androidx.cardview.widget.CardView
         android:id="@+id/cardView2"
         android:layout_width="match_parent"
@@ -145,38 +166,50 @@
         android:background="@color/card_view_color"
         app:cardBackgroundColor="@color/card_view_color"
         app:cardCornerRadius="20dp">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
+
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:layout_marginEnd="4dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_marginEnd="4dp"
                     android:text="@string/app.download.menu_option.download_data"
-                    android:textStyle="bold"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
                 <ImageView
-                    android:layout_marginStart="190dp"
                     android:layout_width="12dp"
                     android:layout_height="20dp"
+                    android:layout_gravity="end"
                     android:alpha="0.9"
                     android:src="@drawable/vector" />
             </LinearLayout>
+
             <TextView
-                android:layout_marginEnd="4dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/darker_gray"
+                android:layout_marginEnd="4dp"
                 android:text="@string/app.download.menu_option.scribe_description"
+                android:textColor="@android:color/darker_gray"
                 android:textSize="12sp" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
+
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardView3"
         android:layout_width="match_parent"
@@ -187,17 +220,18 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         app:cardBackgroundColor="@color/corner_polygon_color"
+        app:cardCornerRadius="20dp"
         app:strokeColor="@color/button_outline_color"
-        app:strokeWidth="@dimen/tiny_margin"
-        app:cardCornerRadius="20dp">
+        app:strokeWidth="@dimen/tiny_margin">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:paddingVertical="20sp"
             android:text="@string/app.installation.button_quick_tutorial"
-            android:textStyle="bold"
+            android:textColor="@color/button_text_color"
             android:textSize="20sp"
-            android:textColor="@color/button_text_color"/>
+            android:textStyle="bold" />
     </com.google.android.material.card.MaterialCardView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_privacy_policy.xml b/app/src/main/res/layout/fragment_privacy_policy.xml
index 488959a0..5338b53d 100644
--- a/app/src/main/res/layout/fragment_privacy_policy.xml
+++ b/app/src/main/res/layout/fragment_privacy_policy.xml
@@ -15,6 +15,7 @@
                 android:id="@+id/textView"
                 android:layout_width="303dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
                 android:layout_marginStart="18dp"
                 android:text="@string/app.about.legal.privacy_policy.caption"
                 android:layout_marginEnd="16dp"
@@ -31,7 +32,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="4dp"
                     android:layout_marginEnd="10dp"
                     android:layout_marginBottom="16dp"
                     android:background="@color/card_view_color"
@@ -80,4 +81,3 @@
             </View>
         </LinearLayout>
     </ScrollView>
-
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 69917089..74f5c256 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -15,6 +15,7 @@
             android:orientation="vertical">
 
             <TextView
+                android:layout_marginTop="16dp"
                 android:id="@+id/languageTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -34,10 +35,10 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:background="@drawable/rounded_all_corners"
-
                />
 
             <TextView
+                android:layout_marginTop="24dp"
                 android:id="@+id/selectLanguage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_third_party.xml b/app/src/main/res/layout/fragment_third_party.xml
index 09612e9a..5666017c 100644
--- a/app/src/main/res/layout/fragment_third_party.xml
+++ b/app/src/main/res/layout/fragment_third_party.xml
@@ -16,6 +16,7 @@
                 android:id="@+id/textView"
                 android:layout_width="303dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
                 android:layout_marginStart="18dp"
                 android:text="@string/app.about.legal.third_party"
                 android:layout_marginEnd="16dp"
@@ -31,7 +32,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="4dp"
                     android:layout_marginEnd="10dp"
                     android:layout_marginBottom="16dp"
                     android:background="@color/card_view_color"
diff --git a/app/src/main/res/layout/fragment_wikimedia_scribe.xml b/app/src/main/res/layout/fragment_wikimedia_scribe.xml
index bd5b3122..8419c69c 100644
--- a/app/src/main/res/layout/fragment_wikimedia_scribe.xml
+++ b/app/src/main/res/layout/fragment_wikimedia_scribe.xml
@@ -16,6 +16,7 @@
                 android:layout_width="303dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="18dp"
+                android:layout_marginTop="24dp"
                 android:text="@string/app.about.community.wikimedia.caption"
                 android:layout_marginEnd="16dp"
                 android:textColor="@color/app_text_color"
@@ -31,7 +32,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="4dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="16dp"
                     android:background="@color/card_view_color"
@@ -104,4 +105,3 @@
             </FrameLayout>
         </LinearLayout>
     </ScrollView>
-