From ba0ea5a9fc03b56eadee347b036ddca6412e973d Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 22 Aug 2023 16:58:31 +0300
Subject: [PATCH] UI fixes

---
 .../org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt    | 2 +-
 .../kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt    | 2 ++
 app/src/main/res/layout/activity_details.xml                 | 4 ++--
 app/src/main/res/layout/activity_reader.xml                  | 5 ++++-
 app/src/main/res/values/strings.xml                          | 1 +
 app/src/main/res/xml/pref_appearance.xml                     | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
index 03d4d3eb7..bb668af73 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
@@ -33,7 +33,7 @@ class FilterSheetFragment :
 		val adapter = FilterAdapter(filter, this)
 		binding.recyclerView.adapter = adapter
 		filter.filterItems.observe(viewLifecycleOwner, adapter)
-		binding.recyclerView.addItemDecoration(TypedListSpacingDecoration(binding.root.context, false))
+		binding.recyclerView.addItemDecoration(TypedListSpacingDecoration(binding.root.context, true))
 
 		if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			binding.recyclerView.scrollIndicators = 0
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt
index eb0509865..6a99fc7be 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt
@@ -70,4 +70,6 @@ class TypedListSpacingDecoration(
 	private fun Rect.set(spacing: Int) = set(spacing, spacing, spacing, spacing)
 
 	private fun ListItemType?.isEdgeToEdge() = this == ListItemType.MANGA_NESTED_GROUP
+		|| this == ListItemType.FILTER_SORT
+		|| this == ListItemType.FILTER_TAG
 }
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index f401b2a27..beb67f619 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -41,6 +41,7 @@
 		style="@style/Widget.Material3.BottomSheet"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:backgroundTint="?colorBackgroundFloating"
 		android:orientation="vertical"
 		android:visibility="gone"
 		app:behavior_hideable="false"
@@ -51,8 +52,7 @@
 		<FrameLayout
 			android:id="@+id/layout_bs_header"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical">
+			android:layout_height="wrap_content">
 
 			<com.google.android.material.bottomsheet.BottomSheetDragHandleView
 				android:id="@+id/dragHandle"
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index 5ceef7ae4..2faed85f9 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -10,7 +10,8 @@
 	<androidx.fragment.app.FragmentContainerView
 		android:id="@+id/container"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
+		android:layout_height="match_parent"
+		tools:background="@color/grey" />
 
 	<org.koitharu.kotatsu.reader.ui.ReaderInfoBarView
 		android:id="@+id/infoBar"
@@ -25,6 +26,7 @@
 		android:id="@+id/appbar_top"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?colorBackgroundFloating"
 		android:elevation="@dimen/m3_card_elevated_elevation"
 		app:elevation="@dimen/m3_card_elevated_elevation"
 		app:liftOnScroll="false">
@@ -46,6 +48,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom"
 		android:layout_margin="8dp"
+		app:cardBackgroundColor="?colorBackgroundFloating"
 		app:layout_insetEdge="bottom">
 
 		<com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79dee1e32..a433d924a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -476,4 +476,5 @@
 	<string name="too_many_requests_message">Too many requests. Try again later</string>
 	<string name="related_manga_summary">Show a list of related manga. In some cases it may be inaccurate or missing</string>
 	<string name="advanced">Advanced</string>
+	<string name="default_section">Default section</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml
index 0d3744269..f33d73f96 100644
--- a/app/src/main/res/xml/pref_appearance.xml
+++ b/app/src/main/res/xml/pref_appearance.xml
@@ -60,7 +60,7 @@
 		android:entries="@array/first_nav_item"
 		android:entryValues="@array/values_first_nav_item"
 		android:key="nav_first"
-		android:title="Default section"
+		android:title="@string/default_section"
 		app:allowDividerAbove="true"
 		app:useSimpleSummaryProvider="true" />