Rename di module

This commit is contained in:
ganfra 2023-01-20 17:12:40 +01:00
parent 7903e855ec
commit c6cfe2b5e2
34 changed files with 49 additions and 36 deletions

View file

@ -18,7 +18,7 @@ package io.element.android.x
import android.app.Application import android.app.Application
import androidx.startup.AppInitializer import androidx.startup.AppInitializer
import io.element.android.x.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
import io.element.android.x.di.AppComponent import io.element.android.x.di.AppComponent
import io.element.android.x.di.DaggerAppComponent import io.element.android.x.di.DaggerAppComponent
import io.element.android.x.initializer.CrashInitializer import io.element.android.x.initializer.CrashInitializer

View file

@ -26,7 +26,7 @@ import androidx.core.view.WindowCompat
import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integration.NodeHost
import com.bumble.appyx.core.integrationpoint.NodeComponentActivity import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.x.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
import io.element.android.libraries.designsystem.ElementXTheme import io.element.android.libraries.designsystem.ElementXTheme
import io.element.android.x.di.AppBindings import io.element.android.x.di.AppBindings
import io.element.android.x.node.RootFlowNode import io.element.android.x.node.RootFlowNode

View file

@ -17,6 +17,7 @@
package io.element.android.x.di package io.element.android.x.di
import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.ContributesTo
import io.element.android.libraries.di.AppScope
import io.element.android.x.matrix.auth.MatrixAuthenticationService import io.element.android.x.matrix.auth.MatrixAuthenticationService
import io.element.android.x.root.RootPresenter import io.element.android.x.root.RootPresenter
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

View file

@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeComponent
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import io.element.android.libraries.architecture.NodeFactoriesBindings import io.element.android.libraries.architecture.NodeFactoriesBindings
import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.di.SingleIn
@SingleIn(AppScope::class) @SingleIn(AppScope::class)
@MergeComponent(AppScope::class) @MergeComponent(AppScope::class)

View file

@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.ContributesTo
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.di.SingleIn
import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers

View file

@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeSubcomponent
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Subcomponent import dagger.Subcomponent
import io.element.android.libraries.architecture.NodeFactoriesBindings 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.x.matrix.room.MatrixRoom import io.element.android.x.matrix.room.MatrixRoom
@SingleIn(RoomScope::class) @SingleIn(RoomScope::class)

View file

@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeSubcomponent
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Subcomponent import dagger.Subcomponent
import io.element.android.libraries.architecture.NodeFactoriesBindings 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.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
@SingleIn(SessionScope::class) @SingleIn(SessionScope::class)

View file

@ -34,7 +34,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack
import com.bumble.appyx.navmodel.backstack.operation.push import com.bumble.appyx.navmodel.backstack.operation.push
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.x.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
import io.element.android.x.di.SessionComponent import io.element.android.x.di.SessionComponent
import io.element.android.x.features.preferences.PreferencesFlowNode import io.element.android.x.features.preferences.PreferencesFlowNode
import io.element.android.x.features.roomlist.RoomListNode import io.element.android.x.features.roomlist.RoomListNode

View file

@ -27,7 +27,7 @@ import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.BackStack
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.x.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
import io.element.android.x.di.RoomComponent import io.element.android.x.di.RoomComponent
import io.element.android.x.features.messages.MessagesNode import io.element.android.x.features.messages.MessagesNode
import io.element.android.x.matrix.room.MatrixRoom import io.element.android.x.matrix.room.MatrixRoom

View file

@ -38,7 +38,7 @@ import com.bumble.appyx.navmodel.backstack.operation.pop
import com.bumble.appyx.navmodel.backstack.operation.push import com.bumble.appyx.navmodel.backstack.operation.push
import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
import io.element.android.x.features.rageshake.bugreport.BugReportNode import io.element.android.x.features.rageshake.bugreport.BugReportNode
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import io.element.android.x.matrix.auth.MatrixAuthenticationService import io.element.android.x.matrix.auth.MatrixAuthenticationService

View file

