highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-11 09:53:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing QR Code screen for smaller screens.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-02-09 14:45:00 -05:00
parent 4cde2fe8e6
commit a003e111eb
1 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt
View File

@@ -62,19 +62,26 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
} }
Column( Column(
modifier = Modifier.fillMaxSize().padding(10.dp), modifier = Modifier.fillMaxSize().padding(horizontal = 10.dp),
verticalArrangement = Arrangement.Center verticalArrangement = Arrangement.SpaceBetween
) { ) {
if (presenting) { if (presenting) {
Row(
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth().padding(horizontal = 30.dp, vertical = 10.dp)
) {
}
Column(modifier = Modifier.fillMaxWidth()) {
Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
AsyncImage( AsyncImage(
model = user.profilePicture() ?: "https://robohash.org/ohno.png", model = user.profilePicture() ?: "https://robohash.org/ohno.png",
contentDescription = "Profile Image", contentDescription = "Profile Image",
placeholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"), placeholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
modifier = Modifier modifier = Modifier
.width(120.dp) .width(100.dp)
.height(120.dp) .height(100.dp)
.clip(shape = CircleShape) .clip(shape = CircleShape)
.border(3.dp, MaterialTheme.colors.background, CircleShape) .border(3.dp, MaterialTheme.colors.background, CircleShape)
.background(MaterialTheme.colors.background) .background(MaterialTheme.colors.background)
@@ -94,14 +101,16 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
Row( Row(
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth().padding(30.dp) modifier = Modifier.fillMaxWidth().padding(horizontal = 35.dp, vertical = 10.dp)
) { ) {
QrCodeDrawer("nostr:${user.pubkey.toNpub()}") QrCodeDrawer("nostr:${user.pubkey.toNpub()}")
} }
}
Row( Row(
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth().padding(30.dp) modifier = Modifier.fillMaxWidth().padding(horizontal = 30.dp, vertical = 10.dp)
) { ) {
Button( Button(
@@ -121,6 +130,15 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
} else { } else {
Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
Text(
"Point to the QR Code",
modifier = Modifier.padding(top = 7.dp),
fontWeight = FontWeight.Bold,
fontSize = 25.sp
)
}
Row( Row(
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth().padding(30.dp) modifier = Modifier.fillMaxWidth().padding(30.dp)
@@ -128,11 +146,16 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
QrCodeScanner(onScan) QrCodeScanner(onScan)
} }
Row(
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth().padding(horizontal = 30.dp, vertical = 10.dp)
) {
Button( Button(
onClick = { presenting = true }, onClick = { presenting = true },
shape = RoundedCornerShape(35.dp), shape = RoundedCornerShape(35.dp),
modifier = Modifier modifier = Modifier
.fillMaxWidth().padding(30.dp) .fillMaxWidth()
.height(50.dp), .height(50.dp),
colors = ButtonDefaults colors = ButtonDefaults
.buttonColors( .buttonColors(
@@ -141,6 +164,7 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
) { ) {
Text(text = "Show QR") Text(text = "Show QR")
} }
}
} }