Refining the performance of the QuickAction menu bar

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt

@@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AlternateEmail
 import androidx.compose.material.icons.filled.Block
@@ -65,7 +64,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 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.toArgb
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -82,6 +80,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav.scope
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.routeEditDraftTo
 import com.vitorpamplona.amethyst.ui.painterRes
@@ -89,6 +88,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.report.ReportNoteDialog
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.LightRedColor
+import com.vitorpamplona.amethyst.ui.theme.QuickActionPopupShadow
+import com.vitorpamplona.amethyst.ui.theme.SmallestBorder
 import com.vitorpamplona.amethyst.ui.theme.isLight
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
 import com.vitorpamplona.quartz.experimental.audio.track.AudioTrackEvent
@@ -232,12 +233,7 @@ private fun RenderMainPopup(
     showReportDialog: MutableState<Boolean>,
     onWantsToEditDraft: () -> Unit,
 ) {
-    val context = LocalContext.current
-    val primaryLight = lightenColor(MaterialTheme.colorScheme.primary, 0.1f)
-    val cardShape = RoundedCornerShape(5.dp)
-    val clipboardManager = LocalClipboardManager.current
-    val scope = rememberCoroutineScope()
-
+    Popup(onDismissRequest = onDismiss, alignment = Alignment.Center) {
         val backgroundColor =
             if (MaterialTheme.colorScheme.isLight) {
                 MaterialTheme.colorScheme.primary
@@ -245,6 +241,31 @@ private fun RenderMainPopup(
                 MaterialTheme.colorScheme.secondaryButtonBackground
             }
 
+        Card(
+            modifier = QuickActionPopupShadow,
+            shape = SmallestBorder,
+            colors = CardDefaults.cardColors(containerColor = backgroundColor),
+        ) {
+            CardBody(accountViewModel, note, onDismiss, showBlockAlertDialog, showDeleteAlertDialog, showReportDialog, onWantsToEditDraft)
+        }
+    }
+}
+
+@Composable
+fun CardBody(
+    accountViewModel: AccountViewModel,
+    note: Note,
+    onDismiss: () -> Unit,
+    showBlockAlertDialog: MutableState<Boolean>,
+    showDeleteAlertDialog: MutableState<Boolean>,
+    showReportDialog: MutableState<Boolean>,
+    onWantsToEditDraft: () -> Unit,
+) {
+    val context = LocalContext.current
+    val primaryLight = lightenColor(MaterialTheme.colorScheme.primary, 0.1f)
+    val clipboardManager = LocalClipboardManager.current
+    val scope = rememberCoroutineScope()
+
     val showToast = { stringRes: Int ->
         scope.launch {
             Toast
@@ -259,12 +280,6 @@ private fun RenderMainPopup(
     val isOwnNote = accountViewModel.isLoggedUser(note.author)
     val isFollowingUser = !isOwnNote && accountViewModel.isFollowing(note.author)
 
-    Popup(onDismissRequest = onDismiss, alignment = Alignment.Center) {
-        Card(
-            modifier = Modifier.shadow(elevation = 6.dp, shape = cardShape),
-            shape = cardShape,
-            colors = CardDefaults.cardColors(containerColor = backgroundColor),
-        ) {
     Column(modifier = Modifier.width(IntrinsicSize.Min)) {
         Row(modifier = Modifier.height(IntrinsicSize.Min)) {
             NoteQuickActionItem(
@@ -411,8 +426,6 @@ private fun RenderMainPopup(
             }
         }
     }
-        }
-    }
 }
 
 @Composable

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -42,6 +42,7 @@ import androidx.compose.material3.Shapes
 import androidx.compose.material3.ripple
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
@@ -61,6 +62,7 @@ val RippleRadius45dp = 45.dp // Ripple should be +10.dp over the component size
 val BottomTopHeight = Modifier.height(50.dp)
 val TabRowHeight = Modifier
 
+val SmallestBorder = RoundedCornerShape(5.dp)
 val SmallBorder = RoundedCornerShape(7.dp)
 val SmallishBorder = RoundedCornerShape(9.dp)
 val QuoteBorder = RoundedCornerShape(15.dp)
@@ -358,3 +360,5 @@ val MaxWidthPaddingTop5dp = Modifier.fillMaxWidth().padding(top = 5.dp)
 val VoiceHeightModifier = Modifier.fillMaxWidth().height(100.dp)
 
 val PaddingHorizontal12Modifier = Modifier.padding(horizontal = 12.dp)
+
+val QuickActionPopupShadow = Modifier.shadow(elevation = Size6dp, shape = SmallestBorder)