Move matrixmedia sources to the libraries.matrixmedia.* packages

The matrixmedia modules were using the `libraries.matrix.ui.media` package
(shared with the matrixui module) and `libraries.matrix.ui.media.*`
namespaces. Use `libraries.matrixmedia.api`, `libraries.matrixmedia.impl`
and `libraries.matrixmedia.test` instead, matching the module paths.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Benoit Marty
2026-10-05 13:52:02 +02:00
parent 9cb68844da
commit fe8b3764e5
52 changed files with 71 additions and 64 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ plugins {
}
android {
namespace = "io.element.android.libraries.matrix.ui.media.impl"
namespace = "io.element.android.libraries.matrixmedia.impl"
}
setupDependencyInjection()
@@ -5,10 +5,12 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.libraries.matrixmedia.api.AVATAR_THUMBNAIL_SIZE_IN_PIXEL
import io.element.android.libraries.matrixmedia.api.MediaRequestData
internal fun AvatarData.toMediaRequestData(): MediaRequestData {
return MediaRequestData(
@@ -6,7 +6,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import coil3.ImageLoader
import coil3.fetch.Fetcher
@@ -6,7 +6,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import coil3.decode.DataSource
import coil3.decode.ImageSource
@@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.exception.isNetworkError
import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.libraries.matrix.api.media.toFile
import io.element.android.libraries.matrixmedia.api.MediaRequestData
import okio.Buffer
import okio.FileSystem
import okio.Path.Companion.toOkioPath
@@ -6,7 +6,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import coil3.ImageLoader
import dev.zacsweers.metro.AppScope
@@ -14,6 +14,7 @@ import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.SingleIn
import io.element.android.libraries.matrix.api.MatrixClient
import io.element.android.libraries.matrix.api.core.SessionId
import io.element.android.libraries.matrixmedia.api.ImageLoaderHolder
import io.element.android.libraries.sessionstorage.api.observer.SessionListener
import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
@@ -6,7 +6,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import android.graphics.Canvas
import android.graphics.Paint
@@ -36,6 +36,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
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.matrixmedia.api.InitialsAvatarBitmapGenerator
@ContributesBinding(AppScope::class)
class DefaultInitialsAvatarBitmapGenerator : InitialsAvatarBitmapGenerator {
@@ -6,7 +6,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import android.content.Context
import android.os.Build
@@ -6,12 +6,13 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import coil3.ImageLoader
import coil3.fetch.Fetcher
import coil3.request.Options
import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
import io.element.android.libraries.matrixmedia.api.MediaRequestData
internal class MediaRequestDataFetcherFactory(
private val matrixMediaLoader: MatrixMediaLoader,
@@ -6,11 +6,12 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import coil3.key.Keyer
import coil3.request.Options
import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.matrixmedia.api.MediaRequestData
internal class AvatarDataKeyer : Keyer<AvatarData> {
override fun key(data: AvatarData, options: Options): String? {
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import android.graphics.Bitmap
import coil3.ComponentRegistry
@@ -6,7 +6,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import androidx.test.platform.app.InstrumentationRegistry
import coil3.ImageLoader
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.matrix.ui.media
package io.element.android.libraries.matrixmedia.impl
import coil3.ImageLoader
import io.element.android.libraries.matrix.api.media.MatrixMediaLoader