From 6995e625484ac487dde43d9ec906eab556e052fb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 20 May 2025 08:54:23 +0200 Subject: [PATCH] Merge on boarding module to login module (#4746) * Move onboarding code to the login module. * Remove OnBoardingEntryPoint, move the flow to LoginFlowNode * Update screenshots --------- Co-authored-by: ElementBot --- .../android/appnav/NotLoggedInFlowNode.kt | 34 ++-------- .../features/login/api/LoginEntryPoint.kt | 18 ++--- features/login/impl/build.gradle.kts | 3 + .../login/impl/DefaultLoginEntryPoint.kt | 4 +- .../features/login/impl/LoginFlowNode.kt | 67 +++++++++++++------ .../login/impl/onboarding}/OnBoardingNode.kt | 18 +++-- .../impl/onboarding}/OnBoardingPresenter.kt | 2 +- .../login/impl/onboarding}/OnBoardingState.kt | 2 +- .../onboarding}/OnBoardingStateProvider.kt | 2 +- .../login/impl/onboarding}/OnBoardingView.kt | 3 +- .../src/main/res/values-be/translations.xml | 6 ++ .../src/main/res/values-bg/translations.xml | 6 ++ .../src/main/res/values-cs/translations.xml | 7 ++ .../src/main/res/values-cy/translations.xml | 7 ++ .../src/main/res/values-de/translations.xml | 6 ++ .../src/main/res/values-el/translations.xml | 6 ++ .../src/main/res/values-es/translations.xml | 6 ++ .../src/main/res/values-et/translations.xml | 7 ++ .../src/main/res/values-eu/translations.xml | 6 ++ .../src/main/res/values-fa/translations.xml | 6 ++ .../src/main/res/values-fi/translations.xml | 10 +++ .../src/main/res/values-fr/translations.xml | 7 ++ .../src/main/res/values-hu/translations.xml | 7 ++ .../src/main/res/values-in/translations.xml | 6 ++ .../src/main/res/values-it/translations.xml | 6 ++ .../src/main/res/values-ka/translations.xml | 6 ++ .../src/main/res/values-lt/translations.xml | 5 ++ .../src/main/res/values-nb/translations.xml | 7 ++ .../src/main/res/values-nl/translations.xml | 6 ++ .../src/main/res/values-pl/translations.xml | 7 ++ .../main/res/values-pt-rBR/translations.xml | 6 ++ .../src/main/res/values-pt/translations.xml | 6 ++ .../src/main/res/values-ro/translations.xml | 6 ++ .../src/main/res/values-ru/translations.xml | 6 ++ .../src/main/res/values-sk/translations.xml | 7 ++ .../src/main/res/values-sv/translations.xml | 6 ++ .../src/main/res/values-tr/translations.xml | 6 ++ .../src/main/res/values-uk/translations.xml | 7 ++ .../src/main/res/values-uz/translations.xml | 6 ++ .../main/res/values-zh-rTW/translations.xml | 6 ++ .../src/main/res/values-zh/translations.xml | 6 ++ .../impl/src/main/res/values/localazy.xml | 7 ++ .../onboarding}/OnBoardingPresenterTest.kt | 2 +- .../impl/onboarding}/OnboardingViewTest.kt | 3 +- features/onboarding/api/build.gradle.kts | 17 ----- .../onboarding/api/OnBoardingEntryPoint.kt | 29 -------- features/onboarding/impl/build.gradle.kts | 52 -------------- .../impl/DefaultOnBoardingEntryPoint.kt | 35 ---------- .../src/main/res/values-be/translations.xml | 9 --- .../src/main/res/values-bg/translations.xml | 9 --- .../src/main/res/values-cs/translations.xml | 10 --- .../src/main/res/values-cy/translations.xml | 10 --- .../src/main/res/values-de/translations.xml | 9 --- .../src/main/res/values-el/translations.xml | 9 --- .../src/main/res/values-es/translations.xml | 9 --- .../src/main/res/values-et/translations.xml | 10 --- .../src/main/res/values-eu/translations.xml | 9 --- .../src/main/res/values-fa/translations.xml | 9 --- .../src/main/res/values-fi/translations.xml | 9 --- .../src/main/res/values-fr/translations.xml | 10 --- .../src/main/res/values-hu/translations.xml | 10 --- .../src/main/res/values-in/translations.xml | 9 --- .../src/main/res/values-it/translations.xml | 9 --- .../src/main/res/values-ka/translations.xml | 9 --- .../src/main/res/values-lt/translations.xml | 8 --- .../src/main/res/values-nb/translations.xml | 10 --- .../src/main/res/values-nl/translations.xml | 9 --- .../src/main/res/values-pl/translations.xml | 10 --- .../main/res/values-pt-rBR/translations.xml | 9 --- .../src/main/res/values-pt/translations.xml | 9 --- .../src/main/res/values-ro/translations.xml | 9 --- .../src/main/res/values-ru/translations.xml | 9 --- .../src/main/res/values-sk/translations.xml | 10 --- .../src/main/res/values-sv/translations.xml | 9 --- .../src/main/res/values-tr/translations.xml | 9 --- .../src/main/res/values-uk/translations.xml | 9 --- .../src/main/res/values-uz/translations.xml | 9 --- .../main/res/values-zh-rTW/translations.xml | 9 --- .../src/main/res/values-zh/translations.xml | 9 --- .../impl/src/main/res/values/localazy.xml | 10 --- ...pl.onboarding_OnBoardingView_Day_0_en.png} | 0 ...pl.onboarding_OnBoardingView_Day_1_en.png} | 0 ...pl.onboarding_OnBoardingView_Day_2_en.png} | 0 ...pl.onboarding_OnBoardingView_Day_3_en.png} | 0 ...pl.onboarding_OnBoardingView_Day_4_en.png} | 0 ....onboarding_OnBoardingView_Night_0_en.png} | 0 ....onboarding_OnBoardingView_Night_1_en.png} | 0 ....onboarding_OnBoardingView_Night_2_en.png} | 0 ....onboarding_OnBoardingView_Night_3_en.png} | 0 ....onboarding_OnBoardingView_Night_4_en.png} | 0 tools/localazy/config.json | 7 +- 91 files changed, 287 insertions(+), 512 deletions(-) rename features/{onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl => login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding}/OnBoardingNode.kt (76%) rename features/{onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl => login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding}/OnBoardingPresenter.kt (96%) rename features/{onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl => login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding}/OnBoardingState.kt (86%) rename features/{onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl => login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding}/OnBoardingStateProvider.kt (95%) rename features/{onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl => login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding}/OnBoardingView.kt (98%) rename features/{onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl => login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding}/OnBoardingPresenterTest.kt (97%) rename features/{onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl => login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding}/OnboardingViewTest.kt (97%) delete mode 100644 features/onboarding/api/build.gradle.kts delete mode 100644 features/onboarding/api/src/main/kotlin/io/element/android/features/onboarding/api/OnBoardingEntryPoint.kt delete mode 100644 features/onboarding/impl/build.gradle.kts delete mode 100644 features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/DefaultOnBoardingEntryPoint.kt delete mode 100644 features/onboarding/impl/src/main/res/values-be/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-bg/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-cs/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-cy/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-de/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-el/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-es/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-et/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-eu/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-fa/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-fi/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-fr/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-hu/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-in/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-it/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-ka/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-lt/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-nb/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-nl/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-pl/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-pt-rBR/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-pt/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-ro/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-ru/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-sk/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-sv/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-tr/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-uk/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-uz/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values-zh/translations.xml delete mode 100644 features/onboarding/impl/src/main/res/values/localazy.xml rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Day_0_en.png => features.login.impl.onboarding_OnBoardingView_Day_0_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Day_1_en.png => features.login.impl.onboarding_OnBoardingView_Day_1_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Day_2_en.png => features.login.impl.onboarding_OnBoardingView_Day_2_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Day_3_en.png => features.login.impl.onboarding_OnBoardingView_Day_3_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Day_4_en.png => features.login.impl.onboarding_OnBoardingView_Day_4_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Night_0_en.png => features.login.impl.onboarding_OnBoardingView_Night_0_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Night_1_en.png => features.login.impl.onboarding_OnBoardingView_Night_1_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Night_2_en.png => features.login.impl.onboarding_OnBoardingView_Night_2_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Night_3_en.png => features.login.impl.onboarding_OnBoardingView_Night_3_en.png} (100%) rename tests/uitests/src/test/snapshots/images/{features.onboarding.impl_OnBoardingView_Night_4_en.png => features.login.impl.onboarding_OnBoardingView_Night_4_en.png} (100%) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt index 8842396fd0..bcd1c5a61e 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt @@ -20,13 +20,10 @@ import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.plugins import com.bumble.appyx.navmodel.backstack.BackStack -import com.bumble.appyx.navmodel.backstack.operation.push import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode import io.element.android.features.login.api.LoginEntryPoint -import io.element.android.features.login.api.LoginFlowType -import io.element.android.features.onboarding.api.OnBoardingEntryPoint import io.element.android.libraries.architecture.BackstackView import io.element.android.libraries.architecture.BaseFlowNode import io.element.android.libraries.designsystem.utils.ForceOrientationInMobileDevices @@ -39,12 +36,11 @@ import kotlinx.parcelize.Parcelize class NotLoggedInFlowNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, - private val onBoardingEntryPoint: OnBoardingEntryPoint, private val loginEntryPoint: LoginEntryPoint, private val notLoggedInImageLoaderFactory: NotLoggedInImageLoaderFactory, ) : BaseFlowNode( backstack = BackStack( - initialElement = NavTarget.OnBoarding, + initialElement = NavTarget.Root, savedStateMap = buildContext.savedStateMap ), buildContext = buildContext, @@ -65,42 +61,22 @@ class NotLoggedInFlowNode @AssistedInject constructor( sealed interface NavTarget : Parcelable { @Parcelize - data object OnBoarding : NavTarget - - @Parcelize - data class LoginFlow(val type: LoginFlowType) : NavTarget + data object Root : NavTarget } override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { return when (navTarget) { - NavTarget.OnBoarding -> { - val callback = object : OnBoardingEntryPoint.Callback { - override fun onSignUp() { - backstack.push(NavTarget.LoginFlow(type = LoginFlowType.SIGN_UP)) - } - - override fun onSignIn() { - backstack.push(NavTarget.LoginFlow(type = LoginFlowType.SIGN_IN_MANUAL)) - } - - override fun onSignInWithQrCode() { - backstack.push(NavTarget.LoginFlow(type = LoginFlowType.SIGN_IN_QR_CODE)) - } - + NavTarget.Root -> { + val callback = object : LoginEntryPoint.Callback { override fun onReportProblem() { plugins().forEach { it.onOpenBugReport() } } } - onBoardingEntryPoint + loginEntryPoint .nodeBuilder(this, buildContext) .callback(callback) .build() } - is NavTarget.LoginFlow -> { - loginEntryPoint.nodeBuilder(this, buildContext) - .params(LoginEntryPoint.Params(flowType = navTarget.type)) - .build() - } } } diff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt index ead74221c1..9914eb1eee 100644 --- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt +++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt @@ -7,28 +7,20 @@ package io.element.android.features.login.api -import android.os.Parcelable import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node +import com.bumble.appyx.core.plugin.Plugin import io.element.android.libraries.architecture.FeatureEntryPoint -import kotlinx.parcelize.Parcelize interface LoginEntryPoint : FeatureEntryPoint { - data class Params( - val flowType: LoginFlowType - ) + interface Callback : Plugin { + fun onReportProblem() + } fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder interface NodeBuilder { - fun params(params: Params): NodeBuilder + fun callback(callback: Callback): NodeBuilder fun build(): Node } } - -@Parcelize -enum class LoginFlowType : Parcelable { - SIGN_IN_MANUAL, - SIGN_IN_QR_CODE, - SIGN_UP -} diff --git a/features/login/impl/build.gradle.kts b/features/login/impl/build.gradle.kts index 02c38e2a57..31d3141920 100644 --- a/features/login/impl/build.gradle.kts +++ b/features/login/impl/build.gradle.kts @@ -29,9 +29,11 @@ setupAnvil(componentMergingStrategy = ComponentMergingStrategy.KSP) dependencies { implementation(projects.appconfig) implementation(projects.features.enterprise.api) + implementation(projects.features.rageshake.api) implementation(projects.libraries.core) implementation(projects.libraries.androidutils) implementation(projects.libraries.architecture) + implementation(projects.libraries.featureflag.api) implementation(projects.libraries.matrix.api) implementation(projects.libraries.matrix.api) implementation(projects.libraries.network) @@ -57,6 +59,7 @@ dependencies { testImplementation(libs.test.truth) testImplementation(libs.test.turbine) testImplementation(projects.features.enterprise.test) + testImplementation(projects.libraries.featureflag.test) testImplementation(projects.libraries.matrix.test) testImplementation(projects.libraries.oidc.impl) testImplementation(projects.libraries.permissions.test) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt index 902cf4ca33..cec04c9cb7 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt @@ -22,8 +22,8 @@ class DefaultLoginEntryPoint @Inject constructor() : LoginEntryPoint { val plugins = ArrayList() return object : LoginEntryPoint.NodeBuilder { - override fun params(params: LoginEntryPoint.Params): LoginEntryPoint.NodeBuilder { - plugins += LoginFlowNode.Inputs(flowType = params.flowType) + override fun callback(callback: LoginEntryPoint.Callback): LoginEntryPoint.NodeBuilder { + plugins += callback return this } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt index 0f2328656e..382180c856 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt @@ -18,6 +18,7 @@ import com.bumble.appyx.core.lifecycle.subscribe import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin +import com.bumble.appyx.core.plugin.plugins import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import com.bumble.appyx.navmodel.backstack.operation.singleTop @@ -25,8 +26,9 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode import io.element.android.compound.theme.ElementTheme -import io.element.android.features.login.api.LoginFlowType +import io.element.android.features.login.api.LoginEntryPoint import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource +import io.element.android.features.login.impl.onboarding.OnBoardingNode import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode import io.element.android.features.login.impl.screens.changeaccountprovider.ChangeAccountProviderNode import io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderNode @@ -35,9 +37,7 @@ import io.element.android.features.login.impl.screens.loginpassword.LoginPasswor import io.element.android.features.login.impl.screens.searchaccountprovider.SearchAccountProviderNode import io.element.android.libraries.architecture.BackstackView import io.element.android.libraries.architecture.BaseFlowNode -import io.element.android.libraries.architecture.NodeInputs import io.element.android.libraries.architecture.createNode -import io.element.android.libraries.architecture.inputs import io.element.android.libraries.di.AppScope import io.element.android.libraries.matrix.api.auth.OidcDetails import io.element.android.libraries.oidc.api.OidcAction @@ -57,7 +57,7 @@ class LoginFlowNode @AssistedInject constructor( private val oidcEntryPoint: OidcEntryPoint, ) : BaseFlowNode( backstack = BackStack( - initialElement = NavTarget.Root, + initialElement = NavTarget.OnBoarding, savedStateMap = buildContext.savedStateMap, ), buildContext = buildContext, @@ -66,12 +66,6 @@ class LoginFlowNode @AssistedInject constructor( private var activity: Activity? = null private var darkTheme: Boolean = false - data class Inputs( - val flowType: LoginFlowType, - ) : NodeInputs - - private val inputs: Inputs = inputs() - private var customChromeTabStarted = false override fun onBuilt() { @@ -96,10 +90,15 @@ class LoginFlowNode @AssistedInject constructor( sealed interface NavTarget : Parcelable { @Parcelize - data object Root : NavTarget + data object OnBoarding : NavTarget @Parcelize - data object ConfirmAccountProvider : NavTarget + data object QrCode : NavTarget + + @Parcelize + data class ConfirmAccountProvider( + val isAccountCreation: Boolean, + ) : NavTarget @Parcelize data object ChangeAccountProvider : NavTarget @@ -119,16 +118,36 @@ class LoginFlowNode @AssistedInject constructor( override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { return when (navTarget) { - NavTarget.Root -> { - if (inputs.flowType == LoginFlowType.SIGN_IN_QR_CODE) { - createNode(buildContext) - } else { - resolve(NavTarget.ConfirmAccountProvider, buildContext) + NavTarget.OnBoarding -> { + val callback = object : OnBoardingNode.Callback { + override fun onSignUp() { + backstack.push( + NavTarget.ConfirmAccountProvider(isAccountCreation = true) + ) + } + + override fun onSignIn() { + backstack.push( + NavTarget.ConfirmAccountProvider(isAccountCreation = false) + ) + } + + override fun onSignInWithQrCode() { + backstack.push(NavTarget.QrCode) + } + + override fun onReportProblem() { + plugins().forEach { it.onReportProblem() } + } } + createNode(buildContext, listOf(callback)) } - NavTarget.ConfirmAccountProvider -> { + NavTarget.QrCode -> { + createNode(buildContext) + } + is NavTarget.ConfirmAccountProvider -> { val inputs = ConfirmAccountProviderNode.Inputs( - isAccountCreation = inputs.flowType == LoginFlowType.SIGN_UP, + isAccountCreation = navTarget.isAccountCreation, ) val callback = object : ConfirmAccountProviderNode.Callback { override fun onOidcDetails(oidcDetails: OidcDetails) { @@ -162,7 +181,10 @@ class LoginFlowNode @AssistedInject constructor( val callback = object : ChangeAccountProviderNode.Callback { override fun onDone() { // Go back to the Account Provider screen - backstack.singleTop(NavTarget.ConfirmAccountProvider) + val confirmAccountProvider = backstack.elements.value.firstOrNull { + it.key.navTarget is NavTarget.ConfirmAccountProvider + }?.key?.navTarget ?: NavTarget.ConfirmAccountProvider(isAccountCreation = false) + backstack.singleTop(confirmAccountProvider) } override fun onOtherClick() { @@ -176,7 +198,10 @@ class LoginFlowNode @AssistedInject constructor( val callback = object : SearchAccountProviderNode.Callback { override fun onDone() { // Go back to the Account Provider screen - backstack.singleTop(NavTarget.ConfirmAccountProvider) + val confirmAccountProvider = backstack.elements.value.firstOrNull { + it.key.navTarget is NavTarget.ConfirmAccountProvider + }?.key?.navTarget ?: NavTarget.ConfirmAccountProvider(isAccountCreation = false) + backstack.singleTop(confirmAccountProvider) } } diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingNode.kt similarity index 76% rename from features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingNode.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingNode.kt index f26a6fdd78..0f566ea1d3 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingNode.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingNode.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -16,7 +16,6 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode -import io.element.android.features.onboarding.api.OnBoardingEntryPoint import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) @@ -28,20 +27,27 @@ class OnBoardingNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins ) { + interface Callback : Plugin { + fun onSignUp() + fun onSignIn() + fun onSignInWithQrCode() + fun onReportProblem() + } + private fun onSignIn() { - plugins().forEach { it.onSignIn() } + plugins().forEach { it.onSignIn() } } private fun onSignUp() { - plugins().forEach { it.onSignUp() } + plugins().forEach { it.onSignUp() } } private fun onSignInWithQrCode() { - plugins().forEach { it.onSignInWithQrCode() } + plugins().forEach { it.onSignInWithQrCode() } } private fun onReportProblem() { - plugins().forEach { it.onReportProblem() } + plugins().forEach { it.onReportProblem() } } @Composable diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingPresenter.kt similarity index 96% rename from features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingPresenter.kt index 481ad6edc6..3d4029990e 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingPresenter.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingState.kt similarity index 86% rename from features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingState.kt index 3a5afb741c..f36566398a 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingState.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding data class OnBoardingState( val productionApplicationName: String, diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingStateProvider.kt similarity index 95% rename from features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingStateProvider.kt index d65b6aa2bf..26135ad353 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingStateProvider.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding import androidx.compose.ui.tooling.preview.PreviewParameterProvider diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingView.kt similarity index 98% rename from features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingView.kt index 44ab2d84a5..bfe1348764 100644 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingView.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -26,6 +26,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons +import io.element.android.features.login.impl.R import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtom import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtomSize import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule diff --git a/features/login/impl/src/main/res/values-be/translations.xml b/features/login/impl/src/main/res/values-be/translations.xml index 1100b7dc08..6fde5f6622 100644 --- a/features/login/impl/src/main/res/values-be/translations.xml +++ b/features/login/impl/src/main/res/values-be/translations.xml @@ -29,6 +29,12 @@ "Matrix - гэта адкрытая сетка для бяспечнай, дэцэнтралізаванай сувязі." "Сардэчна запрашаем!" "Увайсці ў %1$s" + "Увайсці ўручную" + "Увайсці з QR-кодам" + "Стварыць уліковы запіс" + "Сардэчна запрашаем у самы хуткі %1$s. Перавага ў хуткасці і прастаце." + "Сардэчна запрашаем у %1$s. Зараджаны, для хуткасці і прастаты." + "Будзьце ў сваім element" "Ўсталяванне бяспечнага злучэння" "Не атрымалася ўсталяваць бяспечнае злучэнне з новай прыладай. Існуючыя прылады па-ранейшаму ў бяспецы, і вам не трэба турбавацца пра іх." "Што зараз?" diff --git a/features/login/impl/src/main/res/values-bg/translations.xml b/features/login/impl/src/main/res/values-bg/translations.xml index fc512422e9..808dbfade9 100644 --- a/features/login/impl/src/main/res/values-bg/translations.xml +++ b/features/login/impl/src/main/res/values-bg/translations.xml @@ -19,6 +19,12 @@ "Matrix е отворена мрежа за сигурна, децентрализирана комуникация." "Добре дошли отново!" "Влизане в %1$s" + "Влизане ръчно" + "Влизане с QR код" + "Създаване на акаунт" + "Добре дошли в най-бързия %1$s досега. Супер зареден за скорост и простота." + "Добре дошли в %1$s. Супер зареден за скорост и простота." + "Бъдете в стихията си" "Повторен опит" "Промяна на доставчика на акаунт" "Matrix е отворена мрежа за сигурна, децентрализирана комуникация." diff --git a/features/login/impl/src/main/res/values-cs/translations.xml b/features/login/impl/src/main/res/values-cs/translations.xml index c0b2e69c79..77bc398fef 100644 --- a/features/login/impl/src/main/res/values-cs/translations.xml +++ b/features/login/impl/src/main/res/values-cs/translations.xml @@ -34,6 +34,13 @@ "Matrix je otevřená síť pro bezpečnou a decentralizovanou komunikaci." "Vítejte zpět!" "Přihlaste se k %1$s" + "Ruční přihlášení" + "Přihlásit se do %1$s" + "Přihlásit se pomocí QR kódu" + "Vytvořit účet" + "Vítejte v dosud nejrychlejším %1$su. Vylepšený pro rychlost a jednoduchost." + "Vítejte v %1$su. Vylepšený, pro rychlost a jednoduchost." + "Buďte ve svém živlu" "Navazování zabezpečeného spojení" "K novému zařízení se nepodařilo navázat bezpečné připojení. Vaše stávající zařízení jsou stále v bezpečí a nemusíte se o ně obávat." "Co teď?" diff --git a/features/login/impl/src/main/res/values-cy/translations.xml b/features/login/impl/src/main/res/values-cy/translations.xml index 7751ea1270..462a7c640c 100644 --- a/features/login/impl/src/main/res/values-cy/translations.xml +++ b/features/login/impl/src/main/res/values-cy/translations.xml @@ -34,6 +34,13 @@ "Mae Matrix yn rhwydwaith agored ar gyfer cyfathrebu diogel, datganoledig." "Croeso nôl!" "Mewngofnodi i %1$s" + "Mewngofnodwch â llaw" + "Mewngofnodi i %1$s" + "Mewngofnodwch gyda chod QR" + "Creu cyfrif" + "Croeso i\'r %1$s cyflymaf erioed. Yn nodedig am gyflymder a symlrwydd." + "Croeso i %1$s. Yn nodedig ar gyfer cyflymder a symlrwydd." + "Byddwch yn eich elfen" "Yn creu cysylltiad diogel" "Nid oedd modd gwneud cysylltiad diogel â\'r ddyfais newydd. Mae eich dyfeisiau presennol yn dal yn ddiogel a does dim angen i chi boeni amdanyn nhw." "Beth nawr?" diff --git a/features/login/impl/src/main/res/values-de/translations.xml b/features/login/impl/src/main/res/values-de/translations.xml index fdaa1812f7..73a52ee0db 100644 --- a/features/login/impl/src/main/res/values-de/translations.xml +++ b/features/login/impl/src/main/res/values-de/translations.xml @@ -32,6 +32,12 @@ "Matrix ist ein offenes Netzwerk für eine sichere, dezentrale Kommunikation." "Willkommen zurück!" "Anmelden bei %1$s" + "Manuell anmelden" + "Mit QR-Code anmelden" + "Konto erstellen" + "Willkommen beim schnellsten %1$s aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit." + "Willkommen zu %1$s. Aufgeladen, für Geschwindigkeit und Einfachheit." + "Sei in Deinem Element" "Sichere Verbindung aufbauen" "Es konnte keine sichere Verbindung zu dem neuen Gerät hergestellt werden." "Und jetzt?" diff --git a/features/login/impl/src/main/res/values-el/translations.xml b/features/login/impl/src/main/res/values-el/translations.xml index 505e1f43d5..742c86ad73 100644 --- a/features/login/impl/src/main/res/values-el/translations.xml +++ b/features/login/impl/src/main/res/values-el/translations.xml @@ -29,6 +29,12 @@ "Το Matrix είναι ένα ανοιχτό δίκτυο για ασφαλή, αποκεντρωμένη επικοινωνία." "Καλωσόρισες ξανά!" "Συνδέσου στο %1$s" + "Σύνδεση χειροκίνητα" + "Συνδέσου με κωδικό QR" + "Δημιουργία λογαριασμού" + "Καλώς ήλθατε στο γρηγορότερο %1$s όλων των εποχών. Υπερτροφοδοτούμενο με ταχύτητα και απλότητα." + "Καλώς ήρθες στο %1$s. Υπερφορτισμένο, για ταχύτητα και απλότητα." + "Μείνε στο element σου" "Εγκαθίδρυση ασφαλούς σύνδεσης" "Δεν ήταν δυνατή η πραγματοποίηση ασφαλούς σύνδεσης στη νέα συσκευή. Οι υπάρχουσες συσκευές σας εξακολουθούν να είναι ασφαλείς και δεν χρειάζεται να ανησυχείς για αυτές." "Τί είναι πάλι;" diff --git a/features/login/impl/src/main/res/values-es/translations.xml b/features/login/impl/src/main/res/values-es/translations.xml index 1e4d4617b5..390f701b0a 100644 --- a/features/login/impl/src/main/res/values-es/translations.xml +++ b/features/login/impl/src/main/res/values-es/translations.xml @@ -29,6 +29,12 @@ "Matrix es una red abierta para una comunicación segura y descentralizada." "¡Hola de nuevo!" "Iniciar sesión en %1$s" + "Iniciar sesión manualmente" + "Iniciar sesión con un código QR" + "Crear cuenta" + "Bienvenido al %1$s más rápido de todos los tiempos. Diseñado para la velocidad y la simplicidad." + "Bienvenido a %1$s. Vitaminado, para mayor rapidez y sencillez." + "Siéntete en tu Elemento" "Estableciendo una conexión segura" "No se pudo establecer una conexión segura con el nuevo dispositivo. Tus dispositivos actuales siguen siendo seguros y no tienes que preocuparte por ellos." "¿Y ahora qué?" diff --git a/features/login/impl/src/main/res/values-et/translations.xml b/features/login/impl/src/main/res/values-et/translations.xml index 62d0e64c91..4b28c1483f 100644 --- a/features/login/impl/src/main/res/values-et/translations.xml +++ b/features/login/impl/src/main/res/values-et/translations.xml @@ -34,6 +34,13 @@ "Matrix on avatud võrk turvalise ja hajutatud suhtluse jaoks." "Tere tulemast tagasi!" "Logi sisse serverisse %1$s" + "Logi sisse käsitsi" + "Logi sisse teenusesse %1$s" + "Logi sisse QR-koodi alusel" + "Loo kasutajakonto" + "Läbi aegade kiireim ja mugavaim %1$s." + "Tere tulemast kasutama kiiret ja lihtsat suhtlusrakendust %1$s." + "Ole oma elemendis" "Loome turvalist ühendust" "Turvalise ühenduse loomine uue seadmega ei õnnestunud. Sinu olemasolevad seadmed on jätkuvalt turvatud ja sa ei pea nende pärast muretsema." "Mida järgmiseks teeme?" diff --git a/features/login/impl/src/main/res/values-eu/translations.xml b/features/login/impl/src/main/res/values-eu/translations.xml index aad7020ab8..25f11458bf 100644 --- a/features/login/impl/src/main/res/values-eu/translations.xml +++ b/features/login/impl/src/main/res/values-eu/translations.xml @@ -20,6 +20,12 @@ "Matrix komunikazio seguru eta deszentralizaturako sare irekia da." "Ongi etorri!" "Hasi saioa %1$s(e)n" + "Hasi saioa eskuz" + "Hasi saioa QR kodearekin" + "Sortu kontua" + "Ongi etorri inoizko %1$s azkarrenera. Abiaduraz eta sinpletasunaz gainkargatua." + "Ongi etorri %1$s-ra. Abiaduraz eta sinpletasunez gainezka." + "Egon zure saltsan" "Konexio segurua ezartzen" "Ezin izan da konexio segururik ezarri gailu berriarekin. Lehendik dauden gailuak seguru daude oraindik ere eta ez duzu haietaz kezkatu beharrik." "Orain zer?" diff --git a/features/login/impl/src/main/res/values-fa/translations.xml b/features/login/impl/src/main/res/values-fa/translations.xml index 1e7cfba770..071e28046f 100644 --- a/features/login/impl/src/main/res/values-fa/translations.xml +++ b/features/login/impl/src/main/res/values-fa/translations.xml @@ -25,6 +25,12 @@ "ماتریکس شبکه‌ای بار برای ارتباطات نامتمرکز و امن است." "خوش برگشتید!" "ورود به %1$s" + "ورود دستی" + "ورود با کد QR" + "ایجاد حساب" + "به سریع‌ترین %1$s خوش آمدید. بازطرّاحی شده برای سرعت و سادگی." + "به %1$s خوش آمدید. بازطرّاحی شده برای سرعت و سادگی." + "در المنتتان باشید" "برقرار کدن اتّصالی امن" "نتوانست اتّصالی امن به افزارهٔ جدید بسازد. افزاره‌های موجودتان هنوز امنند و نیازی نیست نگرانشان باشید." "اکنون چه؟" diff --git a/features/login/impl/src/main/res/values-fi/translations.xml b/features/login/impl/src/main/res/values-fi/translations.xml index 505d777eec..56f1a52365 100644 --- a/features/login/impl/src/main/res/values-fi/translations.xml +++ b/features/login/impl/src/main/res/values-fi/translations.xml @@ -17,6 +17,9 @@ "Sliding sync ei ole saatavilla well-known tiedostossa olevan ongelman vuoksi: %1$s" "Valitsemasi palveluntarjoaja ei tue sliding syncia. Palvelimen päivitys tarvitaan %1$s -sovelluksen käyttämiseen." + "%1$s ei saa yhdistää %2$s -palvelimeen." + "Tämä sovellus on määritetty sallimaan: %1$s." + "Palveluntarjoaja %1$s ei ole sallittu." "Kotipalvelimen osoite" "Anna verkkotunnuksen osoite." "Mikä on palvelimesi osoite?" @@ -31,6 +34,13 @@ "Matrix on avoin verkko turvallista, hajautettua viestintää varten." "Tervetuloa takaisin!" "Kirjaudu sisään %1$s -palvelimelle" + "Kirjaudu sisään manuaalisesti" + "Kirjaudu sisään %1$s -palvelimelle" + "Kirjaudu sisään QR-koodilla" + "Luo tili" + "Tervetuloa kaikkien aikojen nopeimpaan %1$s -sovellukseen. Ahdettu nopeudella ja yksinkertaisuudella." + "Tervetuloa %1$s -sovellukseen. Ahdettu nopeudella ja yksinkertaisuudella." + "Ole elementissäsi" "Muodostetaan turvallista yhteyttä" "Turvallista yhteyttä uuteen laitteeseen ei voitu muodostaa. Olemassa olevat laitteesi ovat edelleen turvassa, eikä sinun tarvitse huolehtia niistä." "Mitä nyt?" diff --git a/features/login/impl/src/main/res/values-fr/translations.xml b/features/login/impl/src/main/res/values-fr/translations.xml index aa2ca75160..517c63baca 100644 --- a/features/login/impl/src/main/res/values-fr/translations.xml +++ b/features/login/impl/src/main/res/values-fr/translations.xml @@ -34,6 +34,13 @@ "Matrix est un réseau ouvert pour une communication sécurisée et décentralisée." "Content de vous revoir !" "Connectez-vous à %1$s" + "Se connecter manuellement" + "Se connecter à %1$s" + "Se connecter avec un QR code" + "Créer un compte" + "Bienvenue dans l’application %1$s la plus rapide de tous les temps. Boosté pour plus de rapidité et de simplicité." + "Bienvenue sur %1$s. Boosté, pour plus de rapidité et de simplicité." + "Soyez dans votre Element" "Établissement d’une connexion sécurisée" "Aucune connexion sécurisée n’a pu être établie avec la nouvelle session. Vos sessions existantes sont toujours en sécurité et vous n’avez pas à vous en soucier." "Et maintenant ?" diff --git a/features/login/impl/src/main/res/values-hu/translations.xml b/features/login/impl/src/main/res/values-hu/translations.xml index c5704c4ddf..fbd9e57262 100644 --- a/features/login/impl/src/main/res/values-hu/translations.xml +++ b/features/login/impl/src/main/res/values-hu/translations.xml @@ -34,6 +34,13 @@ "A Matrix egy nyitott hálózat a biztonságos, decentralizált kommunikációhoz." "Örülünk, hogy visszatért!" "Bejelentkezés ide: %1$s" + "Kézi bejelentkezés" + "Bejelentkezés ide: %1$s" + "Bejelentkezés QR-kóddal" + "Fiók létrehozása" + "Üdvözöljük a valaha volt leggyorsabb %1$sben. Felturbózva, a sebesség és az egyszerűség érdekében." + "Üdvözli az %1$s. Felturbózva, a sebesség és az egyszerűség jegyében." + "Legyen elemében" "Biztonságos kapcsolat létesítése" "Nem sikerült biztonságos kapcsolatot létesíteni az új eszközzel. A meglévő eszközei továbbra is biztonságban vannak, és nem kell aggódnia miattuk." "Most mi lesz?" diff --git a/features/login/impl/src/main/res/values-in/translations.xml b/features/login/impl/src/main/res/values-in/translations.xml index f089fa5ea8..f7d658e739 100644 --- a/features/login/impl/src/main/res/values-in/translations.xml +++ b/features/login/impl/src/main/res/values-in/translations.xml @@ -29,6 +29,12 @@ "Matrix adalah jaringan terbuka untuk komunikasi yang aman dan terdesentralisasi." "Selamat datang kembali!" "Masuk ke %1$s" + "Masuk secara manual" + "Masuk dengan kode QR" + "Buat akun" + "Selamat datang di %1$s tercepat yang pernah ada. Berdaya besar untuk kecepatan dan kesederhanaan." + "Selamat datang di %1$s. Berdaya penuh, untuk kecepatan dan kesederhanaan." + "Berada di elemen Anda" "Membuat koneksi aman" "Koneksi aman tidak dapat dibuat ke perangkat baru. Perangkat Anda yang ada masih aman dan Anda tidak perlu khawatir tentang mereka." "Apa sekarang?" diff --git a/features/login/impl/src/main/res/values-it/translations.xml b/features/login/impl/src/main/res/values-it/translations.xml index 494d22a39c..b294e498e6 100644 --- a/features/login/impl/src/main/res/values-it/translations.xml +++ b/features/login/impl/src/main/res/values-it/translations.xml @@ -29,6 +29,12 @@ "Matrix è una rete aperta per comunicazioni sicure e decentralizzate." "Bentornato!" "Accedi a %1$s" + "Accedi manualmente" + "Accedi con codice QR" + "Crea account" + "Benvenuti nell\'%1$s più veloce di sempre. Potenziato per velocità e semplicità." + "Benvenuto su %1$s. Potenziato in velocità e semplicità." + "Sii nel tuo elemento" "Stabilendo la connessione" "Non è stato possibile stabilire una connessione sicura con il nuovo dispositivo. I tuoi dispositivi esistenti sono ancora al sicuro e non devi preoccuparti di loro." "E adesso?" diff --git a/features/login/impl/src/main/res/values-ka/translations.xml b/features/login/impl/src/main/res/values-ka/translations.xml index a5dcbec300..f3e46faf19 100644 --- a/features/login/impl/src/main/res/values-ka/translations.xml +++ b/features/login/impl/src/main/res/values-ka/translations.xml @@ -28,6 +28,12 @@ "Matrix არის ღია ქსელი უსაფრთხო, დეცენტრალიზებული კომუნიკაციისთვის." "კეთილი იყოს თქვენი მობრძანება!" "შესვლა %1$s-ში" + "ხელით შესვლა" + "შესვლა QR კოდით" + "ანგარიშის შექმნა" + "კეთილი იყოს თქვენი მობრძანება უსწრაფეს %1$s-ში. დამუხტულია სიჩქარისა და სიმარტივისათვის." + "კეთილი იყოს თქვენი მობრძანება %1$s-ში! დამუხტული სიჩქარისა და სიმარტივისთვის." + "იყავი შენს element-ში" "ხელახლა ცდა" "შეცვალეთ ანგარიშის მომწოდებელი" "კერძო სერვერი Element-ის თანამშრომლებისთვის." diff --git a/features/login/impl/src/main/res/values-lt/translations.xml b/features/login/impl/src/main/res/values-lt/translations.xml index 192e8fbc70..bd53419ce8 100644 --- a/features/login/impl/src/main/res/values-lt/translations.xml +++ b/features/login/impl/src/main/res/values-lt/translations.xml @@ -22,6 +22,11 @@ "Matrix yra atviras tinklas, skirtas saugiam, decentralizuotam bendravimui." "Sveiki sugrįžę!" "Prisijungti prie %1$s" + "Prisijunkite rankiniu būdu" + "Prisijunkite naudodami QR kodą" + "Sukurti paskyrą" + "Sveiki atvykę į %1$s. Įkrautas greitumui ir paprastumui." + "Būkite savo elemente" "Keisti paskyros teikėją" "Privatus serveris “Element” darbuotojams." "Matrix yra atviras tinklas, skirtas saugiam, decentralizuotam bendravimui." diff --git a/features/login/impl/src/main/res/values-nb/translations.xml b/features/login/impl/src/main/res/values-nb/translations.xml index 6622eb750d..88c063d701 100644 --- a/features/login/impl/src/main/res/values-nb/translations.xml +++ b/features/login/impl/src/main/res/values-nb/translations.xml @@ -34,6 +34,13 @@ "Matrix er et åpent nettverk for sikker, desentralisert kommunikasjon." "Velkommen tilbake!" "Logg inn på %1$s" + "Logg på manuelt" + "Logg inn på %1$s" + "Logg inn med QR-kode" + "Opprett konto" + "Velkommen til den raskeste %1$s noensinne. Superladet for hastighet og enkelhet." + "Velkommen til %1$s. Supercharged, for hastighet og enkelhet." + "Vær i ditt rette element" "Etablere en sikker forbindelse" "En sikker tilkobling kunne ikke opprettes til den nye enheten. Dine eksisterende enheter er fortsatt trygge, og du trenger ikke å bekymre deg for dem." "Hva nå?" diff --git a/features/login/impl/src/main/res/values-nl/translations.xml b/features/login/impl/src/main/res/values-nl/translations.xml index edf9f4ad51..1c8515df22 100644 --- a/features/login/impl/src/main/res/values-nl/translations.xml +++ b/features/login/impl/src/main/res/values-nl/translations.xml @@ -29,6 +29,12 @@ "Matrix is een open netwerk voor veilige, gedecentraliseerde communicatie." "Welkom terug!" "Inloggen bij %1$s" + "Handmatig inloggen" + "Inloggen met QR-code" + "Account aanmaken" + "Welkom bij de snelste %1$s ooit. Supercharged, voor snelheid en eenvoud." + "Welkom bij %1$s. Supercharged, voor snelheid en eenvoud." + "Wees in je element" "Een beveiligde verbinding tot stand brengen" "Er kon geen beveiligde verbinding worden gemaakt met het nieuwe apparaat. Je bestaande apparaten zijn nog steeds veilig en je hoeft je daarover geen zorgen te maken." "Wat nu?" diff --git a/features/login/impl/src/main/res/values-pl/translations.xml b/features/login/impl/src/main/res/values-pl/translations.xml index 20506c2359..64a6e57db2 100644 --- a/features/login/impl/src/main/res/values-pl/translations.xml +++ b/features/login/impl/src/main/res/values-pl/translations.xml @@ -32,6 +32,13 @@ "Matrix to otwarta sieć do bezpiecznej i zdecentralizowanej komunikacji." "Witaj ponownie!" "Zaloguj się do %1$s" + "Zaloguj się ręcznie" + "Zaloguj się do %1$s" + "Zaloguj się za pomocą kodu QR" + "Utwórz konto" + "Witamy w %1$s. Szybszy i prostszy niż kiedykolwiek." + "Witamy w %1$s. Doładowany, dla szybkości i prostoty." + "Be in your element" "Nawiązanie bezpiecznego połączenia" "Nie udało się nawiązać bezpiecznego połączenia z nowym urządzeniem. Twoje istniejące urządzenia są nadal bezpieczne i nie musisz się o nie martwić." "Co teraz?" diff --git a/features/login/impl/src/main/res/values-pt-rBR/translations.xml b/features/login/impl/src/main/res/values-pt-rBR/translations.xml index 5794b69f92..9543098529 100644 --- a/features/login/impl/src/main/res/values-pt-rBR/translations.xml +++ b/features/login/impl/src/main/res/values-pt-rBR/translations.xml @@ -27,6 +27,12 @@ "A Matrix é uma rede aberta para comunicação segura e descentralizada." "Bem-vindo de volta!" "Iniciar sessão em %1$s" + "Iniciar sessão manualmente" + "Iniciar sessão com código QR" + "Criar conta" + "Bem-vindo ao mais rápido %1$s de todos os tempos. Turbinado para velocidade e simplicidade." + "Bem-vindo ao %1$s. Turbinado, para velocidade e simplicidade" + "Esteja no seu elemento" "Tente novamente" "Você deve permitir ao %1$s usar a câmera do seu dispositivo para continuar." "Seu código de verificação" diff --git a/features/login/impl/src/main/res/values-pt/translations.xml b/features/login/impl/src/main/res/values-pt/translations.xml index dd67f9f19d..2da567a829 100644 --- a/features/login/impl/src/main/res/values-pt/translations.xml +++ b/features/login/impl/src/main/res/values-pt/translations.xml @@ -29,6 +29,12 @@ "A Matrix é uma rede aberta de comunicação descentralizada e segura." "Bem-vindo(a) de volta!" "Iniciar sessão em %1$s" + "Iniciar sessão manualmente" + "Iniciar sessão com código QR" + "Criar conta" + "Bem-vindo(a) à %1$s mais rápida de sempre. Super rápida e simples." + "Bem-vindo(a) à %1$s. Revitalizado, rápido e simples." + "A liberdade do teu elemento" "A estabelecer uma ligação segura" "Não foi possível estabelecer uma ligação segura com o novo dispositivo. Os teus outros dispositivos continuam seguros, não precisas de te preocupar com eles." "E agora?" diff --git a/features/login/impl/src/main/res/values-ro/translations.xml b/features/login/impl/src/main/res/values-ro/translations.xml index 65b7c90437..c1355a9491 100644 --- a/features/login/impl/src/main/res/values-ro/translations.xml +++ b/features/login/impl/src/main/res/values-ro/translations.xml @@ -29,6 +29,12 @@ "Matrix este o rețea deschisă pentru o comunicare sigură și descentralizată." "Bine ați revenit!" "Conectați-vă la %1$s" + "Conectați-vă manual" + "Conectați-vă cu un cod QR" + "Creați un cont" + "Bine ați venit la cel mai rapid %1$s din toate timpurile. Supraalimentat pentru viteză și simplitate." + "Bun venit în %1$s. Supraalimentat, pentru viteză și simplitate." + "Fii în Elementul tău" "Se stabilește o conexiune securizată" "Nu a putut fi făcută o conexiune sigură la noul dispozitiv. Dispozitivele existente sunt încă în siguranță și nu trebuie să vă faceți griji cu privire la ele." "Și acum?" diff --git a/features/login/impl/src/main/res/values-ru/translations.xml b/features/login/impl/src/main/res/values-ru/translations.xml index 180358ff33..b16ff24a92 100644 --- a/features/login/impl/src/main/res/values-ru/translations.xml +++ b/features/login/impl/src/main/res/values-ru/translations.xml @@ -30,6 +30,12 @@ "Matrix — это открытая сеть для безопасной децентрализованной связи." "Рады видеть вас снова!" "Войти в %1$s" + "Войти вручную" + "Войти QR-кодом" + "Создать учетную запись" + "Добро пожаловать в самый быстрый клиент %1$s. Ориентирован на скорость и простоту." + "Добро пожаловать в %1$s. Ориентирован на скорость и простоту." + "Чувствуйте себя как дома с Element" "Установление безопасного соединения" "Не удалось установить безопасное соединение с новым устройством. Существующие устройства по-прежнему в безопасности, и вам не нужно беспокоиться о них." "Что теперь?" diff --git a/features/login/impl/src/main/res/values-sk/translations.xml b/features/login/impl/src/main/res/values-sk/translations.xml index 92cb48b947..7bdb9c079d 100644 --- a/features/login/impl/src/main/res/values-sk/translations.xml +++ b/features/login/impl/src/main/res/values-sk/translations.xml @@ -34,6 +34,13 @@ "Matrix je otvorená sieť pre bezpečnú a decentralizovanú komunikáciu." "Vitajte späť!" "Prihlásiť sa do %1$s" + "Prihlásiť sa manuálne" + "Prihlásiť sa do %1$s" + "Prihlásiť sa pomocou QR kódu" + "Vytvoriť účet" + "Vitajte v najrýchlejšom %1$s vôbec. Nadupaný pre rýchlosť a jednoduchosť." + "Vitajte v %1$s. Nadupaný, pre rýchlosť a jednoduchosť." + "Buďte vo svojom elemente" "Nadväzovanie bezpečného spojenia" "K novému zariadeniu sa nepodarilo vytvoriť bezpečné pripojenie. Vaše existujúce zariadenia sú stále v bezpečí a nemusíte sa o ne obávať." "Čo teraz?" diff --git a/features/login/impl/src/main/res/values-sv/translations.xml b/features/login/impl/src/main/res/values-sv/translations.xml index 69523b21fa..11ad5f8f10 100644 --- a/features/login/impl/src/main/res/values-sv/translations.xml +++ b/features/login/impl/src/main/res/values-sv/translations.xml @@ -29,6 +29,12 @@ "Matrix är ett öppet nätverk för säker, decentraliserad kommunikation." "Välkommen tillbaka!" "Logga in på %1$s" + "Logga in manuellt" + "Logga in med QR-kod" + "Skapa konto" + "Välkommen till den snabbaste %1$s någonsin. Superladdad för snabbhet och enkelhet." + "Välkommen till %1$s. Superladdad, för snabbhet och enkelhet." + "Var i ditt rätta element" "Upprättar en säker anslutning" "En säker anslutning kunde inte göras till den nya enheten. Dina befintliga enheter är fortfarande säkra och du behöver inte oroa dig för dem." "Nu då?" diff --git a/features/login/impl/src/main/res/values-tr/translations.xml b/features/login/impl/src/main/res/values-tr/translations.xml index 07b84e1f5c..1a18fba1bc 100644 --- a/features/login/impl/src/main/res/values-tr/translations.xml +++ b/features/login/impl/src/main/res/values-tr/translations.xml @@ -29,6 +29,12 @@ "Matrix, güvenli, merkezi olmayan iletişim için açık bir ağdır." "Tekrar hoş geldiniz!" "%1$s adresinde oturum aç" + "Manuel olarak oturum aç" + "QR kodu ile giriş yap" + "Hesap oluştur" + "Şimdiye kadarki en hızlı %1$s hoş geldiniz. Hız ve basitlik için güçlendirildi." + "%1$s\'e hoş geldiniz. Hız ve basitlik için süper şarjlı." + "Kendi elementinizde olun" "Güvenli bir bağlantı kuruluyor" "Yeni cihaza güvenli bir bağlantı kurulamadı. Mevcut cihazlarınız hala güvende ve onlar için endişelenmenize gerek yok." "Şimdi ne olacak?" diff --git a/features/login/impl/src/main/res/values-uk/translations.xml b/features/login/impl/src/main/res/values-uk/translations.xml index 43e3846e2e..b0f3e28567 100644 --- a/features/login/impl/src/main/res/values-uk/translations.xml +++ b/features/login/impl/src/main/res/values-uk/translations.xml @@ -30,6 +30,13 @@ "Matrix — це відкрита мережа для безпечної, децентралізованої комунікації." "З поверненням!" "Увійти в %1$s" + "Увійти вручну" + "Увійти в %1$s" + "Увійти за допомогою QR-коду" + "Створити обліковий запис" + "Ласкаво просимо до найшвидшого %1$s. Заряджений для швидкості та простоти." + "Ласкаво просимо до %1$s. Заряджений, для швидкості та простоти." + "Будьте у своєму element" "Встановлення безпечного з\'єднання" "Не вдалося встановити безпечне з\'єднання з новим пристроєм. Ваші наявні пристрої досі в безпеці, і вам не потрібно про них турбуватися." "Що тепер?" diff --git a/features/login/impl/src/main/res/values-uz/translations.xml b/features/login/impl/src/main/res/values-uz/translations.xml index 6994a30643..25fc695452 100644 --- a/features/login/impl/src/main/res/values-uz/translations.xml +++ b/features/login/impl/src/main/res/values-uz/translations.xml @@ -26,6 +26,12 @@ "Matrix xavfsiz, markazlashmagan aloqa uchun ochiq tarmoqdir." "Qaytib kelganingizdan xursandmiz!" "Kirish%1$s" + "Qo\'lda tizimga kiring" + "QR kod bilan tizimga kiring" + "Hisob yaratish" + "Eng tezkor %1$sga xush kelibsiz. Tezlik va oddylik uchun super zaryadlangan." + "%1$sga Xush kelibsiz. Tezlik va oddylik uchun o\'ta zaryadlangan." + "Elementingizda bo\'ling" "Hisob provayderini o\'zgartiring" "Element xodimlari uchun shaxsiy server." "Matrix xavfsiz, markazlashmagan aloqa uchun ochiq tarmoqdir." diff --git a/features/login/impl/src/main/res/values-zh-rTW/translations.xml b/features/login/impl/src/main/res/values-zh-rTW/translations.xml index 2ca9e3737a..6bd29cb417 100644 --- a/features/login/impl/src/main/res/values-zh-rTW/translations.xml +++ b/features/login/impl/src/main/res/values-zh-rTW/translations.xml @@ -29,6 +29,12 @@ "Matrix 是一個開放網路，為了安全且去中心化的通訊而生。" "歡迎回來！" "登入 %1$s" + "手動登入" + "使用 QR code 登入" + "建立帳號" + "歡迎使用有史以來最快的 %1$s。速度超快，操作簡便。" + "歡迎使用 %1$s。速度超快且簡單。" + "Be in your element" "建立安全連線" "無法與新裝置建立安全連線。您現有的裝置仍然安全，您不必擔心它們。" "現在怎麼辦？" diff --git a/features/login/impl/src/main/res/values-zh/translations.xml b/features/login/impl/src/main/res/values-zh/translations.xml index 6b9e9af591..44d5d48574 100644 --- a/features/login/impl/src/main/res/values-zh/translations.xml +++ b/features/login/impl/src/main/res/values-zh/translations.xml @@ -29,6 +29,12 @@ "Matrix 是一个用于安全、去中心化通信的开放网络。" "欢迎回来！" "登录到 %1$s" + "手动登录" + "使用二维码登录" + "创建账户" + "欢迎使用 %1$s，快而简约的消息应用。" + "欢迎使用 %1$s，速度与简洁的极致。" + "融入您的 Element" "建立安全连接" "无法与新设备建立安全连接。您现有的设备仍然安全，无需担心。" "现在怎么办？" diff --git a/features/login/impl/src/main/res/values/localazy.xml b/features/login/impl/src/main/res/values/localazy.xml index bebbc8e6c3..998a0bc775 100644 --- a/features/login/impl/src/main/res/values/localazy.xml +++ b/features/login/impl/src/main/res/values/localazy.xml @@ -34,6 +34,13 @@ "Matrix is an open network for secure, decentralised communication." "Welcome back!" "Sign in to %1$s" + "Sign in manually" + "Sign in to %1$s" + "Sign in with QR code" + "Create account" + "Welcome to the fastest %1$s ever. Supercharged for speed and simplicity." + "Welcome to %1$s. Supercharged, for speed and simplicity." + "Be in your element" "Establishing a secure connection" "A secure connection could not be made to the new device. Your existing devices are still safe and you don\'t need to worry about them." "What now?" diff --git a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingPresenterTest.kt similarity index 97% rename from features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt rename to features/login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingPresenterTest.kt index b692d291b5..faee90ca14 100644 --- a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding/OnBoardingPresenterTest.kt @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding import app.cash.molecule.RecompositionMode import app.cash.molecule.moleculeFlow diff --git a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnboardingViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding/OnboardingViewTest.kt similarity index 97% rename from features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnboardingViewTest.kt rename to features/login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding/OnboardingViewTest.kt index 955bbea1f1..9565eca614 100644 --- a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnboardingViewTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/onboarding/OnboardingViewTest.kt @@ -5,13 +5,14 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.features.onboarding.impl +package io.element.android.features.login.impl.onboarding import androidx.activity.ComponentActivity import androidx.compose.ui.test.junit4.AndroidComposeTestRule import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.test.ext.junit.runners.AndroidJUnit4 +import io.element.android.features.login.impl.R import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.tests.testutils.EnsureNeverCalled import io.element.android.tests.testutils.clickOn diff --git a/features/onboarding/api/build.gradle.kts b/features/onboarding/api/build.gradle.kts deleted file mode 100644 index 2079f2221b..0000000000 --- a/features/onboarding/api/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2023, 2024 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial - * Please see LICENSE files in the repository root for full details. - */ -plugins { - id("io.element.android-library") -} - -android { - namespace = "io.element.android.features.onboarding.api" -} - -dependencies { - implementation(projects.libraries.architecture) -} diff --git a/features/onboarding/api/src/main/kotlin/io/element/android/features/onboarding/api/OnBoardingEntryPoint.kt b/features/onboarding/api/src/main/kotlin/io/element/android/features/onboarding/api/OnBoardingEntryPoint.kt deleted file mode 100644 index 378176a2a7..0000000000 --- a/features/onboarding/api/src/main/kotlin/io/element/android/features/onboarding/api/OnBoardingEntryPoint.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2023, 2024 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial - * Please see LICENSE files in the repository root for full details. - */ - -package io.element.android.features.onboarding.api - -import com.bumble.appyx.core.modality.BuildContext -import com.bumble.appyx.core.node.Node -import com.bumble.appyx.core.plugin.Plugin -import io.element.android.libraries.architecture.FeatureEntryPoint - -interface OnBoardingEntryPoint : FeatureEntryPoint { - fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder - - interface NodeBuilder { - fun callback(callback: Callback): NodeBuilder - fun build(): Node - } - - interface Callback : Plugin { - fun onSignUp() - fun onSignIn() - fun onSignInWithQrCode() - fun onReportProblem() - } -} diff --git a/features/onboarding/impl/build.gradle.kts b/features/onboarding/impl/build.gradle.kts deleted file mode 100644 index c59cd5684b..0000000000 --- a/features/onboarding/impl/build.gradle.kts +++ /dev/null @@ -1,52 +0,0 @@ -import extension.setupAnvil - -/* - * Copyright 2022-2024 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial - * Please see LICENSE files in the repository root for full details. - */ - -plugins { - id("io.element.android-compose-library") - id("kotlin-parcelize") -} - -android { - namespace = "io.element.android.features.onboarding.impl" - - testOptions { - unitTests { - isIncludeAndroidResources = true - } - } -} - -setupAnvil() - -dependencies { - implementation(projects.appconfig) - implementation(projects.features.rageshake.api) - implementation(projects.libraries.core) - implementation(projects.libraries.androidutils) - implementation(projects.libraries.architecture) - implementation(projects.libraries.designsystem) - implementation(projects.libraries.featureflag.api) - implementation(projects.libraries.matrix.api) - implementation(projects.libraries.testtags) - implementation(projects.libraries.uiStrings) - api(projects.features.onboarding.api) - - testImplementation(libs.test.junit) - testImplementation(libs.androidx.compose.ui.test.junit) - testImplementation(libs.androidx.test.ext.junit) - testImplementation(libs.coroutines.test) - testImplementation(libs.molecule.runtime) - testImplementation(libs.test.robolectric) - testImplementation(libs.test.truth) - testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrix.test) - testImplementation(projects.libraries.featureflag.test) - testImplementation(projects.tests.testutils) - testReleaseImplementation(libs.androidx.compose.ui.test.manifest) -} diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/DefaultOnBoardingEntryPoint.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/DefaultOnBoardingEntryPoint.kt deleted file mode 100644 index 9f31a10ab7..0000000000 --- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/DefaultOnBoardingEntryPoint.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2023, 2024 New Vector Ltd. - * - * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial - * Please see LICENSE files in the repository root for full details. - */ - -package io.element.android.features.onboarding.impl - -import com.bumble.appyx.core.modality.BuildContext -import com.bumble.appyx.core.node.Node -import com.bumble.appyx.core.plugin.Plugin -import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.features.onboarding.api.OnBoardingEntryPoint -import io.element.android.libraries.architecture.createNode -import io.element.android.libraries.di.AppScope -import javax.inject.Inject - -@ContributesBinding(AppScope::class) -class DefaultOnBoardingEntryPoint @Inject constructor() : OnBoardingEntryPoint { - override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): OnBoardingEntryPoint.NodeBuilder { - return object : OnBoardingEntryPoint.NodeBuilder { - val plugins = ArrayList() - - override fun callback(callback: OnBoardingEntryPoint.Callback): OnBoardingEntryPoint.NodeBuilder { - plugins += callback - return this - } - - override fun build(): Node { - return parentNode.createNode(buildContext, plugins) - } - } - } -} diff --git a/features/onboarding/impl/src/main/res/values-be/translations.xml b/features/onboarding/impl/src/main/res/values-be/translations.xml deleted file mode 100644 index ab1c5aba87..0000000000 --- a/features/onboarding/impl/src/main/res/values-be/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Увайсці ўручную" - "Увайсці з QR-кодам" - "Стварыць уліковы запіс" - "Сардэчна запрашаем у самы хуткі %1$s. Перавага ў хуткасці і прастаце." - "Сардэчна запрашаем у %1$s. Зараджаны, для хуткасці і прастаты." - "Будзьце ў сваім element" - diff --git a/features/onboarding/impl/src/main/res/values-bg/translations.xml b/features/onboarding/impl/src/main/res/values-bg/translations.xml deleted file mode 100644 index 67a3fe4a28..0000000000 --- a/features/onboarding/impl/src/main/res/values-bg/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Влизане ръчно" - "Влизане с QR код" - "Създаване на акаунт" - "Добре дошли в най-бързия %1$s досега. Супер зареден за скорост и простота." - "Добре дошли в %1$s. Супер зареден за скорост и простота." - "Бъдете в стихията си" - diff --git a/features/onboarding/impl/src/main/res/values-cs/translations.xml b/features/onboarding/impl/src/main/res/values-cs/translations.xml deleted file mode 100644 index ee565c39b6..0000000000 --- a/features/onboarding/impl/src/main/res/values-cs/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Ruční přihlášení" - "Přihlásit se do %1$s" - "Přihlásit se pomocí QR kódu" - "Vytvořit účet" - "Vítejte v dosud nejrychlejším %1$su. Vylepšený pro rychlost a jednoduchost." - "Vítejte v %1$su. Vylepšený, pro rychlost a jednoduchost." - "Buďte ve svém živlu" - diff --git a/features/onboarding/impl/src/main/res/values-cy/translations.xml b/features/onboarding/impl/src/main/res/values-cy/translations.xml deleted file mode 100644 index 3ecac1ad97..0000000000 --- a/features/onboarding/impl/src/main/res/values-cy/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Mewngofnodwch â llaw" - "Mewngofnodi i %1$s" - "Mewngofnodwch gyda chod QR" - "Creu cyfrif" - "Croeso i\'r %1$s cyflymaf erioed. Yn nodedig am gyflymder a symlrwydd." - "Croeso i %1$s. Yn nodedig ar gyfer cyflymder a symlrwydd." - "Byddwch yn eich elfen" - diff --git a/features/onboarding/impl/src/main/res/values-de/translations.xml b/features/onboarding/impl/src/main/res/values-de/translations.xml deleted file mode 100644 index bd5e9c0c54..0000000000 --- a/features/onboarding/impl/src/main/res/values-de/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Manuell anmelden" - "Mit QR-Code anmelden" - "Konto erstellen" - "Willkommen beim schnellsten %1$s aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit." - "Willkommen zu %1$s. Aufgeladen, für Geschwindigkeit und Einfachheit." - "Sei in Deinem Element" - diff --git a/features/onboarding/impl/src/main/res/values-el/translations.xml b/features/onboarding/impl/src/main/res/values-el/translations.xml deleted file mode 100644 index bdaf30f11b..0000000000 --- a/features/onboarding/impl/src/main/res/values-el/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Σύνδεση χειροκίνητα" - "Συνδέσου με κωδικό QR" - "Δημιουργία λογαριασμού" - "Καλώς ήλθατε στο γρηγορότερο %1$s όλων των εποχών. Υπερτροφοδοτούμενο με ταχύτητα και απλότητα." - "Καλώς ήρθες στο %1$s. Υπερφορτισμένο, για ταχύτητα και απλότητα." - "Μείνε στο element σου" - diff --git a/features/onboarding/impl/src/main/res/values-es/translations.xml b/features/onboarding/impl/src/main/res/values-es/translations.xml deleted file mode 100644 index c794e3b9ab..0000000000 --- a/features/onboarding/impl/src/main/res/values-es/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Iniciar sesión manualmente" - "Iniciar sesión con un código QR" - "Crear cuenta" - "Bienvenido al %1$s más rápido de todos los tiempos. Diseñado para la velocidad y la simplicidad." - "Bienvenido a %1$s. Vitaminado, para mayor rapidez y sencillez." - "Siéntete en tu Elemento" - diff --git a/features/onboarding/impl/src/main/res/values-et/translations.xml b/features/onboarding/impl/src/main/res/values-et/translations.xml deleted file mode 100644 index 1df2de067c..0000000000 --- a/features/onboarding/impl/src/main/res/values-et/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Logi sisse käsitsi" - "Logi sisse teenusesse %1$s" - "Logi sisse QR-koodi alusel" - "Loo kasutajakonto" - "Läbi aegade kiireim ja mugavaim %1$s." - "Tere tulemast kasutama kiiret ja lihtsat suhtlusrakendust %1$s." - "Ole oma elemendis" - diff --git a/features/onboarding/impl/src/main/res/values-eu/translations.xml b/features/onboarding/impl/src/main/res/values-eu/translations.xml deleted file mode 100644 index 18c436a2b7..0000000000 --- a/features/onboarding/impl/src/main/res/values-eu/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Hasi saioa eskuz" - "Hasi saioa QR kodearekin" - "Sortu kontua" - "Ongi etorri inoizko %1$s azkarrenera. Abiaduraz eta sinpletasunaz gainkargatua." - "Ongi etorri %1$s-ra. Abiaduraz eta sinpletasunez gainezka." - "Egon zure saltsan" - diff --git a/features/onboarding/impl/src/main/res/values-fa/translations.xml b/features/onboarding/impl/src/main/res/values-fa/translations.xml deleted file mode 100644 index e4fb34e565..0000000000 --- a/features/onboarding/impl/src/main/res/values-fa/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "ورود دستی" - "ورود با کد QR" - "ایجاد حساب" - "به سریع‌ترین %1$s خوش آمدید. بازطرّاحی شده برای سرعت و سادگی." - "به %1$s خوش آمدید. بازطرّاحی شده برای سرعت و سادگی." - "در المنتتان باشید" - diff --git a/features/onboarding/impl/src/main/res/values-fi/translations.xml b/features/onboarding/impl/src/main/res/values-fi/translations.xml deleted file mode 100644 index fb34bae048..0000000000 --- a/features/onboarding/impl/src/main/res/values-fi/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Kirjaudu sisään manuaalisesti" - "Kirjaudu sisään QR-koodilla" - "Luo tili" - "Tervetuloa kaikkien aikojen nopeimpaan %1$s -sovellukseen. Ahdettu nopeudella ja yksinkertaisuudella." - "Tervetuloa %1$s -sovellukseen. Ahdettu nopeudella ja yksinkertaisuudella." - "Ole elementissäsi" - diff --git a/features/onboarding/impl/src/main/res/values-fr/translations.xml b/features/onboarding/impl/src/main/res/values-fr/translations.xml deleted file mode 100644 index f6dbaadf61..0000000000 --- a/features/onboarding/impl/src/main/res/values-fr/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Se connecter manuellement" - "Se connecter à %1$s" - "Se connecter avec un QR code" - "Créer un compte" - "Bienvenue dans l’application %1$s la plus rapide de tous les temps. Boosté pour plus de rapidité et de simplicité." - "Bienvenue sur %1$s. Boosté, pour plus de rapidité et de simplicité." - "Soyez dans votre Element" - diff --git a/features/onboarding/impl/src/main/res/values-hu/translations.xml b/features/onboarding/impl/src/main/res/values-hu/translations.xml deleted file mode 100644 index a992424d68..0000000000 --- a/features/onboarding/impl/src/main/res/values-hu/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Kézi bejelentkezés" - "Bejelentkezés ide: %1$s" - "Bejelentkezés QR-kóddal" - "Fiók létrehozása" - "Üdvözöljük a valaha volt leggyorsabb %1$sben. Felturbózva, a sebesség és az egyszerűség érdekében." - "Üdvözli az %1$s. Felturbózva, a sebesség és az egyszerűség jegyében." - "Legyen elemében" - diff --git a/features/onboarding/impl/src/main/res/values-in/translations.xml b/features/onboarding/impl/src/main/res/values-in/translations.xml deleted file mode 100644 index e9b7b479a8..0000000000 --- a/features/onboarding/impl/src/main/res/values-in/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Masuk secara manual" - "Masuk dengan kode QR" - "Buat akun" - "Selamat datang di %1$s tercepat yang pernah ada. Berdaya besar untuk kecepatan dan kesederhanaan." - "Selamat datang di %1$s. Berdaya penuh, untuk kecepatan dan kesederhanaan." - "Berada di elemen Anda" - diff --git a/features/onboarding/impl/src/main/res/values-it/translations.xml b/features/onboarding/impl/src/main/res/values-it/translations.xml deleted file mode 100644 index e134337d64..0000000000 --- a/features/onboarding/impl/src/main/res/values-it/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Accedi manualmente" - "Accedi con codice QR" - "Crea account" - "Benvenuti nell\'%1$s più veloce di sempre. Potenziato per velocità e semplicità." - "Benvenuto su %1$s. Potenziato in velocità e semplicità." - "Sii nel tuo elemento" - diff --git a/features/onboarding/impl/src/main/res/values-ka/translations.xml b/features/onboarding/impl/src/main/res/values-ka/translations.xml deleted file mode 100644 index e75edfdefa..0000000000 --- a/features/onboarding/impl/src/main/res/values-ka/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "ხელით შესვლა" - "შესვლა QR კოდით" - "ანგარიშის შექმნა" - "კეთილი იყოს თქვენი მობრძანება უსწრაფეს %1$s-ში. დამუხტულია სიჩქარისა და სიმარტივისათვის." - "კეთილი იყოს თქვენი მობრძანება %1$s-ში! დამუხტული სიჩქარისა და სიმარტივისთვის." - "იყავი შენს element-ში" - diff --git a/features/onboarding/impl/src/main/res/values-lt/translations.xml b/features/onboarding/impl/src/main/res/values-lt/translations.xml deleted file mode 100644 index 1b1d332698..0000000000 --- a/features/onboarding/impl/src/main/res/values-lt/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - "Prisijunkite rankiniu būdu" - "Prisijunkite naudodami QR kodą" - "Sukurti paskyrą" - "Sveiki atvykę į %1$s. Įkrautas greitumui ir paprastumui." - "Būkite savo elemente" - diff --git a/features/onboarding/impl/src/main/res/values-nb/translations.xml b/features/onboarding/impl/src/main/res/values-nb/translations.xml deleted file mode 100644 index b10c0c7a78..0000000000 --- a/features/onboarding/impl/src/main/res/values-nb/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Logg på manuelt" - "Logg inn på %1$s" - "Logg inn med QR-kode" - "Opprett konto" - "Velkommen til den raskeste %1$s noensinne. Superladet for hastighet og enkelhet." - "Velkommen til %1$s. Supercharged, for hastighet og enkelhet." - "Vær i ditt rette element" - diff --git a/features/onboarding/impl/src/main/res/values-nl/translations.xml b/features/onboarding/impl/src/main/res/values-nl/translations.xml deleted file mode 100644 index 86bbf73ade..0000000000 --- a/features/onboarding/impl/src/main/res/values-nl/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Handmatig inloggen" - "Inloggen met QR-code" - "Account aanmaken" - "Welkom bij de snelste %1$s ooit. Supercharged, voor snelheid en eenvoud." - "Welkom bij %1$s. Supercharged, voor snelheid en eenvoud." - "Wees in je element" - diff --git a/features/onboarding/impl/src/main/res/values-pl/translations.xml b/features/onboarding/impl/src/main/res/values-pl/translations.xml deleted file mode 100644 index e57a1dd10e..0000000000 --- a/features/onboarding/impl/src/main/res/values-pl/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Zaloguj się ręcznie" - "Zaloguj się do %1$s" - "Zaloguj się za pomocą kodu QR" - "Utwórz konto" - "Witamy w %1$s. Szybszy i prostszy niż kiedykolwiek." - "Witamy w %1$s. Doładowany, dla szybkości i prostoty." - "Be in your element" - diff --git a/features/onboarding/impl/src/main/res/values-pt-rBR/translations.xml b/features/onboarding/impl/src/main/res/values-pt-rBR/translations.xml deleted file mode 100644 index 965c66c78c..0000000000 --- a/features/onboarding/impl/src/main/res/values-pt-rBR/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Iniciar sessão manualmente" - "Iniciar sessão com código QR" - "Criar conta" - "Bem-vindo ao mais rápido %1$s de todos os tempos. Turbinado para velocidade e simplicidade." - "Bem-vindo ao %1$s. Turbinado, para velocidade e simplicidade" - "Esteja no seu elemento" - diff --git a/features/onboarding/impl/src/main/res/values-pt/translations.xml b/features/onboarding/impl/src/main/res/values-pt/translations.xml deleted file mode 100644 index 311343ef9f..0000000000 --- a/features/onboarding/impl/src/main/res/values-pt/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Iniciar sessão manualmente" - "Iniciar sessão com código QR" - "Criar conta" - "Bem-vindo(a) à %1$s mais rápida de sempre. Super rápida e simples." - "Bem-vindo(a) à %1$s. Revitalizado, rápido e simples." - "A liberdade do teu elemento" - diff --git a/features/onboarding/impl/src/main/res/values-ro/translations.xml b/features/onboarding/impl/src/main/res/values-ro/translations.xml deleted file mode 100644 index 7275680729..0000000000 --- a/features/onboarding/impl/src/main/res/values-ro/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Conectați-vă manual" - "Conectați-vă cu un cod QR" - "Creați un cont" - "Bine ați venit la cel mai rapid %1$s din toate timpurile. Supraalimentat pentru viteză și simplitate." - "Bun venit în %1$s. Supraalimentat, pentru viteză și simplitate." - "Fii în Elementul tău" - diff --git a/features/onboarding/impl/src/main/res/values-ru/translations.xml b/features/onboarding/impl/src/main/res/values-ru/translations.xml deleted file mode 100644 index 80b05a158f..0000000000 --- a/features/onboarding/impl/src/main/res/values-ru/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Войти вручную" - "Войти QR-кодом" - "Создать учетную запись" - "Добро пожаловать в самый быстрый клиент %1$s. Ориентирован на скорость и простоту." - "Добро пожаловать в %1$s. Ориентирован на скорость и простоту." - "Чувствуйте себя как дома с Element" - diff --git a/features/onboarding/impl/src/main/res/values-sk/translations.xml b/features/onboarding/impl/src/main/res/values-sk/translations.xml deleted file mode 100644 index 1cba6d81fb..0000000000 --- a/features/onboarding/impl/src/main/res/values-sk/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Prihlásiť sa manuálne" - "Prihlásiť sa do %1$s" - "Prihlásiť sa pomocou QR kódu" - "Vytvoriť účet" - "Vitajte v najrýchlejšom %1$s vôbec. Nadupaný pre rýchlosť a jednoduchosť." - "Vitajte v %1$s. Nadupaný, pre rýchlosť a jednoduchosť." - "Buďte vo svojom elemente" - diff --git a/features/onboarding/impl/src/main/res/values-sv/translations.xml b/features/onboarding/impl/src/main/res/values-sv/translations.xml deleted file mode 100644 index 6ffadf355b..0000000000 --- a/features/onboarding/impl/src/main/res/values-sv/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Logga in manuellt" - "Logga in med QR-kod" - "Skapa konto" - "Välkommen till den snabbaste %1$s någonsin. Superladdad för snabbhet och enkelhet." - "Välkommen till %1$s. Superladdad, för snabbhet och enkelhet." - "Var i ditt rätta element" - diff --git a/features/onboarding/impl/src/main/res/values-tr/translations.xml b/features/onboarding/impl/src/main/res/values-tr/translations.xml deleted file mode 100644 index 72dcb42a90..0000000000 --- a/features/onboarding/impl/src/main/res/values-tr/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Manuel olarak oturum aç" - "QR kodu ile giriş yap" - "Hesap oluştur" - "Şimdiye kadarki en hızlı %1$s hoş geldiniz. Hız ve basitlik için güçlendirildi." - "%1$s\'e hoş geldiniz. Hız ve basitlik için süper şarjlı." - "Kendi elementinizde olun" - diff --git a/features/onboarding/impl/src/main/res/values-uk/translations.xml b/features/onboarding/impl/src/main/res/values-uk/translations.xml deleted file mode 100644 index 8c834d9bd0..0000000000 --- a/features/onboarding/impl/src/main/res/values-uk/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Увійти вручну" - "Увійти за допомогою QR-коду" - "Створити обліковий запис" - "Ласкаво просимо до найшвидшого %1$s. Заряджений для швидкості та простоти." - "Ласкаво просимо до %1$s. Заряджений, для швидкості та простоти." - "Будьте у своєму element" - diff --git a/features/onboarding/impl/src/main/res/values-uz/translations.xml b/features/onboarding/impl/src/main/res/values-uz/translations.xml deleted file mode 100644 index b69af4adb7..0000000000 --- a/features/onboarding/impl/src/main/res/values-uz/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "Qo\'lda tizimga kiring" - "QR kod bilan tizimga kiring" - "Hisob yaratish" - "Eng tezkor %1$sga xush kelibsiz. Tezlik va oddylik uchun super zaryadlangan." - "%1$sga Xush kelibsiz. Tezlik va oddylik uchun o\'ta zaryadlangan." - "Elementingizda bo\'ling" - diff --git a/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml b/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml deleted file mode 100644 index 8de629fca8..0000000000 --- a/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "手動登入" - "使用 QR code 登入" - "建立帳號" - "歡迎使用有史以來最快的 %1$s。速度超快，操作簡便。" - "歡迎使用 %1$s。速度超快且簡單。" - "Be in your element" - diff --git a/features/onboarding/impl/src/main/res/values-zh/translations.xml b/features/onboarding/impl/src/main/res/values-zh/translations.xml deleted file mode 100644 index f8b53c3369..0000000000 --- a/features/onboarding/impl/src/main/res/values-zh/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - "手动登录" - "使用二维码登录" - "创建账户" - "欢迎使用 %1$s，快而简约的消息应用。" - "欢迎使用 %1$s，速度与简洁的极致。" - "融入您的 Element" - diff --git a/features/onboarding/impl/src/main/res/values/localazy.xml b/features/onboarding/impl/src/main/res/values/localazy.xml deleted file mode 100644 index 04f51a3667..0000000000 --- a/features/onboarding/impl/src/main/res/values/localazy.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - "Sign in manually" - "Sign in to %1$s" - "Sign in with QR code" - "Create account" - "Welcome to the fastest %1$s ever. Supercharged for speed and simplicity." - "Welcome to %1$s. Supercharged, for speed and simplicity." - "Be in your element" - diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_0_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_0_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_0_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_1_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_1_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_1_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_2_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_2_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_2_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_3_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_3_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_3_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_4_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Day_4_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Day_4_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_0_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_0_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_0_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_1_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_1_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_1_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_2_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_2_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_2_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_3_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_3_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_3_en.png diff --git a/tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_4_en.png similarity index 100% rename from tests/uitests/src/test/snapshots/images/features.onboarding.impl_OnBoardingView_Night_4_en.png rename to tests/uitests/src/test/snapshots/images/features.login.impl.onboarding_OnBoardingView_Night_4_en.png diff --git a/tools/localazy/config.json b/tools/localazy/config.json index e5d35def0c..00b51c1924 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -41,12 +41,6 @@ "screen.join_room.loading_alert_title" ] }, - { - "name" : ":features:onboarding:impl", - "includeRegex" : [ - "screen_onboarding_.*" - ] - }, { "name" : ":features:signedout:impl", "includeRegex" : [ @@ -149,6 +143,7 @@ { "name" : ":features:login:impl", "includeRegex" : [ + "screen_onboarding_.*", "screen_login_.*", "screen_server_confirmation_.*", "screen_change_server_.*",