Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-20 15:20:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expand touch area for key transparency bottom sheet.

Browse Source
This commit is contained in:
Michelle Tang
2026-05-11 10:19:23 -04:00
parent 639438b863
commit 155bba2f81
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreen.kt
+22 -17
View File
@@ -50,7 +50,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import org.signal.core.ui.compose.DayNightPreviews
import org.signal.core.ui.compose.Dialogs
import org.signal.core.ui.compose.IconButtons.IconButton
import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.Scaffolds
import org.signal.core.ui.compose.SignalIcons
@@ -298,11 +297,21 @@ private fun AutomaticKeyVerificationBlock(
.background(color = SignalTheme.colors.colorSurface1, shape = RoundedCornerShape(38.dp))
.padding(horizontal = 16.dp)
) { targetStatus ->
val hasInfoSheet = targetStatus != AutomaticVerificationStatus.NONE && targetStatus != AutomaticVerificationStatus.VERIFYING
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.clickable(enabled = targetStatus == AutomaticVerificationStatus.NONE, onClick = {
emitter(VerifyDisplayScreenEvent.VerifyAutomaticallyClick)
}, role = Role.Button)
modifier = Modifier.clickable(
enabled = targetStatus == AutomaticVerificationStatus.NONE || hasInfoSheet,
onClick = {
if (targetStatus == AutomaticVerificationStatus.NONE) {
emitter(VerifyDisplayScreenEvent.VerifyAutomaticallyClick)
} else {
displayEncryptedSheet = true
}
},
role = Role.Button
)
) {
if (targetStatus == AutomaticVerificationStatus.VERIFYING) {
CircularProgressIndicator(
@@ -324,19 +333,15 @@ private fun AutomaticKeyVerificationBlock(
.padding(start = 12.dp)
)
if (targetStatus != AutomaticVerificationStatus.NONE && targetStatus != AutomaticVerificationStatus.VERIFYING) {
IconButton(onClick = {
displayEncryptedSheet = true
}) {
Icon(
imageVector = SignalIcons.ChevronRight.imageVector,
contentDescription = null,
tint = MaterialTheme.colorScheme.outline,
modifier = Modifier
.padding(start = 2.dp)
.size(16.dp)
)
}
if (hasInfoSheet) {
Icon(
imageVector = SignalIcons.ChevronRight.imageVector,
contentDescription = null,
tint = MaterialTheme.colorScheme.outline,
modifier = Modifier
.padding(start = 2.dp)
.size(16.dp)
)
}
}
}