mittwerk
/
element-x-android
mirror of https://github.com/element-hq/element-x-android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Renaming function for code clarity.

pull/2448/head
Benoit Marty 7 months ago
parent
43b5b2196e
commit
f484be0e0b
7 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt
  2. 10
      libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/MediaInfo.kt
  3. 40
      libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerStateProvider.kt
  4. 4
      libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
  5. 18
      libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt
  6. 4
      libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt
  7. 4
      libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt

8
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt
Unescape View File

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

10
libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/MediaInfo.kt
Unescape View File

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

40
libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerStateProvider.kt
Unescape View File

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

4
libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
Unescape View File

@ -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.designsystem.utils.snackbar.SnackbarDispatcher
import io.element.android.libraries.matrix.test.media.FakeMediaLoader import io.element.android.libraries.matrix.test.media.FakeMediaLoader
import io.element.android.libraries.matrix.test.media.aMediaSource 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.MediaViewerEvents
import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerNode import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerNode
import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerPresenter 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.Rule
import org.junit.Test import org.junit.Test
private val TESTED_MEDIA_INFO = aFileInfo() private val TESTED_MEDIA_INFO = anApkMediaInfo()
class MediaViewerPresenterTest { class MediaViewerPresenterTest {
@get:Rule @get:Rule

18
libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt
Unescape View File

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

4
libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt
Unescape View File

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

4
libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt
Unescape View File

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

Write Preview
Loading…
Cancel
Save