Update

Zenlua · Zenlua · commit 72695909aec4 · 2026-06-22T09:33:46.000+07:00
diff --git a/app/src/main/java/com/omarea/krscript/ui/ListItemView.kt b/app/src/main/java/com/omarea/krscript/ui/ListItemView.kt
@@ -7,6 +7,7 @@ import android.widget.TextView
 import com.tool.tree.R
 import com.omarea.krscript.executor.ScriptEnvironmen
 import com.omarea.krscript.model.NodeInfoBase
+import java.util.regex.Pattern
 
 open class ListItemView(private val context: Context,
                         layoutId: Int,
@@ -67,31 +68,39 @@ open class ListItemView(private val context: Context,
             return config.index
         }
 
-    // H&agrave;m b&#7893; tr&#7907; h&#7895; tr&#7907; c&#7843; @string/ v&agrave; @string:
-    private fun resolveString(value: String): String {
-        // Ki&#7875;m tra xem chu&#7895;i c&oacute; ch&#7913;a @string/ ho&#7863;c @string: kh&ocirc;ng
-        if (value.contains("@string/") || value.contains("@string:")) {
-            // T&aacute;ch l&#7845;y ph&#7847;n t&ecirc;n resource &#273;&#7913;ng sau d&#7845;u / ho&#7863;c d&#7845;u :
-            val stringName = value.substringAfter("@string/").substringAfter("@string:")
+    // H&agrave;m b&#7893; tr&#7907; &#273;&atilde; c&#7843;i ti&#7871;n b&#7857;ng Regex &#273;&#7875; t&#7921; d&#7885;n r&aacute;c v&agrave; c&#7855;t chu&#7895;i ch&iacute;nh x&aacute;c tuy&#7879;t &#273;&#7889;i
+    private fun resolveString(value: String?): String {
+        if (value == null) return ""
+        
+        // Lo&#7841;i b&#7887; kho&#7843;ng tr&#7855;ng ho&#7863;c k&yacute; t&#7921; xu&#7889;ng d&ograve;ng th&#7915;a &#7903; hai &#273;&#7847;u
+        val cleanedValue = value.trim()
+
+        // S&#7917; d&#7909;ng Regex &#273;&#7875; t&igrave;m m&#7851;u @string/t&ecirc;n ho&#7863;c @string:t&ecirc;n
+        // M&#7851;u n&agrave;y s&#7869; b&#7855;t tr&iacute;ch xu&#7845;t ch&iacute;nh x&aacute;c ph&#7847;n t&ecirc;n resource ph&iacute;a sau
+        val pattern = Pattern.compile("@string[/:](\\w+)")
+        val matcher = pattern.matcher(cleanedValue)
+
+        if (matcher.find()) {
+            // matcher.group(1) s&#7869; l&agrave; ph&#7847;n t&ecirc;n thu&#7847;n t&uacute;y (v&iacute; d&#7909;: script_action_check_ext4_image)
+            val stringName = matcher.group(1)
             
-            // T&igrave;m ID c&#7911;a Resource t&#7915; t&ecirc;n &#273;&atilde; b&oacute;c t&aacute;ch
             val resId = context.resources.getIdentifier(stringName, "string", context.packageName)
             if (resId != 0) {
                 return context.getString(resId)
             }
         }
-        return value
+        return cleanedValue
     }
 
     open fun updateViewByShell() {
         if (config.descSh.isNotEmpty()) {
             config.desc = ScriptEnvironmen.executeResultRoot(context, config.descSh, config)
-            desc = config.desc
+            desc = resolveString(config.desc)
         }
 
         if (config.summarySh.isNotEmpty()) {
             config.summary = ScriptEnvironmen.executeResultRoot(context, config.summarySh, config)
-            summary = config.summary
+            summary = resolveString(config.summary)
         }
     }
 
