From ad8474268492abb0be57c35d34a74cd60c6cabe6 Mon Sep 17 00:00:00 2001 From: Infi Date: Sun, 21 Jan 2024 19:08:08 +0100 Subject: [PATCH] fix: issue in which listitem and listheader backgrounds were inconsistent Signed-off-by: Infi --- .../main/java/chat/revolt/components/generic/ListHeader.kt | 4 ++-- app/src/main/java/chat/revolt/ui/theme/Theme.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/chat/revolt/components/generic/ListHeader.kt b/app/src/main/java/chat/revolt/components/generic/ListHeader.kt index 9bbacc16..a9069702 100644 --- a/app/src/main/java/chat/revolt/components/generic/ListHeader.kt +++ b/app/src/main/java/chat/revolt/components/generic/ListHeader.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.unit.dp @Composable fun ListHeader( modifier: Modifier = Modifier, - backgroundColor: Color = MaterialTheme.colorScheme.background, + backgroundColor: Color = MaterialTheme.colorScheme.surface, content: @Composable () -> Unit, ) { CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.labelLarge) { @@ -39,7 +39,7 @@ fun ListHeader( fun CountableListHeader( text: String, count: Int, - backgroundColor: Color = MaterialTheme.colorScheme.background + backgroundColor: Color = MaterialTheme.colorScheme.surface ) { ListHeader(backgroundColor = backgroundColor) { Text( 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 61318829..c13df492 100644 --- a/app/src/main/java/chat/revolt/ui/theme/Theme.kt +++ b/app/src/main/java/chat/revolt/ui/theme/Theme.kt @@ -37,7 +37,7 @@ val RevoltColorScheme = darkColorScheme( onBackground = Color(0xffffffff), surfaceVariant = Color(0xff242424), onSurfaceVariant = Color(0xffffffff), - surface = Color(0xff1e1e1e), + surface = Color(0xff191919), onSurface = Color(0xffffffff), surfaceTint = Color(0xFFC0C0C0), ) @@ -47,7 +47,7 @@ val AmoledColorScheme = RevoltColorScheme.copy( onBackground = Color(0xffffffff), surfaceVariant = Color(0xff131313), onSurfaceVariant = Color(0xffffffff), - surface = Color(0xff212121), + surface = Color(0xff000000), onSurface = Color(0xffffffff) ) @@ -68,7 +68,7 @@ val LightColorScheme = lightColorScheme( onBackground = Color(0xff000000), surfaceVariant = Color(0xffe0e0e0), onSurfaceVariant = Color(0xff000000), - surface = Color(0xfff5f5f5), + surface = Color(0xffffffff), onSurface = Color(0xff000000), surfaceTint = Color(0xff5658b9) )