From 8b295f6a9301c0c65e24e8668ecffabc0d00f925 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 13 Mar 2022 17:50:49 +0200
Subject: [PATCH] Fix dialogs width

---
 .../kotatsu/base/ui/BaseBottomSheet.kt        |  2 +-
 .../kotatsu/reader/ui/ReaderActivity.kt       | 10 ++-
 .../res/layout-w600dp/activity_reader.xml     | 83 +++++++++++++++++++
 app/src/main/res/values/themes.xml            |  8 ++
 4 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout-w600dp/activity_reader.xml

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 d65e031fa..b2146c3ba 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
@@ -42,7 +42,7 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		return if (resources.getBoolean(R.bool.is_tablet)) {
-			AppCompatDialog(context, theme)
+			AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
 		} else super.onCreateDialog(savedInstanceState)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
index cd15c2bfa..791bc316f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
@@ -241,7 +241,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 			rawX >= binding.root.width - gestureInsets.right ||
 			rawY >= binding.root.height - gestureInsets.bottom ||
 			binding.appbarTop.hasGlobalPoint(rawX, rawY) ||
-			binding.appbarBottom.hasGlobalPoint(rawX, rawY)
+			binding.appbarBottom?.hasGlobalPoint(rawX, rawY) == true
 		) {
 			false
 		} else {
@@ -318,11 +318,13 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 		if (binding.appbarTop.isVisible != isUiVisible) {
 			val transition = TransitionSet()
 				.setOrdering(TransitionSet.ORDERING_TOGETHER)
-				.addTransition(Slide(Gravity.BOTTOM).addTarget(binding.appbarBottom))
 				.addTransition(Slide(Gravity.TOP).addTarget(binding.appbarTop))
+			binding.appbarBottom?.let { botomBar ->
+				transition.addTransition(Slide(Gravity.BOTTOM).addTarget(botomBar))
+			}
 			TransitionManager.beginDelayedTransition(binding.root, transition)
 			binding.appbarTop.isVisible = isUiVisible
-			binding.appbarBottom.isVisible = isUiVisible
+			binding.appbarBottom?.isVisible = isUiVisible
 			if (isUiVisible) {
 				showSystemUI()
 			} else {
@@ -339,7 +341,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
 			right = systemBars.right,
 			left = systemBars.left
 		)
-		binding.appbarBottom.updatePadding(
+		binding.appbarBottom?.updatePadding(
 			bottom = systemBars.bottom,
 			right = systemBars.right,
 			left = systemBars.left
diff --git a/app/src/main/res/layout-w600dp/activity_reader.xml b/app/src/main/res/layout-w600dp/activity_reader.xml
new file mode 100644
index 000000000..90a78c533
--- /dev/null
+++ b/app/src/main/res/layout-w600dp/activity_reader.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	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"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:keepScreenOn="true">
+
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@+id/container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" />
+
+	<org.koitharu.kotatsu.reader.ui.ReaderToastView
+		android:id="@+id/toastView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|center_horizontal"
+		android:layout_marginBottom="20dp"
+		android:background="@drawable/bg_reader_indicator"
+		android:drawablePadding="6dp"
+		android:singleLine="true"
+		android:textAppearance="?attr/textAppearanceBodySmall"
+		android:theme="@style/ThemeOverlay.Material3.Dark"
+		tools:text="@string/loading_" />
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar_top"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@color/dim"
+		android:elevation="0dp"
+		android:theme="@style/ThemeOverlay.Material3.Dark"
+		app:elevation="0dp">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="horizontal">
+
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@id/toolbar"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				app:popupTheme="@style/ThemeOverlay.Kotatsu" />
+
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@+id/toolbar_bottom"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				app:popupTheme="@style/ThemeOverlay.Kotatsu" />
+
+		</LinearLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<LinearLayout
+		android:id="@+id/layout_loading"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:gravity="center_horizontal"
+		android:orientation="vertical">
+
+		<com.google.android.material.progressindicator.CircularProgressIndicator
+			android:id="@+id/progressBar"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:indeterminate="true" />
+
+		<TextView
+			android:id="@+id/textView_loading"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:text="@string/loading_"
+			android:textAppearance="?attr/textAppearanceBody2" />
+
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d1b29006e..a51ebf1e4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -85,4 +85,12 @@
 
 	<style name="ThemeOverlay.Kotatsu.AMOLED" parent="" />
 
+	<style name="Theme.Kotatsu.Dialog" parent="">
+		<item name="android:windowNoTitle">true</item>
+		<item name="android:windowIsFloating">true</item>
+		<item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
+		<item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
+		<item name="toolbarNavigationButtonStyle">@style/Theme.Kotatsu.ActionMode.CloseButton</item>
+	</style>
+
 </resources>