letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Fix wording issue, 'screen_qr_code_login_no_camera_permission_state_description' needs the application name.

Browse Source
This commit is contained in:
Benoit Marty
2024-06-04 09:12:20 +02:00
parent 5835a025b4
commit b6803d4b7a
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
View File

@@ -59,6 +59,7 @@ class QrCodeIntroPresenter @Inject constructor(
}
return QrCodeIntroState(
appName = buildMeta.applicationName,
desktopAppName = buildMeta.desktopApplicationName,
cameraPermissionState = cameraPermissionState,
canContinue = canContinue,

1
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
View File

@@ -19,6 +19,7 @@ package io.element.android.features.login.impl.screens.qrcode.intro
import io.element.android.libraries.permissions.api.PermissionsState
data class QrCodeIntroState(
val appName: String,
val desktopAppName: String,
val cameraPermissionState: PermissionsState,
val canContinue: Boolean,

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
View File

@@ -31,6 +31,7 @@ open class QrCodeIntroStateProvider : PreviewParameterProvider<QrCodeIntroState>
}
fun aQrCodeIntroState(
appName: String = "AppName",
desktopAppName: String = "Element",
cameraPermissionState: PermissionsState = aPermissionsState(
showDialog = false,
@@ -39,6 +40,7 @@ fun aQrCodeIntroState(
canContinue: Boolean = false,
eventSink: (QrCodeIntroEvents) -> Unit = {},
) = QrCodeIntroState(
appName = appName,
desktopAppName = desktopAppName,
cameraPermissionState = cameraPermissionState,
canContinue = canContinue,

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
View File

@@ -66,7 +66,7 @@ fun QrCodeIntroView(
PermissionsView(
title = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_title),
content = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_description),
content = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_description, state.appName),
icon = { Icon(imageVector = CompoundIcons.TakePhotoSolid(), contentDescription = null) },
state = state.cameraPermissionState,
)

8
features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt
View File

@@ -35,7 +35,8 @@ class QrCodeIntroPresenterTest {
presenter.present()
}.test {
awaitItem().run {
assertThat(desktopAppName).isEmpty()
assertThat(appName).isEqualTo("AppName")
assertThat(desktopAppName).isEqualTo("DesktopAppName")
assertThat(cameraPermissionState.permission).isEqualTo("android.permission.POST_NOTIFICATIONS")
assertThat(canContinue).isFalse()
}
@@ -69,7 +70,10 @@ class QrCodeIntroPresenterTest {
}
private fun createQrCodeIntroPresenter(
buildMeta: BuildMeta = aBuildMeta(),
buildMeta: BuildMeta = aBuildMeta(
applicationName = "AppName",
desktopApplicationName = "DesktopAppName",
),
permissionsPresenterFactory: FakePermissionsPresenterFactory = FakePermissionsPresenterFactory(),
): QrCodeIntroPresenter {
return QrCodeIntroPresenter(