Allowing multiple images on a single event to be displayed in the Profile gallery

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/gallery/GalleryThumb.kt

@@ -53,6 +53,7 @@ import com.vitorpamplona.amethyst.commons.richtext.RichTextParser.Companion.isVi
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.ui.actions.CrossfadeIfEnabled
+import com.vitorpamplona.amethyst.ui.components.AutoNonlazyGrid
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
 import com.vitorpamplona.amethyst.ui.components.DisplayBlurHash
 import com.vitorpamplona.amethyst.ui.components.DisplayUrlWithLoadingSymbol
@@ -60,6 +61,7 @@ import com.vitorpamplona.amethyst.ui.components.GetMediaItem
 import com.vitorpamplona.amethyst.ui.components.GetVideoController
 import com.vitorpamplona.amethyst.ui.components.ImageUrlWithDownloadButton
 import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
+import com.vitorpamplona.amethyst.ui.components.UrlImageView
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.note.DownloadForOfflineIcon
 import com.vitorpamplona.amethyst.ui.note.WatchAuthor
@@ -82,10 +84,8 @@ fun GalleryThumbnail(
 
     val content =
         if (noteEvent is ProfileGalleryEntryEvent) {
-            val url = noteEvent.url()
+            noteEvent.urls().map { url ->
-            if (url == null) {
+                if (isVideoUrl(url)) {
-                null
-            } else if (isVideoUrl(url)) {
                     MediaUrlVideo(
                         url = url,
                         description = noteEvent.content,
@@ -106,11 +106,9 @@ fun GalleryThumbnail(
                         mimeType = noteEvent.mimeType(),
                     )
                 }
+            }
         } else if (noteEvent is PictureEvent) {
-            val imeta = noteEvent.imetaTags().firstOrNull()
+            noteEvent.imetaTags().map { imeta ->
-            if (imeta?.url == null) {
-                null
-            } else {
                 MediaUrlImage(
                     url = imeta.url,
                     description = noteEvent.content,
@@ -122,11 +120,7 @@ fun GalleryThumbnail(
                 )
             }
         } else if (noteEvent is VideoEvent) {
-            val imeta = noteEvent.imetaTags().firstOrNull()
+            noteEvent.imetaTags().map { imeta ->
-
-            if (imeta?.url == null) {
-                null
-            } else {
                 MediaUrlVideo(
                     url = imeta.url,
                     description = noteEvent.content,
@@ -138,7 +132,7 @@ fun GalleryThumbnail(
                 )
             }
         } else {
-            null
+            emptyList()
         }
 
     InnerRenderGalleryThumb(content, baseNote, accountViewModel)
@@ -146,15 +140,12 @@ fun GalleryThumbnail(
 
 @Composable
 fun InnerRenderGalleryThumb(
-    content: MediaUrlContent?,
+    content: List<MediaUrlContent>,
     note: Note,
     accountViewModel: AccountViewModel,
 ) {
-    if (content != null) {
+    if (content.isNotEmpty()) {
-        GalleryContentView(
+        GalleryContentView(content, accountViewModel)
-            content = content,
-            accountViewModel = accountViewModel,
-        )
     } else {
         DisplayGalleryAuthorBanner(note)
     }
@@ -170,10 +161,11 @@ fun DisplayGalleryAuthorBanner(note: Note) {
 @androidx.annotation.OptIn(UnstableApi::class)
 @Composable
 fun GalleryContentView(
-    content: MediaUrlContent,
+    contentList: List<MediaUrlContent>,
     accountViewModel: AccountViewModel,
 ) {
-    when (content) {
+    AutoNonlazyGrid(contentList.size) { contentIndex ->
+        when (val content = contentList[contentIndex]) {
             is MediaUrlImage ->
                 SensitivityWarning(content.contentWarning != null, accountViewModel) {
                     UrlImageView(content, accountViewModel)
@@ -183,6 +175,7 @@ fun GalleryContentView(
                     UrlVideoView(content, accountViewModel)
                 }
         }
+    }
 }
 
 @Composable