From c158c7fc3d21ab2d32f475d0a73ef621a1aab721 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 9 Jun 2023 13:19:14 -0400 Subject: [PATCH] Moves the clipboard starters to their own compositions. --- .../vitorpamplona/amethyst/ui/note/NoteCompose.kt | 13 +++++++------ .../amethyst/ui/screen/loggedIn/ChannelScreen.kt | 3 ++- .../amethyst/ui/screen/loggedIn/ProfileScreen.kt | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) 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 afe8b072b..37cb6389a 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 @@ -812,9 +812,6 @@ fun RenderAppDefinition( ) { val noteEvent = note.event as? AppDefinitionEvent ?: return - val clipboardManager = LocalClipboardManager.current - val uri = LocalUriHandler.current - var metadata by remember { mutableStateOf(null) } @@ -827,6 +824,9 @@ fun RenderAppDefinition( metadata?.let { Box { + val clipboardManager = LocalClipboardManager.current + val uri = LocalUriHandler.current + if (!it.banner.isNullOrBlank()) { var zoomImageDialogOpen by remember { mutableStateOf(false) } @@ -2797,9 +2797,6 @@ data class DropDownParams( @Composable fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, accountViewModel: AccountViewModel) { - val clipboardManager = LocalClipboardManager.current - val appContext = LocalContext.current.applicationContext - val actContext = LocalContext.current var reportDialogShowing by remember { mutableStateOf(false) } var state by remember { @@ -2819,6 +2816,10 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, expanded = popupExpanded, onDismissRequest = onDismiss ) { + val clipboardManager = LocalClipboardManager.current + val appContext = LocalContext.current.applicationContext + val actContext = LocalContext.current + WatchBookmarksFollowsAndAccount(note, accountViewModel) { newState -> if (state != newState) { state = newState diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt index bcce629a6..128272fb5 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt @@ -478,7 +478,6 @@ private fun ChannelActionOptions( private fun NoteCopyButton( note: Channel ) { - val clipboardManager = LocalClipboardManager.current var popupExpanded by remember { mutableStateOf(false) } Button( @@ -502,6 +501,8 @@ private fun NoteCopyButton( expanded = popupExpanded, onDismissRequest = { popupExpanded = false } ) { + val clipboardManager = LocalClipboardManager.current + DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString("nostr:" + note.idNote())); popupExpanded = false }) { Text(stringResource(R.string.copy_channel_id_note_to_the_clipboard)) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt index 3789f8896..f3c92a962 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt @@ -425,8 +425,6 @@ private fun ProfileHeader( var popupExpanded by remember { mutableStateOf(false) } var zoomImageDialogOpen by remember { mutableStateOf(false) } - val clipboardManager = LocalClipboardManager.current - Box { DrawBanner(baseUser) @@ -468,6 +466,8 @@ private fun ProfileHeader( horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Bottom ) { + val clipboardManager = LocalClipboardManager.current + UserPicture( baseUser = baseUser, accountViewModel = accountViewModel,