Update plugin ktlint to v12.1.0 (#2200)

* Update plugin ktlint to v12.1.0 * Run `./gradlew ktlintFormat` and fix some issues manually. * Fix other issues reproted by Ktlint * Limit false positives, KtLint removes unnecessary curly brace in String templates. * Remove useless Unit * Minor improvements over ktlint changes * Restore `AlertDialogContent` behaviour * Update screenshots --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Benoit Marty <benoit@matrix.org> Co-authored-by: Jorge Martín <jorgem@element.io> Co-authored-by: ElementBot <benoitm+elementbot@element.io>
element-hq · Jan 10, 2024 · c8bd362 · c8bd362
1 parent 7e18668
commit c8bd362
Show file tree

Hide file tree

Showing 442 changed files with 1,081 additions and 1,071 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -17,7 +17,7 @@ ij_wrap_on_typing = false
 # Ktlint rule, for more information see https://pinterest.github.io/ktlint/faq/#why-is-editorconfig-property-disabled_rules-deprecated-and-how-do-i-resolve-this
 ktlint_standard_wrapping = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
-
+ktlint_standard_spacing-between-declarations-with-annotations = disabled
 
 [*.java]
 ij_java_align_consecutive_assignments = false

diff --git a/app/src/main/kotlin/io/element/android/x/MainNode.kt b/app/src/main/kotlin/io/element/android/x/MainNode.kt
@@ -68,5 +68,4 @@ class MainNode(
 
     @Parcelize
     object RootNavTarget : Parcelable
-
 }
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
@@ -31,6 +31,9 @@ interface AppComponent : NodeFactoriesBindings {
 
     @Component.Factory
     interface Factory {
-        fun create(@ApplicationContext @BindsInstance context: Context): AppComponent
+        fun create(
+            @ApplicationContext @BindsInstance
+            context: Context
+        ): AppComponent
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt b/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
@@ -40,4 +40,3 @@ fun <T : Any> BackStack<T>.removeLast(element: T) {
     } ?: return
     accept(Remove(lastExpectedNavElement.key))
 }
-
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -138,7 +138,7 @@ class LoggedInFlowNode @AssistedInject constructor(
             },
             onStop = {
                 coroutineScope.launch {
-                    //Counterpart startSync is done in observeSyncStateAndNetworkStatus method.
+                    // Counterpart startSync is done in observeSyncStateAndNetworkStatus method.
                     syncService.stopSync()
                 }
             },

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -268,10 +268,9 @@ class RootFlowNode @AssistedInject constructor(
     }
 
     private suspend fun attachSession(sessionId: SessionId): LoggedInAppScopeFlowNode {
-        //TODO handle multi-session
+        // TODO handle multi-session
         return waitForChildAttached { navTarget ->
             navTarget is NavTarget.LoggedInFlow && navTarget.sessionId == sessionId
         }
     }
 }
-
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt
@@ -65,8 +65,9 @@ class MatrixClientsHolder @Inject constructor(private val authenticationService:
     @Suppress("UNCHECKED_CAST")
     fun restoreWithSavedState(state: SavedStateMap?) {
         Timber.d("Restore state")
-        if (state == null || sessionIdsToMatrixClient.isNotEmpty()) return Unit.also {
+        if (state == null || sessionIdsToMatrixClient.isNotEmpty()) {
             Timber.w("Restore with non-empty map")
+            return
         }
         val sessionIds = state[SAVE_INSTANCE_KEY] as? Array<SessionId>
         Timber.d("Restore matrix session keys = ${sessionIds?.map { it.value }}")

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt
@@ -59,15 +59,15 @@ fun SyncStateView(
         ) {
             Row(
                 modifier = Modifier
-                        .background(color = ElementTheme.colors.bgSubtleSecondary)
-                        .padding(horizontal = 24.dp, vertical = 10.dp),
+                    .background(color = ElementTheme.colors.bgSubtleSecondary)
+                    .padding(horizontal = 24.dp, vertical = 10.dp),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(10.dp)
             ) {
                 CircularProgressIndicator(
                     modifier = Modifier
-                            .progressSemantics()
-                            .size(12.dp),
+                        .progressSemantics()
+                        .size(12.dp),
                     color = ElementTheme.colors.textPrimary,
                     strokeWidth = 1.5.dp,
                 )

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -136,4 +136,3 @@ class RoomFlowNode @AssistedInject constructor(
         )
     }
 }
-
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt
@@ -31,22 +31,22 @@ class LoadingRoomStateFlowFactoryTest {
 
     @Test
     fun `flow should emit Loading and then Loaded when there is a room in cache`() = runTest {
-        val room = FakeMatrixRoom(sessionId= A_SESSION_ID, roomId = A_ROOM_ID)
+        val room = FakeMatrixRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID)
         val matrixClient = FakeMatrixClient(A_SESSION_ID).apply {
             givenGetRoomResult(A_ROOM_ID, room)
         }
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
             .create(this, A_ROOM_ID)
-        .test {
-            assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
-            assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loaded(room))
-        }
+            .test {
+                assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
+                assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loaded(room))
+            }
     }
 
     @Test
     fun `flow should emit Loading and then Loaded when there is a room in cache after SS is loaded`() = runTest {
-        val room = FakeMatrixRoom(sessionId= A_SESSION_ID, roomId = A_ROOM_ID)
+        val room = FakeMatrixRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID)
         val roomListService = FakeRoomListService()
         val matrixClient = FakeMatrixClient(A_SESSION_ID, roomListService = roomListService)
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -216,13 +216,15 @@ subprojects {
             if (project.findProperty("composeCompilerReports") == "true") {
                 freeCompilerArgs += listOf(
                     "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.layout.buildDirectory.asFile.get().absolutePath}/compose_compiler"
+                    "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
+                        "${project.layout.buildDirectory.asFile.get().absolutePath}/compose_compiler"
                 )
             }
             if (project.findProperty("composeCompilerMetrics") == "true") {
                 freeCompilerArgs += listOf(
                     "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.layout.buildDirectory.asFile.get().absolutePath}/compose_compiler"
+                    "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
+                        "${project.layout.buildDirectory.asFile.get().absolutePath}/compose_compiler"
                 )
             }
         }

diff --git a/.../kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt b/.../kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
@@ -25,8 +25,8 @@ import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.features.analytics.api.R
 import io.element.android.libraries.designsystem.components.LINK_TAG
 import io.element.android.libraries.designsystem.components.list.ListItemContent
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.ListSupportingText

diff --git a/...src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt b/...src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
@@ -19,8 +19,7 @@ package io.element.android.features.analytics.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import javax.inject.Inject
 
-open class AnalyticsOptInStateProvider @Inject constructor(
-) : PreviewParameterProvider<AnalyticsOptInState> {
+open class AnalyticsOptInStateProvider @Inject constructor() : PreviewParameterProvider<AnalyticsOptInState> {
     override val values: Sequence<AnalyticsOptInState>
         get() = sequenceOf(
             aAnalyticsOptInState(),

diff --git a/...src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt b/...src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt
@@ -70,4 +70,3 @@ class AnalyticsOptInPresenterTest {
         }
     }
 }
-
diff --git a/.../element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt b/.../element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt
@@ -82,4 +82,3 @@ class AnalyticsPreferencesPresenterTest {
         }
     }
 }
-
diff --git a/features/call/src/main/kotlin/io/element/android/features/call/data/WidgetMessage.kt b/features/call/src/main/kotlin/io/element/android/features/call/data/WidgetMessage.kt
@@ -33,6 +33,7 @@ data class WidgetMessage(
     enum class Direction {
         @SerialName("fromWidget")
         FromWidget,
+
         @SerialName("toWidget")
         ToWidget
     }
@@ -41,6 +42,7 @@ data class WidgetMessage(
     enum class Action {
         @SerialName("im.vector.hangup")
         HangUp,
+
         @SerialName("send_event")
         SendEvent,
     }

diff --git a/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenPresenter.kt b/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenPresenter.kt
@@ -224,6 +224,4 @@ class CallScreenPresenter @AssistedInject constructor(
         navigator.close()
         widgetDriver?.close()
     }
-
 }
-
diff --git a/...src/main/kotlin/io/element/android/features/call/utils/WebViewWidgetMessageInterceptor.kt b/...src/main/kotlin/io/element/android/features/call/utils/WebViewWidgetMessageInterceptor.kt
@@ -56,7 +56,7 @@ class WebViewWidgetMessageInterceptor(
                                 || !message.data.response && message.data.api == "fromWidget") {
                                 let json = JSON.stringify(event.data) 
                                 ${"console.log('message sent: ' + json);".takeIf { BuildConfig.DEBUG } }
-                                ${LISTENER_NAME}.postMessage(json);
+                                $LISTENER_NAME.postMessage(json);
                             } else {
                                 ${"console.log('message received (ignored): ' + JSON.stringify(event.data));".takeIf { BuildConfig.DEBUG } }
                             }

diff --git a/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@@ -191,7 +191,7 @@ class CallScreenPresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-           consumeItemsUntilTimeout()
+            consumeItemsUntilTimeout()
 
             assertThat(matrixClient.syncService().syncState.value).isEqualTo(SyncState.Running)
 

diff --git a/features/call/src/test/kotlin/io/element/android/features/call/ui/FakeCallScreenNavigator.kt b/features/call/src/test/kotlin/io/element/android/features/call/ui/FakeCallScreenNavigator.kt
@@ -17,10 +17,10 @@
 package io.element.android.features.call.ui
 
 class FakeCallScreenNavigator : CallScreenNavigator {
-        var closeCalled = false
-            private set
+    var closeCalled = false
+        private set
 
-        override fun close() {
-            closeCalled = true
-        }
+    override fun close() {
+        closeCalled = true
     }
+}
diff --git a/...s/call/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt b/...s/call/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt
@@ -117,87 +117,87 @@ class CallIntentDataParserTest {
     @Test
     fun `Element Call url with url extra param appPrompt gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}&appPrompt=true",
+            url = "$VALID_CALL_URL_WITH_PARAM&appPrompt=true",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
         )
     }
 
     @Test
     fun `Element Call url with url extra param in fragment appPrompt gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#?appPrompt=true",
+            url = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=true",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=false&confineToRoom=true"
         )
     }
 
     @Test
     fun `Element Call url with url extra param in fragment appPrompt and other gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#?appPrompt=true&otherParam=maybe",
+            url = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=true&otherParam=maybe",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=false&otherParam=maybe&confineToRoom=true"
         )
     }
 
     @Test
     fun `Element Call url with url extra param confineToRoom gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}&confineToRoom=false",
