From 5eba85309bb9d5252516d0c55d4e1b23b10918e2 Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Fri, 23 Aug 2024 21:38:45 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Add=20new=20Default=20Color=20Pr?= =?UTF-8?q?eset=20colors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed new Color Preset's colors to match current theme by default. The default Color Preset's colors are replaced to match Light Blue theme. Resolves: #53 --- .../ua/acclorite/book_story/domain/util/Constants.kt | 4 ++-- .../screens/reader/components/ReaderEndItem.kt | 2 +- .../reader/components/start_item/ReaderStartItem.kt | 2 +- .../components/start_item/ReaderStartItemBackground.kt | 2 +- .../presentation/screens/settings/data/SettingsEvent.kt | 2 +- .../screens/settings/data/SettingsViewModel.kt | 5 ++++- .../appearance/components/settings/ColorPresetSetting.kt | 9 ++++++++- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt b/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt index bb9764be..4efbff6f 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt @@ -541,7 +541,7 @@ private fun provideEmptyBook() = Book( private fun provideDefaultColorPreset() = ColorPreset( id = -1, name = null, - backgroundColor = Color.DarkGray, - fontColor = Color.LightGray, + backgroundColor = Color(0xFFFAF8FF), // Blue Light Surface (hardcoded) + fontColor = Color(0xFF44464F), // Blue Light OnSurfaceVariant (hardcoded) isSelected = false ) \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt index b3633f20..be0d6100 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt @@ -66,7 +66,7 @@ fun ReaderEndItem( Column( modifier = Modifier .fillMaxSize() - .background(MaterialTheme.colorScheme.surface) + .background(MaterialTheme.colorScheme.surfaceContainerLowest) .padding( horizontal = 36.dp, vertical = 108.dp + WindowInsets.navigationBarsIgnoringVisibility diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt index 13443b79..0eb1e82f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt @@ -55,7 +55,7 @@ fun ReaderStartItem(state: State) { Box( modifier = Modifier .fillMaxWidth() - .background(MaterialTheme.colorScheme.surface) + .background(MaterialTheme.colorScheme.surfaceContainerLowest) ) { if (state.value.book.coverImage != null) { ReaderStartItemBackground( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt index 72710291..8787f69f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt @@ -19,7 +19,7 @@ import ua.acclorite.book_story.presentation.components.CustomCoverImage */ @Composable fun ReaderStartItemBackground(height: Dp, image: Uri) { - val background = MaterialTheme.colorScheme.surface + val background = MaterialTheme.colorScheme.surfaceContainerLowest CustomCoverImage( uri = image, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsEvent.kt index 562464b9..5922da77 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsEvent.kt @@ -38,7 +38,7 @@ sealed class SettingsEvent { val fontColor: Color? ) : SettingsEvent() - data object OnAddColorPreset : SettingsEvent() + data class OnAddColorPreset(val backgroundColor: Color, val fontColor: Color) : SettingsEvent() data class OnReorderColorPresets(val from: Int, val to: Int) : SettingsEvent() data object OnConfirmReorderColorPresets : SettingsEvent() } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt index 36e5a939..18041475 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt @@ -394,7 +394,10 @@ class SettingsViewModel @Inject constructor( addColorPresetJob = launch { yield() - val newColorPreset = Constants.DEFAULT_COLOR_PRESET + val newColorPreset = Constants.DEFAULT_COLOR_PRESET.copy( + backgroundColor = event.backgroundColor, + fontColor = event.fontColor + ) updateColorPreset.execute(newColorPreset) onSelectColorPreset(getColorPresets.execute().last()) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt index 17a6a119..2dd44c26 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt @@ -90,6 +90,8 @@ fun LazyItemScope.ColorPresetSetting( ) { from, to -> onEvent(SettingsEvent.OnReorderColorPresets(from.index, to.index)) } + val defaultBackgroundColor = MaterialTheme.colorScheme.surface + val defaultFontColor = MaterialTheme.colorScheme.onSurfaceVariant Column( Modifier @@ -200,7 +202,12 @@ fun LazyItemScope.ColorPresetSetting( ) }, onAdd = { - onEvent(SettingsEvent.OnAddColorPreset) + onEvent( + SettingsEvent.OnAddColorPreset( + backgroundColor = defaultBackgroundColor, + fontColor = defaultFontColor + ) + ) } )