Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the ViewModels

Browse Source
This commit is contained in:
Benoit Marty 2021-11-22 16:45:18 +01:00
parent e10af6476f
commit aee34ad552
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
View File

@ -25,7 +25,6 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
import im.vector.app.core.platform.EmptyViewEvents import im.vector.app.core.platform.EmptyViewEvents
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import im.vector.app.features.settings.VectorDataStore import im.vector.app.features.settings.VectorDataStore
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class DebugPrivateSettingsViewModel @AssistedInject constructor( class DebugPrivateSettingsViewModel @AssistedInject constructor(
@ -45,12 +44,10 @@ class DebugPrivateSettingsViewModel @AssistedInject constructor(
} }
private fun observeVectorDataStore() { private fun observeVectorDataStore() {
vectorDataStore.forceDialPadDisplayFlow.onEach { vectorDataStore.forceDialPadDisplayFlow.setOnEach {
setState { copy(
copy( dialPadVisible = it
dialPadVisible = it )
)
}
} }
} }

22
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
View File

@ -38,7 +38,6 @@ import im.vector.app.features.invite.showInvites
import im.vector.app.features.settings.VectorDataStore import im.vector.app.features.settings.VectorDataStore
import im.vector.app.features.ui.UiStateRepository import im.vector.app.features.ui.UiStateRepository
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flatMapLatest
@ -104,19 +103,16 @@ class HomeDetailViewModel @AssistedInject constructor(
private var forceDialPad = false private var forceDialPad = false
private fun observeDataStore() { private fun observeDataStore() {
viewModelScope.launch { vectorDataStore.pushCounterFlow.setOnEach { nbOfPush ->
vectorDataStore.pushCounterFlow.collect { nbOfPush -> copy(
setState { pushCounter = nbOfPush
copy( )
pushCounter = nbOfPush
)
}
}
vectorDataStore.forceDialPadDisplayFlow.collect { force ->
forceDialPad = force
updateShowDialPadTab()
}
} }
vectorDataStore.forceDialPadDisplayFlow.onEach { force ->
forceDialPad = force
updateShowDialPadTab()
}.launchIn(viewModelScope)
} }
override fun handle(action: HomeDetailAction) { override fun handle(action: HomeDetailAction) {

12
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -195,14 +195,10 @@ class RoomDetailViewModel @AssistedInject constructor(
} }
private fun observeDataStore() { private fun observeDataStore() {
viewModelScope.launch { vectorDataStore.pushCounterFlow.setOnEach { nbOfPush ->
vectorDataStore.pushCounterFlow.collect { nbOfPush -> copy(
setState { pushCounter = nbOfPush
copy( )
pushCounter = nbOfPush
)
}
}
} }
} }