Renaming function for code clarity.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt

@@ -21,21 +21,21 @@ import androidx.core.net.toUri
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.api.local.MediaInfo
-import io.element.android.libraries.mediaviewer.api.local.aFileInfo
-import io.element.android.libraries.mediaviewer.api.local.anImageInfo
+import io.element.android.libraries.mediaviewer.api.local.anApkMediaInfo
+import io.element.android.libraries.mediaviewer.api.local.anImageMediaInfo
 
 open class AttachmentsPreviewStateProvider : PreviewParameterProvider<AttachmentsPreviewState> {
     override val values: Sequence<AttachmentsPreviewState>
         get() = sequenceOf(
             anAttachmentsPreviewState(),
-            anAttachmentsPreviewState(mediaInfo = aFileInfo()),
+            anAttachmentsPreviewState(mediaInfo = anApkMediaInfo()),
             anAttachmentsPreviewState(sendActionState = SendActionState.Sending.Uploading(0.5f)),
             anAttachmentsPreviewState(sendActionState = SendActionState.Failure(RuntimeException("error"))),
         )
 }
 
 fun anAttachmentsPreviewState(
-    mediaInfo: MediaInfo = anImageInfo(),
+    mediaInfo: MediaInfo = anImageMediaInfo(),
     sendActionState: SendActionState = SendActionState.Idle
 ) = AttachmentsPreviewState(
     attachment = Attachment.Media(

libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/MediaInfo.kt

@@ -28,35 +28,35 @@ data class MediaInfo(
     val fileExtension: String,
 ) : Parcelable
 
-fun anImageInfo(): MediaInfo = MediaInfo(
+fun anImageMediaInfo(): MediaInfo = MediaInfo(
     "an image file.jpg",
     MimeTypes.Jpeg,
     "4MB",
     "jpg"
 )
 
-fun aVideoInfo(): MediaInfo = MediaInfo(
+fun aVideoMediaInfo(): MediaInfo = MediaInfo(
     "a video file.mp4",
     MimeTypes.Mp4,
     "14MB",
     "mp4"
 )
 
-fun aPdfInfo(): MediaInfo = MediaInfo(
+fun aPdfMediaInfo(): MediaInfo = MediaInfo(
     "a pdf file.pdf",
     MimeTypes.Pdf,
     "23MB",
     "pdf"
 )
 
-fun aFileInfo(): MediaInfo = MediaInfo(
+fun anApkMediaInfo(): MediaInfo = MediaInfo(
     "an apk file.apk",
     MimeTypes.Apk,
     "50MB",
     "apk"
 )
 
-fun anAudioInfo(): MediaInfo = MediaInfo(
+fun anAudioMediaInfo(): MediaInfo = MediaInfo(
     "an audio file.mp3",
     MimeTypes.Mp3,
     "7MB",

libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerStateProvider.kt

@@ -21,11 +21,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.api.local.MediaInfo
-import io.element.android.libraries.mediaviewer.api.local.aFileInfo
-import io.element.android.libraries.mediaviewer.api.local.aPdfInfo
-import io.element.android.libraries.mediaviewer.api.local.aVideoInfo
-import io.element.android.libraries.mediaviewer.api.local.anAudioInfo
-import io.element.android.libraries.mediaviewer.api.local.anImageInfo
+import io.element.android.libraries.mediaviewer.api.local.anApkMediaInfo
+import io.element.android.libraries.mediaviewer.api.local.aPdfMediaInfo
+import io.element.android.libraries.mediaviewer.api.local.aVideoMediaInfo
+import io.element.android.libraries.mediaviewer.api.local.anAudioMediaInfo
+import io.element.android.libraries.mediaviewer.api.local.anImageMediaInfo
 
 open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState> {
     override val values: Sequence<MediaViewerState>
@@ -35,47 +35,47 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
             aMediaViewerState(AsyncData.Failure(IllegalStateException("error"))),
             aMediaViewerState(
                 AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, anImageInfo())
+                    LocalMedia(Uri.EMPTY, anImageMediaInfo())
                 ),
-                anImageInfo(),
+                anImageMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, aVideoInfo())
+                    LocalMedia(Uri.EMPTY, aVideoMediaInfo())
                 ),
-                aVideoInfo(),
+                aVideoMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, aPdfInfo())
+                    LocalMedia(Uri.EMPTY, aPdfMediaInfo())
                 ),
-                aPdfInfo(),
+                aPdfMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Loading(),
-                aFileInfo(),
+                anApkMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, aFileInfo())
+                    LocalMedia(Uri.EMPTY, anApkMediaInfo())
                 ),
-                aFileInfo(),
+                anApkMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Loading(),
-                anAudioInfo(),
+                anAudioMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, anAudioInfo())
+                    LocalMedia(Uri.EMPTY, anAudioMediaInfo())
                 ),
-                anAudioInfo(),
+                anAudioMediaInfo(),
             ),
             aMediaViewerState(
                 AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, anImageInfo())
+                    LocalMedia(Uri.EMPTY, anImageMediaInfo())
                 ),
