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

Merge pull request #1166 from vector-im/feature/bma/cleanupInputs

Browse source 
Cleanup `LoggedInAppScopeFlowNode`
This commit is contained in:
Benoit Marty 2023-08-29 12:04:31 +02:00 • committed by GitHub
commit 4d35568600
2 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/kotlin/io/element/android/x/MainNode.kt
View file

@ -28,8 +28,8 @@ import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.Plugin
import io.element.android.appnav.LoggedInAppScopeFlowNode import io.element.android.appnav.LoggedInAppScopeFlowNode
import io.element.android.appnav.room.RoomLoadedFlowNode
import io.element.android.appnav.RootFlowNode import io.element.android.appnav.RootFlowNode
import io.element.android.appnav.room.RoomLoadedFlowNode
import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
@ -45,15 +45,14 @@ class MainNode(
buildContext: BuildContext, buildContext: BuildContext,
private val mainDaggerComponentOwner: MainDaggerComponentsOwner, private val mainDaggerComponentOwner: MainDaggerComponentsOwner,
plugins: List<Plugin>, plugins: List<Plugin>,
) : ) : ParentNode<MainNode.RootNavTarget>(
ParentNode<MainNode.RootNavTarget>( navModel = PermanentNavModel(
navModel = PermanentNavModel( navTargets = setOf(RootNavTarget),
navTargets = setOf(RootNavTarget), savedStateMap = buildContext.savedStateMap,
savedStateMap = buildContext.savedStateMap,
),
buildContext = buildContext,
plugins = plugins,
), ),
buildContext = buildContext,
plugins = plugins,
),
DaggerComponentOwner by mainDaggerComponentOwner { DaggerComponentOwner by mainDaggerComponentOwner {
private val loggedInFlowNodeCallback = object : LoggedInAppScopeFlowNode.LifecycleCallback { private val loggedInFlowNodeCallback = object : LoggedInAppScopeFlowNode.LifecycleCallback {

38
appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
View file

@ -23,16 +23,15 @@ import coil.Coil
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.lifecycle.subscribe
import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.navigation.model.permanent.PermanentNavModel
import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.node.ParentNode
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.core.plugin.plugins
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.libraries.architecture.BackstackNode
import io.element.android.libraries.architecture.NodeInputs import io.element.android.libraries.architecture.NodeInputs
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.libraries.architecture.inputs import io.element.android.libraries.architecture.inputs
@ -51,9 +50,9 @@ import kotlinx.parcelize.Parcelize
class LoggedInAppScopeFlowNode @AssistedInject constructor( class LoggedInAppScopeFlowNode @AssistedInject constructor(
@Assisted buildContext: BuildContext, @Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>, @Assisted plugins: List<Plugin>,
) : BackstackNode<LoggedInAppScopeFlowNode.NavTarget>( ) : ParentNode<LoggedInAppScopeFlowNode.NavTarget>(
backstack = BackStack( navModel = PermanentNavModel(
initialElement = NavTarget.Root, navTargets = setOf(NavTarget),
savedStateMap = buildContext.savedStateMap, savedStateMap = buildContext.savedStateMap,
), ),
buildContext = buildContext, buildContext = buildContext,
@ -63,10 +62,8 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
fun onOpenBugReport() fun onOpenBugReport()
} }
sealed interface NavTarget : Parcelable { @Parcelize
@Parcelize object NavTarget : Parcelable
data object Root : NavTarget
}
interface LifecycleCallback : NodeLifecycleCallback { interface LifecycleCallback : NodeLifecycleCallback {
fun onFlowCreated(identifier: String, client: MatrixClient) fun onFlowCreated(identifier: String, client: MatrixClient)
@ -95,31 +92,24 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
} }
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
return when (navTarget) { val callback = object : LoggedInFlowNode.Callback {
NavTarget.Root -> { override fun onOpenBugReport() {
val callback = object : LoggedInFlowNode.Callback { plugins<Callback>().forEach { it.onOpenBugReport() }
override fun onOpenBugReport() {
plugins<Callback>().forEach { it.onOpenBugReport() }
}
}
val nodeLifecycleCallbacks = plugins<NodeLifecycleCallback>()
createNode<LoggedInFlowNode>(buildContext, nodeLifecycleCallbacks + callback)
} }
} }
val nodeLifecycleCallbacks = plugins<NodeLifecycleCallback>()
return createNode<LoggedInFlowNode>(buildContext, nodeLifecycleCallbacks + callback)
} }
suspend fun attachSession(): LoggedInFlowNode { suspend fun attachSession(): LoggedInFlowNode {
return waitForChildAttached { navTarget -> return waitForChildAttached { _ -> true }
navTarget is NavTarget.Root
}
} }
@Composable @Composable
override fun View(modifier: Modifier) { override fun View(modifier: Modifier) {
Children( Children(
navModel = backstack, navModel = navModel,
modifier = modifier, modifier = modifier,
transitionHandler = rememberDefaultTransitionHandler(),
) )
} }
} }