diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt index e575367c66..ec47c23ea7 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt +++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt @@ -19,8 +19,8 @@ package im.vector.app.features.location import im.vector.app.core.platform.VectorViewModelAction sealed class LocationSharingAction : VectorViewModelAction { - object CurrentUserLocationSharingAction : LocationSharingAction() - data class PinnedLocationSharingAction(val locationData: LocationData?) : LocationSharingAction() - data class LocationTargetChangeAction(val locationData: LocationData) : LocationSharingAction() - object ZoomToUserLocationAction : LocationSharingAction() + object CurrentUserLocationSharing : LocationSharingAction() + data class PinnedLocationSharing(val locationData: LocationData?) : LocationSharingAction() + data class LocationTargetChange(val locationData: LocationData) : LocationSharingAction() + object ZoomToUserLocation : LocationSharingAction() } diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt index 85d0b54098..cdffc95d95 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt +++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt @@ -120,7 +120,7 @@ class LocationSharingFragment @Inject constructor( } override fun onLocationTargetChange(target: LocationData) { - viewModel.handle(LocationSharingAction.LocationTargetChangeAction(target)) + viewModel.handle(LocationSharingAction.LocationTargetChange(target)) } override fun invalidate() = withState(viewModel) { state -> @@ -145,7 +145,7 @@ class LocationSharingFragment @Inject constructor( private fun initLocateButton() { views.mapView.locateBtn.setOnClickListener { - viewModel.handle(LocationSharingAction.ZoomToUserLocationAction) + viewModel.handle(LocationSharingAction.ZoomToUserLocation) } } @@ -158,10 +158,10 @@ class LocationSharingFragment @Inject constructor( views.shareLocationOptionsPicker.render() views.shareLocationOptionsPicker.optionPinned.debouncedClicks { val targetLocation = views.mapView.getLocationOfMapCenter() - viewModel.handle(LocationSharingAction.PinnedLocationSharingAction(targetLocation)) + viewModel.handle(LocationSharingAction.PinnedLocationSharing(targetLocation)) } views.shareLocationOptionsPicker.optionUserCurrent.debouncedClicks { - viewModel.handle(LocationSharingAction.CurrentUserLocationSharingAction) + viewModel.handle(LocationSharingAction.CurrentUserLocationSharing) } views.shareLocationOptionsPicker.optionUserLive.debouncedClicks { // TODO diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt index 900ae38d84..0356566b16 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt @@ -115,10 +115,10 @@ class LocationSharingViewModel @AssistedInject constructor( override fun handle(action: LocationSharingAction) { when (action) { - LocationSharingAction.CurrentUserLocationSharingAction -> handleCurrentUserLocationSharingAction() - is LocationSharingAction.PinnedLocationSharingAction -> handlePinnedLocationSharingAction(action) - is LocationSharingAction.LocationTargetChangeAction -> handleLocationTargetChangeAction(action) - LocationSharingAction.ZoomToUserLocationAction -> handleZoomToUserLocationAction() + LocationSharingAction.CurrentUserLocationSharing -> handleCurrentUserLocationSharingAction() + is LocationSharingAction.PinnedLocationSharing -> handlePinnedLocationSharingAction(action) + is LocationSharingAction.LocationTargetChange -> handleLocationTargetChangeAction(action) + LocationSharingAction.ZoomToUserLocation -> handleZoomToUserLocationAction() }.exhaustive } @@ -126,7 +126,7 @@ class LocationSharingViewModel @AssistedInject constructor( shareLocation(state.lastKnownUserLocation, isUserLocation = true) } - private fun handlePinnedLocationSharingAction(action: LocationSharingAction.PinnedLocationSharingAction) { + private fun handlePinnedLocationSharingAction(action: LocationSharingAction.PinnedLocationSharing) { shareLocation(action.locationData, isUserLocation = false) } @@ -144,7 +144,7 @@ class LocationSharingViewModel @AssistedInject constructor( } } - private fun handleLocationTargetChangeAction(action: LocationSharingAction.LocationTargetChangeAction) { + private fun handleLocationTargetChangeAction(action: LocationSharingAction.LocationTargetChange) { viewModelScope.launch { locationTargetFlow.emit(action.locationData) }