mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 19:36:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Using the override setting in the LocationSharing screen

Browse source
This commit is contained in:
Maxime Naturel 2022-03-18 17:28:18 +01:00 committed by Maxime NATUREL
parent 424f70bc58
commit cfce144b61
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
View file

@ -29,7 +29,6 @@ import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.mapbox.mapboxsdk.maps.MapView import com.mapbox.mapboxsdk.maps.MapView
import im.vector.app.BuildConfig
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.platform.VectorBaseFragment import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.core.utils.PERMISSIONS_FOR_BACKGROUND_LOCATION_SHARING import im.vector.app.core.utils.PERMISSIONS_FOR_BACKGROUND_LOCATION_SHARING
@ -243,7 +242,7 @@ class LocationSharingFragment @Inject constructor(
// first, update the options view // first, update the options view
val options: Set<LocationSharingOption> = when (state.areTargetAndUserLocationEqual) { val options: Set<LocationSharingOption> = when (state.areTargetAndUserLocationEqual) {
true -> { true -> {
if (BuildConfig.ENABLE_LIVE_LOCATION_SHARING) { if (state.isLiveLocationSharingEnabled) {
setOf(LocationSharingOption.USER_CURRENT, LocationSharingOption.USER_LIVE) setOf(LocationSharingOption.USER_CURRENT, LocationSharingOption.USER_LIVE)
} else { } else {
setOf(LocationSharingOption.USER_CURRENT) setOf(LocationSharingOption.USER_CURRENT)

12
vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
View file

@ -21,9 +21,11 @@ import com.airbnb.mvrx.MavericksViewModelFactory
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import im.vector.app.BuildConfig
import im.vector.app.core.di.MavericksAssistedViewModelFactory import im.vector.app.core.di.MavericksAssistedViewModelFactory
import im.vector.app.core.di.hiltMavericksViewModelFactory import im.vector.app.core.di.hiltMavericksViewModelFactory
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import im.vector.app.features.VectorOverrides
import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
import im.vector.app.features.location.domain.usecase.CompareLocationsUseCase import im.vector.app.features.location.domain.usecase.CompareLocationsUseCase
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
@ -48,7 +50,8 @@ class LocationSharingViewModel @AssistedInject constructor(
private val locationTracker: LocationTracker, private val locationTracker: LocationTracker,
private val locationPinProvider: LocationPinProvider, private val locationPinProvider: LocationPinProvider,
private val session: Session, private val session: Session,
private val compareLocationsUseCase: CompareLocationsUseCase private val compareLocationsUseCase: CompareLocationsUseCase,
private val vectorOverrides: VectorOverrides
) : VectorViewModel<LocationSharingViewState, LocationSharingAction, LocationSharingViewEvents>(initialState), LocationTracker.Callback { ) : VectorViewModel<LocationSharingViewState, LocationSharingAction, LocationSharingViewEvents>(initialState), LocationTracker.Callback {
private val room = session.getRoom(initialState.roomId)!! private val room = session.getRoom(initialState.roomId)!!
@ -68,6 +71,7 @@ class LocationSharingViewModel @AssistedInject constructor(
setUserItem() setUserItem()
updatePin() updatePin()
compareTargetAndUserLocation() compareTargetAndUserLocation()
observeVectorOverrides()
} }
private fun setUserItem() { private fun setUserItem() {
@ -109,6 +113,12 @@ class LocationSharingViewModel @AssistedInject constructor(
?.let { userLocation -> compareLocationsUseCase.execute(userLocation, targetLocation) } ?.let { userLocation -> compareLocationsUseCase.execute(userLocation, targetLocation) }
} }
private fun observeVectorOverrides() {
vectorOverrides.forceEnableLiveLocationSharing.setOnEach { forceLiveLocation ->
copy(isLiveLocationSharingEnabled = forceLiveLocation || BuildConfig.ENABLE_LIVE_LOCATION_SHARING)
}
}
override fun onCleared() { override fun onCleared() {
super.onCleared() super.onCleared()
locationTracker.removeCallback(this) locationTracker.removeCallback(this)

5
vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
View file

@ -19,6 +19,7 @@ package im.vector.app.features.location
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import androidx.annotation.StringRes import androidx.annotation.StringRes
import com.airbnb.mvrx.MavericksState import com.airbnb.mvrx.MavericksState
import im.vector.app.BuildConfig
import im.vector.app.R import im.vector.app.R
import org.matrix.android.sdk.api.extensions.orTrue import org.matrix.android.sdk.api.extensions.orTrue
import org.matrix.android.sdk.api.util.MatrixItem import org.matrix.android.sdk.api.util.MatrixItem
@ -31,6 +32,7 @@ enum class LocationSharingMode(@StringRes val titleRes: Int) {
data class LocationSharingViewState( data class LocationSharingViewState(
val roomId: String, val roomId: String,
val mode: LocationSharingMode, val mode: LocationSharingMode,
val isLiveLocationSharingEnabled: Boolean,
val userItem: MatrixItem.UserItem? = null, val userItem: MatrixItem.UserItem? = null,
val areTargetAndUserLocationEqual: Boolean? = null, val areTargetAndUserLocationEqual: Boolean? = null,
val lastKnownUserLocation: LocationData? = null, val lastKnownUserLocation: LocationData? = null,
@ -39,7 +41,8 @@ data class LocationSharingViewState(
constructor(locationSharingArgs: LocationSharingArgs) : this( constructor(locationSharingArgs: LocationSharingArgs) : this(
roomId = locationSharingArgs.roomId, roomId = locationSharingArgs.roomId,
mode = locationSharingArgs.mode mode = locationSharingArgs.mode,
isLiveLocationSharingEnabled = BuildConfig.ENABLE_LIVE_LOCATION_SHARING
) )
} }