Merge branch 'main' into amber

2023-09-13 13:15:45 -03:00
parent 8c4af4ac85 2387a609df
commit a2fcb3539e
12 changed files with 809 additions and 80 deletions
@@ -549,23 +549,6 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, 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))
@@ -581,6 +564,16 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, 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) {