Some cleanup:

jmartinesp · jmartinesp · commit 08bbe3fdaa7e · 2025-09-04T16:49:21.000+02:00
- Remove unnecessary `GlobalScope`.
- Rename `Component` to `Graph`, `DaggerComponentOwner` to `DependencyInjectionGraphOwner`.
- Rename component builders to factories, where necessary.
diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
@@ -9,17 +9,16 @@ package io.element.android.x
 
 import android.app.Application
 import androidx.startup.AppInitializer
-import dev.zacsweers.metro.asContribution
+import dev.zacsweers.metro.createGraphFactory
 import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
-import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.x.di.AppComponent
-import io.element.android.x.di.globalGraph
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
+import io.element.android.x.di.AppGraph
 import io.element.android.x.info.logApplicationInfo
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.PlatformInitializer
 
-class ElementXApplication : Application(), DaggerComponentOwner {
-    override val daggerComponent: AppComponent = globalGraph.asContribution<AppComponent.Factory>().create(this)
+class ElementXApplication : Application(), DependencyInjectionGraphOwner {
+    override val graph: AppGraph = createGraphFactory<AppGraph.Factory>().create(this)
 
     override fun onCreate() {
         super.onCreate()
diff --git a/app/src/main/kotlin/io/element/android/x/MainNode.kt b/app/src/main/kotlin/io/element/android/x/MainNode.kt
@@ -21,7 +21,7 @@ import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.appnav.RootFlowNode
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.annotations.ApplicationContext
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
@@ -38,8 +38,8 @@ class MainNode(
     buildContext = buildContext,
     plugins = plugins,
 ),
-    DaggerComponentOwner {
-    override val daggerComponent = (context as DaggerComponentOwner).daggerComponent
+    DependencyInjectionGraphOwner {
+    override val graph = (context as DependencyInjectionGraphOwner).graph
 
     override fun resolve(navTarget: RootNavTarget, buildContext: BuildContext): Node {
         return createNode<RootFlowNode>(buildContext = buildContext)
diff --git a/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt b/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt
@@ -9,22 +9,20 @@ package io.element.android.x.di
 
 import android.content.Context
 import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesTo
-import dev.zacsweers.metro.GraphExtension
+import dev.zacsweers.metro.DependencyGraph
 import dev.zacsweers.metro.Provides
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.libraries.di.annotations.ApplicationContext
 
-@GraphExtension(AppScope::class)
-interface AppComponent : NodeFactoriesBindings {
-    val sessionComponentFactory: SessionComponent.Factory
+@DependencyGraph(AppScope::class)
+interface AppGraph : NodeFactoriesBindings {
+    val sessionGraphFactory: SessionGraph.Factory
 
-    @ContributesTo(GlobalScope::class)
-    @GraphExtension.Factory
+    @DependencyGraph.Factory
     interface Factory {
         fun create(
             @ApplicationContext @Provides
             context: Context
-        ): AppComponent
+        ): AppGraph
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt
@@ -16,10 +16,10 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 @ContributesBinding(SessionScope::class)
 @Inject
 class DefaultRoomComponentFactory(
-    private val sessionComponent: SessionComponent,
+    private val sessionGraph: SessionGraph,
 ) : RoomComponentFactory {
     override fun create(room: JoinedRoom): Any {
-        return sessionComponent.roomComponentFactory
+        return sessionGraph.roomGraphFactory
             .create(room, room)
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt
@@ -10,15 +10,15 @@ package io.element.android.x.di
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
-import io.element.android.appnav.di.SessionComponentFactory
+import io.element.android.appnav.di.SessionGraphFactory
 import io.element.android.libraries.matrix.api.MatrixClient
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultSessionComponentFactory(
-    private val appComponent: AppComponent
-) : SessionComponentFactory {
+class DefaultSessionGraphFactory(
+    private val appGraph: AppGraph
+) : SessionGraphFactory {
     override fun create(client: MatrixClient): Any {
-        return appComponent.sessionComponentFactory.createSessionComponent(client)
+        return appGraph.sessionGraphFactory.create(client)
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/GlobalGraph.kt b/app/src/main/kotlin/io/element/android/x/di/GlobalGraph.kt
diff --git a/app/src/main/kotlin/io/element/android/x/di/GlobalScope.kt b/app/src/main/kotlin/io/element/android/x/di/GlobalScope.kt
diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt b/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
@@ -17,13 +17,13 @@ import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @GraphExtension(RoomScope::class)
-interface RoomComponent : NodeFactoriesBindings {
+interface RoomGraph : NodeFactoriesBindings {
     @ContributesTo(SessionScope::class)
     @GraphExtension.Factory
     interface Factory {
         fun create(
             @Provides joinedRoom: JoinedRoom,
             @Provides baseRoom: BaseRoom
-        ): RoomComponent
+        ): RoomGraph
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt b/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt
@@ -16,12 +16,12 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 
 @GraphExtension(SessionScope::class)
-interface SessionComponent : NodeFactoriesBindings {
-    val roomComponentFactory: RoomComponent.Factory
+interface SessionGraph : NodeFactoriesBindings {
+    val roomGraphFactory: RoomGraph.Factory
 
     @ContributesTo(AppScope::class)
     @GraphExtension.Factory
     interface Factory {
-        fun createSessionComponent(@Provides matrixClient: MatrixClient): SessionComponent
+        fun create(@Provides matrixClient: MatrixClient): SessionGraph
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
@@ -26,11 +26,11 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.appnav.di.SessionComponentFactory
+import io.element.android.appnav.di.SessionGraphFactory
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import kotlinx.parcelize.Parcelize
@@ -45,7 +45,7 @@ import kotlinx.parcelize.Parcelize
 class LoggedInAppScopeFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    sessionComponentFactory: SessionComponentFactory,
+    sessionGraphFactory: SessionGraphFactory,
     private val imageLoaderHolder: ImageLoaderHolder,
 ) : ParentNode<LoggedInAppScopeFlowNode.NavTarget>(
     navModel = PermanentNavModel(
@@ -54,7 +54,7 @@ class LoggedInAppScopeFlowNode(
     ),
     buildContext = buildContext,
     plugins = plugins
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
         fun onOpenBugReport()
     }
@@ -67,7 +67,7 @@ class LoggedInAppScopeFlowNode(
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    override val daggerComponent = sessionComponentFactory.create(inputs.matrixClient)
+    override val graph = sessionGraphFactory.create(inputs.matrixClient)
 
     override fun onBuilt() {
         super.onBuilt()
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt
@@ -9,6 +9,6 @@ package io.element.android.appnav.di
 
 import io.element.android.libraries.matrix.api.MatrixClient
 
-interface SessionComponentFactory {
+interface SessionGraphFactory {
     fun create(client: MatrixClient): Any
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -68,7 +68,7 @@ class JoinedRoomLoadedFlowNode(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
         fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
         fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
@@ -83,7 +83,7 @@ class JoinedRoomLoadedFlowNode(
 
     private val inputs: Inputs = inputs()
     private val callbacks = plugins.filterIsInstance<Callback>()
-    override val daggerComponent = roomComponentFactory.create(inputs.room)
+    override val graph = roomComponentFactory.create(inputs.room)
 
     init {
         lifecycle.subscribe(
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt b/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt
@@ -25,7 +25,7 @@ import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRole
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -44,7 +44,7 @@ class ChangeRoomMemberRolesRootNode(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner, ChangeRoomMemberRolesEntryPoint.NodeProxy {
+), DependencyInjectionGraphOwner, ChangeRoomMemberRolesEntryPoint.NodeProxy {
     sealed interface NavTarget : Parcelable {
         @Parcelize
         object Root : NavTarget
@@ -57,7 +57,7 @@ class ChangeRoomMemberRolesRootNode(
 
     private val inputs = inputs<Inputs>()
 
-    override val daggerComponent = roomComponentFactory.create(inputs.joinedRoom)
+    override val graph = roomComponentFactory.create(inputs.joinedRoom)
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt
@@ -13,10 +13,10 @@ import dev.zacsweers.metro.GraphExtension
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 
 @GraphExtension(QrCodeLoginScope::class)
-interface QrCodeLoginComponent : NodeFactoriesBindings {
+interface QrCodeLoginGraph : NodeFactoriesBindings {
     @ContributesTo(AppScope::class)
     @GraphExtension.Factory
     interface Factory {
-        fun create(): QrCodeLoginComponent
+        fun create(): QrCodeLoginGraph
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt
@@ -26,7 +26,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.login.impl.di.QrCodeLoginBindings
-import io.element.android.features.login.impl.di.QrCodeLoginComponent
+import io.element.android.features.login.impl.di.QrCodeLoginGraph
 import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationNode
 import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationStep
 import io.element.android.features.login.impl.screens.qrcode.error.QrCodeErrorNode
@@ -38,7 +38,7 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrLoginException
@@ -53,7 +53,7 @@ import timber.log.Timber
 class QrCodeLoginFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    qrCodeLoginComponentBuilder: QrCodeLoginComponent.Factory,
+    qrCodeLoginGraphFactory: QrCodeLoginGraph.Factory,
     private val coroutineDispatchers: CoroutineDispatchers,
 ) : BaseFlowNode<QrCodeLoginFlowNode.NavTarget>(
     backstack = BackStack(
@@ -62,10 +62,10 @@ class QrCodeLoginFlowNode(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
     private var authenticationJob: Job? = null
 
-    override val daggerComponent = qrCodeLoginComponentBuilder.create()
+    override val graph = qrCodeLoginGraphFactory.create()
     private val qrCodeLoginManager by lazy { bindings<QrCodeLoginBindings>().qrCodeLoginManager() }
 
     sealed interface NavTarget : Parcelable {
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeMergedQrCodeLoginComponent.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeMergedQrCodeLoginComponent.kt
@@ -1,40 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.di
-
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
-import io.element.android.features.login.impl.qrcode.FakeQrCodeLoginManager
-import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode
-import io.element.android.features.login.impl.qrcode.QrCodeLoginManager
-import io.element.android.libraries.architecture.AssistedNodeFactory
-import io.element.android.libraries.architecture.createNode
-
-internal class FakeMergedQrCodeLoginComponent(private val qrCodeLoginManager: QrCodeLoginManager) :
-    MergedQrCodeLoginComponent {
-    // Ignore this error, it does override a method once code generation is done
-    override fun qrCodeLoginManager(): QrCodeLoginManager = qrCodeLoginManager
-
-    class Builder(private val qrCodeLoginManager: QrCodeLoginManager = FakeQrCodeLoginManager()) :
-        QrCodeLoginComponent.Factory {
-        override fun create(): QrCodeLoginComponent {
-            return FakeMergedQrCodeLoginComponent(qrCodeLoginManager)
-        }
-    }
-
-    override fun nodeFactories(): Map<Class<out Node>, AssistedNodeFactory<*>> {
-        return mapOf(
-            QrCodeLoginFlowNode::class.java to object : AssistedNodeFactory<QrCodeLoginFlowNode> {
-                override fun create(buildContext: BuildContext, plugins: List<Plugin>): QrCodeLoginFlowNode {
-                    return createNode<QrCodeLoginFlowNode>(buildContext, plugins)
-                }
-            }
-        )
-    }
-}
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/DependencyInjectionGraphOwner.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DependencyInjectionGraphOwner.kt

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom`
`16`	`16`	`@ContributesBinding(SessionScope::class)`
`17`	`17`	`@Inject`
`18`	`18`	`class DefaultRoomComponentFactory(`
`19`		`- private val sessionComponent: SessionComponent,`
	`19`	`+ private val sessionGraph: SessionGraph,`
`20`	`20`	`) : RoomComponentFactory {`
`21`	`21`	`override fun create(room: JoinedRoom): Any {`
`22`		`- return sessionComponent.roomComponentFactory`
	`22`	`+ return sessionGraph.roomGraphFactory`
`23`	`23`	`.create(room, room)`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ import io.element.android.libraries.di.SessionScope`
`16`	`16`	`import io.element.android.libraries.matrix.api.MatrixClient`
`17`	`17`
`18`	`18`	`@GraphExtension(SessionScope::class)`
`19`		`-interface SessionComponent : NodeFactoriesBindings {`
`20`		`- val roomComponentFactory: RoomComponent.Factory`
	`19`	`+interface SessionGraph : NodeFactoriesBindings {`
	`20`	`+ val roomGraphFactory: RoomGraph.Factory`
`21`	`21`
`22`	`22`	`@ContributesTo(AppScope::class)`
`23`	`23`	`@GraphExtension.Factory`
`24`	`24`	`interface Factory {`
`25`		`- fun createSessionComponent(@Provides matrixClient: MatrixClient): SessionComponent`
	`25`	`+ fun create(@Provides matrixClient: MatrixClient): SessionGraph`
`26`	`26`	`}`
`27`	`27`	`}`