highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-29 11:11:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added QR code private key export dialog

Browse Source
This commit is contained in:
David Kaspar 2024-12-18 14:43:23 +01:00
parent b75024e1fb
commit ca05b768df
2 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
View File

@ -539,7 +539,7 @@ fun ListContent(
MediaServersListView({ editMediaServers = false }, accountViewModel = accountViewModel, nav = nav)
}
if (backupDialogOpen) {
AccountBackupDialog(accountViewModel, onClose = { backupDialogOpen = false })
AccountBackupDialog(accountViewModel, nav, onClose = { backupDialogOpen = false })
}
if (conectOrbotDialogOpen) {
ConnectTorDialog(

73
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt
View File

@ -35,6 +35,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
@ -71,6 +72,7 @@ import androidx.compose.ui.platform.LocalAutofill
import androidx.compose.ui.platform.LocalAutofillTree
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
@ -90,11 +92,16 @@ import com.halilibo.richtext.ui.material3.RichText
import com.halilibo.richtext.ui.resolveDefaults
import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
import com.vitorpamplona.amethyst.ui.navigation.INav
import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
import com.vitorpamplona.amethyst.ui.note.authenticate
import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.BackButton
import com.vitorpamplona.amethyst.ui.screen.loggedIn.qrcode.QrCodeDrawer
import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
import com.vitorpamplona.amethyst.ui.theme.Size10dp
import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonRow
import com.vitorpamplona.amethyst.ui.theme.placeholderText
import com.vitorpamplona.quartz.crypto.CryptoUtils
@ -107,13 +114,14 @@ import kotlinx.coroutines.launch
@Composable
fun AccountBackupDialog(
accountViewModel: AccountViewModel,
nav: INav,
onClose: () -> Unit,
) {
Dialog(
onDismissRequest = onClose,
properties = DialogProperties(usePlatformDefaultWidth = false),
) {
DialogContents(accountViewModel, onClose)
DialogContents(accountViewModel, nav, onClose)
}
}
@ -123,6 +131,7 @@ fun DialogContentsPreview() {
ThemeComparisonRow {
DialogContents(
mockAccountViewModel(),
EmptyNav,
{},
)
}
@ -132,6 +141,7 @@ fun DialogContentsPreview() {
@Composable
private fun DialogContents(
accountViewModel: AccountViewModel,
nav: INav,
onClose: () -> Unit,
) {
Surface(
@ -185,6 +195,30 @@ private fun DialogContents(
NSecCopyButton(accountViewModel)
// store the dialog open or close state
var dialogOpen by remember { mutableStateOf(false) }
IconButton(
onClick = {
dialogOpen = true
nav.closeDrawer()
},
) {
Icon(
painter = painterResource(R.drawable.ic_qrcode),
contentDescription = stringRes(id = R.string.show_npub_as_a_qr_code),
modifier = Modifier.size(24.dp),
tint = MaterialTheme.colorScheme.primary,
)
}
if (dialogOpen) {
ShowKeyQRDialog(
accountViewModel.account.settings.keyPair.privKey
?.toNsec(),
onClose = { dialogOpen = false },
)
}
Spacer(modifier = Modifier.height(30.dp))
val content = stringRes(R.string.account_backup_tips3_md)
@ -448,3 +482,40 @@ private fun encryptCopyNSec(
}
}
}
@Composable
private fun ShowKeyQRDialog(
qrCode: String?,
onClose: () -> Unit,
) {
Dialog(
onDismissRequest = onClose,
properties = DialogProperties(usePlatformDefaultWidth = false),
) {
Surface {
Column {
Row(
modifier = Modifier.padding(10.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
BackButton(onPress = onClose)
}
Column(
modifier = Modifier.fillMaxSize().padding(horizontal = 10.dp),
verticalArrangement = Arrangement.SpaceAround,
) {
Column {
Row(
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth().padding(horizontal = Size10dp),
) {
QrCodeDrawer(qrCode ?: "error")
}
}
}
}
}
}
}