From c6cfe2b5e2f770ab54f0aa3895e214f7f15222ad Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:12:40 +0100 Subject: [PATCH] Rename di module --- .../main/kotlin/io/element/android/x/ElementXApplication.kt | 2 +- app/src/main/kotlin/io/element/android/x/MainActivity.kt | 2 +- app/src/main/kotlin/io/element/android/x/di/AppBindings.kt | 1 + app/src/main/kotlin/io/element/android/x/di/AppComponent.kt | 3 +++ app/src/main/kotlin/io/element/android/x/di/AppModule.kt | 3 +++ .../main/kotlin/io/element/android/x/di/RoomComponent.kt | 3 +++ .../main/kotlin/io/element/android/x/di/SessionComponent.kt | 3 +++ .../kotlin/io/element/android/x/node/LoggedInFlowNode.kt | 2 +- .../main/kotlin/io/element/android/x/node/RoomFlowNode.kt | 2 +- .../main/kotlin/io/element/android/x/node/RootFlowNode.kt | 2 +- .../x/features/login/changeserver/ChangeServerNode.kt | 2 +- .../element/android/x/features/login/root/LoginRootNode.kt | 2 +- .../io/element/android/x/features/messages/MessagesNode.kt | 2 +- .../x/features/preferences/root/PreferencesRootNode.kt | 2 +- .../android/x/features/rageshake/bugreport/BugReportNode.kt | 2 +- .../android/x/features/rageshake/crash/CrashDataStore.kt | 2 +- .../android/x/features/rageshake/rageshake/RageShake.kt | 6 +++--- .../x/features/rageshake/rageshake/RageshakeDataStore.kt | 2 +- .../android/x/features/rageshake/reporter/BugReporter.kt | 2 +- .../x/features/rageshake/screenshot/ScreenshotHolder.kt | 6 +++--- .../io/element/android/x/features/roomlist/RoomListNode.kt | 2 +- .../io/element/android/x/features/template/TemplateNode.kt | 2 +- .../io/element/android/libraries/architecture/Bindings.kt | 2 +- .../io/element/android/{x => libraries}/di/AppScope.kt | 2 +- .../android/{x => libraries}/di/ApplicationContext.kt | 2 +- .../android/{x => libraries}/di/DaggerComponentOwner.kt | 2 +- .../io/element/android/{x => libraries}/di/RoomScope.kt | 2 +- .../io/element/android/{x => libraries}/di/SessionScope.kt | 2 +- .../io/element/android/{x => libraries}/di/SingleIn.kt | 2 +- .../x/matrix/auth/RustMatrixAuthenticationService.kt | 2 +- .../kotlin/io/element/android/x/matrix/di/MatrixModule.kt | 4 ++-- .../android/x/matrix/session/PreferencesSessionStore.kt | 6 +++--- .../io/element/android/x/matrix/ui/di/MatrixUIBindings.kt | 2 +- .../android/x/matrix/ui/media/ImageLoaderFactories.kt | 2 +- 34 files changed, 49 insertions(+), 36 deletions(-) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/AppScope.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/ApplicationContext.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/DaggerComponentOwner.kt (95%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/RoomScope.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/SessionScope.kt (94%) rename libraries/di/src/main/kotlin/io/element/android/{x => libraries}/di/SingleIn.kt (94%) diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index 4532276e11..a1168f4efb 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -18,7 +18,7 @@ package io.element.android.x import android.app.Application 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.DaggerAppComponent import io.element.android.x.initializer.CrashInitializer diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt index 796601bffe..364ab6396d 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -26,7 +26,7 @@ import androidx.core.view.WindowCompat import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integrationpoint.NodeComponentActivity 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.x.di.AppBindings import io.element.android.x.node.RootFlowNode diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 78f40f0322..1a52428737 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -17,6 +17,7 @@ package io.element.android.x.di 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.root.RootPresenter import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt index c412fa9163..ded3c333d7 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt @@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.MergeComponent import dagger.BindsInstance import dagger.Component 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) @MergeComponent(AppScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt index f9143bc4bb..7cb3fb55c3 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt @@ -21,6 +21,9 @@ import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides 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.CoroutineScope import kotlinx.coroutines.Dispatchers 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 8d19684d18..35b1c931da 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 @@ -21,6 +21,9 @@ 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.x.matrix.room.MatrixRoom @SingleIn(RoomScope::class) 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 57de09231f..05c12af80b 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 @@ -21,6 +21,9 @@ 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.x.matrix.MatrixClient @SingleIn(SessionScope::class) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index b707d1071b..138885870f 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -34,7 +34,7 @@ import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.bindings 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.features.preferences.PreferencesFlowNode import io.element.android.x.features.roomlist.RoomListNode diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index fc505303af..ee38296aa9 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -27,7 +27,7 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.navmodel.backstack.BackStack import io.element.android.libraries.architecture.bindings 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.features.messages.MessagesNode import io.element.android.x.matrix.room.MatrixRoom diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index 6784b1f7cf..d71e193d71 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -38,7 +38,7 @@ import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.push import io.element.android.libraries.architecture.createNode 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.matrix.MatrixClient import io.element.android.x.matrix.auth.MatrixAuthenticationService diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt index 41ea7240a4..6264809ada 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt @@ -27,7 +27,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class ChangeServerNode @AssistedInject constructor( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt index 4eb0735345..b46b79e995 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt @@ -30,7 +30,7 @@ import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector 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) class LoginRootNode @AssistedInject constructor( diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt index 3eb489e365..3bc779eb22 100644 --- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt +++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt @@ -27,7 +27,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.RoomScope +import io.element.android.libraries.di.RoomScope @ContributesNode(RoomScope::class) class MessagesNode @AssistedInject constructor( diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt index e6a03ec6b1..60ff67091b 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.SessionScope +import io.element.android.libraries.di.SessionScope @ContributesNode(SessionScope::class) class PreferencesRootNode @AssistedInject constructor( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt index 48e3b79d30..409e429330 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.libraries.architecture.presenterConnector -import io.element.android.x.di.AppScope +import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) class BugReportNode @AssistedInject constructor( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt index a489b640e2..886877e89b 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt @@ -24,7 +24,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore 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 kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt index ae9c3531c5..14643f8c1c 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt @@ -21,9 +21,9 @@ import android.hardware.Sensor import android.hardware.SensorManager import androidx.core.content.getSystemService import com.squareup.seismic.ShakeDetector -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import javax.inject.Inject @SingleIn(AppScope::class) diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt index 8a5bb853f7..a9e741720b 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt @@ -24,7 +24,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.preferencesDataStore 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 kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt index 1ff95b8bb7..b12aedc0db 100755 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt @@ -21,7 +21,7 @@ import android.os.Build import io.element.android.libraries.core.extensions.toOnOff import io.element.android.libraries.core.file.compressFile 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.crash.CrashDataStore import io.element.android.x.features.rageshake.logs.VectorFileLogger diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt index d10feb9076..e57513d0fa 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt @@ -19,9 +19,9 @@ package io.element.android.x.features.rageshake.screenshot import android.content.Context import android.graphics.Bitmap import io.element.android.libraries.core.bitmap.writeBitmap -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import java.io.File import javax.inject.Inject diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt index 5e216dca42..84ff93680e 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode 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 @ContributesNode(SessionScope::class) diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt index 90a3954d3a..ca0f5ce7fe 100644 --- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt +++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt @@ -27,7 +27,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.libraries.architecture.presenterConnector 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 @ContributesNode(AppScope::class) 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 index 2ac135a31c..e4a6d7ae7d 100644 --- 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 @@ -19,7 +19,7 @@ package io.element.android.libraries.architecture import android.content.Context import android.content.ContextWrapper import com.bumble.appyx.core.node.Node -import io.element.android.x.di.DaggerComponentOwner +import io.element.android.libraries.di.DaggerComponentOwner inline fun Node.bindings() = bindings(T::class.java) inline fun Context.bindings() = bindings(T::class.java) diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt index 79782c60d9..2b40d59894 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class AppScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt index 7ed9251cee..2108678097 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di import javax.inject.Qualifier diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt similarity index 95% rename from libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt index eaf3371be3..57f5540c16 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt @@ -14,7 +14,7 @@ * 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. diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt index bcdb76c31d..af25c4cda5 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class RoomScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt index 55fbb71a8e..8ebd6ecaee 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di abstract class SessionScope private constructor() diff --git a/libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt similarity index 94% rename from libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt rename to libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt index 9e9fb7e24e..42a6b860ca 100644 --- a/libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt +++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.di +package io.element.android.libraries.di import javax.inject.Scope import kotlin.reflect.KClass diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt index 43de690583..daebb759f8 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt @@ -18,7 +18,7 @@ package io.element.android.x.matrix.auth import com.squareup.anvil.annotations.ContributesBinding 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.RustMatrixClient import io.element.android.x.matrix.core.SessionId diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt index 2808c3667b..2a4516aa37 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt @@ -19,8 +19,8 @@ package io.element.android.x.matrix.di import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides -import io.element.android.x.di.AppScope -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.SingleIn import org.matrix.rustcomponents.sdk.AuthenticationService import java.io.File diff --git a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt index 6c8f6498e3..9b18cb25b4 100644 --- a/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt +++ b/libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt @@ -23,9 +23,9 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.x.di.AppScope -import io.element.android.x.di.ApplicationContext -import io.element.android.x.di.SingleIn +import io.element.android.libraries.di.AppScope +import io.element.android.libraries.di.ApplicationContext +import io.element.android.libraries.di.SingleIn import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt index 557d896cb8..4502c4dc94 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt @@ -17,7 +17,7 @@ package io.element.android.x.matrix.ui.di 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.NotLoggedInImageLoaderFactory diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt index eecb25f9f2..655b909db5 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt @@ -19,7 +19,7 @@ package io.element.android.x.matrix.ui.media import android.content.Context import coil.ImageLoader 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 javax.inject.Inject