TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 13:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix QR code padding and icon

Browse Source
This commit is contained in:
Andrew 2024-06-26 23:15:19 +09:30
parent aa5e46ff44
commit 9831758060
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
View File

@ -83,7 +83,11 @@ internal fun StartConversationScreen(
style = small style = small
) )
Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing)) Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
QrImage(string = accountId, Modifier.contentDescription(R.string.AccessibilityId_qr_code)) QrImage(
string = accountId,
Modifier.contentDescription(R.string.AccessibilityId_qr_code),
icon = R.drawable.session
)
} }
} }
} }

2
app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt
View File

@ -23,6 +23,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import network.loki.messenger.R import network.loki.messenger.R
import org.thoughtcrime.securesms.ui.CellWithPaddingAndMargin import org.thoughtcrime.securesms.ui.CellWithPaddingAndMargin
import org.thoughtcrime.securesms.ui.LocalDimensions import org.thoughtcrime.securesms.ui.LocalDimensions
@ -100,6 +101,7 @@ private fun RecoveryPasswordCell(
modifier = Modifier modifier = Modifier
.padding(vertical = LocalDimensions.current.smallMargin) .padding(vertical = LocalDimensions.current.smallMargin)
.contentDescription(R.string.AccessibilityId_qr_code), .contentDescription(R.string.AccessibilityId_qr_code),
contentPadding = 10.dp,
icon = R.drawable.session_shield icon = R.drawable.session_shield
) )
} }

5
app/src/main/java/org/thoughtcrime/securesms/ui/components/QrImage.kt
View File

@ -27,6 +27,7 @@ import androidx.compose.ui.graphics.FilterQuality
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -39,6 +40,7 @@ import org.thoughtcrime.securesms.util.QRCodeUtilities
fun QrImage( fun QrImage(
string: String?, string: String?,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
contentPadding: Dp = LocalDimensions.current.smallItemSpacing,
icon: Int = R.drawable.session_shield icon: Int = R.drawable.session_shield
) { ) {
var bitmap: Bitmap? by remember { var bitmap: Bitmap? by remember {
@ -58,7 +60,7 @@ fun QrImage(
backgroundColor = LocalColors.current.qrCodeBackground, backgroundColor = LocalColors.current.qrCodeBackground,
elevation = 0.dp, elevation = 0.dp,
modifier = modifier modifier = modifier
) { Content(bitmap, icon, backgroundColor = LocalColors.current.qrCodeBackground) } ) { Content(bitmap, icon, Modifier.padding(contentPadding), backgroundColor = LocalColors.current.qrCodeBackground) }
} }
@Composable @Composable
@ -71,7 +73,6 @@ private fun Content(
) { ) {
Box( Box(
modifier = modifier modifier = modifier
.padding(LocalDimensions.current.xxxsItemSpacing)
.fillMaxWidth() .fillMaxWidth()
.aspectRatio(1f) .aspectRatio(1f)
) { ) {