From 28ae78514274c809899d415424c977256054e6b5 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 9 Feb 2025 17:03:46 +0200
Subject: [PATCH] Fix bottom navigation height

---
 .../core/ui/widgets/SlidingBottomNavigationView.kt   |  5 +++++
 .../kotatsu/main/ui/MainNavigationDelegate.kt        |  5 +++++
 .../kotatsu/settings/nav/NavConfigViewModel.kt       |  3 ++-
 app/src/main/res/layout/activity_main.xml            |  4 +---
 app/src/main/res/values/dimens.xml                   |  2 +-
 app/src/main/res/values/styles.xml                   | 12 ------------
 app/src/main/res/values/themes.xml                   |  2 +-
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SlidingBottomNavigationView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SlidingBottomNavigationView.kt
index 0fc9f816d..c7413a149 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SlidingBottomNavigationView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SlidingBottomNavigationView.kt
@@ -77,6 +77,11 @@ class SlidingBottomNavigationView @JvmOverloads constructor(
 		}
 	}
 
+	override fun setMinimumHeight(minHeight: Int) {
+		super.setMinimumHeight(minHeight)
+		getChildAt(0)?.minimumHeight = minHeight
+	}
+
 	fun show() {
 		if (currentState == STATE_UP) {
 			return
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
index 611774e87..8d6c0df78 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
@@ -240,4 +240,9 @@ class MainNavigationDelegate(
 
 		fun onFragmentChanged(fragment: Fragment, fromUser: Boolean)
 	}
+
+	companion object {
+
+		const val MAX_ITEM_COUNT = 6
+	}
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
index 5b6883a6c..6a10558b8 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
@@ -19,6 +19,7 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.main.ui.MainActivity
+import org.koitharu.kotatsu.main.ui.MainNavigationDelegate
 import org.koitharu.kotatsu.parsers.util.move
 import org.koitharu.kotatsu.settings.nav.model.NavItemAddModel
 import org.koitharu.kotatsu.settings.nav.model.NavItemConfigModel
@@ -38,7 +39,7 @@ class NavConfigViewModel @Inject constructor(
 				NavItemConfigModel(it, getUnavailabilityHint(it))
 			}
 			if (size < NavItem.entries.size) {
-				add(NavItemAddModel(size < 5))
+				add(NavItemAddModel(size < MainNavigationDelegate.MAX_ITEM_COUNT))
 			}
 		}
 	}.stateIn(
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9cadc7a44..4644c730f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -95,8 +95,6 @@
 		android:id="@+id/bottomNav"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:clickable="true"
-		tools:ignore="KeyboardInaccessibleWidget" />
+		android:layout_gravity="bottom" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 10c872d6f..1200328b7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,7 +9,7 @@
 	<dimen name="list_spacing_normal">8dp</dimen>
 	<dimen name="list_spacing_large">12dp</dimen>
 	<!-- Navigation -->
-	<dimen name="nav_bar_height_compact">62dp</dimen>
+	<dimen name="nav_bar_height_compact">0dp</dimen>
 
 	<dimen name="grid_spacing">8dp</dimen>
 	<dimen name="list_spacing">8dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c26ae5560..f0683e1ba 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,18 +14,6 @@
 
 	<style name="Widget.Kotatsu.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
 		<item name="labelVisibilityMode">labeled</item>
-		<item name="android:background">?attr/colorSurfaceContainer</item>
-		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
-		<item name="itemIconTint">@color/bottom_menu_active_item</item>
-	</style>
-
-	<style name="Widget.Kotatsu.BottomNavigationView.ColoredIndicators">
-		<item name="itemActiveIndicatorStyle">@style/Widget.Kotatsu.BottomNavigationView.ActiveIndicator</item>
-		<item name="itemIconTint">@color/bottom_menu_active_item</item>
-	</style>
-
-	<style name="Widget.Kotatsu.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
-		<item name="android:color">@color/bottom_menu_active_indicator</item>
 	</style>
 
 	<style name="Widget.Kotatsu.ActionMode" parent="Base.Widget.Material3.ActionMode">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5f07f2f60..80622e3ad 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -70,7 +70,7 @@
 		<item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
 		<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
 		<item name="appBarLayoutStyle">@style/Widget.Kotatsu.AppBarLayout</item>
-		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators</item>
+		<item name="bottomNavigationStyle">@style/Widget.Kotatsu.BottomNavigationView</item>
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="materialCardViewStyle">@style/Widget.Kotatsu.CardView.Filled</item>
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>