lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SearchGridView: don't crash if column preference is faulty

Browse Source
This commit is contained in:
MM20 2022-01-29 19:57:02 +01:00
parent a4b6212a7e
commit a4ead54329
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/main/java/de/mm20/launcher2/ui/legacy/search/SearchGridView.kt
View File

@ -35,19 +35,28 @@ class SearchGridView : ViewGroup, KoinComponent {
val dataStore: LauncherDataStore by inject() val dataStore: LauncherDataStore by inject()
private val columnCountPreference = dataStore.data
.map { it.grid.columnCount.takeIf { it > 0 } ?: 5 }
.distinctUntilChanged()
var job: Job? = null var job: Job? = null
override fun onAttachedToWindow() { override fun onAttachedToWindow() {
super.onAttachedToWindow() super.onAttachedToWindow()
job?.cancel() job?.cancel()
lifecycleScope.launch { lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
dataStore.data.map { it.grid.columnCount }.distinctUntilChanged().collectLatest { columnCountPreference.collectLatest {
columnCount = it columnCount = it
} }
} }
} }
} }
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
job?.cancel()
}
var columnCount: Int = 1 var columnCount: Int = 1
set(value) { set(value) {
@ -116,7 +125,7 @@ class SearchGridView : ViewGroup, KoinComponent {
init { init {
columnCount = runBlocking { columnCount = runBlocking {
dataStore.data.map { it.grid.columnCount }.first().takeIf { it > 0 } ?: 5 columnCountPreference.first()
} }
} }