editor completions for L;, (), {} and "". show assist popup between brackets, max file size setting, own tree look for important apk files, highlight fixes, class by parent search.

Author: loerting

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

@@ -47,6 +47,7 @@
     <string name="settings_category_signing">Sign &amp; Deploy settings</string>
 
     <string name="settings_font_size">Font size</string>
+    <string name="settings_max_file_size">Maximum allowed file size</string>
     <string name="settings_api_level">Dalvik Opcodes API level</string>
     <string name="settings_decompiler_verbose">Verbose decompiler output</string>
     <string name="settings_decompiler_implementation">Decompiler implementation</string>
@@ -108,7 +109,7 @@
 
     <string name="error_password_min_length">Password must be at least 6 characters</string>
 
-    <string name="editor_cannot_open">The file is either too large, not a valid ASCII file or has too many lines. Please use a different editor to open it.</string>
+    <string name="editor_cannot_open">The file is either too large, not a valid ASCII file or has too many lines. Please use a different editor to open it or change the maximum allowed file size.</string>
     <string name="editor_search_placeholder">Search text...</string>
     <string name="editor_search_no_results">No results</string>
     <string name="editor_search_results_found">%1$d results</string>
@@ -118,6 +119,7 @@
     <string name="tree_search_result_type_string">String constant</string>
     <string name="tree_search_result_type_literal">Literal</string>
     <string name="tree_search_result_type_reference">Method or field reference</string>
+    <string name="tree_search_result_type_class_by_parent">Class by direct parent</string>
     <string name="tree_method_count">%1$s methods</string>
     <string name="tree_field_count">%1$s fields</string>
 

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/lexer/SmaliLexerHighlight.kt

