From 72e8fa3679bddbdcf69e8b7230d8b845ce93a123 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 9 Jul 2023 12:46:02 -0400 Subject: [PATCH] Moves the toggle to only be active in NIP94 and NIP95 images --- .../amethyst/ui/actions/NewMediaView.kt | 24 +++++++++---------- .../amethyst/ui/actions/NewPostView.kt | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt index 29741ad58..dd3750337 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt @@ -203,21 +203,21 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) { ) } - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - SettingSwitchItem( - checked = postViewModel.sensitiveContent, - onCheckedChange = { postViewModel.sensitiveContent = it }, - title = R.string.add_sensitive_content_label, - description = R.string.add_sensitive_content_description - ) - } - if (isNIP94Server(postViewModel.selectedServer) || postViewModel.selectedServer == ServersAvailable.NIP95 ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth() + ) { + SettingSwitchItem( + checked = postViewModel.sensitiveContent, + onCheckedChange = { postViewModel.sensitiveContent = it }, + title = R.string.add_sensitive_content_label, + description = R.string.add_sensitive_content_description + ) + } + Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt index 0b06b28b6..89bb3d5a5 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt @@ -988,21 +988,21 @@ fun ImageVideoDescription( ) } - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - SettingSwitchItem( - checked = sensitiveContent, - onCheckedChange = { sensitiveContent = it }, - title = R.string.add_sensitive_content_label, - description = R.string.add_sensitive_content_description - ) - } - if (isNIP94Server(selectedServer) || selectedServer == ServersAvailable.NIP95 ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth() + ) { + SettingSwitchItem( + checked = sensitiveContent, + onCheckedChange = { sensitiveContent = it }, + title = R.string.add_sensitive_content_label, + description = R.string.add_sensitive_content_description + ) + } + Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier