diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt index 63a577dc..81f6ccde 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt @@ -1,9 +1,8 @@ package ua.acclorite.book_story.presentation.screens.settings -import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.windowInsetsPadding @@ -68,12 +67,9 @@ private fun SettingsScreen() { Modifier .fillMaxSize() .padding(top = paddingValues.calculateTopPadding()), - state = lazyListState + state = lazyListState, + contentPadding = PaddingValues(top = 16.dp, bottom = 48.dp) ) { - item { - Spacer(modifier = Modifier.height(16.dp)) - } - item { SettingsCategoryItem( icon = Icons.Outlined.DisplaySettings, @@ -121,8 +117,6 @@ private fun SettingsScreen() { } } } - - item { Spacer(modifier = Modifier.height(48.dp)) } } } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Color.kt b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Color.kt index 8c69113d..fea55468 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Color.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Color.kt @@ -28,10 +28,10 @@ enum class Theme( ) { DYNAMIC(hasThemeContrast = false, title = R.string.dynamic_theme), BLUE(hasThemeContrast = true, title = R.string.blue_theme), + GRAY(hasThemeContrast = false, title = R.string.gray_theme), GREEN(hasThemeContrast = true, title = R.string.green_theme), MARSH(hasThemeContrast = true, title = R.string.marsh_theme), RED(hasThemeContrast = true, title = R.string.red_theme), - GRAY(hasThemeContrast = false, title = R.string.gray_theme), PURPLE(hasThemeContrast = true, title = R.string.purple_theme), LAVENDER(hasThemeContrast = true, title = R.string.lavender_theme), PINK(hasThemeContrast = true, title = R.string.pink_theme),