rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forward error to UI in map screen

Browse Source
This commit is contained in:
Maxime NATUREL 2022-06-15 14:45:32 +02:00
parent 31bb9eaac8
commit fc98057042
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
View File

@ -1294,7 +1294,7 @@ class TimelineViewModel @AssistedInject constructor(
} }
override fun onLocationServiceError(error: Throwable) { override fun onLocationServiceError(error: Throwable) {
_viewEvents.post(RoomDetailViewEvents.Failure(error)) _viewEvents.post(RoomDetailViewEvents.Failure(throwable = error, showInDialog = true))
} }
override fun onCleared() { override fun onCleared() {

4
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt
View File

@ -18,4 +18,6 @@ package im.vector.app.features.location.live.map
import im.vector.app.core.platform.VectorViewEvents import im.vector.app.core.platform.VectorViewEvents
sealed interface LocationLiveMapViewEvents : VectorViewEvents sealed interface LocationLiveMapViewEvents : VectorViewEvents {
data class Error(val error: Throwable) : LocationLiveMapViewEvents
}

10
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
View File

@ -76,6 +76,8 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
observeViewEvents()
views.liveLocationBottomSheetRecyclerView.configureWith(bottomSheetController, hasFixedSize = false, disableItemAnimation = true) views.liveLocationBottomSheetRecyclerView.configureWith(bottomSheetController, hasFixedSize = false, disableItemAnimation = true)
bottomSheetController.callback = object : LiveLocationBottomSheetController.Callback { bottomSheetController.callback = object : LiveLocationBottomSheetController.Callback {
@ -89,6 +91,14 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
} }
} }
private fun observeViewEvents() {
viewModel.observeViewEvents { viewEvent ->
when(viewEvent) {
is LocationLiveMapViewEvents.Error -> displayErrorDialog(viewEvent.error)
}
}
}
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
setupMap() setupMap()

2
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt
View File

@ -82,6 +82,6 @@ class LocationLiveMapViewModel @AssistedInject constructor(
} }
override fun onLocationServiceError(error: Throwable) { override fun onLocationServiceError(error: Throwable) {
// TODO _viewEvents.post(LocationLiveMapViewEvents.Error(error))
} }
} }