@@ -77,23 +77,24 @@ fun getSmaliTokenStyle(tokenType: Int, colors: CodeHighlightColors): SpanStyle?
     val tokenName = getSmaliTokenName(tokenType) ?: return null
 
     val color = when {
+        tokenName.startsWith("INSTRUCTION_") -> colors.senary
         tokenName.endsWith("_DIRECTIVE") -> colors.primary
-        tokenName == "REGISTER" -> colors.secondary
         tokenName.endsWith("_LITERAL") -> colors.tertiary
-        tokenName == "CLASS_DESCRIPTOR" || tokenName == "PRIMITIVE_TYPE" || tokenName == "ARRAY_TYPE_PREFIX" -> colors.quaternary
-        tokenName == "SIMPLE_NAME" -> colors.quinary
-        tokenName == "ACCESS_SPEC" -> colors.septenary
-        tokenName.startsWith("INSTRUCTION_") -> colors.senary
+        tokenName.endsWith("_TYPE") || tokenName == "CLASS_DESCRIPTOR" || tokenName == "ARRAY_TYPE_PREFIX" -> colors.quaternary
+        tokenName.endsWith("_NAME") -> colors.quinary
+
+        tokenName == "REGISTER" -> colors.secondary
+        tokenName == "ACCESS_SPEC" || tokenName == "ANNOTATION_VISIBILITY" -> colors.septenary
+
         tokenName in listOf("COLON", "COMMA", "OPEN_PAREN", "CLOSE_PAREN") -> colors.onSurface.copy(alpha = 0.7f)
         tokenName == "LINE_COMMENT" -> colors.onSurface.copy(alpha = 0.5f)
-        tokenName == "ANNOTATION_VISIBILITY" -> colors.primary
         else -> colors.onSurface
     }
 
     val weight = when {
         tokenName == "ARROW" -> FontWeight.Bold
         tokenName.startsWith("INSTRUCTION_") -> FontWeight.Medium
-        tokenName == "ACCESS_SPEC" -> FontWeight.SemiBold
+        tokenName == "ACCESS_SPEC" || tokenName == "ANNOTATION_VISIBILITY" -> FontWeight.SemiBold
         tokenName.endsWith("_DIRECTIVE") -> FontWeight.SemiBold
 
         else -> FontWeight.Normal

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/settings/DalvikusSettings.kt

@@ -28,6 +28,16 @@ class DalvikusSettings() {
             step = 1,
             unit = "sp"
         ),
+        IntSetting(
+            key = "max_file_size",
+            category = SettingsCategory.EDITOR,
+            nameRes = Res.string.settings_max_file_size,
+            defaultValue = 64,
+            min = 0,
+            max = 1024,
+            step = 1024,
+            unit = "kB"
+        ),
         BooleanSetting(
             key = "check_for_updates",
             category = SettingsCategory.GENERAL,

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

@@ -4,6 +4,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.Article
 import androidx.compose.material.icons.filled.Android
 import androidx.compose.material.icons.filled.Api
+import androidx.compose.material.icons.filled.Approval
+import androidx.compose.material.icons.filled.Book
 import androidx.compose.material.icons.filled.Class
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Directions
@@ -40,27 +42,49 @@ 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()
+    when (fileName) {
+        "AndroidManifest.xml" -> {
+            return FileTypeMeta(Icons.Filled.Book, CodeBlue)
+        }
+        "resources.arsc" -> {
+            return FileTypeMeta(Icons.Filled.Android, AndroidGreen)
+        }
+        "MANIFEST.MF" -> {
+            return FileTypeMeta(Icons.Filled.Api, PackageOrange)
+        }
+        "CERT.RSA", "CERT.SF", "SIGNER.SF", "SIGNER.RSA" -> {
+            return FileTypeMeta(Icons.Filled.Approval, PackageOrange)
+        }
+        else -> {
+            val ext = fileName.substringAfterLast('.', "").lowercase()
 
-    return when (ext) {
-        "txt", "md", "log" -> FileTypeMeta(Icons.Outlined.Description)
-        in readableImageFormats ->
-            FileTypeMeta(Icons.Outlined.Image, ImagePurple)
-        "mp3", "wav", "ogg", "flac", "aac" ->
-            FileTypeMeta(Icons.Outlined.MusicNote, AudioTeal)
-        "mp4", "avi", "mov", "mkv", "webm" ->
-            FileTypeMeta(Icons.Outlined.Movie, VideoRed)
-        "pdf" -> FileTypeMeta(Icons.Outlined.PictureAsPdf, PdfRed)
-        "zip", "jar", "rar", "7z", "tar", "gz" ->
-            FileTypeMeta(Icons.Filled.FolderZip, ArchiveGray)
-        "doc", "docx" -> FileTypeMeta(Icons.AutoMirrored.Outlined.Article, WordBlue)
-        "xls", "xlsx" -> FileTypeMeta(Icons.Outlined.TableChart, ExcelGreen)
-        "ppt", "pptx" -> FileTypeMeta(Icons.Outlined.Slideshow, PowerPointOrange)
-        "html", "xml", "json", "yaml", "yml" ->
-            FileTypeMeta(Icons.Outlined.Code, CodeBlue)
-        "apk", "apks", "aab", "xapk", "dex", "odex" ->
-            FileTypeMeta(Icons.Filled.Android, AndroidGreen)
-        else -> FileTypeMeta(Icons.Outlined.Description)
+            return when (ext) {
+                "txt", "md", "log" -> FileTypeMeta(Icons.Outlined.Description)
+                in readableImageFormats ->
+                    FileTypeMeta(Icons.Outlined.Image, ImagePurple)
+
+                "mp3", "wav", "ogg", "flac", "aac" ->
+                    FileTypeMeta(Icons.Outlined.MusicNote, AudioTeal)
+
+                "mp4", "avi", "mov", "mkv", "webm" ->
+                    FileTypeMeta(Icons.Outlined.Movie, VideoRed)
+
+                "pdf" -> FileTypeMeta(Icons.Outlined.PictureAsPdf, PdfRed)
+                "zip", "jar", "rar", "7z", "tar", "gz" ->
+                    FileTypeMeta(Icons.Filled.FolderZip, ArchiveGray)
+
+                "doc", "docx" -> FileTypeMeta(Icons.AutoMirrored.Outlined.Article, WordBlue)
+                "xls", "xlsx" -> FileTypeMeta(Icons.Outlined.TableChart, ExcelGreen)
+                "ppt", "pptx" -> FileTypeMeta(Icons.Outlined.Slideshow, PowerPointOrange)
+                "html", "xml", "json", "yaml", "yml" ->
+                    FileTypeMeta(Icons.Outlined.Code, CodeBlue)
+
+                "apk", "apks", "aab", "xapk", "dex", "odex" ->
+                    FileTypeMeta(Icons.Filled.Android, AndroidGreen)
+
+                else -> FileTypeMeta(Icons.Outlined.Description)
+            }
+        }
     }
 }
 

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/tree/TreeSearch.kt

@@ -2,6 +2,7 @@ package me.lkl.dalvikus.tree
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Abc
+import androidx.compose.material.icons.filled.EscalatorWarning
 import androidx.compose.material.icons.filled.Route
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.android.tools.smali.dexlib2.iface.Annotation
@@ -24,14 +25,16 @@ enum class TreeSearchResultType {
     TREE_NODE,
     STRING_VALUE,
     LITERAL,
-    REFERENCE;
+    REFERENCE,
+    CLASS_BY_PARENT;
 
     val icon: ImageVector
         get() = when (this) {
             TREE_NODE -> Icons.Default.FamilyHistory
             STRING_VALUE -> Icons.Default.Abc
             LITERAL -> Icons.Default.ThreadUnread
             REFERENCE -> Icons.Default.Route
+            CLASS_BY_PARENT -> Icons.Default.EscalatorWarning
         }
 }
 
@@ -68,6 +71,14 @@ fun searchTreeBFS(
         if (current is DexEntryClassNode) {
             val classDef = current.getClassDef()
 
+            // Check parent class
+            classDef.superclass?.let { parentClass ->
+                if (matcher(parentClass)) {
+                    emit(TreeSearchResult(current, ".super $parentClass", TreeSearchResultType.CLASS_BY_PARENT))
+                    resultsFound++
+                }
+            }
+
             // Search string constants
             classDef.getStringPool().forEach { string ->
                 if (matcher(string)) {

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/tree/dex/DexEntryClassNode.kt

@@ -118,7 +118,7 @@ class DexEntryClassNode(
         )
     }
 
-    override fun getSizeEstimate(): Long = 64 * 1024 // 64 kB
+    override fun getSizeEstimate(): Long = 8 * 1024 // 8 kB
     override fun isDisplayable(): Boolean = true
     override fun isEditable(): Boolean = true
 

composeApp/src/commonMain/kotlin/me/lkl/dalvikus/ui/LeftPanel.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.FolderOpen
 import androidx.compose.material.icons.filled.Search
@@ -34,6 +35,7 @@ import me.lkl.dalvikus.tree.*
 import me.lkl.dalvikus.tree.filesystem.FileSystemFileNode
 import me.lkl.dalvikus.tree.root.HiddenRoot
 import me.lkl.dalvikus.errorreport.crtExHandler
+import me.lkl.dalvikus.selectedNavItem
 import me.lkl.dalvikus.ui.tree.FileSelectorDialog
 import me.lkl.dalvikus.ui.tree.TreeDragAndDropTarget
 import me.lkl.dalvikus.ui.tree.TreeView
@@ -165,7 +167,7 @@ internal fun LeftPanelContent() {
             ExtendedFloatingActionButton(
                 onClick = { showTreeAddFileDialog = true },
                 icon = {
-                    Icon(Icons.Default.FolderOpen, contentDescription = stringResource(Res.string.fab_load_file))
+                    Icon(Icons.Default.Add, contentDescription = stringResource(Res.string.fab_load_file))
                 },
                 text = {
                     Text(stringResource(Res.string.fab_load_file), maxLines = 1)
@@ -202,6 +204,12 @@ internal fun LeftPanelContent() {
                     currentSelection = node
 
                     if (node is FileNode) {
+
+                        if(node.name.equals("resources.arsc", true)) {
+                            selectedNavItem = "Resources"
+                            return@TreeView
+                        }
+
                         scope.launch(crtExHandler) {
                             val newTab = node.createTab()
                             tabManager.addOrSelectTab(newTab)
@@ -257,6 +265,7 @@ private fun SearchResults(
             TreeSearchResultType.STRING_VALUE -> Res.string.tree_search_result_type_string
             TreeSearchResultType.REFERENCE -> Res.string.tree_search_result_type_reference
             TreeSearchResultType.LITERAL -> Res.string.tree_search_result_type_literal
+            TreeSearchResultType.CLASS_BY_PARENT -> Res.string.tree_search_result_type_class_by_parent
         }
     )
 
@@ -303,6 +312,7 @@ private fun SearchResults(
                             TreeSearchResultType.STRING_VALUE -> MaterialTheme.colorScheme.primary
                             TreeSearchResultType.REFERENCE -> MaterialTheme.colorScheme.secondary
                             TreeSearchResultType.LITERAL -> MaterialTheme.colorScheme.tertiary
+                            TreeSearchResultType.CLASS_BY_PARENT -> MaterialTheme.colorScheme.onSurfaceVariant
                         },
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis

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

@@ -30,9 +30,6 @@ import me.lkl.dalvikus.util.SearchOptions
 import me.lkl.dalvikus.util.createSearchMatcher
 import java.math.BigInteger
 
-const val maxEditorFileSize = 128 * 1024 // 128 KiB
-const val maxEditorLines = 10000 // 10,000 lines
-
 class EditorViewModel(private val tab: TabElement) {
     var isLoaded by mutableStateOf(false)
         private set
@@ -56,9 +53,11 @@ class EditorViewModel(private val tab: TabElement) {
         private set
 
     var openable by
-    mutableStateOf(tab.contentProvider.getSizeEstimate() < maxEditorFileSize && tab.contentProvider.isDisplayable())
+    mutableStateOf(tab.contentProvider.getSizeEstimate() < getMaxFileBytes() && tab.contentProvider.isDisplayable())
         private set
 
+    private fun getMaxFileBytes(): Int = ((dalvikusSettings["max_file_size"] as Int) * 1024)
+
     var isSearchActive by mutableStateOf(false)
     var searchOptions by mutableStateOf(SearchOptions())
 
@@ -111,7 +110,11 @@ class EditorViewModel(private val tab: TabElement) {
 
             internalContent = internalContent.copy(text = tab.contentProvider.contentFlow.value.decodeToString())
 
-            if (internalContent.text.lines().size > maxEditorLines) {
+            val charCount = internalContent.text.length
+
+            Logger.i("Loaded ${tab.contentProvider.getFileType()} with $charCount characters.")
+
+            if (charCount * 2 > getMaxFileBytes()) {
                 openable = false
                 return@withContext
             }
@@ -127,7 +130,11 @@ class EditorViewModel(private val tab: TabElement) {
         }
     }
 
-    fun changeContent(newTextFieldValue: TextFieldValue, coroutineScope: CoroutineScope, checkNewline: Boolean = true) {
+    fun changeContent(
+        newTextFieldValue: TextFieldValue,
+        coroutineScope: CoroutineScope,
+        editorAdditions: Boolean = true
+    ) {
         val oldText = internalContent.text
         val newText = newTextFieldValue.text
 
@@ -143,28 +150,58 @@ class EditorViewModel(private val tab: TabElement) {
         val safeNewSuffixStart = maxOf(newSuffixStart, diffIndex)
         val insertedText = newText.substring(diffIndex, safeNewSuffixStart)
 
-        val isNewlineInserted = insertedText == "\n"
-
-        if (checkNewline && isNewlineInserted) {
+        if (editorAdditions) {
             val caretPosition = newTextFieldValue.selection.start
             if (caretPosition > 0) {
-                val beforeNewline = newText.substring(0, caretPosition - 1)
-                val currentLineStart = beforeNewline.lastIndexOf('\n') + 1
-                val currentLine = beforeNewline.substring(currentLineStart)
-                val leadingIndent = currentLine.takeWhile { it == ' ' || it == '\t' }
-
-                val updatedText = newText.substring(0, caretPosition) + leadingIndent + newText.substring(caretPosition)
-                val updatedSelection = TextRange(caretPosition + leadingIndent.length)
-
-                changeContent(
-                    newTextFieldValue.copy(text = updatedText, selection = updatedSelection),
-                    coroutineScope,
-                    checkNewline = false
-                )
-                return
+                fun insertTextAtCaret(suffix: String, moveCaretBack: Boolean = true) {
+                    val updatedText =
+                        newText.substring(0, caretPosition) + suffix + newText.substring(caretPosition)
+                    val updatedSelection = TextRange(
+                        caretPosition - if (moveCaretBack) 0 else -suffix.length
+                    )
+
+                    changeContent(
+                        newTextFieldValue.copy(text = updatedText, selection = updatedSelection),
+                        coroutineScope,
+                        editorAdditions = false
+                    )
+                }
+
+                when (insertedText) {
+                    "\n" -> {
+                        val beforeNewline = newText.substring(0, caretPosition - 1)
+                        val currentLineStart = beforeNewline.lastIndexOf('\n') + 1
+                        val currentLine = beforeNewline.substring(currentLineStart)
+                        val leadingIndent = currentLine.takeWhile { it == ' ' || it == '\t' }
+
+                        insertTextAtCaret(leadingIndent, moveCaretBack = false)
+                        return
+                    }
+
+                    "{" -> {
+                        insertTextAtCaret("}")
+                        return
+                    }
+
+                    "(" -> {
+                        insertTextAtCaret(")")
+                        return
+                    }
+
+                    "L" -> {
+                        insertTextAtCaret(";")
+                        return
+                    }
+
+                    "\"" -> {
+                        insertTextAtCaret("\"")
+                        return
+                    }
+                }
             }
         }
 
+
         mimicOldHighlight(newText, diffIndex, newSuffixStart, oldSuffixStart, insertedText)
 
         if (newText.length > oldText.length) {