Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/bma/settingUpAccount

Browse source
This commit is contained in:
Benoit Marty 2023-08-28 13:02:44 +02:00 • committed by GitHub
commit f80eece489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
100 changed files with 317 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
View file

@ -71,16 +71,16 @@ class FtueFlowNode @AssistedInject constructor(
sealed interface NavTarget : Parcelable {
@Parcelize
object Placeholder : NavTarget
data object Placeholder : NavTarget
@Parcelize
data object MigrationScreen : NavTarget
@Parcelize
object WelcomeScreen : NavTarget
data object WelcomeScreen : NavTarget
@Parcelize
object AnalyticsOptIn : NavTarget
data object AnalyticsOptIn : NavTarget
}
private val callback = plugins.filterIsInstance<FtueEntryPoint.Callback>().firstOrNull()

4
features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt
View file

@ -103,6 +103,6 @@ class DefaultFtueState @Inject constructor(
sealed interface FtueStep {
data object MigrationScreen : FtueStep
object WelcomeScreen : FtueStep
object AnalyticsOptIn : FtueStep
data object WelcomeScreen : FtueStep
data object AnalyticsOptIn : FtueStep
}