From e53656a4e93dfd30fcd890107a89621f6dfc9079 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Fri, 19 Aug 2022 23:44:23 +0500
Subject: [PATCH] Fix layout issue for source code pro font

---
 .../layout/activity_settings_appearance.xml   | 56 ++++++++++++-------
 .../res/layout/activity_settings_drafts.xml   | 51 ++++++++++-------
 .../activity_settings_notifications.xml       | 32 ++++++-----
 .../res/layout/activity_settings_reports.xml  | 32 ++++++-----
 4 files changed, 105 insertions(+), 66 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings_appearance.xml b/app/src/main/res/layout/activity_settings_appearance.xml
index 05b2b162..dfe2d646 100644
--- a/app/src/main/res/layout/activity_settings_appearance.xml
+++ b/app/src/main/res/layout/activity_settings_appearance.xml
@@ -255,37 +255,51 @@
         android:orientation="horizontal"
         android:padding="@dimen/dimen16dp">
 
-        <TextView
-            android:id="@+id/tvLabelsInListHeader"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/label_title_frame"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen48dp"
-            android:text="@string/settingsLabelsInListHeader"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:weightSum="100"
+            android:orientation="horizontal">
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/switchLabelsInListBadge"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dimen32dp"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="end"
-            android:layout_toEndOf="@+id/tvLabelsInListHeader"
-            android:gravity="end"
-            android:paddingStart="@dimen/dimen0dp"
-            android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            <TextView
+                android:id="@+id/tvLabelsInListHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="90"
+                android:layout_marginStart="@dimen/dimen24dp"
+                android:text="@string/settingsLabelsInListHeader"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen18sp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="10"
+                android:gravity="center_vertical|end"
+                android:orientation="horizontal">
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/switchLabelsInListBadge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dimen32dp"
+                    android:paddingStart="@dimen/dimen24dp"
+                    android:paddingEnd="@dimen/dimen24dp"
+                    android:switchMinWidth="@dimen/dimen56dp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/switchLabelsInListBadge"
+            android:layout_below="@+id/label_title_frame"
             android:layout_marginStart="@dimen/dimen24dp"
             android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/settingsLabelsInListHint"
             android:textColor="?attr/hintColor"
-            android:textSize="@dimen/dimen12sp"/>
+            android:textSize="@dimen/dimen12sp" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_settings_drafts.xml b/app/src/main/res/layout/activity_settings_drafts.xml
index 9af483de..42a1dc8b 100644
--- a/app/src/main/res/layout/activity_settings_drafts.xml
+++ b/app/src/main/res/layout/activity_settings_drafts.xml
@@ -57,34 +57,47 @@
         android:orientation="horizontal"
         android:padding="@dimen/dimen16dp">
 
-        <TextView
+        <LinearLayout
             android:id="@+id/enableCommentsDeletionHeader"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen72dp"
-            android:text="@string/settingsEnableCommentsDeletionText"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen18sp"/>
+            android:weightSum="100"
+            android:orientation="horizontal">
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/commentsDeletionSwitch"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dimen24dp"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="end"
-            android:layout_toEndOf="@+id/enableCommentsDeletionHeader"
-            android:gravity="end"
-            android:paddingStart="@dimen/dimen0dp"
-            android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="90"
+                android:layout_marginStart="@dimen/dimen24dp"
+                android:text="@string/settingsEnableCommentsDeletionText"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen18sp"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="10"
+                android:gravity="center_vertical|end"
+                android:orientation="horizontal">
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/commentsDeletionSwitch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/dimen32dp"
+                    android:paddingStart="@dimen/dimen24dp"
+                    android:paddingEnd="@dimen/dimen24dp"
+                    android:switchMinWidth="@dimen/dimen56dp"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/enableCommentsDeletionHeader"
             android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen48dp"
+            android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/settingsEnableCommentsDeletionHintText"
             android:textColor="?attr/hintColor"
             android:textSize="@dimen/dimen12sp"/>
diff --git a/app/src/main/res/layout/activity_settings_notifications.xml b/app/src/main/res/layout/activity_settings_notifications.xml
index 225ea67b..a8a79d4e 100644
--- a/app/src/main/res/layout/activity_settings_notifications.xml
+++ b/app/src/main/res/layout/activity_settings_notifications.xml
@@ -50,38 +50,44 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/enableNotificationsFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dimen6dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
+        android:weightSum="100"
         android:padding="@dimen/dimen16dp">
 
         <TextView
             android:id="@+id/enableNotificationsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_weight="90"
             android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/enableNotificationsHeaderText"
             android:textColor="?attr/primaryTextColor"
             android:textSize="@dimen/dimen18sp"/>
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/enableNotificationsMode"
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dimen24dp"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="end"
-            android:layout_toEndOf="@+id/enableNotificationsHeader"
-            android:gravity="end"
-            android:paddingStart="0dp"
-            android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:layout_height="wrap_content"
+            android:layout_weight="10"
+            android:gravity="center_vertical|end"
+            android:orientation="horizontal">
 
-    </RelativeLayout>
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/enableNotificationsMode"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dimen32dp"
+                android:paddingStart="@dimen/dimen24dp"
+                android:paddingEnd="@dimen/dimen24dp"
+                android:switchMinWidth="@dimen/dimen56dp"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/pollingDelayFrame"
diff --git a/app/src/main/res/layout/activity_settings_reports.xml b/app/src/main/res/layout/activity_settings_reports.xml
index fdb9c7fb..94e67a88 100644
--- a/app/src/main/res/layout/activity_settings_reports.xml
+++ b/app/src/main/res/layout/activity_settings_reports.xml
@@ -47,37 +47,43 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/enableSendReports"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dimen6dp"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
+        android:weightSum="100"
         android:padding="@dimen/dimen16dp">
 
         <TextView
             android:id="@+id/enableReportsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_weight="90"
             android:layout_marginStart="@dimen/dimen24dp"
-            android:layout_marginEnd="@dimen/dimen72dp"
             android:text="@string/settingsEnableReportsText"
             android:textColor="?attr/primaryTextColor"
             android:textSize="@dimen/dimen18sp"/>
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/crashReportsSwitch"
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dimen24dp"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="end"
-            android:layout_toEndOf="@+id/enableReportsHeader"
-            android:gravity="end"
-            android:paddingStart="@dimen/dimen0dp"
-            android:paddingEnd="@dimen/dimen24dp"
-            android:switchMinWidth="@dimen/dimen56dp"/>
+            android:layout_height="wrap_content"
+            android:layout_weight="10"
+            android:gravity="center_vertical|end"
+            android:orientation="horizontal">
 
-    </RelativeLayout>
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/crashReportsSwitch"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dimen32dp"
+                android:paddingStart="@dimen/dimen24dp"
+                android:paddingEnd="@dimen/dimen24dp"
+                android:switchMinWidth="@dimen/dimen56dp"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>