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>

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt

@@ -34,6 +34,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -43,7 +44,6 @@ import io.element.android.libraries.designsystem.theme.components.ListItemStyle
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheetLayout
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.ui.media.AvatarAction
-import io.element.android.compound.theme.ElementTheme
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.launch

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt

@@ -29,15 +29,15 @@ import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-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.theme.components.Text
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
-import io.element.android.compound.theme.ElementTheme
 
 @Composable
 fun MatrixUserHeader(

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeaderPlaceholder.kt

@@ -31,12 +31,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-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.theme.placeholderBackground
-import io.element.android.compound.theme.ElementTheme
 
 @Composable
 fun MatrixUserHeaderPlaceholder(

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt

@@ -20,8 +20,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-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.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt

@@ -35,12 +35,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.debugPlaceholderBackground
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
-import io.element.android.compound.theme.ElementTheme
 
 /**
  * An avatar that the user has selected, but which has not yet been uploaded to Matrix.

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt

@@ -42,4 +42,3 @@ data class MediaRequestData(
         }
     }
 }
-

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt

@@ -34,5 +34,5 @@ internal class MediaRequestDataKeyer : Keyer<MediaRequestData> {
 
 private fun MediaRequestData.toKey(): String? {
     if (source == null) return null
-    return "${source.url}_${kind}"
+    return "${source.url}_$kind"
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt

@@ -37,17 +37,17 @@ fun FormattedBody.toHtmlDocument(prefix: String? = null): Document? {
         // We don't trim the start in case it's used as indentation.
         ?.trimEnd()
         ?.let { formattedBody ->
-        val dom = if (prefix != null) {
-            Jsoup.parse("$prefix $formattedBody")
-        } else {
-            Jsoup.parse(formattedBody)
+            val dom = if (prefix != null) {
+                Jsoup.parse("$prefix $formattedBody")
+            } else {
+                Jsoup.parse(formattedBody)
+            }
+
+            // Prepend `@` to mentions
+            fixMentions(dom)
+
+            dom
         }
-
-        // Prepend `@` to mentions
-        fixMentions(dom)
-
-        dom
-    }
 }
 
 private fun fixMentions(dom: Document) {

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainText.kt

@@ -17,8 +17,8 @@
 package io.element.android.libraries.matrix.ui.messages
 
 import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
-import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.nodes.Node

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt

@@ -37,4 +37,3 @@ fun MatrixRoom.canRedactAsState(updateKey: Long): State<Boolean> {
         value = canRedact().getOrElse { false }
     }
 }
-

libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToPlainTextTest.kt

@@ -40,7 +40,8 @@ class ToPlainTextTest {
             """.trimIndent()
         )
 
-        assertThat(document.toPlainText()).isEqualTo("""
+        assertThat(document.toPlainText()).isEqualTo(
+            """
             Hello world 
             • This is an unordered list.
             1. This is an ordered list.
@@ -59,7 +60,8 @@ class ToPlainTextTest {
                 <br />
             """.trimIndent()
         )
-        assertThat(formattedBody.toPlainText()).isEqualTo("""
+        assertThat(formattedBody.toPlainText()).isEqualTo(
+            """
             Hello world 
             • This is an unordered list.
             1. This is an ordered list.
@@ -95,7 +97,8 @@ class ToPlainTextTest {
                 """.trimIndent()
             )
         )
-        assertThat(messageType.toPlainText()).isEqualTo("""
+        assertThat(messageType.toPlainText()).isEqualTo(
+            """
             Hello world 
             • This is an unordered list.
             1. This is an ordered list.