Popup: Adds a file viewer for image attachments

toolkit/popup/src/main/AndroidManifest.xml

@@ -19,5 +19,15 @@
 
 <!--suppress XmlUnusedNamespaceDeclaration -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <application>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/files" />
+        </provider>
+    </application>
 </manifest>

toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/Popup.kt

@@ -38,6 +38,7 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -65,7 +66,8 @@ import com.arcgismaps.toolkit.popup.internal.element.state.mutablePopupElementSt
 import com.arcgismaps.toolkit.popup.internal.element.textelement.TextElementState
 import com.arcgismaps.toolkit.popup.internal.element.textelement.TextPopupElement
 import com.arcgismaps.toolkit.popup.internal.element.textelement.rememberTextElementState
-import com.arcgismaps.toolkit.popup.internal.fileviewer.ViewableFile
+import com.arcgismaps.toolkit.popup.internal.ui.fileviewer.FileViewer
+import com.arcgismaps.toolkit.popup.internal.ui.fileviewer.ViewableFile
 
 @Immutable
 private data class PopupState(@Stable val popup: Popup)
@@ -113,7 +115,14 @@ private fun Popup(popupState: PopupState, modifier: Modifier = Modifier) {
 
 @Composable
 private fun Popup(popupState: PopupState, evaluated: Boolean, modifier: Modifier = Modifier) {
+    val scope = rememberCoroutineScope()
     val popup = popupState.popup
+    val viewableFileState = rememberSaveable { mutableStateOf<ViewableFile?>(null) }
+    viewableFileState.value?.let { viewableFile ->
+        FileViewer(scope, fileState = viewableFile) {
+            viewableFileState.value = null
+        }
+    }
     Column(
         modifier = modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally
@@ -132,7 +141,9 @@ private fun Popup(popupState: PopupState, evaluated: Boolean, modifier: Modifier
         }
         HorizontalDivider(modifier = Modifier.fillMaxWidth(), thickness = 2.dp)
         if (evaluated) {
-            PopupBody(popupState)
+            PopupBody(popupState) {
+                viewableFileState.value = it
+            }
         }
     }
 }
@@ -161,7 +172,8 @@ private fun PopupBody(popupState: PopupState, onFileClicked: (ViewableFile?) ->
                     is AttachmentsPopupElement -> {
                         AttachmentsPopupElement(
                             state = entry.state as AttachmentsElementState,
-                            onFileClicked)
+                            onFileClicked
+                        )
                     }
 
                     is FieldsPopupElement -> {

toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/internal/element/attachment/AttachmentTile.kt

@@ -60,7 +60,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.arcgismaps.LoadStatus
 import com.arcgismaps.mapping.popup.PopupAttachmentType
-import com.arcgismaps.toolkit.popup.internal.fileviewer.ViewableFile
+import com.arcgismaps.toolkit.popup.internal.ui.fileviewer.ViewableFile
+import com.arcgismaps.toolkit.popup.internal.ui.fileviewer.toViewableFileType
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @Composable
@@ -87,7 +88,15 @@ internal fun AttachmentTile(
                     // load attachment
                     state.loadAttachment(coroutineScope)
                 } else if (loadStatus is LoadStatus.Loaded) {
-                    onClicked(state)
+                    onClicked(
+                        ViewableFile(
+                            state.name,
+                            state.size,
+                            state.path,
+                            state.popupAttachmentType.toViewableFileType(),
+                            state.contentType
+                        )
+                    )
                 }
                 // TODO open attachment viewer in `else` here
             }
@@ -274,6 +283,7 @@ internal fun PreviewAttachmentTile() {
             size = 1234L,
             popupAttachmentType = PopupAttachmentType.Other,
             loadStatus = MutableStateFlow(LoadStatus.NotLoaded),
+            contentType = "image/jpeg",
             onLoadAttachment = { Result.success(Unit) },
             onLoadThumbnail = null
         )

toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/internal/element/attachment/AttachmentsElementState.kt

@@ -38,10 +38,7 @@ import com.arcgismaps.mapping.popup.AttachmentsPopupElement
 import com.arcgismaps.mapping.popup.Popup
 import com.arcgismaps.mapping.popup.PopupAttachment
 import com.arcgismaps.mapping.popup.PopupAttachmentType
-import com.arcgismaps.toolkit.popup.internal.fileviewer.ViewableFile
-import com.arcgismaps.toolkit.popup.internal.fileviewer.toViewableFileType
 import com.arcgismaps.toolkit.popup.internal.element.state.PopupElementState
-import com.arcgismaps.toolkit.popup.internal.fileviewer.ViewableFileImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
@@ -116,27 +113,29 @@ internal fun rememberAttachmentsElementState(
  * @param onLoadThumbnail A function that loads the thumbnail of the attachment.
  */
 internal class PopupAttachmentState(
-    name: String,
-    size: Long,
+    val name: String,
+    val size: Long,
     val popupAttachmentType: PopupAttachmentType,
+    val contentType: String,
     val loadStatus: StateFlow<LoadStatus>,
     private val onLoadAttachment: suspend () -> Result<Unit>,
     private val onLoadThumbnail: (suspend () -> Result<BitmapDrawable?>)? = null
-) : ViewableFile by ViewableFileImpl(name, size, "", popupAttachmentType.toViewableFileType()) {
+) {
     private val _thumbnail: MutableState<ImageBitmap?> = mutableStateOf(null)
     private lateinit var _attachment: PopupAttachment
 
     /**
      * The thumbnail of the attachment. This is `null` until [loadAttachment] is called.
      */
     val thumbnail: State<ImageBitmap?> = _thumbnail
-    override val path: String
+    val path: String
         get() = _attachment.filePath
 
     constructor(attachment: PopupAttachment) : this(
         name = attachment.name,
         size = attachment.size,
         popupAttachmentType = attachment.type,
+        contentType = attachment.contentType,
         loadStatus = attachment.loadStatus,
         onLoadAttachment = attachment::retryLoad,
         onLoadThumbnail = if (attachment.type == PopupAttachmentType.Image) {

toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/internal/element/attachment/AttachmentsPopupElement.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.arcgismaps.LoadStatus
 import com.arcgismaps.mapping.popup.PopupAttachmentType
-import com.arcgismaps.toolkit.popup.internal.fileviewer.ViewableFile
+import com.arcgismaps.toolkit.popup.internal.ui.fileviewer.ViewableFile
 import com.arcgismaps.toolkit.popup.internal.ui.ExpandableCard
 import kotlinx.coroutines.flow.MutableStateFlow
 
@@ -96,6 +96,7 @@ private fun AttachmentsPopupElementPreview() {
                 name = "Photo 1.jpg",
                 size = 2024,
                 PopupAttachmentType.Image,
+                contentType = "image/jpeg",
                 MutableStateFlow(LoadStatus.Loaded),
                 { Result.success(Unit) },
                 { Result.success(null) }