From 625b8c3bced109cc5634b0bf6a39760b7b0a6780 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 15 Mar 2023 09:11:55 -0400 Subject: [PATCH] Makes the reporting Menu less starkey in dark theme --- .../amethyst/ui/note/NoteQuickActionMenu.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt index 170ba719c..9992f1571 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt @@ -45,6 +45,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.compositeOver import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalClipboardManager @@ -100,6 +101,12 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni val isOwnNote = note.author == accountViewModel.accountLiveData.value?.account?.userProfile() val isFollowingUser = !isOwnNote && accountViewModel.isFollowing(note.author!!) + val backgroundColor = if (MaterialTheme.colors.isLight) { + MaterialTheme.colors.primary + } else { + MaterialTheme.colors.primary.copy(alpha = 0.32f).compositeOver(MaterialTheme.colors.background) + } + val showToast = { stringResource: Int -> scope.launch { Toast.makeText( @@ -115,7 +122,7 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni Card( modifier = Modifier.shadow(elevation = 6.dp, shape = cardShape), shape = cardShape, - backgroundColor = MaterialTheme.colors.primary + backgroundColor = backgroundColor ) { Column(modifier = Modifier.width(IntrinsicSize.Min)) { Row(modifier = Modifier.height(IntrinsicSize.Min)) {