From 46b797fc67bf16af0928a7e2f6f01b8ef62537a0 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 4 Jun 2023 15:56:57 +0300
Subject: [PATCH] Fix chapters bottom sheet header size

---
 .../koitharu/kotatsu/details/ui/DetailsActivity.kt  |  3 +++
 app/src/main/res/layout/activity_details.xml        | 13 +++++++++----
 .../res/layout/layout_sheet_header_adaptive.xml     |  2 ++
 3 files changed, 14 insertions(+), 4 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 0acb146c1..038348767 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
@@ -243,6 +243,9 @@ class DetailsActivity :
 		viewBinding.cardChapters?.updateLayoutParams<MarginLayoutParams> {
 			bottomMargin = insets.bottom + marginEnd
 		}
+		viewBinding.dragHandle?.updateLayoutParams<MarginLayoutParams> {
+			bottomMargin = insets.bottom
+		}
 	}
 
 	private fun onHistoryChanged(info: HistoryInfo) {
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index 7e6f0e8d1..579adf35d 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -48,7 +48,7 @@
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.BottomSheet"
 		tools:visibility="visible">
 
-		<LinearLayout
+		<FrameLayout
 			android:id="@+id/layout_bs_header"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -57,12 +57,17 @@
 			<com.google.android.material.bottomsheet.BottomSheetDragHandleView
 				android:id="@+id/dragHandle"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content" />
+				android:layout_height="?actionBarSize"
+				android:layout_gravity="top"
+				android:paddingTop="0dp"
+				android:paddingBottom="32dp"
+				tools:layout_marginBottom="14dp" />
 
 			<com.google.android.material.appbar.MaterialToolbar
 				android:id="@+id/toolbar_chapters"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_height="?actionBarSize"
+				android:layout_gravity="bottom"
 				android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar"
 				tools:menu="@menu/opt_chapters">
 
@@ -92,7 +97,7 @@
 
 			</com.google.android.material.appbar.MaterialToolbar>
 
-		</LinearLayout>
+		</FrameLayout>
 
 		<androidx.fragment.app.FragmentContainerView
 			android:id="@+id/container_chapters"
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..e0e7243c5 100644
--- a/app/src/main/res/layout/layout_sheet_header_adaptive.xml
+++ b/app/src/main/res/layout/layout_sheet_header_adaptive.xml
@@ -24,6 +24,7 @@
 		android:orientation="horizontal"
 		android:paddingVertical="8dp"
 		android:visibility="gone"
+		tools:ignore="UseCompoundDrawables"
 		tools:visibility="visible">
 
 		<TextView
@@ -43,6 +44,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginEnd="8dp"
 			android:background="?selectableItemBackgroundBorderless"
+			android:contentDescription="@string/close"
 			android:padding="16dp"
 			app:srcCompat="?actionModeCloseDrawable"
 			app:tint="?colorControlActivated" />