From af866e3407af897338b5ebe28df6293c5a993244 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 18 Mar 2025 11:35:11 +0100
Subject: [PATCH] Fix issues reported by Konsist.

---
 .../mediaviewer/impl/local/LocalMediaView.kt         |  4 ++--
 ...TxtFileProvider.kt => TextFileContentProvider.kt} |  2 +-
 .../local/txt/{TxtFileView.kt => TextFileView.kt}    | 12 ++++++------
 .../android/tests/konsist/KonsistClassNameTest.kt    |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/{TxtFileProvider.kt => TextFileContentProvider.kt} (89%)
 rename libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/{TxtFileView.kt => TextFileView.kt} (94%)

diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt
index f58bd34066..10ac3a7c2a 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt
@@ -20,7 +20,7 @@ import io.element.android.libraries.mediaviewer.impl.local.audio.MediaAudioView
 import io.element.android.libraries.mediaviewer.impl.local.file.MediaFileView
 import io.element.android.libraries.mediaviewer.impl.local.image.MediaImageView
 import io.element.android.libraries.mediaviewer.impl.local.pdf.MediaPdfView
-import io.element.android.libraries.mediaviewer.impl.local.txt.TxtFileView
+import io.element.android.libraries.mediaviewer.impl.local.txt.TextFileView
 import io.element.android.libraries.mediaviewer.impl.local.video.MediaVideoView
 
 @Composable
@@ -49,7 +49,7 @@ fun LocalMediaView(
             localMedia = localMedia,
             modifier = modifier,
         )
-        mimeType == MimeTypes.PlainText -> TxtFileView(
+        mimeType == MimeTypes.PlainText -> TextFileView(
             localMedia = localMedia,
             textFileViewer = textFileViewer,
             modifier = modifier,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TxtFileProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt
similarity index 89%
rename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TxtFileProvider.kt
rename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt
index 29b50ef85b..00480f2d42 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TxtFileProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.architecture.AsyncData
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
-open class TxtFileProvider : PreviewParameterProvider<AsyncData<ImmutableList<String>>> {
+open class TextFileContentProvider : PreviewParameterProvider<AsyncData<ImmutableList<String>>> {
     override val values: Sequence<AsyncData<ImmutableList<String>>>
         get() = sequenceOf(
             AsyncData.Uninitialized,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TxtFileView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt
similarity index 94%
rename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TxtFileView.kt
rename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt
index 461efa0dc9..c025ab8bed 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TxtFileView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt
@@ -32,7 +32,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 @Composable
-fun TxtFileView(
+fun TextFileView(
     localMedia: LocalMedia?,
     textFileViewer: TextFileViewer,
     modifier: Modifier = Modifier,
@@ -55,7 +55,7 @@ fun TxtFileView(
             }
         }
     }
-    TxtFileViewContent(
+    TextFileContentView(
         data = data.value,
         textFileViewer = textFileViewer,
         modifier = modifier,
@@ -63,7 +63,7 @@ fun TxtFileView(
 }
 
 @Composable
-private fun TxtFileViewContent(
+private fun TextFileContentView(
     data: AsyncData<ImmutableList<String>>,
     textFileViewer: TextFileViewer,
     modifier: Modifier = Modifier,
@@ -95,10 +95,10 @@ private fun TxtFileViewContent(
 
 @PreviewsDayNight
 @Composable
-internal fun TxtFileViewPreview(
-    @PreviewParameter(TxtFileProvider::class) text: AsyncData<ImmutableList<String>>,
+internal fun TextFileContentViewPreview(
+    @PreviewParameter(TextFileContentProvider::class) text: AsyncData<ImmutableList<String>>,
 ) = ElementPreview {
-    TxtFileViewContent(
+    TextFileContentView(
         data = text,
         textFileViewer = { lines, modifier ->
             Text(
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index b5e75b904d..020245b906 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -51,6 +51,7 @@ class KonsistClassNameTest {
             .withoutName(
                 "AspectRatioProvider",
                 "OverlapRatioProvider",
+                "TextFileContentProvider",
             )
             .also {
                 // Check that classes are actually found