Merge branch 'develop' into fix/4657-preview-param-suffix

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.architecture.Presenter
 
 @ContributesTo(AppScope::class)
 @BindingContainer
-interface AnalyticsModule {
+interface AnalyticsBindingContainer {
     @Binds
     fun bindAnalyticsPreferencesPresenter(presenter: AnalyticsPreferencesPresenter): Presenter<AnalyticsPreferencesState>
 }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt

@@ -60,7 +60,9 @@ class PictureInPicturePresenter(
                 }
                 is PictureInPictureEvent.SetPipOrientation -> {
                     Timber.tag(loggerTag.value).d("onOrientationChange: ${event.orientation}")
-                    pipView?.setPipOrientation(event.orientation)
+                    if (isPipSupported) {
+                        pipView?.setPipOrientation(event.orientation)
+                    }
                 }
             }
         }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipView.kt

@@ -8,9 +8,15 @@
 
 package io.element.android.features.call.impl.pip
 
+import android.os.Build
+import androidx.annotation.RequiresApi
+
 interface PipView {
+    @RequiresApi(Build.VERSION_CODES.O)
     fun setPipOrientation(orientation: Int?)
+    @RequiresApi(Build.VERSION_CODES.O)
     fun setPipParams()
+    @RequiresApi(Build.VERSION_CODES.O)
     fun enterPipMode(): Boolean
     fun hangUp()
 }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt

