From dee231d43abbabdb9c3fc8e32fc736cc31fdc1b3 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 13 Sep 2023 10:27:37 -0400 Subject: [PATCH] Moves deletion and report to be the last item on the dropdown menu: https://image.nostr.build/709c4f2753cf6a40f9f9322379394d09354acb7e88502b64be348e4a3030734b.png --- .../amethyst/ui/note/UserProfilePicture.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt index 3d8656dd4..53fc06b6e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt @@ -461,16 +461,6 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState, accountVi } } Divider() - if (state.isLoggedUser) { - DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.delete(note); onDismiss() } }) { - Text(stringResource(R.string.request_deletion)) - } - } else { - DropdownMenuItem(onClick = { reportDialogShowing = true }) { - Text(stringResource(R.string.block_report)) - } - } - Divider() if (state.showSensitiveContent == null || state.showSensitiveContent == true) { DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.hideSensitiveContent(); onDismiss() } }) { Text(stringResource(R.string.content_warning_hide_all_sensitive_content)) @@ -486,6 +476,16 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState, accountVi Text(stringResource(R.string.content_warning_see_warnings)) } } + Divider() + if (state.isLoggedUser) { + DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.delete(note); onDismiss() } }) { + Text(stringResource(R.string.request_deletion)) + } + } else { + DropdownMenuItem(onClick = { reportDialogShowing = true }) { + Text(stringResource(R.string.block_report)) + } + } } if (reportDialogShowing) {