From 14d827c88a8b391e41594ad04841268bc1efc348 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 28 Jul 2022 19:43:30 +0200
Subject: [PATCH] Dialogs have a 24dp outer spacing

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../main/res/layout/dialog_poll_create.xml    | 27 ++++++++++---------
 .../res/layout/poll_create_options_item.xml   |  4 +--
 app/src/main/res/values/dimens.xml            |  3 ++-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/dialog_poll_create.xml b/app/src/main/res/layout/dialog_poll_create.xml
index 5d9e150c5..f48baaa2a 100644
--- a/app/src/main/res/layout/dialog_poll_create.xml
+++ b/app/src/main/res/layout/dialog_poll_create.xml
@@ -31,13 +31,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingTop="@dimen/dialog_padding">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/standard_padding"
-            android:paddingEnd="@dimen/standard_padding"
+            android:paddingStart="@dimen/dialog_padding"
+            android:paddingEnd="@dimen/dialog_padding"
             android:text="@string/polls_question"
             android:textColor="@color/colorPrimary"
             android:textStyle="bold" />
@@ -46,8 +47,8 @@
             android:id="@+id/poll_create_question"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginEnd="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/dialog_padding"
+            android:layout_marginEnd="@dimen/dialog_padding"
             android:inputType="textMultiLine"
             tools:ignore="Autofill,LabelFor">
 
@@ -58,8 +59,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/standard_margin"
-            android:paddingStart="@dimen/standard_padding"
-            android:paddingEnd="@dimen/standard_padding"
+            android:paddingStart="@dimen/dialog_padding"
+            android:paddingEnd="@dimen/dialog_padding"
             android:text="@string/polls_options"
             android:textColor="@color/colorPrimary"
             android:textStyle="bold" />
@@ -75,9 +76,9 @@
             style="@style/OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/dialog_padding"
             android:layout_marginTop="@dimen/standard_half_margin"
-            android:layout_marginEnd="@dimen/standard_margin"
+            android:layout_marginEnd="@dimen/dialog_padding"
             android:minHeight="@dimen/min_size_clickable_area"
             android:text="@string/polls_add_option"
             app:cornerRadius="@dimen/button_corner_radius"
@@ -89,8 +90,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/standard_margin"
             android:layout_marginBottom="@dimen/standard_half_margin"
-            android:paddingStart="@dimen/standard_padding"
-            android:paddingEnd="@dimen/standard_padding"
+            android:paddingStart="@dimen/dialog_padding"
+            android:paddingEnd="@dimen/dialog_padding"
             android:text="@string/polls_settings"
             android:textColor="@color/colorPrimary"
             android:textStyle="bold" />
@@ -121,8 +122,8 @@
             android:layout_marginTop="@dimen/standard_margin"
             android:gravity="end"
             android:orientation="horizontal"
-            android:paddingStart="@dimen/standard_padding"
-            android:paddingEnd="@dimen/standard_padding"
+            android:paddingStart="@dimen/dialog_padding"
+            android:paddingEnd="@dimen/dialog_padding"
             android:paddingBottom="@dimen/standard_padding">
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/poll_create_options_item.xml b/app/src/main/res/layout/poll_create_options_item.xml
index 94c1e7fef..e9c3dae49 100644
--- a/app/src/main/res/layout/poll_create_options_item.xml
+++ b/app/src/main/res/layout/poll_create_options_item.xml
@@ -27,7 +27,7 @@
     android:layout_height="wrap_content"
     android:minHeight="@dimen/min_size_clickable_area"
     android:orientation="horizontal"
-    android:paddingStart="@dimen/standard_padding"
+    android:paddingStart="@dimen/dialog_padding"
     android:paddingEnd="@dimen/zero"
     tools:background="@color/white">
 
@@ -45,7 +45,7 @@
         style="@style/Widget.AppTheme.Button.IconButton"
         android:layout_width="@dimen/min_size_clickable_area"
         android:layout_height="@dimen/min_size_clickable_area"
-        android:layout_marginStart="5dp"
+        android:layout_marginEnd="@dimen/standard_half_margin"
         android:contentDescription="@string/nc_action_open_main_menu"
         app:cornerRadius="@dimen/button_corner_radius"
         app:icon="@drawable/ic_baseline_close_24"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9b286236b..9962226da 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -59,6 +59,7 @@
     <dimen name="standard_half_padding">8dp</dimen>
     <dimen name="standard_half_margin">8dp</dimen>
     <dimen name="default_login_width">400dp</dimen>
+    <dimen name="dialog_padding">24dp</dimen>
 
     <dimen name="call_grid_item_min_height">180dp</dimen>
     <dimen name="call_controls_height">110dp</dimen>
@@ -71,7 +72,7 @@
     <dimen name="reaction_bottom_sheet_layout_size">40dp</dimen>
     <dimen name="standard_eighth_margin">2dp</dimen>
 
-    <dimen name="default_checkbox_dialog_start_margin">10dp</dimen>
+    <dimen name="default_checkbox_dialog_start_margin">18dp</dimen>
 
     <dimen name="mediatab_file_icon_size">50dp</dimen>
 </resources>