diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/BlueGreenColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/BlueGreenColorScheme.kt index a0a0555e9f..3b53c9059e 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/BlueGreenColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/BlueGreenColorScheme.kt @@ -4,9 +4,6 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color -// Shades for hex colors https://noeldelgado.github.io/shadowlord/ -// Color palette https://paletton.com/ - internal object BlueGreenColorScheme : BaseColorScheme() { override val lightScheme = lightColorScheme( @@ -30,7 +27,7 @@ internal object BlueGreenColorScheme : BaseColorScheme() { onBackground = Color(0xFF000000), surface = Color(0xFFF0F7F7), onSurface = Color(0xFF000000), - surfaceVariant = Color(0xFFF0F7F7), + surfaceVariant = Color(0xFFD4F1E6), onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFBFD7D5), outlineVariant = Color(0xFFDFEBEA), @@ -69,7 +66,7 @@ internal object BlueGreenColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFF14191B), onSurface = Color(0xFFFFFFFF), - surfaceVariant = Color(0xFF14191B), + surfaceVariant = Color(0xFF1D2528), onSurfaceVariant = Color(0xFFFFFFFF), outline = Color(0xFFCCE3ED), outlineVariant = Color(0xFFE6F1F6), diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/GreenColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/GreenColorScheme.kt index 72bf2df3d7..228003fa43 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/GreenColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/GreenColorScheme.kt @@ -27,8 +27,8 @@ internal object GreenColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFFE9EFEB), onSurface = Color(0xFF000000), - surfaceVariant = Color(0xFFE9EFEB), - onSurfaceVariant = Color(0xFFDDF2E4), + surfaceVariant = Color(0xFFD9ECE0), + onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFBCE5C9), outlineVariant = Color(0xFFAEDFC0), scrim = Color(0xFFFFFFFF), @@ -66,7 +66,7 @@ internal object GreenColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFF202125), onSurface = Color(0xFFFFFFFF), - surfaceVariant = Color(0xFF202125), + surfaceVariant = Color(0xFF292929), onSurfaceVariant = Color(0xFFFFFFFF), outline = Color(0xFFACFCC7), outlineVariant = Color(0xFFACFCC7), diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OrangeColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OrangeColorScheme.kt index a276f618d3..970833b96d 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OrangeColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OrangeColorScheme.kt @@ -4,9 +4,6 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color -// Shades for hex colors https://noeldelgado.github.io/shadowlord/ -// Color palette https://paletton.com/ - internal object OrangeColorScheme : BaseColorScheme() { override val lightScheme = lightColorScheme( @@ -30,7 +27,7 @@ internal object OrangeColorScheme : BaseColorScheme() { onBackground = Color(0xFF000000), surface = Color(0xFFFFFFFF), onSurface = Color(0xFF000000), - surfaceVariant = Color(0xFFFFFFFF), + surfaceVariant = Color(0xFFFFD9CF), onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFFFC2B3), outlineVariant = Color(0xFFFFE1D9), @@ -69,7 +66,7 @@ internal object OrangeColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFF292929), onSurface = Color(0xFFFFFFFF), - surfaceVariant = Color(0xFF292929), + surfaceVariant = Color(0xFF212121), onSurfaceVariant = Color(0xFFFFFFFF), outline = lightScheme.outline, outlineVariant = lightScheme.outlineVariant, diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OutRunColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OutRunColorScheme.kt index 7e91f86a78..179aa8acc5 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OutRunColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/OutRunColorScheme.kt @@ -4,9 +4,6 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color -// Shades for hex colors https://noeldelgado.github.io/shadowlord/ -// Color palette https://paletton.com/ - internal object OutRunColorScheme : BaseColorScheme() { // This is not used so if it starts being used, ignore the below and start fresh override val lightScheme = @@ -31,8 +28,8 @@ internal object OutRunColorScheme : BaseColorScheme() { onBackground = Color(0xFF201147), surface = Color(0xFFEFC8D3), onSurface = Color(0xFF201147), - surfaceVariant = Color(0xFFEFC8D3), - onSurfaceVariant = Color(0xFF201147), + surfaceVariant = Color(0xFF201147), + onSurfaceVariant = Color(0xFFFFFFFF), outline = Color(0xFF4B3A78), outlineVariant = Color(0xFF4B3A78), scrim = Color(0xFFFFFFFF), diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PinkColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PinkColorScheme.kt index a7599f834c..bff18441b2 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PinkColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PinkColorScheme.kt @@ -4,9 +4,6 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color -// Shades for hex colors https://noeldelgado.github.io/shadowlord/ -// Color palette https://paletton.com/ - internal object PinkColorScheme : BaseColorScheme() { override val lightScheme = lightColorScheme( @@ -30,7 +27,7 @@ internal object PinkColorScheme : BaseColorScheme() { onBackground = Color(0xDE240728), surface = Color(0xFFF7F4F8), onSurface = Color(0xDE240728), - surfaceVariant = Color(0xFFF7F4F8), + surfaceVariant = Color(0xFFEFE3F3), onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFD9B6E5), outlineVariant = Color(0xFFECDBF2), @@ -69,7 +66,7 @@ internal object PinkColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFF16151D), onSurface = Color(0xFFFFFFFF), - surfaceVariant = Color(0xFF16151D), + surfaceVariant = Color(0xFF272026), onSurfaceVariant = Color(0xFFFFFFFF), outline = Color(0xFFF5C6D9), outlineVariant = Color(0xFFFAE2EC), diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PurpleColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PurpleColorScheme.kt index cbb22e0e5d..c3e0191996 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PurpleColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/PurpleColorScheme.kt @@ -27,7 +27,7 @@ internal object PurpleColorScheme : BaseColorScheme() { onBackground = Color(0xFF000000), surface = Color(0xFFEDE2FF), onSurface = Color(0xFF000000), - surfaceVariant = Color(0xFFFFFFFF), + surfaceVariant = Color(0xFFDED3F3), onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFD7C1ED), outlineVariant = Color(0xFFEBE0F6), @@ -66,7 +66,7 @@ internal object PurpleColorScheme : BaseColorScheme() { onBackground = Color(0xFFDEE8FF), surface = Color(0xFF111129), onSurface = Color(0xFFDEE8FF), - surfaceVariant = Color(0xFF111129), + surfaceVariant = Color(0xFF201042), onSurfaceVariant = Color(0xFFDEE8FF), outline = Color(0xFFD9C9FF), outlineVariant = Color(0xFFECE4FF), diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/RedColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/RedColorScheme.kt index c4f04dfa09..cec573f535 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/RedColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/RedColorScheme.kt @@ -4,9 +4,6 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color -// Shades for hex colors https://noeldelgado.github.io/shadowlord/ -// Color palette https://paletton.com/ - internal object RedColorScheme : BaseColorScheme() { override val lightScheme = lightColorScheme( @@ -30,7 +27,7 @@ internal object RedColorScheme : BaseColorScheme() { onBackground = Color(0xFF000000), surface = Color(0xFFFAFAFA), onSurface = Color(0xFF000000), - surfaceVariant = Color(0xFFFAFAFA), + surfaceVariant = Color(0xFFF3E7E7), onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFEDA5B1), outlineVariant = Color(0xFFF6D2D8), @@ -69,7 +66,7 @@ internal object RedColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFF1A1716), onSurface = Color(0xFFFFFFFF), - surfaceVariant = Color(0xFF1A1716), + surfaceVariant = Color(0xFF2B2320), onSurfaceVariant = Color(0xFFFFFFFF), outline = Color(0xFFF3B8B8), outlineVariant = Color(0xFFF9DCDC), diff --git a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/TakoColorScheme.kt b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/TakoColorScheme.kt index a76a323672..2c0d96f8ff 100644 --- a/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/TakoColorScheme.kt +++ b/app/src/main/java/org/nekomanga/presentation/theme/colorschemes/TakoColorScheme.kt @@ -27,7 +27,7 @@ internal object TakoColorScheme : BaseColorScheme() { onBackground = Color(0xFF000000), surface = Color(0xFFF2EDF7), onSurface = Color(0xFF000000), - surfaceVariant = Color(0xFFFFFFFF), + surfaceVariant = Color(0xFFE5DCF4), onSurfaceVariant = Color(0xFF000000), outline = Color(0xFFB5AEC0), outlineVariant = Color(0xFFDAD7DF), @@ -66,7 +66,7 @@ internal object TakoColorScheme : BaseColorScheme() { onBackground = Color(0xFFFFFFFF), surface = Color(0xFF21212E), onSurface = Color(0xFFFFFFFF), - surfaceVariant = Color(0xFF21212E), + surfaceVariant = Color(0xFF342F40), onSurfaceVariant = Color(0xFFFFFFFF), outline = Color(0xFFFEEBD9), outlineVariant = Color(0xFFFEF5EC), diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 411c9983ce..eb007a4e3a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -86,4 +86,6 @@ #589ab8 @color/md_white_1000 + #212121 + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 26a15010ae..239c885c0b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -168,5 +168,6 @@ #FF6740 + #FFD9CF diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 70a330fcd9..b423901928 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -232,6 +232,7 @@