Merge pull request #2957 from element-hq/feature/bma/konsistClassName

Konsist class name
element-hq · May 31, 2024 · e29f919 · e29f919
2 parents 19b6b92 + 2aeab9e
commit e29f919
Show file tree

Hide file tree

Showing 39 changed files with 131 additions and 143 deletions.
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
@@ -34,7 +34,6 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.CacheDirectory
-import io.element.android.libraries.di.DefaultPreferences
 import io.element.android.libraries.di.SingleIn
 import io.element.android.x.BuildConfig
 import io.element.android.x.R
@@ -97,8 +96,7 @@ object AppModule {
 
     @Provides
     @SingleIn(AppScope::class)
-    @DefaultPreferences
-    fun providesDefaultSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+    fun providesSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
         return PreferenceManager.getDefaultSharedPreferences(context)
     }
 

diff --git a/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.system.Os
 import androidx.preference.PreferenceManager
 import androidx.startup.Initializer
-import io.element.android.features.preferences.impl.developer.tracing.SharedPrefTracingConfigurationStore
+import io.element.android.features.preferences.impl.developer.tracing.SharedPreferencesTracingConfigurationStore
 import io.element.android.features.preferences.impl.developer.tracing.TargetLogLevelMapBuilder
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.matrix.api.tracing.TracingConfiguration
@@ -38,7 +38,7 @@ class TracingInitializer : Initializer<Unit> {
         Timber.plant(tracingService.createTimberTree())
         val tracingConfiguration = if (BuildConfig.DEBUG) {
             val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-            val store = SharedPrefTracingConfigurationStore(prefs)
+            val store = SharedPreferencesTracingConfigurationStore(prefs)
             val builder = TargetLogLevelMapBuilder(store)
             TracingConfiguration(
                 filterConfiguration = TracingFilterConfigurations.custom(builder.getCurrentMap()),

diff --git a/...nt/android/x/intent/IntentProviderImpl.kt → ...android/x/intent/DefaultIntentProvider.kt b/...nt/android/x/intent/IntentProviderImpl.kt → ...android/x/intent/DefaultIntentProvider.kt
@@ -31,7 +31,7 @@ import io.element.android.x.MainActivity
 import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class IntentProviderImpl @Inject constructor(
+class DefaultIntentProvider @Inject constructor(
     @ApplicationContext private val context: Context,
     private val deepLinkCreator: DeepLinkCreator,
 ) : IntentProvider {

diff --git a/...ndroid/x/intent/IntentProviderImplTest.kt → ...oid/x/intent/DefaultIntentProviderTest.kt b/...ndroid/x/intent/IntentProviderImplTest.kt → ...oid/x/intent/DefaultIntentProviderTest.kt
@@ -30,10 +30,10 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class IntentProviderImplTest {
+class DefaultIntentProviderTest {
     @Test
     fun `test getViewRoomIntent with Session`() {
-        val sut = createIntentProviderImpl()
+        val sut = createDefaultIntentProvider()
         val result = sut.getViewRoomIntent(
             sessionId = A_SESSION_ID,
             roomId = null,
@@ -45,7 +45,7 @@ class IntentProviderImplTest {
 
     @Test
     fun `test getViewRoomIntent with Session and Room`() {
-        val sut = createIntentProviderImpl()
+        val sut = createDefaultIntentProvider()
         val result = sut.getViewRoomIntent(
             sessionId = A_SESSION_ID,
             roomId = A_ROOM_ID,
@@ -57,7 +57,7 @@ class IntentProviderImplTest {
 
     @Test
     fun `test getViewRoomIntent with Session, Room and Thread`() {
-        val sut = createIntentProviderImpl()
+        val sut = createDefaultIntentProvider()
         val result = sut.getViewRoomIntent(
             sessionId = A_SESSION_ID,
             roomId = A_ROOM_ID,
@@ -67,8 +67,8 @@ class IntentProviderImplTest {
         assertThat(result.data.toString()).isEqualTo("elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId")
     }
 
-    private fun createIntentProviderImpl(): IntentProviderImpl {
-        return IntentProviderImpl(
+    private fun createDefaultIntentProvider(): DefaultIntentProvider {
+        return DefaultIntentProvider(
             context = RuntimeEnvironment.getApplication() as Context,
             deepLinkCreator = DeepLinkCreator(),
         )

diff --git a/...elcome/state/AndroidWelcomeScreenState.kt → ...te/SharedPreferencesWelcomeScreenState.kt b/...elcome/state/AndroidWelcomeScreenState.kt → ...te/SharedPreferencesWelcomeScreenState.kt
@@ -20,15 +20,14 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.DefaultPreferences
 import io.element.android.libraries.di.SingleIn
 import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-class AndroidWelcomeScreenState @Inject constructor(
-    @DefaultPreferences private val sharedPreferences: SharedPreferences,
-) : WelcomeScreenState {
+class SharedPreferencesWelcomeScreenState @Inject constructor(
+    private val sharedPreferences: SharedPreferences,
+) : WelcomeScreenStore {
     companion object {
         private const val IS_WELCOME_SCREEN_SHOWN = "is_welcome_screen_shown"
     }

diff --git a/.../impl/welcome/state/WelcomeScreenState.kt → .../impl/welcome/state/WelcomeScreenStore.kt b/.../impl/welcome/state/WelcomeScreenState.kt → .../impl/welcome/state/WelcomeScreenStore.kt
@@ -16,7 +16,7 @@
 
 package io.element.android.features.ftue.impl.welcome.state
 
-interface WelcomeScreenState {
+interface WelcomeScreenStore {
     fun isWelcomeScreenNeeded(): Boolean
     fun setWelcomeScreenShown()
     fun reset()

diff --git a/...l/welcome/state/FakeWelcomeScreenState.kt → ...lcome/state/InMemoryWelcomeScreenState.kt b/...l/welcome/state/FakeWelcomeScreenState.kt → ...lcome/state/InMemoryWelcomeScreenState.kt
@@ -16,7 +16,7 @@
 
 package io.element.android.features.ftue.impl.welcome.state
 
-class FakeWelcomeScreenState : WelcomeScreenState {
+class InMemoryWelcomeScreenState : WelcomeScreenStore {
     private var isWelcomeScreenNeeded = true
 
     override fun isWelcomeScreenNeeded(): Boolean {

diff --git a/...esponse/AcceptDeclineInviteViewWrapper.kt → ...esponse/DefaultAcceptDeclineInviteView.kt b/...esponse/AcceptDeclineInviteViewWrapper.kt → ...esponse/DefaultAcceptDeclineInviteView.kt
@@ -26,7 +26,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
-class AcceptDeclineInviteViewWrapper @Inject constructor() : AcceptDeclineInviteView {
+class DefaultAcceptDeclineInviteView @Inject constructor() : AcceptDeclineInviteView {
     @Composable
     override fun Render(
         state: AcceptDeclineInviteState,

diff --git a/.../leaveroom/impl/LeaveRoomPresenterImpl.kt → ...averoom/impl/DefaultLeaveRoomPresenter.kt b/.../leaveroom/impl/LeaveRoomPresenterImpl.kt → ...averoom/impl/DefaultLeaveRoomPresenter.kt
@@ -21,6 +21,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.leaveroom.api.LeaveRoomState
@@ -29,14 +30,16 @@ import io.element.android.features.leaveroom.api.LeaveRoomState.Confirmation.Gen
 import io.element.android.features.leaveroom.api.LeaveRoomState.Confirmation.LastUserInRoom
 import io.element.android.features.leaveroom.api.LeaveRoomState.Confirmation.PrivateRoom
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
-class LeaveRoomPresenterImpl @Inject constructor(
+@ContributesBinding(SessionScope::class)
+class DefaultLeaveRoomPresenter @Inject constructor(
     private val client: MatrixClient,
     private val roomMembershipObserver: RoomMembershipObserver,
     private val dispatchers: CoroutineDispatchers,

diff --git a/...rc/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterImplModule.kt b/...rc/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterImplModule.kt
diff --git a/...veroom/impl/LeaveRoomPresenterImplTest.kt → ...oom/impl/DefaultLeaveRoomPresenterTest.kt b/...veroom/impl/LeaveRoomPresenterImplTest.kt → ...oom/impl/DefaultLeaveRoomPresenterTest.kt
@@ -21,7 +21,6 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
-import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
@@ -37,13 +36,13 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class LeaveRoomPresenterImplTest {
+class DefaultLeaveRoomPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
     @Test
     fun `present - initial state hides all dialogs`() = runTest {
-        val presenter = createLeaveRoomPresenter()
+        val presenter = createDefaultLeaveRoomPresenter()
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -56,7 +55,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - show generic confirmation`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -76,7 +75,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - show private room confirmation`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -96,7 +95,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - show last user in room confirmation`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -116,7 +115,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - show DM confirmation`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -137,7 +136,7 @@ class LeaveRoomPresenterImplTest {
     @Test
     fun `present - leaving a room leaves the room`() = runTest {
         val roomMembershipObserver = RoomMembershipObserver()
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -159,7 +158,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - show error if leave room fails`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -183,7 +182,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - show progress indicator while leaving a room`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -205,7 +204,7 @@ class LeaveRoomPresenterImplTest {
 
     @Test
     fun `present - hide error hides the error`() = runTest {
-        val presenter = createLeaveRoomPresenter(
+        val presenter = createDefaultLeaveRoomPresenter(
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
@@ -231,10 +230,10 @@ class LeaveRoomPresenterImplTest {
     }
 }
 
-private fun TestScope.createLeaveRoomPresenter(
+private fun TestScope.createDefaultLeaveRoomPresenter(
     client: MatrixClient = FakeMatrixClient(),
     roomMembershipObserver: RoomMembershipObserver = RoomMembershipObserver(),
-): LeaveRoomPresenter = LeaveRoomPresenterImpl(
+): DefaultLeaveRoomPresenter = DefaultLeaveRoomPresenter(
     client = client,
     roomMembershipObserver = roomMembershipObserver,
     dispatchers = testCoroutineDispatchers(false),

diff --git a/...n/permissions/PermissionsPresenterImpl.kt → ...ermissions/DefaultPermissionsPresenter.kt b/...n/permissions/PermissionsPresenterImpl.kt → ...ermissions/DefaultPermissionsPresenter.kt
@@ -26,13 +26,14 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import io.element.android.libraries.di.AppScope
 
-class PermissionsPresenterImpl @AssistedInject constructor(
+@Suppress("unused")
+class DefaultPermissionsPresenter @AssistedInject constructor(
     @Assisted private val permissions: List<String>
 ) : PermissionsPresenter {
     @AssistedFactory
     @ContributesBinding(AppScope::class)
     interface Factory : PermissionsPresenter.Factory {
-        override fun create(permissions: List<String>): PermissionsPresenterImpl
+        override fun create(permissions: List<String>): DefaultPermissionsPresenter
     }
 
     @OptIn(ExperimentalPermissionsApi::class)

diff --git a/...n/impl/send/SendLocationEntryPointImpl.kt → ...mpl/send/DefaultSendLocationEntryPoint.kt b/...n/impl/send/SendLocationEntryPointImpl.kt → ...mpl/send/DefaultSendLocationEntryPoint.kt
@@ -25,7 +25,7 @@ import io.element.android.libraries.di.AppScope
 import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class SendLocationEntryPointImpl @Inject constructor() : SendLocationEntryPoint {
+class DefaultSendLocationEntryPoint @Inject constructor() : SendLocationEntryPoint {
     override fun createNode(
         parentNode: Node,
         buildContext: BuildContext

diff --git a/...n/impl/show/ShowLocationEntryPointImpl.kt → ...mpl/show/DefaultShowLocationEntryPoint.kt b/...n/impl/show/ShowLocationEntryPointImpl.kt → ...mpl/show/DefaultShowLocationEntryPoint.kt
@@ -25,7 +25,7 @@ import io.element.android.libraries.di.AppScope
 import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class ShowLocationEntryPointImpl @Inject constructor() : ShowLocationEntryPoint {
+class DefaultShowLocationEntryPoint @Inject constructor() : ShowLocationEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
         return parentNode.createNode<ShowLocationNode>(buildContext, listOf(inputs))
     }

diff --git a/...pl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/...pl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -72,7 +72,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
-import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatterImpl
+import io.element.android.features.messages.impl.utils.messagesummary.DefaultMessageSummaryFormatter
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.list.ListItemContent
@@ -229,7 +229,7 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif
     }
 
     val context = LocalContext.current
-    val formatter = remember(context) { MessageSummaryFormatterImpl(context) }
+    val formatter = remember(context) { DefaultMessageSummaryFormatter(context) }
     val textContent = remember(event.content) { formatter.format(event) }
 
     when (event.content) {

diff --git a/...agecomposer/MessageComposerContextImpl.kt → ...composer/DefaultMessageComposerContext.kt b/...agecomposer/MessageComposerContextImpl.kt → ...composer/DefaultMessageComposerContext.kt
@@ -28,7 +28,7 @@ import javax.inject.Inject
 
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
-class MessageComposerContextImpl @Inject constructor() : MessageComposerContext {
+class DefaultMessageComposerContext @Inject constructor() : MessageComposerContext {
     override var composerMode: MessageComposerMode by mutableStateOf(MessageComposerMode.Normal)
         internal set
 }
diff --git a/...lin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/...lin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
@@ -100,7 +100,7 @@ class MessageComposerPresenter @Inject constructor(
     private val mediaSender: MediaSender,
     private val snackbarDispatcher: SnackbarDispatcher,
     private val analyticsService: AnalyticsService,
-    private val messageComposerContext: MessageComposerContextImpl,
+    private val messageComposerContext: DefaultMessageComposerContext,
     private val richTextEditorStateFactory: RichTextEditorStateFactory,
     private val currentSessionIdHolder: CurrentSessionIdHolder,
     private val permalinkParser: PermalinkParser,

diff --git a/...agesummary/MessageSummaryFormatterImpl.kt → ...summary/DefaultMessageSummaryFormatter.kt b/...agesummary/MessageSummaryFormatterImpl.kt → ...summary/DefaultMessageSummaryFormatter.kt
@@ -40,7 +40,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import javax.inject.Inject
 
 @ContributesBinding(RoomScope::class)
-class MessageSummaryFormatterImpl @Inject constructor(
+class DefaultMessageSummaryFormatter @Inject constructor(
     @ApplicationContext private val context: Context,
 ) : MessageSummaryFormatter {
     companion object {

diff --git a/...s/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/...s/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
@@ -27,7 +27,7 @@ import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.fixtures.aMessageEvent
 import io.element.android.features.messages.impl.fixtures.aTimelineItemsFactory
-import io.element.android.features.messages.impl.messagecomposer.MessageComposerContextImpl
+import io.element.android.features.messages.impl.messagecomposer.DefaultMessageComposerContext
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
 import io.element.android.features.messages.impl.messagesummary.FakeMessageSummaryFormatter
 import io.element.android.features.messages.impl.textcomposer.TestRichTextEditorStateFactory
@@ -793,7 +793,7 @@ class MessagesPresenterTest {
             mediaSender = mediaSender,
             snackbarDispatcher = SnackbarDispatcher(),
             analyticsService = analyticsService,
-            messageComposerContext = MessageComposerContextImpl(),
+            messageComposerContext = DefaultMessageComposerContext(),
             richTextEditorStateFactory = TestRichTextEditorStateFactory(),
             permissionsPresenterFactory = permissionsPresenterFactory,
             currentSessionIdHolder = CurrentSessionIdHolder(FakeMatrixClient(A_SESSION_ID)),