Add Thumbs of Controller on Controller Mapper

KreitinnSoftware · KreitinnSoftware · commit d92b02f0649e · 2025-01-20T16:59:01.000-03:00
diff --git a/app/src/main/java/com/micewine/emu/activities/ControllerMapper.kt b/app/src/main/java/com/micewine/emu/activities/ControllerMapper.kt
@@ -198,6 +198,8 @@ class ControllerMapper : AppCompatActivity() {
         const val BUTTON_R2_KEY = "buttonR2"
         const val BUTTON_L1_KEY = "buttonL1"
         const val BUTTON_L2_KEY = "buttonL2"
+        const val BUTTON_THUMBL_KEY = "thumbLKey"
+        const val BUTTON_THUMBR_KEY = "thumbRKey"
         const val AXIS_X_PLUS_KEY = "axisX+"
         const val AXIS_X_MINUS_KEY = "axisX-"
         const val AXIS_Y_PLUS_KEY = "axisY+"
@@ -227,20 +229,22 @@ class ControllerMapper : AppCompatActivity() {
             BUTTON_R2_KEY to 8,
             BUTTON_L1_KEY to 9,
             BUTTON_L2_KEY to 10,
-            AXIS_X_PLUS_KEY to 11,
-            AXIS_X_MINUS_KEY to 12,
-            AXIS_Y_PLUS_KEY to 13,
-            AXIS_Y_MINUS_KEY to 14,
-            AXIS_Z_PLUS_KEY to 15,
-            AXIS_Z_MINUS_KEY to 16,
-            AXIS_RZ_PLUS_KEY to 17,
-            AXIS_RZ_MINUS_KEY to 18,
-            AXIS_HAT_X_PLUS_KEY to 19,
-            AXIS_HAT_X_MINUS_KEY to 20,
-            AXIS_HAT_Y_PLUS_KEY to 21,
-            AXIS_HAT_Y_MINUS_KEY to 22,
-            DEAD_ZONE to 23,
-            MOUSE_SENSIBILITY to 24
+            BUTTON_THUMBL_KEY to 11,
+            BUTTON_THUMBR_KEY to 12,
+            AXIS_X_PLUS_KEY to 13,
+            AXIS_X_MINUS_KEY to 14,
+            AXIS_Y_PLUS_KEY to 15,
+            AXIS_Y_MINUS_KEY to 16,
+            AXIS_Z_PLUS_KEY to 17,
+            AXIS_Z_MINUS_KEY to 18,
+            AXIS_RZ_PLUS_KEY to 19,
+            AXIS_RZ_MINUS_KEY to 20,
+            AXIS_HAT_X_PLUS_KEY to 21,
+            AXIS_HAT_X_MINUS_KEY to 22,
+            AXIS_HAT_Y_PLUS_KEY to 23,
+            AXIS_HAT_Y_MINUS_KEY to 24,
+            DEAD_ZONE to 25,
+            MOUSE_SENSIBILITY to 26
         )
 
         fun putDeadZone(context: Context, name: String, value: Int) {
@@ -400,7 +404,7 @@ class ControllerMapper : AppCompatActivity() {
             val json = preferences.getString("controllerPresetList", "")
             val listType = object : TypeToken<MutableList<List<String>>>() {}.type
 
-            return gson.fromJson(json, listType) ?: mutableListOf(ArrayList(Collections.nCopies(25, ":")).apply {
+            return gson.fromJson(json, listType) ?: mutableListOf(ArrayList(Collections.nCopies(mappingMap.size, ":")).apply {
                 this[0] = "default"
                 this[mappingMap[DEAD_ZONE]!!] = "25"
                 this[mappingMap[MOUSE_SENSIBILITY]!!] = "100"
diff --git a/app/src/main/java/com/micewine/emu/controller/ControllerUtils.kt b/app/src/main/java/com/micewine/emu/controller/ControllerUtils.kt
@@ -11,6 +11,8 @@ import android.view.KeyEvent.KEYCODE_BUTTON_R1
 import android.view.KeyEvent.KEYCODE_BUTTON_R2
 import android.view.KeyEvent.KEYCODE_BUTTON_SELECT
 import android.view.KeyEvent.KEYCODE_BUTTON_START
+import android.view.KeyEvent.KEYCODE_BUTTON_THUMBL
+import android.view.KeyEvent.KEYCODE_BUTTON_THUMBR
 import android.view.KeyEvent.KEYCODE_BUTTON_X
 import android.view.KeyEvent.KEYCODE_BUTTON_Y
 import android.view.MotionEvent
@@ -43,6 +45,8 @@ import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_R1_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_R2_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_SELECT_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_START_KEY
+import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_THUMBL_KEY
+import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_THUMBR_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_X_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_Y_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.SELECTED_CONTROLLER_PRESET_KEY
@@ -83,6 +87,8 @@ object ControllerUtils {
     private lateinit var axisHatY_plus_mapping: List<Int>
     private lateinit var axisHatX_minus_mapping: List<Int>
     private lateinit var axisHatY_minus_mapping: List<Int>
+    private lateinit var buttonThumbR_mapping: List<Int>
+    private lateinit var buttonThumbL_mapping: List<Int>
 
     private var deadZone: Float = 0F
     private var moveVMouse: Int? = null
@@ -144,6 +150,9 @@ object ControllerUtils {
         buttonL1_mapping = detectKey(context, BUTTON_L1_KEY)
         buttonL2_mapping = detectKey(context, BUTTON_L2_KEY)
 
+        buttonThumbL_mapping = detectKey(context, BUTTON_THUMBL_KEY)
+        buttonThumbR_mapping = detectKey(context, BUTTON_THUMBR_KEY)
+
         buttonStart_mapping = detectKey(context, BUTTON_START_KEY)
         buttonSelect_mapping = detectKey(context, BUTTON_SELECT_KEY)
 
@@ -267,6 +276,18 @@ object ControllerUtils {
                 true
             }
 
+            KEYCODE_BUTTON_THUMBR -> {
+                handleKey(lorieView, pressed, buttonThumbR_mapping)
+
+                true
+            }
+
+            KEYCODE_BUTTON_THUMBL -> {
+                handleKey(lorieView, pressed, buttonThumbL_mapping)
+
+                true
+            }
+
             else -> false
         }
     }
diff --git a/app/src/main/java/com/micewine/emu/fragments/ControllerMapperFragment.kt b/app/src/main/java/com/micewine/emu/fragments/ControllerMapperFragment.kt
@@ -28,6 +28,8 @@ import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_R1_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_R2_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_SELECT_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_START_KEY
+import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_THUMBL_KEY
+import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_THUMBR_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_X_KEY
 import com.micewine.emu.activities.ControllerMapper.Companion.BUTTON_Y_KEY
 import com.micewine.emu.adapters.AdapterSettingsController
@@ -69,6 +71,8 @@ class ControllerMapperFragment : Fragment() {
         addToAdapter(R.drawable.lt_button, BUTTON_L2_KEY)
         addToAdapter(R.drawable.start_button, BUTTON_START_KEY)
         addToAdapter(R.drawable.select_button, BUTTON_SELECT_KEY)
+        addToAdapter(R.drawable.l_thumb, BUTTON_THUMBL_KEY)
+        addToAdapter(R.drawable.r_thumb, BUTTON_THUMBR_KEY)
         addToAdapter(R.drawable.l_right, AXIS_X_PLUS_KEY)
         addToAdapter(R.drawable.l_left, AXIS_X_MINUS_KEY)
         addToAdapter(R.drawable.l_down, AXIS_Y_PLUS_KEY)
diff --git a/app/src/main/res/drawable-night/l_thumb.xml b/app/src/main/res/drawable-night/l_thumb.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.35">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3.175,3.175m-3.175,0a3.175,3.175 0,1 1,6.35 0a3.175,3.175 0,1 1,-6.35 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M3.175,3.175m-2.9308,0a2.9308,2.9308 0,1 1,5.8615 0a2.9308,2.9308 0,1 1,-5.8615 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3.175,3.175m-2.6865,0a2.6865,2.6865 0,1 1,5.3731 0a2.6865,2.6865 0,1 1,-5.3731 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="m4.3524,4.7625h-1.8756v-3.1493h0.7093v2.5739h1.1663z"
+        android:strokeWidth="0.264583" />
+
+</vector>
diff --git a/app/src/main/res/drawable-night/r_thumb.xml b/app/src/main/res/drawable-night/r_thumb.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.35">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M3.175,3.175m-3.175,0a3.175,3.175 0,1 1,6.35 0a3.175,3.175 0,1 1,-6.35 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3.175,3.175m-2.9308,0a2.9308,2.9308 0,1 1,5.8615 0a2.9308,2.9308 0,1 1,-5.8615 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M3.175,3.175m-2.6865,0a2.6865,2.6865 0,1 1,5.3731 0a2.6865,2.6865 0,1 1,-5.3731 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="#040405"
+        android:pathData="m4.722,4.7625h-0.8147l-0.4897,-0.8104c-0.0368,-0.0614 -0.072,-0.1164 -0.1056,-0.1648 -0.0336,-0.0481 -0.068,-0.0892 -0.1032,-0.1228 -0.0336,-0.0352 -0.0696,-0.0617 -0.1077,-0.0791 -0.0365,-0.0191 -0.0767,-0.0286 -0.1207,-0.0286h-0.1913v1.2057h-0.7093v-3.1493h1.1245c0.7644,0 1.1464,0.2855 1.1464,0.8565 0,0.1098 -0.0167,0.2117 -0.0505,0.3053 -0.0336,0.0921 -0.0812,0.1757 -0.1426,0.2503 -0.0617,0.0746 -0.1363,0.1392 -0.2241,0.1934 -0.0863,0.054 -0.1831,0.0966 -0.29,0.1273v0.0087c0.0471,0.0148 0.0923,0.0389 0.1363,0.0725 0.0439,0.0323 0.0865,0.0704 0.1275,0.1143 0.041,0.0439 0.0796,0.0916 0.1164,0.1426 0.0378,0.0497 0.0722,0.0989 0.1032,0.1471zM2.7892,2.1445v0.8763h0.3077c0.1521,0 0.2744,-0.0439 0.3667,-0.1318 0.0937,-0.0892 0.1405,-0.1998 0.1405,-0.3315 0,-0.2752 -0.1646,-0.413 -0.4942,-0.413z"
+        android:strokeWidth="0.264583" />
+
+</vector>
diff --git a/app/src/main/res/drawable/l_thumb.xml b/app/src/main/res/drawable/l_thumb.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.35">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M3.175,3.175m-3.175,0a3.175,3.175 0,1 1,6.35 0a3.175,3.175 0,1 1,-6.35 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3.175,3.175m-2.9308,0a2.9308,2.9308 0,1 1,5.8615 0a2.9308,2.9308 0,1 1,-5.8615 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M3.175,3.175m-2.6865,0a2.6865,2.6865 0,1 1,5.3731 0a2.6865,2.6865 0,1 1,-5.3731 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m4.3524,4.7625h-1.8756v-3.1493h0.7093v2.5739h1.1663z"
+        android:strokeWidth="0.264583" />
+
+</vector>
diff --git a/app/src/main/res/drawable/r_thumb.xml b/app/src/main/res/drawable/r_thumb.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="6.35"
+    android:viewportHeight="6.35">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M3.175,3.175m-3.175,0a3.175,3.175 0,1 1,6.35 0a3.175,3.175 0,1 1,-6.35 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3.175,3.175m-2.9308,0a2.9308,2.9308 0,1 1,5.8615 0a2.9308,2.9308 0,1 1,-5.8615 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M3.175,3.175m-2.6865,0a2.6865,2.6865 0,1 1,5.3731 0a2.6865,2.6865 0,1 1,-5.3731 0"
+        android:strokeWidth="0.264583" />
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m4.722,4.7625h-0.8147l-0.4897,-0.8104c-0.0368,-0.0614 -0.072,-0.1164 -0.1056,-0.1648 -0.0336,-0.0481 -0.068,-0.0892 -0.1032,-0.1228 -0.0336,-0.0352 -0.0696,-0.0617 -0.1077,-0.0791 -0.0365,-0.0191 -0.0767,-0.0286 -0.1207,-0.0286h-0.1913v1.2057h-0.7093v-3.1493h1.1245c0.7644,0 1.1464,0.2855 1.1464,0.8565 0,0.1098 -0.0167,0.2117 -0.0505,0.3053 -0.0336,0.0921 -0.0812,0.1757 -0.1426,0.2503 -0.0617,0.0746 -0.1363,0.1392 -0.2241,0.1934 -0.0863,0.054 -0.1831,0.0966 -0.29,0.1273v0.0087c0.0471,0.0148 0.0923,0.0389 0.1363,0.0725 0.0439,0.0323 0.0865,0.0704 0.1275,0.1143 0.041,0.0439 0.0796,0.0916 0.1164,0.1426 0.0378,0.0497 0.0722,0.0989 0.1032,0.1471zM2.7892,2.1445v0.8763h0.3077c0.1521,0 0.2744,-0.0439 0.3667,-0.1318 0.0937,-0.0892 0.1405,-0.1998 0.1405,-0.3315 0,-0.2752 -0.1646,-0.413 -0.4942,-0.413z"
+        android:strokeWidth="0.264583" />
+
+</vector>
