mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-06-12 00:08:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

API 35 compat: handle bottom nav bar insets

Browse Source
This commit is contained in:
johan12345
2025-07-14 00:07:46 +02:00
parent 0b68ddb939
commit 845bd2e5ca
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
View File

@@ -138,6 +138,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
private var connectionErrorSnackbar: Snackbar? = null
private var mapTopPadding: Int = 0
private var popupMenu: PopupMenu? = null
private var insetBottom: Int = 0
private lateinit var favToggle: MenuItem
private val backPressedCallback = object : OnBackPressedCallback(false) {
override fun handleOnBackPressed() {
@@ -248,6 +249,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
// and cause an infinite loop. So we rely on onMapReady being called later than
// onApplyWindowInsets.
insetBottom = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
binding.navBarScrim.layoutParams.height = insetBottom
updatePeekHeight()
insets
}
@@ -262,6 +267,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
return binding.root
}
private fun updatePeekHeight() {
bottomSheetBehavior.peekHeight = binding.detailView.topPart.bottom + insetBottom
}
private fun getMapProvider(provider: String) = when (provider) {
"mapbox" -> MapFactory.MAPLIBRE
"google" -> MapFactory.GOOGLE
@@ -291,7 +300,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
}
binding.detailView.topPart.doOnNextLayout {
bottomSheetBehavior.peekHeight = binding.detailView.topPart.bottom
updatePeekHeight()
vm.bottomSheetState.value?.let { bottomSheetBehavior.state = it }
}
bottomSheetBehavior.isCollapsible = bottomSheetCollapsible
@@ -626,6 +635,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
min(bottomSheetBehavior.peekHeight, height)
)
}
println(slideOffset)
if (bottomSheetBehavior.state != STATE_HIDDEN) {
binding.navBarScrim.visibility = View.VISIBLE
binding.navBarScrim.translationY =
(if (slideOffset < 0f) -slideOffset else 2 * slideOffset) * binding.navBarScrim.height
} else {
binding.navBarScrim.visibility = View.INVISIBLE
}
}
override fun onStateChanged(bottomSheet: View, newState: Int) {

9
app/src/main/res/layout/fragment_map.xml
View File

@@ -247,6 +247,15 @@
app:layout_behavior="@string/hide_on_scroll_fab_behavior"
android:theme="@style/NoElevationOverlay" />
<View
android:id="@+id/navBarScrim"
android:layout_width="match_parent"
android:layout_height="16dp"
android:background="?android:colorBackground"
android:layout_gravity="bottom"
app:invisibleUnless="@{vm.bottomSheetState == BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED}"
tools:visibility="invisible" />
<androidx.cardview.widget.CardView
android:id="@+id/layers_sheet"
android:layout_height="wrap_content"