From dec8e136f9a82fe8e6e21ed3d170434329b6709a Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Sat, 15 Oct 2022 18:49:10 +0100 Subject: [PATCH] android: increase paddings in link views (#1217) * android: increase paddings in link views * increase padding on scan screen * Update apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com> * Update apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com> --- .../java/chat/simplex/app/views/newchat/AddContactView.kt | 2 +- .../chat/simplex/app/views/newchat/ScanToConnectView.kt | 1 + .../chat/simplex/app/views/usersettings/UserAddressView.kt | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt index 935b4953a7..8169e2b6fd 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt @@ -83,7 +83,7 @@ fun AddContactLayout(connReq: String, connIncognito: Boolean, share: () -> Unit) annotatedStringResource(R.string.if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel), lineHeight = 22.sp, modifier = Modifier - .padding(bottom = if (screenHeight > 600.dp) 8.dp else 0.dp) + .padding(top = 16.dp, bottom = if (screenHeight > 600.dp) 16.dp else 0.dp) ) Row( Modifier.fillMaxWidth(), diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt index 4f090ab605..5d22090c27 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt @@ -91,6 +91,7 @@ fun ConnectContactLayout(chatModelIncognito: Boolean, qrCodeScanner: @Composable Modifier .fillMaxWidth() .aspectRatio(ratio = 1F) + .padding(bottom = 12.dp) ) { qrCodeScanner() } Text( annotatedStringResource(R.string.if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link), diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt index 0dcaf65133..77407ba1e3 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt @@ -73,21 +73,21 @@ fun UserAddressLayout( if (userAddress == null) { Text( stringResource(R.string.if_you_later_delete_address_you_wont_lose_contacts), - Modifier.padding(bottom = 12.dp), + Modifier.padding(bottom = 24.dp), lineHeight = 22.sp ) SimpleButton(stringResource(R.string.create_address), icon = Icons.Outlined.QrCode, click = createAddress) } else { Text( stringResource(R.string.if_you_delete_address_you_wont_lose_contacts), - Modifier.padding(bottom = 12.dp), + Modifier.padding(bottom = 24.dp), lineHeight = 22.sp ) QRCode(userAddress, Modifier.weight(1f, fill = false).aspectRatio(1f)) Row( horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(vertical = 10.dp) + modifier = Modifier.padding(vertical = 16.dp) ) { SimpleButton( stringResource(R.string.share_link),