Revert "DI: more cleanup"

This reverts commit ecf00f5629.

app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt

@@ -16,11 +16,13 @@
 
 package io.element.android.x.di
 
+import com.squareup.anvil.annotations.ContributesTo
 import com.squareup.anvil.annotations.MergeSubcomponent
 import dagger.BindsInstance
 import dagger.Subcomponent
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 
@@ -34,4 +36,9 @@ interface RoomComponent : NodeFactoriesBindings {
         fun room(room: MatrixRoom): Builder
         fun build(): RoomComponent
     }
+
+    @ContributesTo(SessionScope::class)
+    interface ParentBindings {
+        fun roomComponentBuilder(): Builder
+    }
 }

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

@@ -16,10 +16,12 @@
 
 package io.element.android.x.di
 
+import com.squareup.anvil.annotations.ContributesTo
 import com.squareup.anvil.annotations.MergeSubcomponent
 import dagger.BindsInstance
 import dagger.Subcomponent
 import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -34,4 +36,9 @@ interface SessionComponent : NodeFactoriesBindings {
         fun client(matrixClient: MatrixClient): Builder
         fun build(): SessionComponent
     }
+
+    @ContributesTo(AppScope::class)
+    interface ParentBindings {
+        fun sessionComponentBuilder(): Builder
+    }
 }