mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:01:40 +00:00
Sign in with QR code (#2793)
* Add QR code login. * Add FF to disable it in release mode. * Force portrait orientation on the login flow. * Create `NumberedList` UI components. * Improve camera permission dialog. * Make nodes in qrcode feature use `QrCodeLoginScope` instead of `AppScope` * Bump SDK version. * Fix maestro tests --------- Co-authored-by: Benoit Marty <benoit@matrix.org> Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
committed by
GitHub
parent
e29f919abc
commit
c8bd04ceb1
+6
-2
@@ -30,18 +30,22 @@ import io.element.android.libraries.ui.strings.CommonStrings
|
||||
fun PermissionsView(
|
||||
state: PermissionsState,
|
||||
modifier: Modifier = Modifier,
|
||||
title: String = stringResource(id = CommonStrings.common_permission),
|
||||
content: String? = null,
|
||||
icon: @Composable (() -> Unit)? = null,
|
||||
) {
|
||||
if (state.showDialog.not()) return
|
||||
|
||||
ConfirmationDialog(
|
||||
modifier = modifier,
|
||||
title = stringResource(id = CommonStrings.common_permission),
|
||||
content = state.permission.toDialogContent(),
|
||||
title = title,
|
||||
content = content ?: state.permission.toDialogContent(),
|
||||
submitText = stringResource(id = CommonStrings.action_open_settings),
|
||||
onSubmitClick = {
|
||||
state.eventSink.invoke(PermissionsEvents.OpenSystemSettingAndCloseDialog)
|
||||
},
|
||||
onDismiss = { state.eventSink.invoke(PermissionsEvents.CloseDialog) },
|
||||
icon = icon,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user