@ -27,7 +27,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
@ContributesNode(AppScope::class) @ContributesNode(AppScope::class)
class ChangeServerNode @AssistedInject constructor( class ChangeServerNode @AssistedInject constructor(

View file

@ -30,7 +30,7 @@ import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.core.compose.OnLifecycleEvent import io.element.android.libraries.core.compose.OnLifecycleEvent
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
@ContributesNode(AppScope::class) @ContributesNode(AppScope::class)
class LoginRootNode @AssistedInject constructor( class LoginRootNode @AssistedInject constructor(

View file

@ -27,7 +27,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.RoomScope import io.element.android.libraries.di.RoomScope
@ContributesNode(RoomScope::class) @ContributesNode(RoomScope::class)
class MessagesNode @AssistedInject constructor( class MessagesNode @AssistedInject constructor(

View file

@ -28,7 +28,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.SessionScope import io.element.android.libraries.di.SessionScope
@ContributesNode(SessionScope::class) @ContributesNode(SessionScope::class)
class PreferencesRootNode @AssistedInject constructor( class PreferencesRootNode @AssistedInject constructor(

View file

@ -28,7 +28,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
@ContributesNode(AppScope::class) @ContributesNode(AppScope::class)
class BugReportNode @AssistedInject constructor( class BugReportNode @AssistedInject constructor(

View file

@ -24,7 +24,7 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore import androidx.datastore.preferences.preferencesDataStore
import io.element.android.libraries.core.bool.orFalse import io.element.android.libraries.core.bool.orFalse
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map

View file

@ -21,9 +21,9 @@ import android.hardware.Sensor
import android.hardware.SensorManager import android.hardware.SensorManager
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import com.squareup.seismic.ShakeDetector import com.squareup.seismic.ShakeDetector
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.x.di.SingleIn import io.element.android.libraries.di.SingleIn
import javax.inject.Inject import javax.inject.Inject
@SingleIn(AppScope::class) @SingleIn(AppScope::class)

View file

@ -24,7 +24,7 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.core.floatPreferencesKey
import androidx.datastore.preferences.preferencesDataStore import androidx.datastore.preferences.preferencesDataStore
import io.element.android.libraries.core.bool.orTrue import io.element.android.libraries.core.bool.orTrue
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map

View file

@ -21,7 +21,7 @@ import android.os.Build
import io.element.android.libraries.core.extensions.toOnOff import io.element.android.libraries.core.extensions.toOnOff
import io.element.android.libraries.core.file.compressFile import io.element.android.libraries.core.file.compressFile
import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.x.features.rageshake.R import io.element.android.x.features.rageshake.R
import io.element.android.x.features.rageshake.crash.CrashDataStore import io.element.android.x.features.rageshake.crash.CrashDataStore
import io.element.android.x.features.rageshake.logs.VectorFileLogger import io.element.android.x.features.rageshake.logs.VectorFileLogger

View file

@ -19,9 +19,9 @@ package io.element.android.x.features.rageshake.screenshot
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
import io.element.android.libraries.core.bitmap.writeBitmap import io.element.android.libraries.core.bitmap.writeBitmap
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.x.di.SingleIn import io.element.android.libraries.di.SingleIn
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject

View file

@ -28,7 +28,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.SessionScope import io.element.android.libraries.di.SessionScope
import io.element.android.x.matrix.core.RoomId import io.element.android.x.matrix.core.RoomId
@ContributesNode(SessionScope::class) @ContributesNode(SessionScope::class)

View file

@ -27,7 +27,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.anvilannotations.ContributesNode
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
// TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope
@ContributesNode(AppScope::class) @ContributesNode(AppScope::class)

View file

@ -19,7 +19,7 @@ package io.element.android.libraries.architecture
import android.content.Context import android.content.Context
import android.content.ContextWrapper import android.content.ContextWrapper
import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.Node
import io.element.android.x.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
inline fun <reified T : Any> Node.bindings() = bindings(T::class.java) inline fun <reified T : Any> Node.bindings() = bindings(T::class.java)
inline fun <reified T : Any> Context.bindings() = bindings(T::class.java) inline fun <reified T : Any> Context.bindings() = bindings(T::class.java)

View file

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.di package io.element.android.libraries.di
abstract class AppScope private constructor() abstract class AppScope private constructor()

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.di package io.element.android.libraries.di
import javax.inject.Qualifier import javax.inject.Qualifier

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.di package io.element.android.libraries.di
/** /**
* A [DaggerComponentOwner] is anything that "owns" a Dagger Component. * A [DaggerComponentOwner] is anything that "owns" a Dagger Component.

View file

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.di package io.element.android.libraries.di
abstract class RoomScope private constructor() abstract class RoomScope private constructor()

View file

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.di package io.element.android.libraries.di
abstract class SessionScope private constructor() abstract class SessionScope private constructor()

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.di package io.element.android.libraries.di
import javax.inject.Scope import javax.inject.Scope
import kotlin.reflect.KClass import kotlin.reflect.KClass

View file

@ -18,7 +18,7 @@ package io.element.android.x.matrix.auth
import com.squareup.anvil.annotations.ContributesBinding import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import io.element.android.x.matrix.RustMatrixClient import io.element.android.x.matrix.RustMatrixClient
import io.element.android.x.matrix.core.SessionId import io.element.android.x.matrix.core.SessionId

View file

@ -19,8 +19,8 @@ package io.element.android.x.matrix.di
import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.ContributesTo
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.x.di.SingleIn import io.element.android.libraries.di.SingleIn
import org.matrix.rustcomponents.sdk.AuthenticationService import org.matrix.rustcomponents.sdk.AuthenticationService
import java.io.File import java.io.File

View file

@ -23,9 +23,9 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore import androidx.datastore.preferences.preferencesDataStore
import com.squareup.anvil.annotations.ContributesBinding import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.x.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.x.di.SingleIn import io.element.android.libraries.di.SingleIn
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map

View file

@ -17,7 +17,7 @@
package io.element.android.x.matrix.ui.di package io.element.android.x.matrix.ui.di
import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.ContributesTo
import io.element.android.x.di.SessionScope import io.element.android.libraries.di.SessionScope
import io.element.android.x.matrix.ui.media.LoggedInImageLoaderFactory import io.element.android.x.matrix.ui.media.LoggedInImageLoaderFactory
import io.element.android.x.matrix.ui.media.NotLoggedInImageLoaderFactory import io.element.android.x.matrix.ui.media.NotLoggedInImageLoaderFactory

View file

@ -19,7 +19,7 @@ package io.element.android.x.matrix.ui.media
import android.content.Context import android.content.Context
import coil.ImageLoader import coil.ImageLoader
import coil.ImageLoaderFactory import coil.ImageLoaderFactory
import io.element.android.x.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import javax.inject.Inject import javax.inject.Inject