Fix severe index error

AndyDu · web-flow · commit f641672fa679 · 2023-07-19T13:32:02.000+08:00
Fix spinner index issue
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId 'com.tranquilrock.androidscript'
         minSdkVersion 30
         targetSdk 33
-        versionCode 2
-        versionName '3.0.0'
+        versionCode 3
+        versionName '3.0.0-alpha'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/com/tranquilrock/androidscript/App.kt b/app/src/main/java/com/tranquilrock/androidscript/App.kt
@@ -15,7 +15,17 @@ import java.lang.IllegalStateException
  * Handles OpenCV check and setup the default exception handler.
  */
 class App : Application() {
+
     companion object {
+        const val META_FILE = "meta.json"
+
+        const val SCRIPT_UPLOAD_EXTENSION = "zip"
+        const val IMAGE_UPLOAD_EXTENSION = "png"
+
+        const val CODE_FILE_TYPE = ".txt"
+        const val SCRIPT_FILE_TYPE = ".blc"
+        const val IMAGE_FILE_TYPE = ".png"
+
         const val BLOCK_DATA_KEY = "BLOCK_DATA_KEY"
         const val MEDIA_PROJECTION_KEY = "MEDIA_PROJECTION"
         const val BASIC_SCRIPT_TYPE = "BASIC"
@@ -36,8 +46,8 @@ class App : Application() {
         }
 
         /** Initialize BASIC's meta If NOT EXIST. */
-        File(getDir(BASIC_SCRIPT_TYPE, MODE_PRIVATE), "meta.json").run {
-            if (createNewFile()) {
+        File(getDir(BASIC_SCRIPT_TYPE, MODE_PRIVATE), META_FILE).run {
+            if (createNewFile()) { // Write Basic meta if not exist
                 val data = Gson().toJson(
                     Command.BASIC_META
                 )
diff --git a/app/src/main/java/com/tranquilrock/androidscript/activity/EditActivity.kt b/app/src/main/java/com/tranquilrock/androidscript/activity/EditActivity.kt
@@ -24,6 +24,7 @@ import com.tranquilrock.androidscript.databinding.ActivityEditBinding
 import com.tranquilrock.androidscript.feature.PermissionRequester
 import com.tranquilrock.androidscript.service.WidgetService
 import java.io.IOException
+import java.lang.Exception
 
 /**
  * UI for editing scripts.
@@ -62,6 +63,7 @@ class EditActivity : AppCompatActivity(), InternalStorageUser, PermissionRequest
 
         try {
             blockData = getScript(this, scriptClass, fileName)
+            Log.d(TAG, blockData.toString())
         } catch (e: IOException) {
             e.printStackTrace()
             Log.e(TAG, "Reading block file error!")
@@ -107,16 +109,21 @@ class EditActivity : AppCompatActivity(), InternalStorageUser, PermissionRequest
             ).show()
         }
 
-        binding.editCodeGrid.run {
-            layoutManager = LinearLayoutManager(this@EditActivity)
-            adapter = BlockAdapter(blockMeta, blockData)
-            addItemDecoration(
-                DividerItemDecoration(
-                    this@EditActivity, DividerItemDecoration.VERTICAL
+        try {
+            binding.editCodeGrid.run {
+                layoutManager = LinearLayoutManager(this@EditActivity)
+                adapter = BlockAdapter(blockMeta, blockData)
+                addItemDecoration(
+                    DividerItemDecoration(
+                        this@EditActivity, DividerItemDecoration.VERTICAL
+                    )
                 )
-            )
+            }
+        }catch (e: Exception){
+            e.printStackTrace()
         }
 
+
         binding.editButtonGrid.run {
             layoutManager = GridLayoutManager(this@EditActivity, 2)
             adapter = ButtonAdapter(
diff --git a/app/src/main/java/com/tranquilrock/androidscript/activity/ManageActivity.kt b/app/src/main/java/com/tranquilrock/androidscript/activity/ManageActivity.kt
@@ -11,13 +11,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.tranquilrock.androidscript.App
+import com.tranquilrock.androidscript.App.Companion.IMAGE_UPLOAD_EXTENSION
 import com.tranquilrock.androidscript.component.manage.ManageAdapter
 import com.tranquilrock.androidscript.databinding.ActivityManageBinding
 import com.tranquilrock.androidscript.feature.InternalStorageUser
-import com.tranquilrock.androidscript.feature.InternalStorageUser.Companion.IMAGE_UPLOAD_EXTENSION
 import com.tranquilrock.androidscript.utils.ResourceRemover
 
-// TODO recycler view to list images with remove button
 class ManageActivity : AppCompatActivity(), InternalStorageUser {
 
     private lateinit var binding: ActivityManageBinding
diff --git a/app/src/main/java/com/tranquilrock/androidscript/activity/MenuActivity.kt b/app/src/main/java/com/tranquilrock/androidscript/activity/MenuActivity.kt
@@ -11,10 +11,10 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.tranquilrock.androidscript.App.Companion.SCRIPT_TYPE_KEY
+import com.tranquilrock.androidscript.App.Companion.SCRIPT_UPLOAD_EXTENSION
 import com.tranquilrock.androidscript.R
 import com.tranquilrock.androidscript.databinding.ActivityMenuBinding
 import com.tranquilrock.androidscript.feature.InternalStorageUser
-import com.tranquilrock.androidscript.feature.InternalStorageUser.Companion.SCRIPT_UPLOAD_EXTENSION
 import com.tranquilrock.androidscript.service.WidgetService
 import java.util.zip.ZipInputStream
 
diff --git a/app/src/main/java/com/tranquilrock/androidscript/component/editor/BlockAdapter.kt b/app/src/main/java/com/tranquilrock/androidscript/component/editor/BlockAdapter.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.tranquilrock.androidscript.R
+import java.lang.Exception
 import java.util.Collections
 
 
@@ -35,6 +36,7 @@ class BlockAdapter(
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BlockViewHolder {
+        Log.d("??", blockMeta[viewType].second.toString())
         val blockDef = blockMeta[viewType].second
         assert(blockDef.size < BLOCK_VIEWS_RID.size) { Log.e(TAG, "Block $blockMeta too long!") }
         val (layoutId, inputIds) = BLOCK_VIEWS_RID[blockDef.size]
diff --git a/app/src/main/java/com/tranquilrock/androidscript/component/editor/BlockViewHolder.kt b/app/src/main/java/com/tranquilrock/androidscript/component/editor/BlockViewHolder.kt
@@ -113,7 +113,7 @@ class BlockViewHolder(
                     if (blockData[blockViewHolder.adapterPosition][index] !in inputDef) {
                         blockData[blockViewHolder.adapterPosition][index] = inputDef[1]
                     }
-                    spinner.setSelection(inputDef.indexOf(blockData[blockViewHolder.adapterPosition][index]))
+                    spinner.setSelection(inputDef.indexOf(blockData[blockViewHolder.adapterPosition][index]) - 1)
                 }
 
                 "EditText" -> {
diff --git a/app/src/main/java/com/tranquilrock/androidscript/component/manage/ManageAdapter.kt b/app/src/main/java/com/tranquilrock/androidscript/component/manage/ManageAdapter.kt
@@ -1,9 +1,7 @@
 package com.tranquilrock.androidscript.component.manage
 
 import android.graphics.Bitmap
-import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.tranquilrock.androidscript.databinding.ManageResourceBlockBinding
diff --git a/app/src/main/java/com/tranquilrock/androidscript/core/Command.kt b/app/src/main/java/com/tranquilrock/androidscript/core/Command.kt
@@ -39,7 +39,7 @@ object Command {
     private const val floatVarFormat = "($floatFormat||$varFormat)"
     private const val imgVarFormat = "($imgFormat||$varFormat)"
     private const val intVarFloatFormat = "($intFormat||$varFormat||$floatFormat)"
-    private const val anyFormat = "[a-zA-Z.0-9 $]*"
+    private const val anyFormat = "[a-zA-Z.0-9 $-]*"
 
     val COMMAND_LIST = arrayOf(
         EXIT,
@@ -84,7 +84,7 @@ object Command {
         "$CALL_ARG $scriptFormat $anyFormat",
         "$IF_GREATER $intVarFormat $intVarFormat",
         "$IF_SMALLER $intVarFormat $intVarFormat",
-        "$IF_EQUAL $intVarFormat $intVarFormat",
+        "$IF_EQUAL $varFormat $anyFormat",
         "$ADD $varFormat $intVarFormat",
         "$SUBTRACT $varFormat $intVarFormat",
         "$VAR $varFormat $intVarFloatFormat",
diff --git a/app/src/main/java/com/tranquilrock/androidscript/core/Interpreter.kt b/app/src/main/java/com/tranquilrock/androidscript/core/Interpreter.kt
@@ -73,6 +73,9 @@ class Interpreter(
         } catch (e: NumberFormatException) {
             Log.e(TAG, "Execute:: Wrong format!")
             board.announce("Error!")
+        } catch (e: NullPointerException){
+            Log.e(TAG, "Execute:: Code Not Found")
+            board.announce("Error!")
         }
     }
 
diff --git a/app/src/main/java/com/tranquilrock/androidscript/feature/InternalStorageUser.kt b/app/src/main/java/com/tranquilrock/androidscript/feature/InternalStorageUser.kt
@@ -8,6 +8,10 @@ import android.net.Uri
 import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
+import com.tranquilrock.androidscript.App.Companion.CODE_FILE_TYPE
+import com.tranquilrock.androidscript.App.Companion.IMAGE_FILE_TYPE
+import com.tranquilrock.androidscript.App.Companion.META_FILE
+import com.tranquilrock.androidscript.App.Companion.SCRIPT_FILE_TYPE
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
@@ -29,12 +33,7 @@ import java.util.zip.ZipInputStream
 interface InternalStorageUser {
 
     companion object {
-        const val SCRIPT_UPLOAD_EXTENSION = "zip"
-        const val IMAGE_UPLOAD_EXTENSION = "png"
-        const val CODE_FILE_TYPE = ".txt"
-        const val SCRIPT_FILE_TYPE = ".blc"
-        const val IMAGE_FILE_TYPE = ".png"
-        const val META_FILE = "meta.json"
+
         private const val SCRIPT_FOLDER_PREFIX = "app_"
         private const val CODE_COMMENT_PREFIX = "//"
         private const val VALID_FILENAME_PATTERN = "([A-Za-z0-9_-]*)"
diff --git a/app/src/main/java/com/tranquilrock/androidscript/utils/ImageParser.kt b/app/src/main/java/com/tranquilrock/androidscript/utils/ImageParser.kt
@@ -3,7 +3,6 @@ package com.tranquilrock.androidscript.utils
 import android.graphics.Bitmap
 import android.media.ImageReader
 import android.util.Log
-import com.tranquilrock.androidscript.feature.ProjectionReader
 import org.opencv.android.Utils
 import org.opencv.core.Core
 import org.opencv.core.CvException
@@ -27,16 +26,16 @@ class ImageParser(
     private val imageReader: ImageReader
 ) {
 
-    suspend fun checkScreenColor(x: Int, y: Int, color: Int): Boolean =
+    fun checkScreenColor(x: Int, y: Int, color: Int): Boolean =
         checkColor(getScreenShotBitmap(), x, y, color)
 
 
-    suspend fun exist(Target: Bitmap): Boolean {
+    fun exist(Target: Bitmap): Boolean {
         val screen = getScreenShotBitmap() ?: return false
         return matchPictures(screen, Target) > 70 // TODO verify threshold.
     }
 
-    suspend fun compare(Target: Bitmap, x1: Int, y1: Int, x2: Int, y2: Int): Int {
+    fun compare(Target: Bitmap, x1: Int, y1: Int, x2: Int, y2: Int): Int {
 
         val screen = getScreenShotBitmap()
         if (screen == null || x1 > x2 || y1 > y2 || x2 > screen.width || y2 > screen.height) {
@@ -50,10 +49,10 @@ class ImageParser(
         )
     }
 
-    suspend fun findLocation(target: Bitmap?, resizeRatio: Double): Point? =
+    fun findLocation(target: Bitmap?, resizeRatio: Double): Point? =
         findLocation(getScreenShotBitmap(), target, resizeRatio)
 
-    private suspend fun getScreenShotBitmap(): Bitmap? {
+    private fun getScreenShotBitmap(): Bitmap? {
         val image = imageReader.acquireLatestImage() ?: return null
 
         Log.d(TAG, "getScreenShotBitmap " + image.width + " " + image.height)

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ class BlockViewHolder(`
`113`	`113`	`if (blockData[blockViewHolder.adapterPosition][index] !in inputDef) {`
`114`	`114`	`blockData[blockViewHolder.adapterPosition][index] = inputDef[1]`
`115`	`115`	`}`
`116`		`- spinner.setSelection(inputDef.indexOf(blockData[blockViewHolder.adapterPosition][index]))`
	`116`	`+ spinner.setSelection(inputDef.indexOf(blockData[blockViewHolder.adapterPosition][index]) - 1)`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`"EditText" -> {`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ class Interpreter(`
`73`	`73`	`} catch (e: NumberFormatException) {`
`74`	`74`	`Log.e(TAG, "Execute:: Wrong format!")`
`75`	`75`	`board.announce("Error!")`
	`76`	`+ } catch (e: NullPointerException){`
	`77`	`+ Log.e(TAG, "Execute:: Code Not Found")`
	`78`	`+ board.announce("Error!")`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`