mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-04-25 00:27:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

correctly implement onBackPresssed()

Browse Source
This commit is contained in:
Johan von Forstner
2020-03-29 22:15:10 +02:00
parent de59dda16e
commit f0f3d1600c
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/johan/evmap/MapsActivity.kt
View File

@@ -66,6 +66,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
private val vm: MapsActivityViewModel by viewModels()
private var markers: Map<Marker, ChargeLocation> = emptyMap()
private var clusterMarkers: List<Marker> = emptyList()
private lateinit var bottomSheetBehavior: BottomSheetBehaviorGoogleMapsLike<View>
private var reenterState: Bundle? = null
@@ -85,7 +86,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
setupAdapters()
val behavior = BottomSheetBehaviorGoogleMapsLike.from(binding.bottomSheet)
bottomSheetBehavior = BottomSheetBehaviorGoogleMapsLike.from(binding.bottomSheet)
vm.charger.observe(this, object : Observer<ChargeLocation> {
var previousCharger = vm.charger.value
@@ -95,11 +96,12 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
if (previousCharger == null ||
previousCharger!!.id != charger.id
) {
behavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
bottomSheetBehavior.state =
BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
loadChargerDetails()
}
} else {
behavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
}
previousCharger = charger
}
@@ -359,6 +361,18 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
}
}
override fun onBackPressed() {
if (bottomSheetBehavior.state != BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED &&
bottomSheetBehavior.state != BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
) {
bottomSheetBehavior.state = BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
} else if (bottomSheetBehavior.state == BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED) {
vm.charger.value = null
} else {
super.onBackPressed()
}
}
private val exitElementCallback = object : SharedElementCallback() {
override fun onMapSharedElements(
names: MutableList<String>,