+            url = "$VALID_CALL_URL_WITH_PARAM&confineToRoom=false",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
         )
     }
 
     @Test
     fun `Element Call url with url extra param in fragment confineToRoom gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#?confineToRoom=false",
+            url = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=false",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=true&appPrompt=false"
         )
     }
 
     @Test
     fun `Element Call url with url extra param in fragment confineToRoom and more gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#?confineToRoom=false&otherParam=maybe",
+            url = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=false&otherParam=maybe",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=true&otherParam=maybe&appPrompt=false"
         )
     }
 
     @Test
     fun `Element Call url with url fragment gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#fragment",
+            url = "$VALID_CALL_URL_WITH_PARAM#fragment",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#fragment?$EXTRA_PARAMS"
         )
     }
 
     @Test
     fun `Element Call url with url fragment with params gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#fragment?otherParam=maybe",
+            url = "$VALID_CALL_URL_WITH_PARAM#fragment?otherParam=maybe",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#fragment?otherParam=maybe&$EXTRA_PARAMS"
         )
     }
 
     @Test
     fun `Element Call url with url fragment with other params gets url extracted`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#?otherParam=maybe",
+            url = "$VALID_CALL_URL_WITH_PARAM#?otherParam=maybe",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?otherParam=maybe&$EXTRA_PARAMS"
         )
     }
 
     @Test
     fun `Element Call url with empty fragment`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#",
