resource id popup

Author: loerting

composeApp/src/commonMain/composeResources/values/strings.xml

@@ -80,7 +80,7 @@
 
     <string name="deploy">Deploy</string>
     <string name="sign_deploy_app">Sign and deploy %1$s</string>
-    <string name="open">"Open</string>
+    <string name="open">Open</string>
     <string name="close">Close</string>
     <string name="select">Select</string>
     <string name="cancel">Cancel</string>

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

@@ -11,6 +11,7 @@ import me.lkl.dalvikus.snackbarManager
 import me.lkl.dalvikus.tree.ContainerNode
 import me.lkl.dalvikus.tree.Node
 import java.io.File
+import java.math.BigInteger
 
 class ApkNode(
     override val name: String,
@@ -47,6 +48,13 @@ class ApkNode(
     override fun readEntry(path: String): ByteArray {
         return super.readEntry(path)
     }
+
+    fun getResourceById(unsignedValue: Int): ResResSpec? {
+        if (!resTable.isMainPackageLoaded) return null
+        val resId = ResID(unsignedValue)
+        val resSpec = resTable.mainPackage.getResSpec(resId)
+        return resSpec
+    }
 }
 
 fun getApkToolConfig(): Config {

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/ui/editor/EditorViewModel.kt

@@ -1,5 +1,6 @@
 package me.lkl.dalvikus.ui.editor
 
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -9,15 +10,19 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.sp
+import brut.androlib.res.data.ResResSpec
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import me.lkl.dalvikus.dalvikusSettings
 import me.lkl.dalvikus.tabs.TabElement
+import me.lkl.dalvikus.tree.archive.ApkNode
 import me.lkl.dalvikus.ui.editor.highlight.CodeHighlightColors
 import me.lkl.dalvikus.ui.editor.highlight.highlightCode
 import me.lkl.dalvikus.ui.editor.suggestions.AssistPopupState
+import me.lkl.dalvikus.ui.uiTreeRoot
+import java.math.BigInteger
 
 const val maxEditorFileSize = 128 * 1024 // 128 KiB
 const val maxEditorLines = 10000 // 10,000 lines
@@ -221,4 +226,17 @@ class EditorViewModel(private val tab: TabElement) {
         )
         changeContent(newTextFieldValue, coroutineScope)
     }
+
+    fun tryResolveResIdText(unsignedValue: BigInteger): String {
+        val apks = uiTreeRoot.childrenFlow.value.filterIsInstance<ApkNode>()
+        val resIds = mutableListOf<ResResSpec>()
+        for (apk in apks) {
+            val resResSpec = apk.getResourceById(unsignedValue.toInt())
+            if (resResSpec != null) {
+                resIds.add(resResSpec)
+            }
+        }
+        return if (resIds.isEmpty()) "Resource not found"
+        else resIds.joinToString(", ") { "R.${it.type.name}.${it.name}" }
+    }
 }

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/ui/editor/suggestions/Popups.kt

@@ -2,10 +2,8 @@ package me.lkl.dalvikus.ui.editor.suggestions
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ContentCopy
-import androidx.compose.material.icons.filled.Error
 import androidx.compose.material.icons.filled.ErrorOutline
 import androidx.compose.material.icons.outlined.ArrowCircleRight
-import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.MaterialTheme
@@ -134,14 +132,7 @@ fun HexPopup(
             8 -> {
                 println(cleanedHex)
                 if(cleanedHex.startsWith("7e") || cleanedHex.startsWith("7f")) {
-                    val intValue = signedValue.toInt()
-                    val typeId = (intValue shr 16) and 0xFF
-                    val entryId = intValue and 0xFFFF
-                    val typeNames = mapOf(
-                        1 to "anim", 2 to "drawable", 3 to "layout", 4 to "string", 5 to "style", 6 to "id"
-                    )
-                    val typeName = typeNames[typeId] ?: "unknown"
-                    "$typeName:$entryId (resource ID)"
+                    "$cleanedHex (resource ID) = ${viewModel.tryResolveResIdText(unsignedValue)} (resolved) "
                 } else {
                     val floatValue = Float.fromBits(signedValue.toInt())
                     "$signedValue (base 10) = $floatValue (float)"

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/ui/resources/ResourcesView.kt

@@ -64,9 +64,9 @@ val resourceTypesIcons = mapOf(
 
 @Composable
 private fun ApkResourceCards() {
+    // TODO add search bar for resource ids in base 16, base 10, and resource name.
     val treeRootChildren by uiTreeRoot.childrenFlow.collectAsState()
-    val apks = treeRootChildren
-        .filterIsInstance<ApkNode>()
+    val apks = treeRootChildren.filterIsInstance<ApkNode>()
 
     val gridState = rememberLazyGridState()
     var selectedResType by remember { mutableStateOf("all") }