From 32695f98167b15cba93d1873ea042e4f0582c7c8 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sun, 4 Jun 2023 13:55:06 +0300
Subject: [PATCH] Bottom sheet adjustments

---
 .../org/koitharu/kotatsu/details/ui/DetailsActivity.kt   | 2 +-
 app/src/main/res/layout/activity_details.xml             | 1 +
 app/src/main/res/layout/layout_sheet_header_adaptive.xml | 1 +
 app/src/main/res/values/dimens.xml                       | 1 +
 app/src/main/res/values/styles.xml                       | 9 +++++++--
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index 1206fa6ce..0acb146c1 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -201,7 +201,7 @@ class DetailsActivity :
 		val toolbar = viewBinding.toolbarChapters ?: return
 		if (isAnimationsEnabled) {
 			val transition = AutoTransition()
-			transition.duration = getAnimationDuration(R.integer.config_tinyAnimTime)
+			transition.duration = getAnimationDuration(R.integer.config_shorterAnimTime)
 			TransitionManager.beginDelayedTransition(toolbar, transition)
 		}
 		if (isExpanded) {
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index 7e6f0e8d1..c73fd7075 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -55,6 +55,7 @@
 			android:orientation="vertical">
 
 			<com.google.android.material.bottomsheet.BottomSheetDragHandleView
+				style="@style/Widget.Kotatsu.BottomSheet.DragHandle"
 				android:id="@+id/dragHandle"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/layout_sheet_header_adaptive.xml b/app/src/main/res/layout/layout_sheet_header_adaptive.xml
index 0f5bead1c..616360f18 100644
--- a/app/src/main/res/layout/layout_sheet_header_adaptive.xml
+++ b/app/src/main/res/layout/layout_sheet_header_adaptive.xml
@@ -9,6 +9,7 @@
 	tools:parentTag="android.widget.LinearLayout">
 
 	<com.google.android.material.bottomsheet.BottomSheetDragHandleView
+		style="@style/Widget.Kotatsu.BottomSheet.DragHandle"
 		android:id="@+id/sh_dragHandle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 487bae75d..717a03880 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -41,6 +41,7 @@
 	<dimen name="bottom_sheet_width">0dp</dimen>
 	<dimen name="bottom_sheet_handle_size_min">16dp</dimen>
 	<dimen name="bottom_sheet_handle_size_max">24dp</dimen>
+	<dimen name="bottom_sheet_corner_radius">28dp</dimen>
 	<dimen name="dialog_radius">8dp</dimen>
 
 	<dimen name="card_indicator_size">32dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a4652f0cb..df869a46e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,10 +45,15 @@
 		<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Kotatsu.BottomSheet</item>
 	</style>
 
+	<style name="Widget.Kotatsu.BottomSheet.DragHandle" parent="Widget.Material3.BottomSheet.DragHandle">
+		<!-- Fix weird bottom padding -->
+		<item name="android:paddingBottom">0dp</item>
+	</style>
+
 	<style name="ShapeAppearanceOverlay.Kotatsu.BottomSheet" parent="">
 		<item name="cornerFamily">rounded</item>
-		<item name="cornerSizeTopRight">@dimen/dialog_radius</item>
-		<item name="cornerSizeTopLeft">@dimen/dialog_radius</item>
+		<item name="cornerSizeTopRight">@dimen/bottom_sheet_corner_radius</item>
+		<item name="cornerSizeTopLeft">@dimen/bottom_sheet_corner_radius</item>
 		<item name="cornerSizeBottomRight">0dp</item>
 		<item name="cornerSizeBottomLeft">0dp</item>
 	</style>