PIN: add callback on LockScreenEntryPoint
This commit is contained in:
parent
f105455bd6
commit
d59eaab7a8
4 changed files with 46 additions and 1 deletions
|
|
@ -145,7 +145,13 @@ class FtueFlowNode @AssistedInject constructor(
|
||||||
analyticsEntryPoint.createNode(this, buildContext)
|
analyticsEntryPoint.createNode(this, buildContext)
|
||||||
}
|
}
|
||||||
NavTarget.LockScreenSetup -> {
|
NavTarget.LockScreenSetup -> {
|
||||||
|
val callback = object : LockScreenEntryPoint.Callback {
|
||||||
|
override fun onSetupCompleted() {
|
||||||
|
lifecycleScope.launch { moveToNextStep() }
|
||||||
|
}
|
||||||
|
}
|
||||||
lockScreenEntryPoint.nodeBuilder(this, buildContext)
|
lockScreenEntryPoint.nodeBuilder(this, buildContext)
|
||||||
|
.callback(callback)
|
||||||
.target(LockScreenEntryPoint.Target.Setup)
|
.target(LockScreenEntryPoint.Target.Setup)
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ package io.element.android.features.lockscreen.api
|
||||||
|
|
||||||
import com.bumble.appyx.core.modality.BuildContext
|
import com.bumble.appyx.core.modality.BuildContext
|
||||||
import com.bumble.appyx.core.node.Node
|
import com.bumble.appyx.core.node.Node
|
||||||
|
import com.bumble.appyx.core.plugin.Plugin
|
||||||
import io.element.android.libraries.architecture.FeatureEntryPoint
|
import io.element.android.libraries.architecture.FeatureEntryPoint
|
||||||
|
|
||||||
interface LockScreenEntryPoint : FeatureEntryPoint {
|
interface LockScreenEntryPoint : FeatureEntryPoint {
|
||||||
|
|
@ -25,10 +26,15 @@ interface LockScreenEntryPoint : FeatureEntryPoint {
|
||||||
fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
|
fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
|
||||||
|
|
||||||
interface NodeBuilder {
|
interface NodeBuilder {
|
||||||
|
fun callback(callback: Callback): NodeBuilder
|
||||||
fun target(target: Target): NodeBuilder
|
fun target(target: Target): NodeBuilder
|
||||||
fun build(): Node
|
fun build(): Node
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface Callback: Plugin {
|
||||||
|
fun onSetupCompleted()
|
||||||
|
}
|
||||||
|
|
||||||
enum class Target {
|
enum class Target {
|
||||||
Settings,
|
Settings,
|
||||||
Setup,
|
Setup,
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,15 @@ class DefaultLockScreenEntryPoint @Inject constructor() : LockScreenEntryPoint {
|
||||||
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LockScreenEntryPoint.NodeBuilder {
|
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LockScreenEntryPoint.NodeBuilder {
|
||||||
|
|
||||||
var innerTarget: LockScreenEntryPoint.Target = LockScreenEntryPoint.Target.Unlock
|
var innerTarget: LockScreenEntryPoint.Target = LockScreenEntryPoint.Target.Unlock
|
||||||
|
val callbacks = mutableListOf<LockScreenEntryPoint.Callback>()
|
||||||
|
|
||||||
return object : LockScreenEntryPoint.NodeBuilder {
|
return object : LockScreenEntryPoint.NodeBuilder {
|
||||||
|
|
||||||
|
override fun callback(callback: LockScreenEntryPoint.Callback): LockScreenEntryPoint.NodeBuilder {
|
||||||
|
callbacks += callback
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
override fun target(target: LockScreenEntryPoint.Target): LockScreenEntryPoint.NodeBuilder {
|
override fun target(target: LockScreenEntryPoint.Target): LockScreenEntryPoint.NodeBuilder {
|
||||||
innerTarget = target
|
innerTarget = target
|
||||||
return this
|
return this
|
||||||
|
|
@ -45,7 +52,8 @@ class DefaultLockScreenEntryPoint @Inject constructor() : LockScreenEntryPoint {
|
||||||
LockScreenEntryPoint.Target.Settings -> LockScreenFlowNode.NavTarget.Settings
|
LockScreenEntryPoint.Target.Settings -> LockScreenFlowNode.NavTarget.Settings
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return parentNode.createNode<LockScreenFlowNode>(buildContext, listOf(inputs))
|
val plugins = listOf(inputs) + callbacks
|
||||||
|
return parentNode.createNode<LockScreenFlowNode>(buildContext, plugins)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,13 +20,17 @@ import android.os.Parcelable
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import com.bumble.appyx.core.composable.Children
|
import com.bumble.appyx.core.composable.Children
|
||||||
|
import com.bumble.appyx.core.lifecycle.subscribe
|
||||||
import com.bumble.appyx.core.modality.BuildContext
|
import com.bumble.appyx.core.modality.BuildContext
|
||||||
import com.bumble.appyx.core.node.Node
|
import com.bumble.appyx.core.node.Node
|
||||||
import com.bumble.appyx.core.plugin.Plugin
|
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.BackStack
|
||||||
import dagger.assisted.Assisted
|
import dagger.assisted.Assisted
|
||||||
import dagger.assisted.AssistedInject
|
import dagger.assisted.AssistedInject
|
||||||
import io.element.android.anvilannotations.ContributesNode
|
import io.element.android.anvilannotations.ContributesNode
|
||||||
|
import io.element.android.features.lockscreen.api.LockScreenEntryPoint
|
||||||
|
import io.element.android.features.lockscreen.impl.pin.PinCodeManager
|
||||||
import io.element.android.features.lockscreen.impl.settings.LockScreenSettingsFlowNode
|
import io.element.android.features.lockscreen.impl.settings.LockScreenSettingsFlowNode
|
||||||
import io.element.android.features.lockscreen.impl.setup.SetupPinNode
|
import io.element.android.features.lockscreen.impl.setup.SetupPinNode
|
||||||
import io.element.android.features.lockscreen.impl.unlock.PinUnlockNode
|
import io.element.android.features.lockscreen.impl.unlock.PinUnlockNode
|
||||||
|
|
@ -41,6 +45,7 @@ import kotlinx.parcelize.Parcelize
|
||||||
class LockScreenFlowNode @AssistedInject constructor(
|
class LockScreenFlowNode @AssistedInject constructor(
|
||||||
@Assisted buildContext: BuildContext,
|
@Assisted buildContext: BuildContext,
|
||||||
@Assisted plugins: List<Plugin>,
|
@Assisted plugins: List<Plugin>,
|
||||||
|
private val pinCodeManager: PinCodeManager,
|
||||||
) : BackstackNode<LockScreenFlowNode.NavTarget>(
|
) : BackstackNode<LockScreenFlowNode.NavTarget>(
|
||||||
backstack = BackStack(
|
backstack = BackStack(
|
||||||
initialElement = plugins.filterIsInstance(Inputs::class.java).first().initialNavTarget,
|
initialElement = plugins.filterIsInstance(Inputs::class.java).first().initialNavTarget,
|
||||||
|
|
@ -65,6 +70,26 @@ class LockScreenFlowNode @AssistedInject constructor(
|
||||||
data object Settings : NavTarget
|
data object Settings : NavTarget
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val pinCodeManagerCallback = object : PinCodeManager.Callback {
|
||||||
|
override fun onPinCodeCreated() {
|
||||||
|
plugins<LockScreenEntryPoint.Callback>().forEach {
|
||||||
|
it.onSetupCompleted()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBuilt() {
|
||||||
|
super.onBuilt()
|
||||||
|
lifecycle.subscribe(
|
||||||
|
onCreate = {
|
||||||
|
pinCodeManager.addCallback(pinCodeManagerCallback)
|
||||||
|
},
|
||||||
|
onDestroy = {
|
||||||
|
pinCodeManager.removeCallback(pinCodeManagerCallback)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
|
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
|
||||||
return when (navTarget) {
|
return when (navTarget) {
|
||||||
NavTarget.Unlock -> {
|
NavTarget.Unlock -> {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue