add image view

Author: loerting

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/tabs/ImageTab.kt

@@ -0,0 +1,21 @@
+package me.lkl.dalvikus.tabs
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.graphics.vector.ImageVector
+import me.lkl.dalvikus.tree.archive.ZipEntryImageNode
+
+class ImageTab(
+    val tabName: String,
+    override val tabId: String,
+    override val contentProvider: ZipEntryImageNode
+) : TabElement {
+    override var hasUnsavedChanges: MutableState<Boolean> = mutableStateOf(false)
+
+    @Composable
+    override fun tabName(): String = tabName
+    override val tabIcon: ImageVector = Icons.Filled.Image
+}

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/theme/FileTypeMeta.kt

@@ -37,12 +37,14 @@ fun getSuggestionTypeIcon(type: SuggestionType): ImageVector {
     }
 }
 
+val readableImageFormats = listOf("png", "jpg", "jpeg", "bmp", "webp", "gif", "ico")
+
 fun getFileExtensionMeta(fileName: String): FileTypeMeta {
     val ext = fileName.substringAfterLast('.', "").lowercase()
 
     return when (ext) {
         "txt", "md", "log" -> FileTypeMeta(Icons.Outlined.Description)
-        "jpg", "jpeg", "png", "gif", "bmp", "webp", "svg" ->
+        in readableImageFormats ->
             FileTypeMeta(Icons.Outlined.Image, ImagePurple)
         "mp3", "wav", "ogg", "flac", "aac" ->
             FileTypeMeta(Icons.Outlined.MusicNote, AudioTeal)

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/tree/archive/ZipEntryFolderNode.kt

@@ -2,6 +2,7 @@ package me.lkl.dalvikus.tree.archive
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Folder
+import me.lkl.dalvikus.theme.readableImageFormats
 import me.lkl.dalvikus.tree.ContainerNode
 import me.lkl.dalvikus.tree.Node
 import me.lkl.dalvikus.tree.backing.ZipBacking
@@ -27,9 +28,11 @@ class ZipEntryFolderNode(
                 ZipEntryFolderNode(name, path, zipRoot, this)
             },
             onFile = { name, path, bytes ->
+                // TODO this is code duplication with ZipNode, refactor to avoid it
                 when {
                     name.endsWith(".dex") -> DexFileNode(name, ZipBacking(path, zipRoot), this)
                     name.endsWith(".xml") && zipRoot is ApkNode -> ApkEntryXmlNode(name, path, zipRoot, this)
+                    name.substringAfterLast(".").lowercase() in readableImageFormats -> ZipEntryImageNode(name, path, zipRoot, this)
                     else -> ZipEntryFileNode(name, path, zipRoot, this)
                 }
             }

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/tree/archive/ZipEntryImageNode.kt

@@ -0,0 +1,35 @@
+package me.lkl.dalvikus.tree.archive
+
+import brut.androlib.res.decoder.AXmlResourceParser
+import brut.androlib.res.decoder.AndroidManifestPullStreamDecoder
+import brut.androlib.res.decoder.AndroidManifestResourceParser
+import brut.androlib.res.decoder.ResStreamDecoder
+import brut.androlib.res.decoder.ResXmlPullStreamDecoder
+import me.lkl.dalvikus.tabs.CodeTab
+import me.lkl.dalvikus.tabs.TabElement
+import me.lkl.dalvikus.tree.ContainerNode
+import me.lkl.dalvikus.util.guessIfEditableTextually
+import me.lkl.dalvikus.util.newXmlSerializer
+import java.io.ByteArrayOutputStream
+import kotlin.properties.Delegates
+
+
+class ZipEntryImageNode(
+    override val name: String,
+    private val fullPath: String,
+    private val zipRoot: ZipNode,
+    override val parent: ContainerNode?
+) : ZipEntryFileNode(name, fullPath, zipRoot, parent) {
+
+    override fun isDisplayable(): Boolean = true
+    override fun isEditable(): Boolean = false
+
+    override suspend fun createTab(): TabElement {
+        return CodeTab(
+            tabName = name,
+            tabId = fullPath,
+            tabIcon = icon,
+            contentProvider = this
+        )
+    }
+}

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/tree/archive/ZipNode.kt

@@ -6,6 +6,7 @@ import me.lkl.dalvikus.tree.backing.ZipBacking
 import me.lkl.dalvikus.tree.buildChildNodes
 import me.lkl.dalvikus.tree.dex.DexFileNode
 import me.lkl.dalvikus.theme.getFileExtensionMeta
+import me.lkl.dalvikus.theme.readableImageFormats
 import java.io.File
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
@@ -46,6 +47,7 @@ open class ZipNode(
                 when {
                     name.endsWith(".dex") -> DexFileNode(name, ZipBacking(path, this), this)
                     name.endsWith(".xml") && this is ApkNode -> ApkEntryXmlNode(name, path, this, this)
+                    name.substringAfterLast(".").lowercase() in readableImageFormats -> ZipEntryImageNode(name, path, this, this)
                     else -> ZipEntryFileNode(name, path, this, this)
                 }
             }

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/ui/image/ImageView.kt

@@ -0,0 +1,101 @@
+package me.lkl.dalvikus.ui.image
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTransformGestures
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.toComposeImageBitmap
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import me.lkl.dalvikus.tabs.ImageTab
+import org.jetbrains.skia.Image as SkiaImage
+
+@Composable
+fun ImageView(tab: ImageTab) {
+    val imageByteArray by tab.contentProvider.contentFlow.collectAsState()
+    var image by remember(imageByteArray) { mutableStateOf<ImageBitmap?>(null) }
+    var scale by remember { mutableStateOf(1f) }
+    var offset by remember { mutableStateOf(Offset.Zero) }
+
+    LaunchedEffect(tab) {
+        tab.contentProvider.loadContent()
+    }
+
+    LaunchedEffect(imageByteArray) {
+        image = withContext(Dispatchers.Default) {
+            runCatching {
+                SkiaImage.makeFromEncoded(imageByteArray).toComposeImageBitmap()
+            }.getOrNull()
+        }
+        scale = 1f
+        offset = Offset.Zero
+    }
+
+    val gestureModifier = Modifier.pointerInput(Unit) {
+        detectTransformGestures { _, pan, zoom, _ ->
+            scale = (scale * zoom).coerceIn(0.1f, 10f)
+            offset += pan
+        }
+    }
+
+    val colors = MaterialTheme.colorScheme
+
+    Box(
+        modifier = Modifier.fillMaxSize().background(colors.background)
+    ) {
+        image?.let { img ->
+            val imageWidth = img.width
+            val imageHeight = img.height
+
+            Box(
+                modifier = gestureModifier
+                    .graphicsLayer(
+                        scaleX = scale,
+                        scaleY = scale,
+                        translationX = offset.x,
+                        translationY = offset.y
+                    )
+                    .align(Alignment.Center)
+            ) {
+                Image(
+                    bitmap = img,
+                    contentDescription = null,
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .background(colors.surfaceVariant)
+                )
+            }
+
+            Text(
+                text = "$imageWidth x $imageHeight",
+                color = colors.onBackground,
+                fontSize = 14.sp,
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .padding(8.dp)
+                    .background(colors.surface.copy(alpha = 0.7f), shape = RoundedCornerShape(4.dp))
+                    .padding(horizontal = 8.dp, vertical = 4.dp)
+            )
+        } ?: run {
+            CircularProgressIndicator(
+                modifier = Modifier.align(Alignment.Center),
+                color = colors.primary
+            )
+        }
+    }
+}

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/ui/tabs/TabContentRenderer.kt

@@ -8,10 +8,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import me.lkl.dalvikus.tabs.CodeTab
+import me.lkl.dalvikus.tabs.ImageTab
 import me.lkl.dalvikus.tabs.SmaliTab
 import me.lkl.dalvikus.tabs.TabElement
 import me.lkl.dalvikus.tabs.WelcomeTab
 import me.lkl.dalvikus.ui.editor.EditorView
+import me.lkl.dalvikus.ui.image.ImageView
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -20,14 +22,8 @@ fun TabContentRenderer(tab: TabElement) {
         is WelcomeTab -> WelcomeView()
         is CodeTab -> EditorView(tab)
         is SmaliTab -> EditorView(tab)
-
-        else -> {
-            Icon(
-                imageVector = Icons.Default.BugReport,
-                contentDescription = null,
-                modifier = Modifier.fillMaxSize().padding(16.dp)
-            )
-        }
+        is ImageTab -> ImageView(tab)
+        else -> throw IllegalArgumentException("Unsupported tab type: ${tab::class.simpleName}")
     }
 }