From 4b0bf3541a9076d62c593e11446c3082aed4cb49 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 May 2019 09:26:01 +0200
Subject: [PATCH] Advanced options layout simplification

---
 app/src/main/res/layout/fragment_options.xml  |  3 +-
 .../res/layout/fragment_options_behavior.xml  | 36 ++-----------
 .../layout/fragment_options_connection.xml    | 24 +++------
 .../res/layout/fragment_options_display.xml   | 53 +++----------------
 .../res/layout/fragment_options_general.xml   | 15 ++----
 .../main/res/layout/fragment_options_misc.xml | 45 ++++------------
 .../layout/fragment_options_notifications.xml | 26 +++------
 7 files changed, 42 insertions(+), 160 deletions(-)

diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 5fc391fa3c..37ee618a8a 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -16,6 +16,7 @@
         <androidx.viewpager.widget.PagerTitleStrip
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="top" />
+            android:layout_gravity="top"
+            android:padding="12dp" />
     </androidx.viewpager.widget.ViewPager>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml
index b9fd3bc113..c954b38ef0 100644
--- a/app/src/main/res/layout/fragment_options_behavior.xml
+++ b/app/src/main/res/layout/fragment_options_behavior.xml
@@ -15,15 +15,13 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="12dp">
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swPull"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_pull_refresh"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -33,9 +31,7 @@
                 android:id="@+id/swAutoScroll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_autoscroll"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swPull"
@@ -45,9 +41,7 @@
                 android:id="@+id/swSwipeNav"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_swipenav"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAutoScroll"
@@ -57,9 +51,7 @@
                 android:id="@+id/swAutoExpand"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_autoexpand"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swSwipeNav"
@@ -69,8 +61,7 @@
                 android:id="@+id/tvAutoExpandHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_autoexpand_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -82,9 +73,7 @@
                 android:id="@+id/swCollapse"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_collapse"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvAutoExpandHint"
@@ -94,8 +83,7 @@
                 android:id="@+id/tvAutoCollapseHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_autocollapse_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -107,9 +95,7 @@
                 android:id="@+id/swAutoClose"
                 android:layout_width="match_parent"
                 android:layout_height="22dp"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_autoclose"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvAutoCollapseHint"
@@ -119,8 +105,7 @@
                 android:id="@+id/tvAutoCloseHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_autoclose_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -144,9 +129,7 @@
                 android:id="@+id/swAutoRead"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_autoread"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAutoNext"
@@ -156,9 +139,7 @@
                 android:id="@+id/swAutoMove"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_automove"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAutoRead"
@@ -168,9 +149,7 @@
                 android:id="@+id/swAutoResize"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_autoresize"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAutoMove"
@@ -180,7 +159,6 @@
                 android:id="@+id/spAutoResize"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
                 android:entries="@array/resizeNames"
                 app:layout_constraintStart_toStartOf="parent"
@@ -199,9 +177,7 @@
                 android:id="@+id/swPrefixOnce"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_prefix_once"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/spAutoResize"
@@ -211,9 +187,7 @@
                 android:id="@+id/swAutoSend"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_autosend"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swPrefixOnce"
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index 8f8ddaa849..efd6dd5860 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -15,15 +15,14 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="12dp">
 
             <TextView
                 android:id="@+id/tvConnectionType"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="Connection is unmetered"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -35,8 +34,7 @@
                 android:id="@+id/tvConnectionRoaming"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_legend_roaming"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -48,9 +46,7 @@
                 android:id="@+id/swMetered"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_metered"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvConnectionRoaming"
@@ -60,8 +56,7 @@
                 android:id="@+id/tvMeteredHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_metered_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -73,8 +68,7 @@
                 android:id="@+id/tvMeteredWarning"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_metered_warning"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textColor="?attr/colorWarning"
@@ -87,9 +81,8 @@
                 android:id="@+id/tvDownload"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_download"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorPrimary"
@@ -101,7 +94,6 @@
                 android:id="@+id/spDownload"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:entries="@array/downloadNames"
                 app:layout_constraintStart_toStartOf="parent"
@@ -111,9 +103,7 @@
                 android:id="@+id/swRoaming"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_roaming"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/spDownload"
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 05c5284909..d743ecb70d 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -15,15 +15,13 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="12dp">
 
             <TextView
                 android:id="@+id/tvStartup"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_startup"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorPrimary"
@@ -35,7 +33,6 @@
                 android:id="@+id/spStartup"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:entries="@array/startupNames"
                 app:layout_constraintStart_toStartOf="parent"
@@ -45,9 +42,7 @@
                 android:id="@+id/swDate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_date_header"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/spStartup"
@@ -57,9 +52,7 @@
                 android:id="@+id/swThreading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_threading"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swDate"
@@ -69,8 +62,7 @@
                 android:id="@+id/tvThreadingHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_threading_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -82,9 +74,7 @@
                 android:id="@+id/swAvatars"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_avatars"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvThreadingHint"
@@ -94,9 +84,7 @@
                 android:id="@+id/swIdenticons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_identicons"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAvatars"
@@ -106,9 +94,7 @@
                 android:id="@+id/swCircular"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_circular"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swIdenticons"
@@ -118,9 +104,7 @@
                 android:id="@+id/swNameEmail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_name_email"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swCircular"
@@ -130,8 +114,7 @@
                 android:id="@+id/tvNameEmailHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_name_email_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -143,9 +126,7 @@
                 android:id="@+id/swSubjectItalic"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_subject_italic"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvNameEmailHint"
@@ -155,9 +136,7 @@
                 android:id="@+id/swFlags"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_flags"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swSubjectItalic"