@@ -202,7 +202,9 @@ class ElementCallActivity :
         }
         DisposableEffect(Unit) {
             val onPictureInPictureModeChangedListener = Consumer { _: PictureInPictureModeChangedInfo ->
-                setPipParams()
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    setPipParams()
+                }
                 pipEventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(isInPictureInPictureMode))
                 if (!isInPictureInPictureMode && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
                     Timber.tag(loggerTag.value).d("Exiting PiP mode: Hangup the call")
@@ -300,6 +302,7 @@ class ElementCallActivity :
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun setPipOrientation(orientation: Int?) {
         currentPipOrientation = orientation
         setPictureInPictureParams(getPictureInPictureParams())

features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerBindingContainer.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.CoroutineScope
 
 @BindingContainer
 @ContributesTo(RoomScope::class)
-object ContentScannerModule {
+object ContentScannerBindingContainer {
     @Provides
     @SingleIn(RoomScope::class)
     fun providesContentScannerService(

features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerBindingContainerTest.kt

@@ -15,16 +15,16 @@ import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class ContentScannerModuleTest {
+class ContentScannerBindingContainerTest {
     @Test
-    fun `ContentScannerModule provides NoopContentScannerService when ContentScanner is null`() = runTest {
+    fun `ContentScannerBindingContainer provides NoopContentScannerService when ContentScanner is null`() = runTest {
         // Given
         val contentScanner: ContentScanner? = null
         val sessionCoroutineScope = backgroundScope
         val coroutineDispatchers = testCoroutineDispatchers()
 
         // When
-        val contentScannerService = ContentScannerModule.providesContentScannerService(
+        val contentScannerService = ContentScannerBindingContainer.providesContentScannerService(
             contentScanner = contentScanner,
             coroutineScope = sessionCoroutineScope,
             coroutineDispatchers = coroutineDispatchers,
@@ -35,14 +35,14 @@ class ContentScannerModuleTest {
     }
 
     @Test
-    fun `ContentScannerModule provides DefaultContentScannerService when ContentScanner is not null`() = runTest {
+    fun `ContentScannerBindingContainer provides DefaultContentScannerService when ContentScanner is not null`() = runTest {
         // Given
         val contentScanner: ContentScanner? = FakeContentScanner()
         val sessionCoroutineScope = backgroundScope
         val coroutineDispatchers = testCoroutineDispatchers()
 
         // When
-        val contentScannerService = ContentScannerModule.providesContentScannerService(
+        val contentScannerService = ContentScannerBindingContainer.providesContentScannerService(
             contentScanner = contentScanner,
             coroutineScope = sessionCoroutineScope,
             coroutineDispatchers = coroutineDispatchers,

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface FtueModule {
+interface FtueBindingContainer {
     @Binds
-    fun bindChooseSelfVerificationMethodPresenter(presenter: ChooseSelfVerificationModePresenter): Presenter<ChooseSelfVerificationModeState>
+    fun bindChooseSelfVerificationModePresenter(presenter: ChooseSelfVerificationModePresenter): Presenter<ChooseSelfVerificationModeState>
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/HomeSpacesBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @BindingContainer
 @ContributesTo(SessionScope::class)
-interface HomeSpacesModule {
+interface HomeSpacesBindingContainer {
     @Binds
     fun bindHomeSpacesPresenter(presenter: HomeSpacesPresenter): Presenter<HomeSpacesState>
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListBindingContainer.kt

@@ -26,15 +26,15 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface RoomListModule {
+interface RoomListBindingContainer {
     @Binds
     fun bindRoomListPresenter(presenter: RoomListPresenter): Presenter<RoomListState>
 
     @Binds
-    fun bindSearchPresenter(presenter: RoomListSearchPresenter): Presenter<RoomListSearchState>
+    fun bindRoomListSearchPresenter(presenter: RoomListSearchPresenter): Presenter<RoomListSearchState>
 
     @Binds
-    fun bindFiltersPresenter(presenter: RoomListFiltersPresenter): Presenter<RoomListFiltersState>
+    fun bindRoomListFiltersPresenter(presenter: RoomListFiltersPresenter): Presenter<RoomListFiltersState>
 
     @Binds
     fun bindSpaceFiltersPresenter(presenter: SpaceFiltersPresenter): Presenter<SpaceFiltersState>

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenterTest.kt

@@ -5,6 +5,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package io.element.android.features.home.impl.search
 
 import com.google.common.truth.Truth.assertThat
@@ -35,6 +37,7 @@ import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteBindingContainer.kt

@@ -22,9 +22,9 @@ import io.element.android.libraries.matrix.api.MatrixClient
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface InviteModule {
+interface InviteBindingContainer {
     @Binds
-    fun bindAcceptDeclinePresenter(presenter: AcceptDeclineInvitePresenter): Presenter<AcceptDeclineInviteState>
+    fun bindAcceptDeclineInvitePresenter(presenter: AcceptDeclineInvitePresenter): Presenter<AcceptDeclineInviteState>
 
     companion object {
         @Provides

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomBindingContainer.kt

@@ -27,7 +27,7 @@ import java.util.Optional
 
 @BindingContainer
 @ContributesTo(SessionScope::class)
-object JoinRoomModule {
+object JoinRoomBindingContainer {
     @Provides
     fun providesJoinRoomPresenterFactory(
         client: MatrixClient,

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/di/KnockRequestsBindingContainer.kt

@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.knockrequests.impl.data
+package io.element.android.features.knockrequests.impl.data.di
 
 import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.ContributesTo
@@ -14,16 +14,17 @@ import dev.zacsweers.metro.Provides
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.api.knockRequestPermissions
+import io.element.android.features.knockrequests.impl.data.KnockRequestsService
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsFlow
 
 @BindingContainer
 @ContributesTo(RoomScope::class)
-object KnockRequestsModule {
+object KnockRequestsBindingContainer {
     @Provides
     @SingleIn(RoomScope::class)
-    fun knockRequestsService(room: JoinedRoom): KnockRequestsService {
+    fun providesKnockRequestsService(room: JoinedRoom): KnockRequestsService {
         return KnockRequestsService(
             knockRequestsFlow = room.knockRequestsFlow,
             permissionsFlow = room.permissionsFlow(KnockRequestPermissions.DEFAULT) { perms ->

features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/di/LeaveRoomBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface LeaveRoomModule {
+interface LeaveRoomBindingContainer {
     @Binds
     fun bindLeaveRoomPresenter(presenter: LeaveRoomPresenter): Presenter<LeaveRoomState>
 }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenConfig.kt

@@ -8,12 +8,7 @@
 
 package io.element.android.features.lockscreen.impl
 
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.BindingContainer
-import dev.zacsweers.metro.ContributesTo
-import dev.zacsweers.metro.Provides
 import kotlin.time.Duration
-import io.element.android.appconfig.LockScreenConfig as AppConfigLockScreenConfig
 
 data class LockScreenConfig(
     val isPinMandatory: Boolean,
@@ -24,18 +19,3 @@ data class LockScreenConfig(
     val isStrongBiometricsEnabled: Boolean,
     val isWeakBiometricsEnabled: Boolean,
 )
-
-@ContributesTo(AppScope::class)
-@BindingContainer
-object LockScreenConfigModule {
-    @Provides
-    fun providesLockScreenConfig(): LockScreenConfig = LockScreenConfig(
-        isPinMandatory = AppConfigLockScreenConfig.IS_PIN_MANDATORY,
-        forbiddenPinCodes = AppConfigLockScreenConfig.FORBIDDEN_PIN_CODES,
-        pinSize = AppConfigLockScreenConfig.PIN_SIZE,
-        maxPinCodeAttemptsBeforeLogout = AppConfigLockScreenConfig.MAX_PIN_CODE_ATTEMPTS_BEFORE_LOGOUT,
-        gracePeriod = AppConfigLockScreenConfig.GRACE_PERIOD,
-        isStrongBiometricsEnabled = AppConfigLockScreenConfig.IS_STRONG_BIOMETRICS_ENABLED,
-        isWeakBiometricsEnabled = AppConfigLockScreenConfig.IS_WEAK_BIOMETRICS_ENABLED,
-    )
-}

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/di/LockScreenConfigBindingContainer.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import io.element.android.features.lockscreen.impl.LockScreenConfig
+
+@ContributesTo(AppScope::class)
+@BindingContainer
+object LockScreenConfigBindingContainer {
+    @Provides
+    fun providesLockScreenConfig(): LockScreenConfig = LockScreenConfig(
+        isPinMandatory = io.element.android.appconfig.LockScreenConfig.IS_PIN_MANDATORY,
+        forbiddenPinCodes = io.element.android.appconfig.LockScreenConfig.FORBIDDEN_PIN_CODES,
+        pinSize = io.element.android.appconfig.LockScreenConfig.PIN_SIZE,
+        maxPinCodeAttemptsBeforeLogout = io.element.android.appconfig.LockScreenConfig.MAX_PIN_CODE_ATTEMPTS_BEFORE_LOGOUT,
+        gracePeriod = io.element.android.appconfig.LockScreenConfig.GRACE_PERIOD,
+        isStrongBiometricsEnabled = io.element.android.appconfig.LockScreenConfig.IS_STRONG_BIOMETRICS_ENABLED,
+        isWeakBiometricsEnabled = io.element.android.appconfig.LockScreenConfig.IS_WEAK_BIOMETRICS_ENABLED,
+    )
+}

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/LoginBindingContainer.kt

@@ -20,7 +20,7 @@ import io.element.android.libraries.architecture.Presenter
 
 @ContributesTo(AppScope::class)
 @BindingContainer
-interface LoginModule {
+interface LoginBindingContainer {
     @Binds
     fun bindChangeServerPresenter(presenter: ChangeServerPresenter): Presenter<ChangeServerState>
 

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/di/LogoutBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
 @BindingContainer
-interface LogoutModule {
+interface LogoutBindingContainer {
     @Binds
     fun bindDirectLogoutPresenter(presenter: DirectLogoutPresenter): Presenter<DirectLogoutState>
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesBindingContainer.kt

@@ -34,7 +34,7 @@ import io.element.android.libraries.di.RoomScope
 
 @ContributesTo(RoomScope::class)
 @BindingContainer
-interface MessagesBindsModule {
+interface MessagesBindingContainer {
     @Binds
     fun bindPinnedMessagesBannerPresenter(presenter: PinnedMessagesBannerPresenter): Presenter<PinnedMessagesBannerState>
 

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesProvidesBindingContainer.kt

@@ -18,8 +18,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 
 @ContributesTo(RoomScope::class)
 @BindingContainer
-object MessagesProvidesModule {
+object MessagesProvidesBindingContainer {
     @Provides
     @LiveTimeline
-    fun provideLiveTimeline(joinedRoom: JoinedRoom): Timeline = joinedRoom.liveTimeline
+    fun providesLiveTimeline(joinedRoom: JoinedRoom): Timeline = joinedRoom.liveTimeline
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactories.kt

@@ -10,28 +10,13 @@ package io.element.android.features.messages.impl.timeline.di
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import dev.zacsweers.metro.BindingContainer
-import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.Inject
-import dev.zacsweers.metro.Multibinds
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.RoomScope
 import kotlin.reflect.KClass
 
-/**
- * Container that declares the [TimelineItemPresenterFactory] map multi binding.
- *
- * Its sole purpose is to support the case of an empty map multibinding.
- */
-@BindingContainer
-@ContributesTo(RoomScope::class)
-interface TimelineItemPresenterFactoriesModule {
-    @Multibinds
-    fun multiBindTimelineItemPresenterFactories(): @JvmSuppressWildcards Map<KClass<out TimelineItemEventContent>, TimelineItemPresenterFactory<*, *>>
-}
-
 /**
  * Room level caching layer for the [TimelineItemPresenterFactory] instances.
  *

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactoriesBindingContainer.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.di
+
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Multibinds
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
+import io.element.android.libraries.di.RoomScope
+import kotlin.reflect.KClass
+
+/**
+ * Container that declares the [TimelineItemPresenterFactory] map multi binding.
+ *
+ * Its sole purpose is to support the case of an empty map multibinding.
+ */
+@BindingContainer
+@ContributesTo(RoomScope::class)
+interface TimelineItemPresenterFactoriesBindingContainer {
+    @Multibinds
+    fun multiBindTimelineItemPresenterFactories(): @JvmSuppressWildcards Map<KClass<out TimelineItemEventContent>, TimelineItemPresenterFactory<*, *>>
+}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenter.kt

@@ -12,27 +12,12 @@ import androidx.compose.runtime.Composable
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
-import dev.zacsweers.metro.BindingContainer
-import dev.zacsweers.metro.Binds
-import dev.zacsweers.metro.ContributesTo
-import dev.zacsweers.metro.IntoMap
-import io.element.android.features.messages.impl.timeline.di.TimelineItemEventContentKey
 import io.element.android.features.messages.impl.timeline.di.TimelineItemPresenterFactory
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.voiceplayer.api.VoiceMessagePresenterFactory
 import io.element.android.libraries.voiceplayer.api.VoiceMessageState
 
-@BindingContainer
-@ContributesTo(RoomScope::class)
-interface VoiceMessagePresenterModule {
-    @Binds
-    @IntoMap
-    @TimelineItemEventContentKey(TimelineItemVoiceContent::class)
-    fun bindVoiceMessagePresenterFactory(factory: VoiceMessagePresenter.Factory): TimelineItemPresenterFactory<*, *>
-}
-
 @AssistedInject
 class VoiceMessagePresenter(
     voiceMessagePresenterFactory: VoiceMessagePresenterFactory,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/di/VoiceMessagePresenterBindingContainer.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.voicemessages.timeline.di
+
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.Binds
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.IntoMap
+import io.element.android.features.messages.impl.timeline.di.TimelineItemEventContentKey
+import io.element.android.features.messages.impl.timeline.di.TimelineItemPresenterFactory
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
+import io.element.android.features.messages.impl.voicemessages.timeline.VoiceMessagePresenter
+import io.element.android.libraries.di.RoomScope
+
+@BindingContainer
+@ContributesTo(RoomScope::class)
+interface VoiceMessagePresenterBindingContainer {
+    @Binds
+    @IntoMap
+    @TimelineItemEventContentKey(TimelineItemVoiceContent::class)
+    fun bindVoiceMessagePresenterFactory(factory: VoiceMessagePresenter.Factory): TimelineItemPresenterFactory<*, *>
+}

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/di/DeveloperSettingsBindingContainer.kt

@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.Presenter
 
 @ContributesTo(AppScope::class)
 @BindingContainer
-interface DeveloperSettingsModule {
+interface DeveloperSettingsBindingContainer {
     @Binds
     fun bindAppDeveloperSettingsPresenter(presenter: AppDeveloperSettingsPresenter): Presenter<AppDeveloperSettingsState>
 }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/di/UserStatusBindingContainer.kt

@@ -5,11 +5,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.preferences.impl.userstatus
+package io.element.android.features.preferences.impl.userstatus.di
 
 import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.Binds
 import dev.zacsweers.metro.ContributesTo
+import io.element.android.features.preferences.impl.userstatus.UserStatusPresenter
+import io.element.android.features.preferences.impl.userstatus.UserStatusState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.SessionScope
 

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeBindingContainer.kt

@@ -22,7 +22,7 @@ import io.element.android.libraries.architecture.Presenter
 
 @ContributesTo(AppScope::class)
 @BindingContainer
-interface RageshakeModule {
+interface RageshakeBindingContainer {
     @Binds
     fun bindRageshakePreferencesPresenter(presenter: RageshakePreferencesPresenter): Presenter<RageshakePreferencesState>
 

features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/di/RoomAliasResolverBindingContainer.kt

@@ -18,9 +18,9 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 
 @BindingContainer
 @ContributesTo(SessionScope::class)
-object RoomAliasResolverModule {
+object RoomAliasResolverBindingContainer {
     @Provides
-    fun providesJoinRoomPresenterFactory(
+    fun providesRoomAliasResolverPresenterFactory(
         client: MatrixClient,
     ): RoomAliasResolverPresenter.Factory {
         return object : RoomAliasResolverPresenter.Factory {

features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/di/RoomCallBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.RoomScope
 
 @ContributesTo(RoomScope::class)
 @BindingContainer
-interface RoomCallModule {
+interface RoomCallBindingContainer {
     @Binds
     fun bindRoomCallStatePresenter(presenter: RoomCallStatePresenter): Presenter<RoomCallState>
 }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberBindingContainer.kt

@@ -21,9 +21,9 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @BindingContainer
 @ContributesTo(RoomScope::class)
-object RoomMemberModule {
+object RoomMemberBindingContainer {
     @Provides
-    fun provideRoomMemberDetailsPresenterFactory(
+    fun providesRoomMemberDetailsPresenterFactory(
         room: JoinedRoom,
         userProfilePresenterFactory: UserProfilePresenterFactory,
         encryptionService: EncryptionService,

features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/di/RoomMemberModerationBindingContainer.kt

@@ -18,7 +18,7 @@ import io.element.android.libraries.di.RoomScope
 
 @ContributesTo(RoomScope::class)
 @BindingContainer
-interface RoomMemberModerationModule {
+interface RoomMemberModerationBindingContainer {
     @Binds
     fun bindRoomMemberModerationPresenter(presenter: RoomMemberModerationPresenter): Presenter<RoomMemberModerationState>
 }