diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt index dde3a68a..6edefe0c 100644 --- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt @@ -294,7 +294,7 @@ fun AppearanceSettingsScreen( .padding(start = 20.dp, end = 20.dp) ) { ColourChip( - color = Color(0xff1c243c), + color = Color(0xff191919), text = stringResource(id = R.string.settings_appearance_theme_revolt), selected = GlobalState.theme == Theme.Revolt, modifier = Modifier @@ -327,7 +327,7 @@ fun AppearanceSettingsScreen( } ColourChip( - color = if (isSystemInDarkTheme()) Color(0xff1c243c) else Color(0xfff7f7f7), + color = if (isSystemInDarkTheme()) Color(0xff191919) else Color(0xfff7f7f7), text = stringResource(id = R.string.settings_appearance_theme_none), selected = GlobalState.theme == Theme.None, modifier = Modifier diff --git a/app/src/main/java/chat/revolt/ui/theme/Theme.kt b/app/src/main/java/chat/revolt/ui/theme/Theme.kt index 0ec510f0..61318829 100644 --- a/app/src/main/java/chat/revolt/ui/theme/Theme.kt +++ b/app/src/main/java/chat/revolt/ui/theme/Theme.kt @@ -23,15 +23,23 @@ import androidx.core.view.ViewCompat val RevoltColorScheme = darkColorScheme( primary = Color(0xffda4e5b), onPrimary = Color(0xffffffff), - secondary = Color(0xffe96a7a), + primaryContainer = Color(0xffda4e5b), + onPrimaryContainer = Color(0xffffffff), + secondary = Color(0xfff84848), onSecondary = Color(0xffffffff), - background = Color(0xff131722), + secondaryContainer = Color(0xfff84848), + onSecondaryContainer = Color(0xffffffff), + tertiary = Color(0xff3abf7e), + onTertiary = Color(0xffffffff), + tertiaryContainer = Color(0xff3abf7e), + onTertiaryContainer = Color(0xffffffff), + background = Color(0xff191919), onBackground = Color(0xffffffff), - surfaceVariant = Color(0xff191f30), + surfaceVariant = Color(0xff242424), onSurfaceVariant = Color(0xffffffff), - surface = Color(0xff1c243c), + surface = Color(0xff1e1e1e), onSurface = Color(0xffffffff), - surfaceTint = Color(0xff5658b9) + surfaceTint = Color(0xFFC0C0C0), ) val AmoledColorScheme = RevoltColorScheme.copy( @@ -46,8 +54,16 @@ val AmoledColorScheme = RevoltColorScheme.copy( val LightColorScheme = lightColorScheme( primary = Color(0xffda4e5b), onPrimary = Color(0xffffffff), - secondary = Color(0xffe96a7a), + primaryContainer = Color(0xffda4e5b), + onPrimaryContainer = Color(0xffffffff), + secondary = Color(0xfff84848), onSecondary = Color(0xffffffff), + secondaryContainer = Color(0xfff84848), + onSecondaryContainer = Color(0xffffffff), + tertiary = Color(0xff3abf7e), + onTertiary = Color(0xffffffff), + tertiaryContainer = Color(0xff3abf7e), + onTertiaryContainer = Color(0xffffffff), background = Color(0xffffffff), onBackground = Color(0xff000000), surfaceVariant = Color(0xffe0e0e0),