2FAS/2fas-android
1
0
Fork 0
mirror of https://github.com/twofas/2fas-android.git synced 2024-11-21 17:59:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Respect in-app service sorting method for widgets (#95)

Browse Source
This commit is contained in:
Zachary Wander 2023-12-24 04:14:45 -05:00 committed by GitHub
parent 0e3a3933b2
commit c85d30420c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
feature/widget/src/main/java/com/twofasapp/feature/widget/ui/settings/WidgetSettingsViewModel.kt
View File

@ -7,12 +7,16 @@ import com.twofasapp.data.services.ServicesRepository
import com.twofasapp.data.services.WidgetsRepository
import com.twofasapp.data.services.domain.Widget
import com.twofasapp.data.services.domain.WidgetService
import com.twofasapp.data.session.SettingsRepository
import com.twofasapp.data.session.domain.ServicesSort
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.update
class WidgetSettingsViewModel(
private val widgetsRepository: WidgetsRepository,
private val servicesRepository: ServicesRepository,
private val settingsRepository: SettingsRepository,
private val timeProvider: TimeProvider,
) : ViewModel() {
@ -21,11 +25,16 @@ class WidgetSettingsViewModel(
init {
launchScoped {
servicesRepository.observeServices().collect { services ->
combine(servicesRepository.observeServices(), settingsRepository.observeAppSettings()) { services, appSettings -> services to appSettings }.collect { (services, appSettings) ->
uiState.update {
it.copy(
loading = false,
services = services,
services = services.sortedBy { service ->
when (appSettings.servicesSort) {
ServicesSort.Alphabetical -> service.name.lowercase()
ServicesSort.Manual -> null
}
},
)
}
}
@ -59,12 +68,13 @@ class WidgetSettingsViewModel(
widgetsRepository.saveWidget(
widget.copy(
lastInteraction = timeProvider.systemCurrentTime(),
services = uiState.value.selected.map { serviceId ->
WidgetService(
service = uiState.value.services.first { it.id == serviceId },
revealed = false,
)
}
services = uiState.value.services.filter { uiState.value.selected.contains(it.id) }
.map { service ->
WidgetService(
service = service,
revealed = false,
)
},
)
)
}