+            url = "$VALID_CALL_URL_WITH_PARAM#",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
         )
     }
 
     @Test
     fun `Element Call url with empty fragment query`() {
         doTest(
-            url = "${VALID_CALL_URL_WITH_PARAM}#?",
+            url = "$VALID_CALL_URL_WITH_PARAM#?",
             expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
         )
     }

diff --git a/...res/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt b/...res/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
@@ -24,19 +24,19 @@ import io.element.android.libraries.matrix.test.widget.FakeWidgetDriver
 class FakeCallWidgetProvider(
     private val widgetDriver: FakeWidgetDriver = FakeWidgetDriver(),
     private val url: String = "https://call.element.io",
-    ) : CallWidgetProvider {
+) : CallWidgetProvider {
 
-        var getWidgetCalled = false
-            private set
+    var getWidgetCalled = false
+        private set
 
-        override suspend fun getWidget(
-            sessionId: SessionId,
-            roomId: RoomId,
-            clientId: String,
-            languageTag: String?,
-            theme: String?
-        ): Result<Pair<MatrixWidgetDriver, String>> {
-            getWidgetCalled = true
-            return Result.success(widgetDriver to url)
-        }
+    override suspend fun getWidget(
+        sessionId: SessionId,
+        roomId: RoomId,
+        clientId: String,
+        languageTag: String?,
+        theme: String?
+    ): Result<Pair<MatrixWidgetDriver, String>> {
+        getWidgetCalled = true
+        return Result.success(widgetDriver to url)
     }
+}
diff --git a/...ll/src/test/kotlin/io/element/android/features/call/utils/FakeWidgetMessageInterceptor.kt b/...ll/src/test/kotlin/io/element/android/features/call/utils/FakeWidgetMessageInterceptor.kt
@@ -19,15 +19,15 @@ package io.element.android.features.call.utils
 import kotlinx.coroutines.flow.MutableSharedFlow
 
 class FakeWidgetMessageInterceptor : WidgetMessageInterceptor {
-        val sentMessages = mutableListOf<String>()
+    val sentMessages = mutableListOf<String>()
 
-        override val interceptedMessages = MutableSharedFlow<String>(extraBufferCapacity = 1)
+    override val interceptedMessages = MutableSharedFlow<String>(extraBufferCapacity = 1)
 
-        override fun sendMessage(message: String) {
-            sentMessages += message
-        }
+    override fun sendMessage(message: String) {
+        sentMessages += message
+    }
 
-        fun givenInterceptedMessage(message: String) {
-            interceptedMessages.tryEmit(message)
-        }
+    fun givenInterceptedMessage(message: String) {
+        interceptedMessages.tryEmit(message)
     }
+}
diff --git a/...rc/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt b/...rc/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
@@ -29,7 +29,6 @@ import javax.inject.Inject
 class DefaultCreateRoomEntryPoint @Inject constructor() : CreateRoomEntryPoint {
 
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
-
         val plugins = ArrayList<Plugin>()
 
         return object : CreateRoomEntryPoint.NodeBuilder {

diff --git a/...c/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenter.kt b/...c/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenter.kt
@@ -45,4 +45,3 @@ class AddPeoplePresenter @Inject constructor(
         return userListPresenter.present()
     }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,5 +68,4 @@ class MainNode(

		@Parcelize
		object RootNavTarget : Parcelable

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,3 @@ fun <T : Any> BackStack<T>.removeLast(element: T) {
		} ?: return
		accept(Remove(lastExpectedNavElement.key))
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -136,4 +136,3 @@ class RoomFlowNode @AssistedInject constructor(
		)
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,4 +70,3 @@ class AnalyticsOptInPresenterTest {
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,4 +82,3 @@ class AnalyticsPreferencesPresenterTest {
		}
		}
		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -224,6 +224,4 @@ class CallScreenPresenter @AssistedInject constructor( @@
             navigator.close()
             widgetDriver?.close()
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,4 +45,3 @@ class AddPeoplePresenter @Inject constructor(
		return userListPresenter.present()
		}
		}