From 6abccc1ae79f5cbf2f3372ade274bb46a0695496 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 19 Sep 2023 18:07:20 +0200 Subject: [PATCH] Revert "DI: more cleanup" This reverts commit ecf00f56295a3b6e98efd5e9351853e0d64417a2. --- .../main/kotlin/io/element/android/x/di/RoomComponent.kt | 7 +++++++ .../kotlin/io/element/android/x/di/SessionComponent.kt | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index 13694b3dd3..68c700bdb8 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/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 + } } diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 4d1b7c342c..54e8c27498 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/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 + } }