From bbf0d36cdf6cb26be6dd2810b088339e87963512 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Sat, 2 Mar 2024 15:42:55 +0000 Subject: [PATCH] Sealed message button on send message --- .../vitorpamplona/amethyst/ui/note/Icons.kt | 28 +++++++++++++++++++ .../ui/screen/loggedIn/ChatroomScreen.kt | 17 +++-------- app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 32bfb7439..397a18db9 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.amethyst.ui.note +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack @@ -49,6 +50,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange import com.vitorpamplona.amethyst.ui.theme.Size18Modifier @@ -480,3 +482,29 @@ fun NIP05FailedVerification(modifier: Modifier) { tint = Color.Red, ) } + +@Composable +fun IncognitoIconOn() { + Icon( + painter = painterResource(id = R.drawable.incognito), + contentDescription = stringResource(id = R.string.accessibility_turn_off_sealed_message), + modifier = + Modifier + .padding(top = 2.dp) + .size(18.dp), + tint = MaterialTheme.colorScheme.primary, + ) +} + +@Composable +fun IncognitoIconOff() { + Icon( + painter = painterResource(id = R.drawable.incognito_off), + contentDescription = stringResource(id = R.string.accessibility_turn_on_sealed_message), + modifier = + Modifier + .padding(top = 2.dp) + .size(18.dp), + tint = MaterialTheme.colorScheme.placeholderText, + ) +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt index c7537ddba..5850c5cba 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt @@ -68,7 +68,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardCapitalization @@ -98,6 +97,8 @@ import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture import com.vitorpamplona.amethyst.ui.note.DisplayRoomSubject import com.vitorpamplona.amethyst.ui.note.DisplayUserSetAsSubject +import com.vitorpamplona.amethyst.ui.note.IncognitoIconOff +import com.vitorpamplona.amethyst.ui.note.IncognitoIconOn import com.vitorpamplona.amethyst.ui.note.LoadUser import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures import com.vitorpamplona.amethyst.ui.note.QuickActionAlertDialog @@ -441,19 +442,9 @@ fun PrivateMessageEditFieldRow( }, ) { if (channelScreenModel.nip24) { - Icon( - painter = painterResource(id = R.drawable.incognito), - null, - modifier = Modifier.padding(top = 2.dp).size(18.dp), - tint = MaterialTheme.colorScheme.primary, - ) + IncognitoIconOn() } else { - Icon( - painter = painterResource(id = R.drawable.incognito_off), - null, - modifier = Modifier.padding(top = 2.dp).size(18.dp), - tint = MaterialTheme.colorScheme.placeholderText, - ) + IncognitoIconOff() } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb391ed93..16c97a3d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -806,4 +806,6 @@ Download Lyrics on Lyrics off + Sealed message off. Click to turn on sealed message + Sealed message on. Click to turn off sealed message