-                anImageInfo(),
+                anImageMediaInfo(),
                 canDownload = false,
                 canShare = false,
             ),
@@ -84,7 +84,7 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
 
 fun aMediaViewerState(
     downloadedMedia: AsyncData<LocalMedia> = AsyncData.Uninitialized,
-    mediaInfo: MediaInfo = anImageInfo(),
+    mediaInfo: MediaInfo = anImageMediaInfo(),
     canDownload: Boolean = true,
     canShare: Boolean = true,
     eventSink: (MediaViewerEvents) -> Unit = {},

libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt

@@ -27,7 +27,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.matrix.test.media.FakeMediaLoader
 import io.element.android.libraries.matrix.test.media.aMediaSource
-import io.element.android.libraries.mediaviewer.api.local.aFileInfo
+import io.element.android.libraries.mediaviewer.api.local.anApkMediaInfo
 import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerEvents
 import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerNode
 import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerPresenter
@@ -40,7 +40,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-private val TESTED_MEDIA_INFO = aFileInfo()
+private val TESTED_MEDIA_INFO = anApkMediaInfo()
 
 class MediaViewerPresenterTest {
     @get:Rule

libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.test.swipeDown
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
-import io.element.android.libraries.mediaviewer.api.local.anImageInfo
+import io.element.android.libraries.mediaviewer.api.local.anImageMediaInfo
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
@@ -79,9 +79,9 @@ class MediaViewerViewTest {
         rule.setMediaViewerView(
             aMediaViewerState(
                 downloadedMedia = AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, anImageInfo())
+                    LocalMedia(Uri.EMPTY, anImageMediaInfo())
                 ),
-                mediaInfo = anImageInfo(),
+                mediaInfo = anImageMediaInfo(),
                 eventSink = eventsRecorder
             ),
         )
@@ -97,9 +97,9 @@ class MediaViewerViewTest {
         rule.setMediaViewerView(
             aMediaViewerState(
                 downloadedMedia = AsyncData.Success(
-                    LocalMedia(Uri.EMPTY, anImageInfo())
+                    LocalMedia(Uri.EMPTY, anImageMediaInfo())
                 ),
-                mediaInfo = anImageInfo(),
+                mediaInfo = anImageMediaInfo(),
                 eventSink = eventsRecorder
             ),
         )
@@ -122,9 +122,9 @@ class MediaViewerViewTest {
             rule.setMediaViewerView(
                 aMediaViewerState(
                     downloadedMedia = AsyncData.Success(
-                        LocalMedia(Uri.EMPTY, anImageInfo())
+                        LocalMedia(Uri.EMPTY, anImageMediaInfo())
                     ),
-                    mediaInfo = anImageInfo(),
+                    mediaInfo = anImageMediaInfo(),
                     eventSink = eventsRecorder
                 ),
                 onBackPressed = callback,
@@ -141,7 +141,7 @@ class MediaViewerViewTest {
         rule.setMediaViewerView(
             aMediaViewerState(
                 downloadedMedia = AsyncData.Failure(IllegalStateException("error")),
-                mediaInfo = anImageInfo(),
+                mediaInfo = anImageMediaInfo(),
                 eventSink = eventsRecorder
             ),
         )
@@ -155,7 +155,7 @@ class MediaViewerViewTest {
         rule.setMediaViewerView(
             aMediaViewerState(
                 downloadedMedia = AsyncData.Failure(IllegalStateException("error")),
-                mediaInfo = anImageInfo(),
+                mediaInfo = anImageMediaInfo(),
                 eventSink = eventsRecorder
             ),
         )

libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt

@@ -22,7 +22,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.media.MediaFile
 import io.element.android.libraries.matrix.test.media.FakeMediaFile
 import io.element.android.libraries.mediaviewer.api.local.MediaInfo
-import io.element.android.libraries.mediaviewer.api.local.anImageInfo
+import io.element.android.libraries.mediaviewer.api.local.anImageMediaInfo
 import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractorWithoutValidation
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -34,7 +34,7 @@ class AndroidLocalMediaFactoryTest {
     @Test
     fun `test AndroidLocalMediaFactory`() {
         val sut = createAndroidLocalMediaFactory()
-        val result = sut.createFromMediaFile(aMediaFile(), anImageInfo())
+        val result = sut.createFromMediaFile(aMediaFile(), anImageMediaInfo())
         assertThat(result.uri.toString()).endsWith("aPath")
         assertThat(result.info).isEqualTo(
             MediaInfo(

libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt

@@ -19,11 +19,11 @@ package io.element.android.libraries.mediaviewer.test.viewer
 import android.net.Uri
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.api.local.MediaInfo
-import io.element.android.libraries.mediaviewer.api.local.anImageInfo
+import io.element.android.libraries.mediaviewer.api.local.anImageMediaInfo
 
 fun aLocalMedia(
     uri: Uri,
-    mediaInfo: MediaInfo = anImageInfo(),
+    mediaInfo: MediaInfo = anImageMediaInfo(),
 ) = LocalMedia(
     uri = uri,
     info = mediaInfo