diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt index a514637026..ada8861490 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt +++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt @@ -33,6 +33,7 @@ class OnBoardingPresenter @Inject constructor( override fun present(): OnBoardingState { return OnBoardingState( isDebugBuild = buildMeta.buildType != BuildType.RELEASE, + applicationName = buildMeta.applicationName, canLoginWithQrCode = OnBoardingConfig.CAN_LOGIN_WITH_QR_CODE, canCreateAccount = OnBoardingConfig.CAN_CREATE_ACCOUNT, ) diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt index 5bd7718033..b091843f1f 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt +++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt @@ -18,6 +18,7 @@ package io.element.android.features.onboarding.impl data class OnBoardingState( val isDebugBuild: Boolean, + val applicationName: String, val canLoginWithQrCode: Boolean, val canCreateAccount: Boolean, ) diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt index 926d2a2303..0006c82836 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt +++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt @@ -31,10 +31,12 @@ open class OnBoardingStateProvider : PreviewParameterProvider { fun anOnBoardingState( isDebugBuild: Boolean = false, + applicationName: String = "Element", canLoginWithQrCode: Boolean = false, canCreateAccount: Boolean = false ) = OnBoardingState( isDebugBuild = isDebugBuild, + applicationName = applicationName, canLoginWithQrCode = canLoginWithQrCode, canCreateAccount = canCreateAccount ) diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt index 2e122898e1..74557f62a9 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt +++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt @@ -129,7 +129,7 @@ private fun OnBoardingContent( ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = stringResource(id = R.string.screen_onboarding_welcome_message), + text = stringResource(id = R.string.screen_onboarding_welcome_message, state.applicationName), color = ElementTheme.materialColors.secondary, style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp), textAlign = TextAlign.Center diff --git a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt b/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt index 51d1ccc932..d037fb2cc7 100644 --- a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt +++ b/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt @@ -33,12 +33,14 @@ class OnBoardingPresenterTest { @Test fun `present - initial state`() = runTest { - val presenter = OnBoardingPresenter(aBuildMeta()) + val appName = "Name" + val presenter = OnBoardingPresenter(aBuildMeta(applicationName = appName)) moleculeFlow(RecompositionMode.Immediate) { presenter.present() }.test { val initialState = awaitItem() assertThat(initialState.isDebugBuild).isTrue() + assertThat(initialState.applicationName).isEqualTo(appName) assertThat(initialState.canLoginWithQrCode).isFalse() assertThat(initialState.canCreateAccount).isFalse() }