From 853e4d6fde66b3691d40b7f3a9fe58d6ad9d7df4 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Thu, 22 Sep 2022 20:00:43 +0300
Subject: [PATCH] Follow guidelines for some dialogs

---
 app/src/main/res/layout/dialog_list_mode.xml  |  8 +--
 .../main/res/layout/dialog_manga_error.xml    |  2 +-
 app/src/main/res/layout/dialog_onboard.xml    |  8 ++-
 app/src/main/res/layout/dialog_progress.xml   |  4 +-
 .../main/res/layout/dialog_reader_config.xml  | 50 -------------------
 5 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 app/src/main/res/layout/dialog_reader_config.xml

diff --git a/app/src/main/res/layout/dialog_list_mode.xml b/app/src/main/res/layout/dialog_list_mode.xml
index e8341c954..af859eb04 100644
--- a/app/src/main/res/layout/dialog_list_mode.xml
+++ b/app/src/main/res/layout/dialog_list_mode.xml
@@ -16,7 +16,8 @@
 			android:id="@+id/checkableGroup"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
+			android:layout_marginVertical="16dp"
+			android:layout_marginHorizontal="?attr/dialogPreferredPadding"
 			android:orientation="vertical">
 
 			<com.google.android.material.button.MaterialButton
@@ -50,8 +51,7 @@
 			style="?materialAlertDialogTitleTextStyle"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingLeft="?attr/dialogPreferredPadding"
-			android:paddingRight="?attr/dialogPreferredPadding"
+			android:paddingHorizontal="?attr/dialogPreferredPadding"
 			android:singleLine="true"
 			android:text="@string/grid_size"
 			android:visibility="gone"
@@ -72,4 +72,4 @@
 			tools:visibility="visible" />
 
 	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_manga_error.xml b/app/src/main/res/layout/dialog_manga_error.xml
index be84d7bbc..abf5ae871 100644
--- a/app/src/main/res/layout/dialog_manga_error.xml
+++ b/app/src/main/res/layout/dialog_manga_error.xml
@@ -9,7 +9,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:paddingHorizontal="@dimen/margin_normal"
+		android:paddingHorizontal="?attr/dialogPreferredPadding"
 		android:paddingTop="@dimen/margin_normal">
 
 		<TextView
diff --git a/app/src/main/res/layout/dialog_onboard.xml b/app/src/main/res/layout/dialog_onboard.xml
index 553e7e186..82de7c7a3 100644
--- a/app/src/main/res/layout/dialog_onboard.xml
+++ b/app/src/main/res/layout/dialog_onboard.xml
@@ -11,10 +11,8 @@
 		android:id="@+id/textView_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingStart="?listPreferredItemPaddingStart"
-		android:paddingTop="6dp"
-		android:paddingEnd="?listPreferredItemPaddingEnd"
-		android:paddingBottom="6dp"
+		android:paddingHorizontal="?attr/dialogPreferredPadding"
+		android:paddingVertical="16dp"
 		android:textAppearance="?attr/textAppearanceBodyMedium"
 		tools:text="@string/onboard_text" />
 
@@ -28,4 +26,4 @@
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_source_locale" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml
index 60173a273..a3f627ad0 100644
--- a/app/src/main/res/layout/dialog_progress.xml
+++ b/app/src/main/res/layout/dialog_progress.xml
@@ -6,7 +6,7 @@
 	android:layout_height="wrap_content"
 	android:gravity="center_vertical"
 	android:orientation="vertical"
-	android:padding="20dp">
+	android:padding="?attr/dialogPreferredPadding">
 
 	<TextView
 		android:id="@+id/textView_title"
@@ -31,4 +31,4 @@
 		android:textColor="?android:textColorSecondary"
 		tools:text="Subtitle" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_reader_config.xml b/app/src/main/res/layout/dialog_reader_config.xml
deleted file mode 100644
index 1374dc940..000000000
--- a/app/src/main/res/layout/dialog_reader_config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	android:paddingHorizontal="16dp">
-
-	<org.koitharu.kotatsu.base.ui.widgets.CheckableButtonGroup
-		android:id="@+id/checkableGroup"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="16dp"
-		android:orientation="vertical">
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_standard"
-			style="@style/Widget.Kotatsu.ToggleButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/standard"
-			app:icon="@drawable/ic_book_page" />
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_reversed"
-			style="@style/Widget.Kotatsu.ToggleButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/right_to_left"
-			app:icon="@drawable/ic_reader_rtl" />
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_webtoon"
-			style="@style/Widget.Kotatsu.ToggleButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/webtoon"
-			app:icon="@drawable/ic_script" />
-
-	</org.koitharu.kotatsu.base.ui.widgets.CheckableButtonGroup>
-
-	<TextView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:text="@string/reader_mode_hint"
-		android:textAppearance="?attr/textAppearanceBodySmall" />
-
-</LinearLayout>