@@ -167,8 +146,7 @@
                 android:id="@+id/tvFlagsHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_flags_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -180,9 +158,7 @@
                 android:id="@+id/swPreview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_preview"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvFlagsHint"
@@ -192,8 +168,7 @@
                 android:id="@+id/tvPreviewHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_preview_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -205,9 +180,7 @@
                 android:id="@+id/swAddresses"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_addresses"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvPreviewHint"
@@ -217,9 +190,7 @@
                 android:id="@+id/swMonospaced"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_monospaced"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAddresses"
@@ -229,9 +200,7 @@
                 android:id="@+id/swHtml"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_html"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swMonospaced"
@@ -241,8 +210,7 @@
                 android:id="@+id/tvHtmlHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_ask_show_html"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -254,9 +222,7 @@
                 android:id="@+id/swImages"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_images"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvHtmlHint"
@@ -266,8 +232,7 @@
                 android:id="@+id/tvImagesHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_ask_show_image"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -279,9 +244,7 @@
                 android:id="@+id/swActionbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_actionbar"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvImagesHint"
diff --git a/app/src/main/res/layout/fragment_options_general.xml b/app/src/main/res/layout/fragment_options_general.xml
index 8798fc9645..d375a610eb 100644
--- a/app/src/main/res/layout/fragment_options_general.xml
+++ b/app/src/main/res/layout/fragment_options_general.xml
@@ -15,15 +15,13 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="12dp">
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swEnabled"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:checked="true"
                 android:text="@string/title_advanced_enabled"
                 app:layout_constraintStart_toStartOf="parent"
@@ -34,8 +32,7 @@
                 android:id="@+id/tvEnabledHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_enabled_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -47,7 +44,6 @@
                 android:id="@+id/spPollInterval"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:entries="@array/pollIntervalNames"
                 app:layout_constraintStart_toStartOf="parent"
@@ -57,9 +53,7 @@
                 android:id="@+id/swSchedule"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_schedule"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/spPollInterval"
@@ -103,8 +97,7 @@
                 android:id="@+id/tvScheduleHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_schedule_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index d8d8c6fdba..34905fe1b0 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -15,15 +15,13 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="12dp">
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swBadge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_badge"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -33,8 +31,7 @@
                 android:id="@+id/tvBadgeHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_badge_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -46,9 +43,7 @@
                 android:id="@+id/swSubscriptions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_subscriptions"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvBadgeHint"
@@ -58,8 +53,7 @@
                 android:id="@+id/tvSubscriptionsHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_subscriptions_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -71,8 +65,7 @@
                 android:id="@+id/tvNotifyPreviewPro"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_pro_feature"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -84,9 +77,7 @@
                 android:id="@+id/swSearchLocal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_search_local"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewPro"
@@ -96,8 +87,7 @@
                 android:id="@+id/tvSearchLocalHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_search_local_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -109,9 +99,7 @@
                 android:id="@+id/swEnglish"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_english"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvSearchLocalHint"
@@ -121,8 +109,7 @@
                 android:id="@+id/tvEnglishHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_english_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -134,9 +121,7 @@
                 android:id="@+id/swAuthentication"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_authentication"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvEnglishHint"
@@ -146,9 +131,7 @@
                 android:id="@+id/swParanoid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_paranoid"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swAuthentication"
@@ -158,8 +141,7 @@
                 android:id="@+id/tvParanoidHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_paranoid_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -171,9 +153,7 @@
                 android:id="@+id/swUpdates"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_updates"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvParanoidHint"
@@ -183,10 +163,7 @@
                 android:id="@+id/swDebug"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginBottom="12dp"
                 android:text="@string/title_advanced_debug"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swUpdates"
@@ -196,8 +173,7 @@
                 android:id="@+id/tvDebugHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_debug_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -209,9 +185,8 @@
                 android:id="@+id/tvLastCleanup"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_last_cleanup"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index 638ace0aeb..e76eecffd7 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -15,15 +15,13 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="12dp">
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swNotifyPreview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_notify_preview"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -33,8 +31,7 @@
                 android:id="@+id/tvNotifyPreviewHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_preview_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -46,8 +43,7 @@
                 android:id="@+id/tvNotifyPreviewPro"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_pro_feature"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -59,9 +55,8 @@
                 android:id="@+id/tvNotifyActions"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_notify_actions"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorPrimary"
@@ -73,7 +68,6 @@
                 android:id="@+id/cbNotifyActionTrash"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:text="@string/title_advanced_notify_action_trash"
                 app:layout_constraintStart_toStartOf="parent"
@@ -83,7 +77,6 @@
                 android:id="@+id/cbNotifyActionArchive"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:text="@string/title_advanced_notify_action_archive"
                 app:layout_constraintStart_toStartOf="parent"
@@ -93,7 +86,6 @@
                 android:id="@+id/cbNotifyActionReply"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:text="@string/title_advanced_notify_action_reply"
                 app:layout_constraintStart_toStartOf="parent"
@@ -103,7 +95,6 @@
                 android:id="@+id/cbNotifyActionSeen"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
                 android:text="@string/title_advanced_notify_action_seen"
                 app:layout_constraintStart_toStartOf="parent"
@@ -113,9 +104,8 @@
                 android:id="@+id/tvNotifyActionsHint"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginEnd="48dp"
                 android:text="@string/title_advanced_notify_action_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="italic"
@@ -127,9 +117,7 @@
                 android:id="@+id/swLight"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:text="@string/title_advanced_light"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvNotifyActionsHint"
@@ -140,9 +128,7 @@
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
                 android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
                 android:minWidth="0dp"
                 android:minHeight="0dp"
                 android:text="@string/title_advanced_sound"