Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🚀 Move Gray "Callisto" theme to the start

Browse source 
* Moved Gray theme to second place after Blue theme
This commit is contained in:
Acclorite 2024-10-25 11:52:26 +03:00
parent 53b2816290
commit bc249521db
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
View file

@ -1,9 +1,8 @@
package ua.acclorite.book_story.presentation.screens.settings 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.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.layout.windowInsetsPadding
@ -68,12 +67,9 @@ private fun SettingsScreen() {
Modifier Modifier
.fillMaxSize() .fillMaxSize()
.padding(top = paddingValues.calculateTopPadding()), .padding(top = paddingValues.calculateTopPadding()),
state = lazyListState state = lazyListState,
contentPadding = PaddingValues(top = 16.dp, bottom = 48.dp)
) { ) {
item {
Spacer(modifier = Modifier.height(16.dp))
}
item { item {
SettingsCategoryItem( SettingsCategoryItem(
icon = Icons.Outlined.DisplaySettings, icon = Icons.Outlined.DisplaySettings,
@ -121,8 +117,6 @@ private fun SettingsScreen() {
} }
} }
} }
item { Spacer(modifier = Modifier.height(48.dp)) }
} }
} }
} }

2
app/src/main/java/ua/acclorite/book_story/presentation/ui/Color.kt
View file

@ -28,10 +28,10 @@ enum class Theme(
) { ) {
DYNAMIC(hasThemeContrast = false, title = R.string.dynamic_theme), DYNAMIC(hasThemeContrast = false, title = R.string.dynamic_theme),
BLUE(hasThemeContrast = true, title = R.string.blue_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), GREEN(hasThemeContrast = true, title = R.string.green_theme),
MARSH(hasThemeContrast = true, title = R.string.marsh_theme), MARSH(hasThemeContrast = true, title = R.string.marsh_theme),
RED(hasThemeContrast = true, title = R.string.red_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), PURPLE(hasThemeContrast = true, title = R.string.purple_theme),
LAVENDER(hasThemeContrast = true, title = R.string.lavender_theme), LAVENDER(hasThemeContrast = true, title = R.string.lavender_theme),
PINK(hasThemeContrast = true, title = R.string.pink_theme), PINK(hasThemeContrast = true, title = R.string.pink_theme),