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

Fix pager preferences

Browse Source
This commit is contained in:
MM20 2023-05-18 21:20:03 +02:00
parent 1b4ed85cb4
commit 1ddee5d493
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt
View File

@ -2,6 +2,8 @@ package de.mm20.launcher2.ui.settings.clockwidget
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.* import androidx.compose.material.icons.rounded.*
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
@ -13,9 +15,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.google.accompanist.pager.HorizontalPager
import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.HorizontalPagerIndicator
import com.google.accompanist.pager.rememberPagerState
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockStyle import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockStyle
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetColors import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetColors
import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetLayout import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetLayout
@ -153,7 +153,7 @@ fun ClockStylePreference(
val styles = remember { val styles = remember {
ClockStyle.values().filter { it != ClockStyle.UNRECOGNIZED } ClockStyle.values().filter { it != ClockStyle.UNRECOGNIZED }
} }
val pagerState = rememberPagerState(styles.indexOf(value)) val pagerState = rememberPagerState(styles.indexOf(value)) { styles.size }
AlertDialog( AlertDialog(
onDismissRequest = { showDialog = false }, onDismissRequest = { showDialog = false },
@ -180,7 +180,6 @@ fun ClockStylePreference(
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
HorizontalPager( HorizontalPager(
count = styles.size,
state = pagerState, state = pagerState,
modifier = Modifier.height(300.dp) modifier = Modifier.height(300.dp)
) { ) {
@ -189,7 +188,7 @@ fun ClockStylePreference(
layout = layout layout = layout
) )
} }
HorizontalPagerIndicator(pagerState = pagerState) HorizontalPagerIndicator(pagerState = pagerState, pageCount = styles.size)
} }
} }
) )

3
app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt
View File

@ -233,7 +233,7 @@ fun SearchBarStylePreference(
Settings.SearchBarSettings.SearchBarStyle.values() Settings.SearchBarSettings.SearchBarStyle.values()
.filter { it != Settings.SearchBarSettings.SearchBarStyle.UNRECOGNIZED } .filter { it != Settings.SearchBarSettings.SearchBarStyle.UNRECOGNIZED }
} }
val pagerState = rememberPagerState(styles.indexOf(value)) val pagerState = rememberPagerState(initialPage = styles.indexOf(value)) { styles.size }
var level by remember { mutableStateOf(SearchBarLevel.Resting) } var level by remember { mutableStateOf(SearchBarLevel.Resting) }
var previewSearchValue by remember { mutableStateOf("") } var previewSearchValue by remember { mutableStateOf("") }
@ -280,7 +280,6 @@ fun SearchBarStylePreference(
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
HorizontalPager( HorizontalPager(
pageCount = styles.size,
state = pagerState, state = pagerState,
modifier = Modifier modifier = Modifier
.height(150.dp) .height(150.dp)