RoomList: setup dagger for node (remove fragment bindings)

app/src/main/java/io/element/android/x/MainActivity.kt

@@ -22,10 +22,7 @@ import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.di.AppBindings
 import io.element.android.x.node.RootFlowNode
 
-class MainActivity : NodeComponentActivity(), DaggerComponentOwner {
-
-    override val daggerComponent: Any
-        get() = listOfNotNull((applicationContext as? DaggerComponentOwner)?.daggerComponent)
+class MainActivity : NodeComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -41,7 +38,7 @@ class MainActivity : NodeComponentActivity(), DaggerComponentOwner {
                     NodeHost(integrationPoint = appyxIntegrationPoint) {
                         RootFlowNode(
                             buildContext = it,
-                            appComponentOwner = this,
+                            appComponentOwner = applicationContext as DaggerComponentOwner,
                             matrix = appBindings.matrix(),
                             sessionComponentsOwner = appBindings.sessionComponentsOwner()
                         )

app/src/main/java/io/element/android/x/di/AppComponent.kt

@@ -8,10 +8,10 @@ import io.element.android.x.core.di.DaggerMavericksBindings
 
 @SingleIn(AppScope::class)
 @MergeComponent(AppScope::class)
-interface AppComponent: DaggerMavericksBindings {
+interface AppComponent : DaggerMavericksBindings {
 
     @Component.Factory
     interface Factory {
         fun create(@ApplicationContext @BindsInstance context: Context): AppComponent
     }
-}
+}

app/src/main/java/io/element/android/x/di/SessionComponent.kt

@@ -5,11 +5,12 @@ import com.squareup.anvil.annotations.MergeSubcomponent
 import dagger.BindsInstance
 import dagger.Subcomponent
 import io.element.android.x.core.di.DaggerMavericksBindings
+import io.element.android.x.core.di.NodeFactoriesBindings
 import io.element.android.x.matrix.MatrixClient
 
 @SingleIn(SessionScope::class)
 @MergeSubcomponent(SessionScope::class)
-interface SessionComponent: DaggerMavericksBindings {
+interface SessionComponent: DaggerMavericksBindings, NodeFactoriesBindings {
 
     fun matrixClient(): MatrixClient
 

app/src/main/java/io/element/android/x/node/LoggedInFlowNode.kt

@@ -4,27 +4,23 @@ import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 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.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
+import io.element.android.x.core.di.createNode
 import io.element.android.x.core.di.viewModelSupportNode
 import io.element.android.x.features.messages.MessagesScreen
 import io.element.android.x.features.roomlist.RoomListNode
-import io.element.android.x.features.roomlist.RoomListPresenter
-import io.element.android.x.matrix.MatrixClient
 import io.element.android.x.matrix.core.RoomId
 import io.element.android.x.matrix.core.SessionId
 import kotlinx.parcelize.Parcelize
-import timber.log.Timber
 
 class LoggedInFlowNode(
     buildContext: BuildContext,
     val sessionId: SessionId,
-    private val matrixClient: MatrixClient,
     private val backstack: BackStack<NavTarget> = BackStack(
         initialElement = NavTarget.RoomList,
         savedStateMap = buildContext.savedStateMap,
@@ -34,11 +30,10 @@ class LoggedInFlowNode(
     buildContext = buildContext
 ) {
 
-    init {
-        lifecycle.subscribe(
-            onCreate = { Timber.v("OnCreate") },
-            onDestroy = { Timber.v("OnDestroy") }
-        )
+    private val roomListCallback = object : RoomListNode.Callback {
+        override fun onRoomClicked(roomId: RoomId) {
+            backstack.push(NavTarget.Messages(roomId))
+        }
     }
 
     sealed interface NavTarget : Parcelable {
@@ -51,12 +46,9 @@ class LoggedInFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            NavTarget.RoomList -> RoomListNode(
-                buildContext = buildContext,
-                presenter = RoomListPresenter(matrixClient),
-                onRoomClicked = {
-                    backstack.push(NavTarget.Messages(it))
-                })
+            NavTarget.RoomList -> {
+                createNode<RoomListNode>(buildContext, plugins = listOf(roomListCallback))
+            }
             is NavTarget.Messages -> viewModelSupportNode(buildContext) {
                 MessagesScreen(
                     roomId = navTarget.roomId.value,

app/src/main/java/io/element/android/x/node/RootFlowNode.kt

@@ -135,8 +135,7 @@ class RootFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             is NavTarget.LoggedInFlow -> {
-                val matrixClient = sessionComponentsOwner.activeSessionComponent!!.matrixClient()
-                LoggedInFlowNode(buildContext, navTarget.sessionId, matrixClient)
+                LoggedInFlowNode(buildContext, navTarget.sessionId)
             }
             NavTarget.NotLoggedInFlow -> NotLoggedInFlowNode(buildContext)
             NavTarget.SplashScreen -> node(buildContext) {