Merge pull request #11616 from t895/kotlin-skylanders

Android: Convert Skylanders code to Kotlin

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java

@@ -406,7 +406,7 @@ protected void onSaveInstanceState(@NonNull Bundle outState)
     outState.putBoolean(EXTRA_MENU_TOAST_SHOWN, mMenuToastShown);
     outState.putInt(EXTRA_SKYLANDER_SLOT, mSkylanderSlot);
     outState.putInt(EXTRA_SKYLANDER_ID, mSkylanderData.getId());
-    outState.putInt(EXTRA_SKYLANDER_VAR, mSkylanderData.getVar());
+    outState.putInt(EXTRA_SKYLANDER_VAR, mSkylanderData.getVariant());
     outState.putString(EXTRA_SKYLANDER_NAME, mSkylanderData.getName());
     super.onSaveInstanceState(outState);
   }
@@ -546,10 +546,10 @@ else if (requestCode == REQUEST_SKYLANDER_FILE)
       }
       else if (requestCode == REQUEST_CREATE_SKYLANDER)
       {
-        if (!(mSkylanderData.getId() == -1) && !(mSkylanderData.getVar() == -1))
+        if (!(mSkylanderData.getId() == -1) && !(mSkylanderData.getVariant() == -1))
         {
           Pair<Integer, String> slot = SkylanderConfig.createSkylander(mSkylanderData.getId(),
-                  mSkylanderData.getVar(),
+                  mSkylanderData.getVariant(),
                   result.getData().toString(), sSkylanderSlots.get(mSkylanderSlot).getPortalSlot());
           clearSkylander(mSkylanderSlot);
           sSkylanderSlots.get(mSkylanderSlot).setPortalSlot(slot.first);

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/SkylanderConfig.kt

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders
+
+import android.util.Pair
+import org.dolphinemu.dolphinemu.features.skylanders.model.SkylanderPair
+
+object SkylanderConfig {
+    var LIST_SKYLANDERS: Map<SkylanderPair, String> = getSkylanderMap()
+    var REVERSE_LIST_SKYLANDERS: Map<String, SkylanderPair> = getInverseSkylanderMap()
+
+    private external fun getSkylanderMap(): Map<SkylanderPair, String>
+    private external fun getInverseSkylanderMap(): Map<String, SkylanderPair>
+
+    @JvmStatic
+    external fun removeSkylander(slot: Int): Boolean
+
+    @JvmStatic
+    external fun loadSkylander(slot: Int, fileName: String?): Pair<Int?, String?>?
+
+    @JvmStatic
+    external fun createSkylander(
+        id: Int,
+        variant: Int,
+        fileName: String,
+        slot: Int
+    ): Pair<Int, String>
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/Skylander.kt

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.model
+
+class Skylander(id: Int, variant: Int, var name: String) {
+    private val pair: SkylanderPair = SkylanderPair(id, variant)
+
+    val id: Int get() = pair.id
+    val variant: Int get() = pair.variant
+
+    companion object {
+        @JvmField
+        val BLANK_SKYLANDER = Skylander(-1, -1, "Blank")
+    }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.model
+
+class SkylanderPair(var id: Int, var variant: Int) {
+    override fun hashCode(): Int {
+        return (id shl 16) + variant
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is SkylanderPair) return false
+        if (other.id != id) return false
+        return other.variant == variant
+    }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.kt

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.ui
+
+class SkylanderSlot(var label: String, val slotNum: Int) {
+    var portalSlot: Int = -1
+}