rename and remove nouse function

puutaro · Apr 21, 2023 · 4793d6e · 4793d6e
1 parent 017f41b
commit 4793d6e
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 12 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,7 +16,7 @@ android {
         applicationId = "com.puutaro.commandclick"
         minSdk = 27
         targetSdk = 33
-        versionCode = 21
+        versionCode = 22
         versionName = "${versionMajor}.${versionMinor}.${versionCode}"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/...java/com/puutaro/commandclick/fragment_lib/terminal_fragment/js_interface/JsListSelect.kt b/...java/com/puutaro/commandclick/fragment_lib/terminal_fragment/js_interface/JsListSelect.kt
@@ -15,15 +15,15 @@ class JsListSelect(
     private val escapeCharHyphen = "-"
     @JavascriptInterface
     fun updateListFileCon(
-        searchListFilePath: String,
-        searchText: String
+        targetListFilePath: String,
+        itemText: String
     ) {
-        val trimSearchText = searchText.trim()
+        val trimSearchText = itemText.trim()
         if(
             trimSearchText == escapeCharHyphen
             || trimSearchText.isEmpty()
         ) return
-        val listFileObj = File(searchListFilePath)
+        val listFileObj = File(targetListFilePath)
         val searchListDirPath = listFileObj.parent
             ?: return
         val searchListFileName = listFileObj.name
@@ -54,15 +54,15 @@ class JsListSelect(
 
     @JavascriptInterface
     fun removeItemInListFileCon(
-        searchListFilePath: String,
-        searchText: String
+        targetListFilePath: String,
+        itemText: String
     ){
-        val trimSearchText = searchText.trim()
+        val trimSearchText = itemText.trim()
         if(
             trimSearchText == escapeCharHyphen
-            || searchText.isEmpty()
+            || itemText.isEmpty()
         ) return
-        val listFileObj = File(searchListFilePath)
+        val listFileObj = File(targetListFilePath)
         val searchListDirPath = listFileObj.parent
             ?: return
         val searchListFileName = listFileObj.name
@@ -79,7 +79,7 @@ class JsListSelect(
         ) {
             Toast.makeText(
                 context,
-                "no exist: $searchText",
+                "no exist: $itemText",
                 Toast.LENGTH_SHORT
             ).show()
             return
@@ -91,7 +91,7 @@ class JsListSelect(
             val trimItem = it.trim()
             trimItem.isNotEmpty()
                     && trimItem != escapeCharHyphen
-                    && trimItem != searchText
+                    && trimItem != itemText
         }.joinToString("\n")
         FileSystems.writeFile(
             searchListDirPath,

diff --git a/app/src/main/java/com/puutaro/commandclick/proccess/edit/lib/ScriptContentsLister.kt b/app/src/main/java/com/puutaro/commandclick/proccess/edit/lib/ScriptContentsLister.kt
@@ -0,0 +1,51 @@
+package com.puutaro.commandclick.proccess.edit.lib
+
+import android.widget.EditText
+import android.widget.LinearLayout
+import com.puutaro.commandclick.common.variable.edit.RecordNumToMapNameValueInHolderColumn
+import com.puutaro.commandclick.util.CompleteQuote
+
+class ScriptContentsLister(
+    private val editLinearLayout: LinearLayout,
+) {
+    fun update(
+        recordNumToMapNameValueInHolder: Map<Int, Map<String, String>?>,
+        scriptContentsList: List<String>,
+        startIdNum: Int
+    ): List<String> {
+        val factRecordNumToNameToValueInHolderSize = recordNumToMapNameValueInHolder.size - 1
+        if(factRecordNumToNameToValueInHolderSize <= -1) return scriptContentsList
+        val editedRecordNumToNameToValue = (0..factRecordNumToNameToValueInHolderSize).map {
+            val currentId = startIdNum + it
+            val editTextView = editLinearLayout.findViewById<EditText>(currentId)
+            val currentRecordNumToMapNameValue = recordNumToMapNameValueInHolder.entries.elementAt(it)
+            val currentVriableValue = editTextView.text.toString()
+            currentRecordNumToMapNameValue.key to
+                    mapOf(
+                        RecordNumToMapNameValueInHolderColumn.VARIABLE_NAME.name
+                                to editTextView.tag.toString(),
+                        RecordNumToMapNameValueInHolderColumn.VARIABLE_VALUE.name
+                                to CompleteQuote.comp(currentVriableValue)
+                    )
+        }.toMap()
+        val processScriptSize = scriptContentsList.size - 1
+        if(processScriptSize <= -1) return scriptContentsList
+        return (0..processScriptSize).map {
+                currentOrder ->
+            val getReplaceValue = editedRecordNumToNameToValue.get(currentOrder)
+            if(getReplaceValue.isNullOrEmpty()){
+                scriptContentsList[currentOrder]
+            } else {
+                val currentVariableName = getReplaceValue.get(
+                    RecordNumToMapNameValueInHolderColumn.VARIABLE_NAME.name
+                )
+                val currentVariableValue = getReplaceValue.get(
+                    RecordNumToMapNameValueInHolderColumn.VARIABLE_VALUE.name
+                )?.let {
+                    CompleteQuote.comp(it)
+                }
+                "${currentVariableName}=${currentVariableValue}"
+            }
+        }
+    }
+}