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

Merge pull request #549 from vector-im/feature/bma/onboardingServer

Browse source 
Onboarding iteration
This commit is contained in:
Benoit Marty 2023-06-13 09:21:50 +02:00 • committed by GitHub
commit ef7ddb8d0f
168 changed files with 3294 additions and 1406 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
View file

@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.api.verification.SessionVerificationS
import io.element.android.libraries.matrix.api.verification.VerificationFlowState
import io.element.android.libraries.ui.strings.R
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.drop
import kotlinx.coroutines.flow.launchIn
@ -31,7 +30,6 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.coroutines.coroutineContext
class LoggedInEventProcessor @Inject constructor(
private val snackbarDispatcher: SnackbarDispatcher,

14
appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
View file

@ -63,7 +63,9 @@ class NotLoggedInFlowNode @AssistedInject constructor(
object OnBoarding : NavTarget
@Parcelize
object LoginFlow : NavTarget
data class LoginFlow(
val isAccountCreation: Boolean,
) : NavTarget
}
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@ -71,11 +73,11 @@ class NotLoggedInFlowNode @AssistedInject constructor(
NavTarget.OnBoarding -> {
val callback = object : OnBoardingEntryPoint.Callback {
override fun onSignUp() {
//NOOP
backstack.push(NavTarget.LoginFlow(isAccountCreation = true))
}
override fun onSignIn() {
backstack.push(NavTarget.LoginFlow)
backstack.push(NavTarget.LoginFlow(isAccountCreation = false))
}
}
onBoardingEntryPoint
@ -83,8 +85,10 @@ class NotLoggedInFlowNode @AssistedInject constructor(
.callback(callback)
.build()
}
NavTarget.LoginFlow -> {
loginEntryPoint.createNode(this, buildContext)
is NavTarget.LoginFlow -> {
loginEntryPoint.nodeBuilder(this, buildContext)
.params(LoginEntryPoint.Params(isAccountCreation = navTarget.isAccountCreation))
.build()
}
}
}