prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bottom navigation height

Browse Source
This commit is contained in:
Koitharu
2025-02-09 17:03:46 +02:00
parent 8c59f97b02
commit 28ae785142
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/SlidingBottomNavigationView.kt
View File

@@ -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

5
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt
View File

@@ -240,4 +240,9 @@ class MainNavigationDelegate(
fun onFragmentChanged(fragment: Fragment, fromUser: Boolean)
}
companion object {
const val MAX_ITEM_COUNT = 6
}
}

3
app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
View File

@@ -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(

4
app/src/main/res/layout/activity_main.xml
View File

@@ -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>

2
app/src/main/res/values/dimens.xml
View File

@@ -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>

12
app/src/main/res/values/styles.xml
View File

@@ -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">

2
app/src/main/res/values/themes.xml
View File

@@ -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>