From c52bbd3d6b376ee5351a3c620368006ffb812dc6 Mon Sep 17 00:00:00 2001 From: XDdevv Date: Mon, 25 Aug 2025 12:46:42 +0500 Subject: [PATCH] refactor: add _light prefix to color resources --- .../designsystem/theme/PokedexBackground.kt | 2 +- .../core/designsystem/theme/PokedexColors.kt | 24 +++++++++---------- .../src/main/res/values/colors.xml | 18 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexBackground.kt b/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexBackground.kt index d68cbff..90c48e5 100644 --- a/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexBackground.kt +++ b/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexBackground.kt @@ -41,7 +41,7 @@ public data class PokedexBackground( ) } else { PokedexBackground( - color = colorResource(id = R.color.background), + color = colorResource(id = R.color.background_light), tonalElevation = 0.dp, ) } diff --git a/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexColors.kt b/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexColors.kt index 822d7ea..5368ef0 100644 --- a/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexColors.kt +++ b/core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/theme/PokedexColors.kt @@ -70,8 +70,8 @@ public data class PokedexColors( background = colorResource(id = R.color.background_dark), backgroundLight = colorResource(id = R.color.background800_dark), backgroundDark = colorResource(id = R.color.background900_dark), - absoluteWhite = colorResource(id = R.color.white), - absoluteBlack = colorResource(id = R.color.black), + absoluteWhite = colorResource(id = R.color.white_light), + absoluteBlack = colorResource(id = R.color.black_light), white = colorResource(id = R.color.white_dark), white12 = colorResource(id = R.color.white_12_dark), white56 = colorResource(id = R.color.white_56_dark), @@ -108,16 +108,16 @@ public data class PokedexColors( @Composable public fun defaultLightColors(): PokedexColors = PokedexColors( primary = colorResource(id = R.color.colorPrimary), - background = colorResource(id = R.color.background), - backgroundLight = colorResource(id = R.color.background800), - backgroundDark = colorResource(id = R.color.background900), - absoluteWhite = colorResource(id = R.color.white), - absoluteBlack = colorResource(id = R.color.black), - white = colorResource(id = R.color.white), - white12 = colorResource(id = R.color.white_12), - white56 = colorResource(id = R.color.white_56), - white70 = colorResource(id = R.color.white_70), - black = colorResource(id = R.color.black), + background = colorResource(id = R.color.background_light), + backgroundLight = colorResource(id = R.color.background800_light), + backgroundDark = colorResource(id = R.color.background900_light), + absoluteWhite = colorResource(id = R.color.white_light), + absoluteBlack = colorResource(id = R.color.black_light), + white = colorResource(id = R.color.white_light), + white12 = colorResource(id = R.color.white_12_light), + white56 = colorResource(id = R.color.white_56_light), + white70 = colorResource(id = R.color.white_70_light), + black = colorResource(id = R.color.black_light), gray21 = colorResource(id = R.color.gray_21), bug = colorResource(id = R.color.bug), dark = colorResource(id = R.color.dark), diff --git a/core/designsystem/src/main/res/values/colors.xml b/core/designsystem/src/main/res/values/colors.xml index 6732f7e..4804965 100644 --- a/core/designsystem/src/main/res/values/colors.xml +++ b/core/designsystem/src/main/res/values/colors.xml @@ -53,13 +53,13 @@ #ffffff - #F4EBF4 - #D0C7C7 - #FFFFFF - #1F000000 - #8F000000 - #B3000000 - #ED000000 - #ffffff - #000000 + #F4EBF4 + #D0C7C7 + #FFFFFF + #1F000000 + #8F000000 + #B3000000 + #ED000000 + #ffffff + #000000 \ No newline at end of file