filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deselect all sessions when leaving select mode

Browse Source
This commit is contained in:
Maxime NATUREL 2022-10-19 12:51:59 +02:00
parent 5b1bf8a68e
commit 2fc2665ff3
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
View File

@ -154,7 +154,7 @@ class OtherSessionsFragment :
override fun invalidate() = withState(viewModel) { state -> override fun invalidate() = withState(viewModel) { state ->
if (state.devices is Success) { if (state.devices is Success) {
val devices = state.devices().orEmpty() val devices = state.devices.invoke()
renderDevices(devices, state.currentFilter) renderDevices(devices, state.currentFilter)
updateToolbar(devices, state.isSelectModeEnabled) updateToolbar(devices, state.isSelectModeEnabled)
} }

23
vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
View File

@ -85,16 +85,15 @@ class OtherSessionsViewModel @AssistedInject constructor(
} }
private fun handleDisableSelectMode() { private fun handleDisableSelectMode() {
// TODO deselect all selected sessions setSelectionForAllDevices(isSelected = false, enableSelectMode = false)
setState { copy(isSelectModeEnabled = false) }
} }
private fun handleEnableSelectMode(deviceId: String?) { private fun handleEnableSelectMode(deviceId: String?) {
toggleSelectionForDevice(deviceId, true) toggleSelectionForDevice(deviceId, enableSelectMode = true)
} }
private fun handleToggleSelectionForDevice(deviceId: String) = withState { state -> private fun handleToggleSelectionForDevice(deviceId: String) = withState { state ->
toggleSelectionForDevice(deviceId, state.isSelectModeEnabled) toggleSelectionForDevice(deviceId, enableSelectMode = state.isSelectModeEnabled)
} }
private fun toggleSelectionForDevice(deviceId: String?, enableSelectMode: Boolean) = withState { state -> private fun toggleSelectionForDevice(deviceId: String?, enableSelectMode: Boolean) = withState { state ->
@ -118,4 +117,20 @@ class OtherSessionsViewModel @AssistedInject constructor(
) )
} }
} }
private fun setSelectionForAllDevices(isSelected: Boolean, enableSelectMode: Boolean) = withState { state ->
val updatedDevices = if (state.devices is Success) {
val updatedDevices = state.devices.invoke().map { it.copy(isSelected = isSelected) }
Success(updatedDevices)
} else {
state.devices
}
setState {
copy(
devices = updatedDevices,
isSelectModeEnabled = enableSelectMode
)
}
}
} }