letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Rename di module

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
View File

@@ -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

2
app/src/main/kotlin/io/element/android/x/MainActivity.kt
View File

@@ -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

1
app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
View File

@@ -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

3
app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
View File

@@ -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)

3
app/src/main/kotlin/io/element/android/x/di/AppModule.kt
View File

@@ -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

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

@@ -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)

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

@@ -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)

2
app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt
View File

@@ -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

2
app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
View File

@@ -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

2
app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
View File

@@ -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

2
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt
View File

@@ -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(

2
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt
View File

@@ -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(

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt
View File

@@ -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(

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt
View File

@@ -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(

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt
View File

@@ -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(

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/CrashDataStore.kt
View File

@@ -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

6
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageShake.kt
View File

@@ -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)

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/rageshake/RageshakeDataStore.kt
View File

@@ -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

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/reporter/BugReporter.kt
View File

@@ -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

6
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/screenshot/ScreenshotHolder.kt
View File

@@ -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

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt
View File

@@ -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)

2
features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
View File

@@ -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)

2
libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
View File

@@ -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 <reified T : Any> Node.bindings() = bindings(T::class.java)
inline fun <reified T : Any> Context.bindings() = bindings(T::class.java)

2
libraries/di/src/main/kotlin/io/element/android/x/di/AppScope.kt → libraries/di/src/main/kotlin/io/element/android/libraries/di/AppScope.kt
View File

@@ -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()

2
libraries/di/src/main/kotlin/io/element/android/x/di/ApplicationContext.kt → libraries/di/src/main/kotlin/io/element/android/libraries/di/ApplicationContext.kt
View File

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

2
libraries/di/src/main/kotlin/io/element/android/x/di/DaggerComponentOwner.kt → libraries/di/src/main/kotlin/io/element/android/libraries/di/DaggerComponentOwner.kt
View File

@@ -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.

2
libraries/di/src/main/kotlin/io/element/android/x/di/RoomScope.kt → libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt
View File

@@ -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()

2
libraries/di/src/main/kotlin/io/element/android/x/di/SessionScope.kt → libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt
View File

@@ -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()

2
libraries/di/src/main/kotlin/io/element/android/x/di/SingleIn.kt → libraries/di/src/main/kotlin/io/element/android/libraries/di/SingleIn.kt
View File

@@ -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

2
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/auth/RustMatrixAuthenticationService.kt
View File

@@ -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

4
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/di/MatrixModule.kt
View File

@@ -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

6
libraries/matrix/src/main/kotlin/io/element/android/x/matrix/session/PreferencesSessionStore.kt
View File

@@ -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

2
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/di/MatrixUIBindings.kt
View File

@@ -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

2
libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt
View File

@@ -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