RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: tweak default theme colours 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2023-12-09 21:15:00 +01:00
parent d4f994ebf4
commit 4524b23b3d
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
View File

@ -294,7 +294,7 @@ fun AppearanceSettingsScreen(
.padding(start = 20.dp, end = 20.dp) .padding(start = 20.dp, end = 20.dp)
) { ) {
ColourChip( ColourChip(
color = Color(0xff1c243c), color = Color(0xff191919),
text = stringResource(id = R.string.settings_appearance_theme_revolt), text = stringResource(id = R.string.settings_appearance_theme_revolt),
selected = GlobalState.theme == Theme.Revolt, selected = GlobalState.theme == Theme.Revolt,
modifier = Modifier modifier = Modifier
@ -327,7 +327,7 @@ fun AppearanceSettingsScreen(
} }
ColourChip( 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), text = stringResource(id = R.string.settings_appearance_theme_none),
selected = GlobalState.theme == Theme.None, selected = GlobalState.theme == Theme.None,
modifier = Modifier modifier = Modifier

28
app/src/main/java/chat/revolt/ui/theme/Theme.kt
View File

@ -23,15 +23,23 @@ import androidx.core.view.ViewCompat
val RevoltColorScheme = darkColorScheme( val RevoltColorScheme = darkColorScheme(
primary = Color(0xffda4e5b), primary = Color(0xffda4e5b),
onPrimary = Color(0xffffffff), onPrimary = Color(0xffffffff),
secondary = Color(0xffe96a7a), primaryContainer = Color(0xffda4e5b),
onPrimaryContainer = Color(0xffffffff),
secondary = Color(0xfff84848),
onSecondary = Color(0xffffffff), 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), onBackground = Color(0xffffffff),
surfaceVariant = Color(0xff191f30), surfaceVariant = Color(0xff242424),
onSurfaceVariant = Color(0xffffffff), onSurfaceVariant = Color(0xffffffff),
surface = Color(0xff1c243c), surface = Color(0xff1e1e1e),
onSurface = Color(0xffffffff), onSurface = Color(0xffffffff),
surfaceTint = Color(0xff5658b9) surfaceTint = Color(0xFFC0C0C0),
) )
val AmoledColorScheme = RevoltColorScheme.copy( val AmoledColorScheme = RevoltColorScheme.copy(
@ -46,8 +54,16 @@ val AmoledColorScheme = RevoltColorScheme.copy(
val LightColorScheme = lightColorScheme( val LightColorScheme = lightColorScheme(
primary = Color(0xffda4e5b), primary = Color(0xffda4e5b),
onPrimary = Color(0xffffffff), onPrimary = Color(0xffffffff),
secondary = Color(0xffe96a7a), primaryContainer = Color(0xffda4e5b),
onPrimaryContainer = Color(0xffffffff),
secondary = Color(0xfff84848),
onSecondary = Color(0xffffffff), onSecondary = Color(0xffffffff),
secondaryContainer = Color(0xfff84848),
onSecondaryContainer = Color(0xffffffff),
tertiary = Color(0xff3abf7e),
onTertiary = Color(0xffffffff),
tertiaryContainer = Color(0xff3abf7e),
onTertiaryContainer = Color(0xffffffff),
background = Color(0xffffffff), background = Color(0xffffffff),
onBackground = Color(0xff000000), onBackground = Color(0xff000000),
surfaceVariant = Color(0xffe0e0e0), surfaceVariant = Color(0xffe0e0e0),