Create matrixui module and remove dependency to coil in the matrix module. Move MatrixUser there.

libraries/matrixui/src/main/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest/>

libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/MatrixUi.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.matrix.ui
+
+import coil.ComponentRegistry
+import io.element.android.x.matrix.MatrixClient
+import io.element.android.x.matrix.ui.media.MediaFetcher
+import io.element.android.x.matrix.ui.media.MediaKeyer
+import javax.inject.Inject
+
+class MatrixUi @Inject constructor() {
+
+    fun registerCoilComponents(
+        builder: ComponentRegistry.Builder,
+        activeClientProvider: () -> MatrixClient?
+    ) {
+        builder.add(MediaKeyer())
+        builder.add(MediaFetcher.Factory(activeClientProvider))
+    }
+}

libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaFetcher.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.matrix.ui.media
+
+import coil.ImageLoader
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.request.Options
+import io.element.android.x.matrix.MatrixClient
+import io.element.android.x.matrix.media.MediaResolver
+import java.nio.ByteBuffer
+
+class MediaFetcher(
+    private val mediaResolver: MediaResolver?,
+    private val meta: MediaResolver.Meta,
+    private val options: Options,
+    private val imageLoader: ImageLoader
+) : Fetcher {
+
+    override suspend fun fetch(): FetchResult? {
+        val byteArray = mediaResolver?.resolve(meta) ?: return null
+        val byteBuffer = ByteBuffer.wrap(byteArray)
+        return imageLoader.components.newFetcher(byteBuffer, options, imageLoader)?.first?.fetch()
+    }
+
+    class Factory(private val activeClientProvider: () -> MatrixClient?) :
+        Fetcher.Factory<MediaResolver.Meta> {
+        override fun create(
+            data: MediaResolver.Meta,
+            options: Options,
+            imageLoader: ImageLoader
+        ): Fetcher {
+            val activeClient = activeClientProvider()
+            return MediaFetcher(
+                mediaResolver = activeClient?.mediaResolver(),
+                meta = data,
+                options = options,
+                imageLoader = imageLoader
+            )
+        }
+    }
+}

libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/MediaKeyer.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.matrix.ui.media
+
+import coil.key.Keyer
+import coil.request.Options
+import io.element.android.x.matrix.media.MediaResolver
+
+class MediaKeyer : Keyer<MediaResolver.Meta> {
+    override fun key(data: MediaResolver.Meta, options: Options): String? {
+        return "${data.source.url()}_${data.kind}"
+    }
+}

libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.matrix.ui.model
+
+import androidx.compose.runtime.Stable
+import io.element.android.x.designsystem.components.avatar.AvatarData
+
+@Stable
+data class MatrixUser(
+    val username: String? = null,
+    val avatarUrl: String? = null,
+    val avatarData: AvatarData = AvatarData(),
+)