Merge pull request #12215 from JosJuice/android-si-devices

Android: Add more GameCube controller types

3 files changed, 51 insertions, 32 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt
index 348e75b6a0..e84dd201a5 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController.kt
@@ -30,11 +30,16 @@ class EmulatedController private constructor(private val pointer: Long) {
 
     external fun saveProfile(path: String)
 
+    external fun getProfileName(): String
+
     companion object {
         @JvmStatic
         external fun getGcPad(controllerIndex: Int): EmulatedController
 
         @JvmStatic
+        external fun getGcKeyboard(controllerIndex: Int): EmulatedController
+
+        @JvmStatic
         external fun getWiimote(controllerIndex: Int): EmulatedController
 
         @JvmStatic
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/ProfileDialogPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/ProfileDialogPresenter.kt
index 624441aa73..2896c815fe 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/ProfileDialogPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/ProfileDialogPresenter.kt
@@ -100,15 +100,14 @@ class ProfileDialogPresenter {
             .show()
     }
 
-    private val profileDirectoryName: String
-        get() = if (menuTag.isGCPadMenu) "GCPad" else if (menuTag.isWiimoteMenu) "Wiimote" else throw UnsupportedOperationException()
-
-    private fun getProfileDirectoryPath(stock: Boolean): String =
-        if (stock) {
+    private fun getProfileDirectoryPath(stock: Boolean): String {
+        val profileDirectoryName = menuTag.correspondingEmulatedController.getProfileName()
+        return if (stock) {
             "${DirectoryInitialization.getSysDirectory()}/Profiles/$profileDirectoryName/"
         } else {
             "${DirectoryInitialization.getUserDirectory()}/Config/Profiles/$profileDirectoryName/"
         }
+    }
 
     private fun getProfilePath(profileName: String, stock: Boolean): String =
         getProfileDirectoryPath(stock) + profileName + EXTENSION
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
index b85a3999cc..b1e1271f89 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -2079,34 +2079,49 @@ class SettingsFragmentPresenter(
     }
 
     private fun addGcPadSubSettings(sl: ArrayList<SettingsItem>, gcPadNumber: Int, gcPadType: Int) {
-        if (gcPadType == 6) {
-            // Emulated
-            val gcPad = EmulatedController.getGcPad(gcPadNumber)
+        when (gcPadType) {
+            6, 8, 9, 10 -> {
+                // Emulated
+                val gcPad = EmulatedController.getGcPad(gcPadNumber)
 
-            if (!TextUtils.isEmpty(gameId)) {
-                addControllerPerGameSettings(sl, "Pad", gcPadNumber)
-            } else {
-                addControllerMetaSettings(sl, gcPad)
-                addControllerMappingSettings(sl, gcPad, null)
+                if (!TextUtils.isEmpty(gameId)) {
+                    addControllerPerGameSettings(sl, gcPad, gcPadNumber)
+                } else {
+                    addControllerMetaSettings(sl, gcPad)
+                    addControllerMappingSettings(sl, gcPad, null)
+                }
             }
-        } else if (gcPadType == 12) {
-            // Adapter
-            sl.add(
-                SwitchSetting(
-                    context,
-                    BooleanSetting.getSettingForAdapterRumble(gcPadNumber),
-                    R.string.gc_adapter_rumble,
-                    R.string.gc_adapter_rumble_description
+            7 -> {
+                // Emulated keyboard controller
+                val gcKeyboard = EmulatedController.getGcKeyboard(gcPadNumber)
+
+                if (!TextUtils.isEmpty(gameId)) {
+                    addControllerPerGameSettings(sl, gcKeyboard, gcPadNumber)
+                } else {
+                    sl.add(HeaderSetting(context, R.string.keyboard_controller_warning, 0))
+                    addControllerMetaSettings(sl, gcKeyboard)
+                    addControllerMappingSettings(sl, gcKeyboard, null)
+                }
+            }
+            12 -> {
+                // Adapter
+                sl.add(
+                    SwitchSetting(
+                        context,
+                        BooleanSetting.getSettingForAdapterRumble(gcPadNumber),
+                        R.string.gc_adapter_rumble,
+                        R.string.gc_adapter_rumble_description
+                    )
                 )
-            )
-            sl.add(
-                SwitchSetting(
-                    context,
-                    BooleanSetting.getSettingForSimulateKonga(gcPadNumber),
-                    R.string.gc_adapter_bongos,
-                    R.string.gc_adapter_bongos_description
+                sl.add(
+                    SwitchSetting(
+                        context,
+                        BooleanSetting.getSettingForSimulateKonga(gcPadNumber),
+                        R.string.gc_adapter_bongos,
+                        R.string.gc_adapter_bongos_description
+                    )
                 )
-            )
+            }
         }
     }
 
@@ -2114,7 +2129,7 @@ class SettingsFragmentPresenter(
         val wiimote = EmulatedController.getWiimote(wiimoteNumber)
 
         if (!TextUtils.isEmpty(gameId)) {
-            addControllerPerGameSettings(sl, "Wiimote", wiimoteNumber)
+            addControllerPerGameSettings(sl, wiimote, wiimoteNumber)
         } else {
             addControllerMetaSettings(sl, wiimote)
 
@@ -2210,11 +2225,11 @@ class SettingsFragmentPresenter(
      */
     private fun addControllerPerGameSettings(
         sl: ArrayList<SettingsItem>,
-        profileString: String,
+        controller: EmulatedController,
         controllerNumber: Int
     ) {
         val profiles = ProfileDialogPresenter(menuTag).getProfileNames(false)
-        val profileKey = profileString + "Profile" + (controllerNumber + 1)
+        val profileKey = controller.getProfileName() + "Profile" + (controllerNumber + 1)
         sl.add(
             StringSingleChoiceSetting(
                 context,