From 344ce64fa90964a18fcc602b2cd42f7ebaa883c9 Mon Sep 17 00:00:00 2001 From: Infi Date: Sat, 26 Oct 2024 03:24:38 +0200 Subject: [PATCH] chore: remove legacy elevation colours Signed-off-by: Infi --- .../java/chat/revolt/activities/InviteActivity.kt | 3 +-- .../chat/revolt/activities/ShareTargetActivity.kt | 2 +- .../main/java/chat/revolt/components/chat/Embed.kt | 3 +-- .../main/java/chat/revolt/components/chat/Message.kt | 6 +----- .../chat/revolt/components/chat/MessageAttachment.kt | 7 +++---- .../chat/revolt/components/chat/NativeMessageField.kt | 4 ++-- .../main/java/chat/revolt/components/chat/Reaction.kt | 3 +-- .../main/java/chat/revolt/components/chat/TimeRift.kt | 3 +-- .../java/chat/revolt/components/emoji/EmojiPicker.kt | 2 +- .../chat/revolt/components/generic/IconPlaceholder.kt | 4 +--- .../revolt/components/markdown/MarkdownCodeBlock.kt | 3 +-- .../chat/revolt/components/markdown/MarkdownText.kt | 4 +--- .../chat/revolt/components/markdown/MarkdownTree.kt | 3 +-- .../java/chat/revolt/components/media/AudioPlayer.kt | 2 +- .../components/screens/chat/AttachmentManager.kt | 3 +-- .../revolt/components/screens/chat/ReplyManager.kt | 3 +-- .../screens/chat/drawer/ChannelSideDrawer.kt | 5 ++--- .../components/settings/profile/StatusPicker.kt | 5 ++--- .../chat/revolt/screens/about/AttributionScreen.kt | 3 +-- .../chat/dialogs/safety/ReportMessageDialog.kt | 2 +- .../screens/chat/views/channel/ChannelScreen.kt | 11 +++-------- .../revolt/screens/settings/SessionSettngsScreen.kt | 3 +-- 22 files changed, 29 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt index b4a906ea..26d2045b 100644 --- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt +++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt @@ -26,7 +26,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -201,7 +200,7 @@ fun InviteScreen( modifier = Modifier .padding(16.dp) .clip(MaterialTheme.shapes.large) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .padding(16.dp), horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt b/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt index bdeaf546..636da09d 100644 --- a/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt +++ b/app/src/main/java/chat/revolt/activities/ShareTargetActivity.kt @@ -426,7 +426,7 @@ fun ShareTargetScreen( modifier = Modifier .fillMaxWidth() .fillMaxHeight(0.5f) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .padding(4.dp) ) { EmojiPicker { diff --git a/app/src/main/java/chat/revolt/components/chat/Embed.kt b/app/src/main/java/chat/revolt/components/chat/Embed.kt index c154b6b5..8e250182 100644 --- a/app/src/main/java/chat/revolt/components/chat/Embed.kt +++ b/app/src/main/java/chat/revolt/components/chat/Embed.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -42,7 +41,7 @@ fun RegularEmbed( Row( modifier = modifier .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .wrapContentWidth(Alignment.Start) .height(IntrinsicSize.Min) ) { diff --git a/app/src/main/java/chat/revolt/components/chat/Message.kt b/app/src/main/java/chat/revolt/components/chat/Message.kt index d724ec60..b796fda5 100644 --- a/app/src/main/java/chat/revolt/components/chat/Message.kt +++ b/app/src/main/java/chat/revolt/components/chat/Message.kt @@ -538,11 +538,7 @@ fun Message( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .clip(MaterialTheme.shapes.small) - .background( - MaterialTheme.colorScheme.surfaceColorAtElevation( - 2.dp - ) - ) + .background(MaterialTheme.colorScheme.surfaceContainer) .clickable(onClick = onAddReaction) .padding(8.dp) ) { diff --git a/app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt b/app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt index b773f221..6f7fb626 100644 --- a/app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt +++ b/app/src/main/java/chat/revolt/components/chat/MessageAttachment.kt @@ -18,7 +18,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment @@ -44,7 +43,7 @@ fun FileAttachment(attachment: AutumnResource) { Row( modifier = Modifier .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .padding(8.dp), verticalAlignment = Alignment.CenterVertically ) { @@ -97,7 +96,7 @@ fun VideoPlayButton() { .width(48.dp) .aspectRatio(1f) .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) ) Icon( @@ -133,7 +132,7 @@ fun VideoAttachment(attachment: AutumnResource) { ), description = attachment.filename ?: "Video" ) - + VideoPlayButton() } } diff --git a/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt b/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt index 3cb35221..3d8d95c1 100644 --- a/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt +++ b/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt @@ -202,7 +202,7 @@ fun NativeMessageField( } Column( - modifier = modifier.background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + modifier = modifier.background(MaterialTheme.colorScheme.surfaceContainer) ) { AnimatedVisibility( visible = autocompleteSuggestions.size > 0, @@ -339,7 +339,7 @@ fun NativeMessageField( } Row( modifier = modifier - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)), + .background(MaterialTheme.colorScheme.surfaceContainer), verticalAlignment = Alignment.CenterVertically ) { Spacer(modifier = Modifier.width(8.dp)) diff --git a/app/src/main/java/chat/revolt/components/chat/Reaction.kt b/app/src/main/java/chat/revolt/components/chat/Reaction.kt index cc5b7a3b..ad997f12 100644 --- a/app/src/main/java/chat/revolt/components/chat/Reaction.kt +++ b/app/src/main/java/chat/revolt/components/chat/Reaction.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue @@ -48,7 +47,7 @@ fun Reaction( targetValue = if (hasOwn) { MaterialTheme.colorScheme.primary } else { - MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp) + MaterialTheme.colorScheme.surfaceContainer }, label = "Reaction background" ) diff --git a/app/src/main/java/chat/revolt/components/chat/TimeRift.kt b/app/src/main/java/chat/revolt/components/chat/TimeRift.kt index 3e042c6c..ebf0abc0 100644 --- a/app/src/main/java/chat/revolt/components/chat/TimeRift.kt +++ b/app/src/main/java/chat/revolt/components/chat/TimeRift.kt @@ -11,7 +11,6 @@ import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -27,7 +26,7 @@ fun TimeRift(modifier: Modifier = Modifier, onMessageLoad: () -> Unit) { Column( modifier = modifier .padding(vertical = 10.dp) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .fillMaxWidth() .padding(vertical = 20.dp), verticalArrangement = Arrangement.Center, diff --git a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt index c1c35c55..8b924fd7 100644 --- a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt +++ b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt @@ -225,7 +225,7 @@ fun EmojiPicker( Box( modifier = Modifier .clip(MaterialTheme.shapes.small) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp)) + .background(MaterialTheme.colorScheme.surfaceContainerHigh) .padding(horizontal = 8.dp, vertical = 4.dp), contentAlignment = Alignment.CenterStart ) { diff --git a/app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt b/app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt index 9b5e4615..f345ebce 100644 --- a/app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt +++ b/app/src/main/java/chat/revolt/components/generic/IconPlaceholder.kt @@ -4,13 +4,11 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.TextUnit -import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @Composable @@ -22,7 +20,7 @@ fun IconPlaceholder( Box( contentAlignment = Alignment.Center, modifier = modifier - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp)) + .background(MaterialTheme.colorScheme.surfaceContainerHigh) ) { Text( text = name.first().uppercase(), diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt b/app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt index 0a4b9410..55a0fb74 100644 --- a/app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt +++ b/app/src/main/java/chat/revolt/components/markdown/MarkdownCodeBlock.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -25,7 +24,7 @@ fun MarkdownCodeBlock(node: AstNode, modifier: Modifier = Modifier) { } ) .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .padding(8.dp) ) { Text( diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt b/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt index 44308206..a207a909 100644 --- a/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt +++ b/app/src/main/java/chat/revolt/components/markdown/MarkdownText.kt @@ -12,7 +12,6 @@ import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -33,7 +32,6 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontSynthesis import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp import androidx.core.net.toUri import chat.revolt.R import chat.revolt.activities.InviteActivity @@ -259,7 +257,7 @@ fun annotateText(node: AstNode): AnnotatedString { .copy( fontFamily = FragmentMono, fontSynthesis = FontSynthesis.All, - background = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp) + background = MaterialTheme.colorScheme.surfaceContainer ) ) append(node.text ?: "") diff --git a/app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt b/app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt index d85a8d5f..f02d4cdc 100644 --- a/app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt +++ b/app/src/main/java/chat/revolt/components/markdown/MarkdownTree.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.compositionLocalOf @@ -104,7 +103,7 @@ fun MarkdownTree(node: AstNode) { modifier = Modifier .padding(top = 4.dp, bottom = 4.dp) .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .fillMaxWidth() .height(IntrinsicSize.Min) ) { diff --git a/app/src/main/java/chat/revolt/components/media/AudioPlayer.kt b/app/src/main/java/chat/revolt/components/media/AudioPlayer.kt index 3c69d470..afb1a780 100644 --- a/app/src/main/java/chat/revolt/components/media/AudioPlayer.kt +++ b/app/src/main/java/chat/revolt/components/media/AudioPlayer.kt @@ -193,7 +193,7 @@ fun AudioPlayer(url: String, filename: String, contentType: String) { Column( modifier = Modifier .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .padding(8.dp) ) { Row( diff --git a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt index 9e4f053f..b546e2b5 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt @@ -28,7 +28,6 @@ import androidx.compose.material3.ProgressIndicatorDefaults import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -152,7 +151,7 @@ fun AttachmentManager( Column( modifier = Modifier .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) ) { Row( modifier = Modifier diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt b/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt index e3c5012e..181a58a9 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/ReplyManager.kt @@ -17,7 +17,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -54,7 +53,7 @@ fun ManageableReply(reply: SendMessageReply, onToggleMention: () -> Unit, onRemo Row( modifier = Modifier .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .horizontalScroll(rememberScrollState()) .padding(horizontal = 8.dp, vertical = 4.dp), verticalAlignment = Alignment.CenterVertically diff --git a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt index f7b42105..e8a5d786 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt @@ -48,7 +48,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect @@ -436,7 +435,7 @@ fun ChannelSideDrawer( bottomEnd = CornerSize(0) ) ) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .weight(1f) .fillMaxHeight() ) { @@ -463,7 +462,7 @@ fun ChannelSideDrawer( drawRect( Brush.linearGradient( listOf( - surfaceColorAtElevation(1.dp).copy(alpha = 0.8f), + surfaceContainer.copy(alpha = 0.8f), Color.Transparent ), Offset.Zero, diff --git a/app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt b/app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt index b5883d06..028ed997 100644 --- a/app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt +++ b/app/src/main/java/chat/revolt/components/settings/profile/StatusPicker.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -63,7 +62,7 @@ fun StatusPicker( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .clip(MaterialTheme.shapes.small) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) ) { Presence.entries.forEach { StatusButton( @@ -106,7 +105,7 @@ fun StatusButton( .then( if (selected) { Modifier.background( - MaterialTheme.colorScheme.surfaceColorAtElevation(6.dp) + MaterialTheme.colorScheme.surfaceContainerHigh ) } else { Modifier diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt index c56d7e66..37167ffa 100644 --- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt @@ -25,7 +25,6 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberModalBottomSheetState -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -188,7 +187,7 @@ fun AttributionScreen(navController: NavController) { modifier = Modifier .padding(16.dp) .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .fillMaxWidth() .padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp) diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt index 9660f1c6..04b05871 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt +++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt @@ -118,7 +118,7 @@ fun ReportMessageDialog(onDismiss: () -> Unit, messageId: String) { Box( modifier = Modifier .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .verticalScroll(rememberScrollState()) .heightIn(max = 200.dp) .padding(bottom = 8.dp) diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt index 6b1baede..0198fb31 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt @@ -63,7 +63,6 @@ import androidx.compose.material3.SmallFloatingActionButton import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.rememberModalBottomSheetState -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect @@ -755,7 +754,7 @@ fun ChannelScreen( Column( modifier = Modifier - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) .fillMaxWidth(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally @@ -885,7 +884,7 @@ fun ChannelScreen( Modifier .imePadding() .navigationBarsPadding() - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainer) ) } else { Box( @@ -917,11 +916,7 @@ fun ChannelScreen( Column( modifier = Modifier .fillMaxWidth() - .background( - MaterialTheme.colorScheme.surfaceColorAtElevation( - 1.dp - ) - ) + .background(MaterialTheme.colorScheme.surfaceContainer) .padding(4.dp) .navigationBarsPadding() ) { diff --git a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt index 8c2ce10c..733c5d75 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt @@ -29,7 +29,6 @@ import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -224,7 +223,7 @@ fun SessionSettingsScreen( .fillMaxWidth() .clip(shape = MaterialTheme.shapes.medium) .background( - color = MaterialTheme.colorScheme.surfaceColorAtElevation(6.dp) + color = MaterialTheme.colorScheme.surfaceContainerHigh ) .padding(16.dp), verticalAlignment = Alignment.CenterVertically,