From 097e040dd611c346a9358e78c6f313009c8bca61 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Mon, 17 Jan 2022 09:26:54 +0300
Subject: [PATCH] Fix AlertDialogs

---
 .../java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt  | 2 +-
 .../kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt  | 2 +-
 app/src/main/res/layout/activity_main.xml                 | 2 +-
 app/src/main/res/layout/navigation_header.xml             | 4 ++--
 app/src/main/res/values-night/bools.xml                   | 6 +++---
 app/src/main/res/values-v27/bools.xml                     | 4 ++--
 app/src/main/res/values-v27/themes.xml                    | 2 +-
 app/src/main/res/values-w600dp/bools.xml                  | 2 +-
 app/src/main/res/values/bools.xml                         | 8 ++++----
 app/src/main/res/values/dimens.xml                        | 3 +++
 app/src/main/res/values/styles.xml                        | 3 ++-
 app/src/main/res/values/themes.xml                        | 4 ++--
 app/src/main/res/xml/pref_main.xml                        | 3 +--
 13 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
index b2921cdbd..1a522dfb0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -34,7 +34,7 @@ abstract class BaseBottomSheet<B : ViewBinding> :
 	}
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return if (resources.getBoolean(R.bool.isTablet)) {
+		return if (resources.getBoolean(R.bool.is_tablet)) {
 			AppCompatDialog(context, theme)
 		} else super.onCreateDialog(savedInstanceState)
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
index 9ad62224c..0a2f4f2cb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
@@ -60,7 +60,7 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 		binding.toolbar.setNavigationOnClickListener { dismiss() }
 		binding.toolbar.subtitle = null
 
-		if (!resources.getBoolean(R.bool.isTablet)) {
+		if (!resources.getBoolean(R.bool.is_tablet)) {
 			binding.toolbar.navigationIcon = null
 		} else {
 			binding.toolbar.subtitle =
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 667c821b1..f02321df3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
 				android:id="@+id/toolbar_card"
 				android:background="@drawable/toolbar_background"
 				android:layout_width="match_parent"
-				android:layout_height="50dp"
+				android:layout_height="48dp"
 				android:layout_marginStart="16dp"
 				android:layout_marginTop="8dp"
 				android:layout_marginEnd="16dp"
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index 0e2c5897c..3c1de5d04 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -29,9 +29,9 @@
 		android:gravity="center_vertical"
 		android:singleLine="true"
 		android:text="@string/app_name"
-		android:textAppearance="?attr/textAppearanceLabelLarge" />
+		android:textAppearance="?attr/textAppearanceTitleMedium" />
 
-	<View
+	<com.google.android.material.divider.MaterialDivider
 		android:id="@+id/divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
index 633508d65..bd0cb49f5 100644
--- a/app/src/main/res/values-night/bools.xml
+++ b/app/src/main/res/values-night/bools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<bool name="lightStatusBar">false</bool>
-	<bool name="lightNavigationBar">false</bool>
-	<bool name="elevationOverlayEnabled">true</bool>
+	<bool name="light_status_bar">false</bool>
+	<bool name="light_navigation_bar">false</bool>
+	<bool name="elevation_overlay_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/bools.xml b/app/src/main/res/values-v27/bools.xml
index fee4eae22..f86c4c879 100644
--- a/app/src/main/res/values-v27/bools.xml
+++ b/app/src/main/res/values-v27/bools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<bool name="lightStatusBar">true</bool>
-	<bool name="lightNavigationBar">true</bool>
+	<bool name="light_status_bar">true</bool>
+	<bool name="light_navigation_bar">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 486243e60..6e14e07fb 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -3,7 +3,7 @@
 
 	<style name="Base.V27.Kotatsu" parent="Base.Theme.Kotatsu">
 		<item name="android:navigationBarColor">@android:color/transparent</item>
-		<item name="android:windowLightNavigationBar">@bool/lightNavigationBar</item>
+		<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
 	</style>
 
 	<style name="Theme.Kotatsu" parent="Base.V27.Kotatsu" />
diff --git a/app/src/main/res/values-w600dp/bools.xml b/app/src/main/res/values-w600dp/bools.xml
index 975f4a5b7..f8f94c770 100644
--- a/app/src/main/res/values-w600dp/bools.xml
+++ b/app/src/main/res/values-w600dp/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<bool name="isTablet">true</bool>
+	<bool name="is_tablet">true</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 8a2a3ce4f..967cf9dce 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<bool name="isTablet">false</bool>
-	<bool name="lightStatusBar">true</bool>
-	<bool name="lightNavigationBar">false</bool>
-	<bool name="elevationOverlayEnabled">false</bool>
+	<bool name="is_tablet">false</bool>
+	<bool name="light_status_bar">true</bool>
+	<bool name="light_navigation_bar">false</bool>
+	<bool name="elevation_overlay_enabled">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 6e4900beb..26f6a11ab 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,5 +28,8 @@
 
 	<!--Text dimens-->
 	<dimen name="text_size_h1">22sp</dimen>
+	<dimen name="menu_radius">16dp</dimen>
+
+	<item name="material_emphasis_medium" format="float" type="dimen">0.6</item>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8b108fca6..36181a691 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,6 +16,7 @@
 		<item name="android:background">?attr/colorSurface</item>
 		<item name="android:textColorPrimary">?attr/colorOnSurface</item>
 		<item name="android:textColor">?attr/colorOnSurface</item>
+		<item name="dialogCornerRadius">28dp</item>
 	</style>
 
 	<!-- Widget styles -->
@@ -84,7 +85,7 @@
 	</style>
 
 	<style name="ThemeOverlay.Kotatsu.Switch" parent="">
-		<item name="elevationOverlayEnabled">@bool/elevationOverlayEnabled</item>
+		<item name="elevationOverlayEnabled">@bool/elevation_overlay_enabled</item>
 	</style>
 
 	<!-- TextAppearance -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a1add1d8e..fc379e0da 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -43,14 +43,14 @@
 		<item name="android:textDirection">locale</item>
 
 		<!-- Themes -->
-		<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/lightStatusBar</item>
+		<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
 		<item name="android:statusBarColor">@android:color/transparent</item>
 		<item name="android:navigationBarColor">@color/surface_amoled</item>
 		<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
 		<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
 		<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
-		<item name="android:alertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
+		<item name="alertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
 		<item name="materialAlertDialogTheme">@style/ThemeOverlay.Kotatsu.MaterialAlertDialog</item>
 		<item name="textAppearanceButton">@style/TextAppearance.Kotatsu.Button</item>
 		<item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index 08be3e379..6a6c72594 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools">
+	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<ListPreference
 		android:defaultValue="-1"