From 15771289e253d30ec34b4912a4639d2dc632426e Mon Sep 17 00:00:00 2001 From: maxmoney21m Date: Wed, 8 Mar 2023 23:30:41 +0800 Subject: [PATCH] Revise note quick action button layout --- .../amethyst/ui/components/SelectTextDialog.kt | 2 +- .../amethyst/ui/note/NoteCompose.kt | 7 +------ .../amethyst/ui/note/NoteQuickActionMenu.kt | 17 ++++++++++++++--- app/src/main/res/values/strings.xml | 8 +++++--- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt index 69bc90918..15061da9e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt @@ -43,7 +43,7 @@ fun SelectTextDialog(text: String, onDismiss: () -> Unit) { tint = MaterialTheme.colors.primary ) } - Text(text = stringResource(R.string.select_text)) + Text(text = stringResource(R.string.select_text_dialog_top)) } Divider() Row(modifier = Modifier.padding(16.dp)) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index df29b16bd..045887019 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -25,7 +25,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -54,8 +53,8 @@ import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status import com.vitorpamplona.amethyst.ui.components.ResizeImage import com.vitorpamplona.amethyst.ui.components.TranslateableRichTextViewer import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel -import com.vitorpamplona.amethyst.ui.theme.Following import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelHeader +import com.vitorpamplona.amethyst.ui.theme.Following @OptIn(ExperimentalFoundationApi::class) @Composable @@ -756,10 +755,6 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, } Divider() } - DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString("@${note.author?.pubkeyNpub()}" ?: "")); onDismiss() }) { - Text(stringResource(R.string.copy_user_pubkey)) - } - Divider() DropdownMenuItem(onClick = { accountViewModel.broadcast(note); onDismiss() }) { Text(stringResource(R.string.broadcast)) } 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 2973c45e8..61e07a774 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 @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -20,6 +21,7 @@ import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AlternateEmail import androidx.compose.material.icons.filled.ContentCopy +import androidx.compose.material.icons.filled.FormatQuote import androidx.compose.material.icons.filled.Share import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -109,12 +111,20 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni onDismiss() } VerticalDivider(primaryLight) - NoteQuickActionItem(Icons.Default.AlternateEmail, stringResource(R.string.quick_action_copy_note_id)) { + NoteQuickActionItem(Icons.Default.AlternateEmail, stringResource(R.string.quick_action_copy_user_id)) { + clipboardManager.setText(AnnotatedString("@${note.author?.pubkeyNpub()}" ?: "")) + showToast(R.string.copied_user_id_to_clipboard) + onDismiss() + } + VerticalDivider(primaryLight) + NoteQuickActionItem(Icons.Default.FormatQuote, stringResource(R.string.quick_action_copy_note_id)) { clipboardManager.setText(AnnotatedString("@${note.idNote()}")) showToast(R.string.copied_note_id_to_clipboard) onDismiss() } - VerticalDivider(primaryLight) + } + Divider(color = primaryLight, modifier = Modifier.fillMaxWidth().width(1.dp)) + Row(modifier = Modifier.height(IntrinsicSize.Min)) { NoteQuickActionItem( icon = ImageVector.vectorResource(id = R.drawable.text_select_move_forward_character), label = stringResource(R.string.quick_action_select) @@ -138,6 +148,7 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni ContextCompat.startActivity(context, shareIntent, null) onDismiss() } + VerticalDivider(primaryLight) } } } @@ -163,7 +174,7 @@ fun NoteQuickActionItem(icon: ImageVector, label: String, onClick: () -> Unit) { Icon( imageVector = icon, contentDescription = null, - modifier = Modifier.size(20.dp), + modifier = Modifier.size(24.dp), tint = MaterialTheme.colors.onPrimary, ) Text(text = label, fontSize = 12.sp) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa56b00a7..dae1ded26 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -193,11 +193,13 @@ You Received a new Badge Award Badge award granted to Copied note text to clipboard + Copied author’s @npub to clipboard Copied note ID (@note1) to clipboard - Select Text + Select Text Select Share Browser Link Share - Copy ID - Copy Text + Mention + Quote + Copy