From 33dd1961f5eaa3772f570d14bfeb0da2e8b6a638 Mon Sep 17 00:00:00 2001 From: LooKeR Date: Thu, 13 Jan 2022 00:35:30 +0530 Subject: [PATCH] Fix wrong sort order on restart (Closes #153) --- .../kotlin/com/looker/droidify/screen/TabsFragment.kt | 1 - .../com/looker/droidify/ui/viewmodels/AppListViewModel.kt | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt index 404395fe..fdce8c2a 100644 --- a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt @@ -35,7 +35,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.schedulers.Schedulers -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import kotlin.math.* diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt index 959ce242..11c2956b 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt +++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppListViewModel.kt @@ -2,16 +2,20 @@ package com.looker.droidify.ui.viewmodels import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.looker.droidify.content.Preferences import com.looker.droidify.database.CursorOwner import com.looker.droidify.entity.ProductItem import com.looker.droidify.ui.fragments.AppListFragment import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch class AppListViewModel : ViewModel() { - private val _order = MutableStateFlow(ProductItem.Order.LAST_UPDATE) + private val _order = MutableStateFlow(Preferences[Preferences.Key.SortOrder].order) private val _sections = MutableStateFlow(ProductItem.Section.All) private val _searchQuery = MutableStateFlow("")