Browse Source

Media: some code clean-up

feature/jme/open-room-member-details-when-clicking-on-user-data
ganfra 1 year ago
parent
commit
3e01a2f317
  1. 2
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaFactory.kt
  2. 3
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt
  3. 2
      features/messages/impl/src/test/kotlin/io/element/android/features/messages/attachments/AttachmentsPreviewPresenterTest.kt
  4. 3
      features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/media.kt
  5. 2
      features/messages/impl/src/test/kotlin/io/element/android/features/messages/media/FakeLocalMediaFactory.kt
  6. 4
      libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaSource.kt
  7. 0
      libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaFile.kt

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaFactory.kt

@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.api.media.MediaFile
interface LocalMediaFactory { interface LocalMediaFactory {
/** /**
* This method will create a [LocalMedia] with the given [MediaFile] and [mimeType] * This method will create a [LocalMedia] with the given [MediaFile] and [mimeType].
* *
*/ */
fun createFromMediaFile(mediaFile: MediaFile, mimeType: String?): LocalMedia fun createFromMediaFile(mediaFile: MediaFile, mimeType: String?): LocalMedia

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/LocalMediaView.kt

@ -74,7 +74,7 @@ private fun MediaImageView(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),
contentDescription = null, contentDescription = null,
) )
} } else {
val zoomableState = rememberZoomableState( val zoomableState = rememberZoomableState(
zoomSpec = ZoomSpec(maxZoomFactor = 3f) zoomSpec = ZoomSpec(maxZoomFactor = 3f)
) )
@ -86,6 +86,7 @@ private fun MediaImageView(
contentScale = ContentScale.Fit, contentScale = ContentScale.Fit,
) )
} }
}
@UnstableApi @UnstableApi
@Composable @Composable

2
features/messages/impl/src/test/kotlin/io/element/android/features/messages/attachments/AttachmentsPreviewPresenterTest.kt

@ -84,7 +84,7 @@ class AttachmentsPreviewPresenterTest {
} }
private fun anAttachmentsPreviewPresenter( private fun anAttachmentsPreviewPresenter(
localMedia: LocalMedia = aLocalMedia(MimeTypes.IMAGE_JPEG), localMedia: LocalMedia = aLocalMedia(mimeType = MimeTypes.IMAGE_JPEG),
room: MatrixRoom = FakeMatrixRoom() room: MatrixRoom = FakeMatrixRoom()
): AttachmentsPreviewPresenter { ): AttachmentsPreviewPresenter {
return AttachmentsPreviewPresenter( return AttachmentsPreviewPresenter(

3
features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/media.kt

@ -17,13 +17,14 @@
package io.element.android.features.messages.fixtures package io.element.android.features.messages.fixtures
import android.net.Uri import android.net.Uri
import androidx.media3.common.MimeTypes
import io.element.android.features.messages.impl.attachments.Attachment import io.element.android.features.messages.impl.attachments.Attachment
import io.element.android.features.messages.impl.media.local.LocalMedia import io.element.android.features.messages.impl.media.local.LocalMedia
import io.mockk.mockk import io.mockk.mockk
fun aLocalMedia( fun aLocalMedia(
mimeType: String,
uri: Uri = mockk("localMediaUri"), uri: Uri = mockk("localMediaUri"),
mimeType: String = MimeTypes.IMAGE_JPEG,
name: String = "a media", name: String = "a media",
size: Long = 1000, size: Long = 1000,
) = LocalMedia( ) = LocalMedia(

2
features/messages/impl/src/test/kotlin/io/element/android/features/messages/media/FakeLocalMediaFactory.kt

@ -23,7 +23,7 @@ import io.element.android.features.messages.impl.media.local.LocalMediaFactory
import io.element.android.libraries.core.mimetype.MimeTypes 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
class FakeLocalMediaFactory() : LocalMediaFactory { class FakeLocalMediaFactory : LocalMediaFactory {
var fallbackMimeType: String = MimeTypes.OctetStream var fallbackMimeType: String = MimeTypes.OctetStream

4
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaSource.kt

@ -22,11 +22,11 @@ import kotlinx.parcelize.Parcelize
@Parcelize @Parcelize
data class MediaSource( data class MediaSource(
/** /**
* Url of the media * Url of the media.
*/ */
val url: String, val url: String,
/** /**
* This is used to hold data for encrypted media * This is used to hold data for encrypted media.
*/ */
val json: String? = null, val json: String? = null,
) : Parcelable ) : Parcelable

0
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaHandle.kt → libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaFile.kt

Loading…
Cancel
Save