Android: Convert MappingCommon to Kotlin

2 files changed, 29 insertions, 34 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.java
deleted file mode 100644
index 5e4c0076ea..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.input.model;
-
-import androidx.annotation.NonNull;
-
-import org.dolphinemu.dolphinemu.features.input.model.controlleremu.EmulatedController;
-
-public final class MappingCommon
-{
-  private MappingCommon()
-  {
-  }
-
-  /**
-   * Waits until the user presses one or more inputs or until a timeout,
-   * then returns the pressed inputs.
-   *
-   * When this is being called, a separate thread must be calling ControllerInterface's
-   * dispatchKeyEvent and dispatchGenericMotionEvent, otherwise no inputs will be registered.
-   *
-   * @param controller The device to detect inputs from.
-   * @param allDevices Whether to also detect inputs from devices other than the specified one.
-   * @return The input(s) pressed by the user in the form of an InputCommon expression,
-   * or an empty string if there were no inputs.
-   */
-  public static native String detectInput(@NonNull EmulatedController controller,
-          boolean allDevices);
-
-  public static native String getExpressionForControl(String control, String device,
-          String defaultDevice);
-
-  public static native void save();
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.kt
new file mode 100644
index 0000000000..32775a7ebc
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/MappingCommon.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.EmulatedController
+
+object MappingCommon {
+    /**
+     * Waits until the user presses one or more inputs or until a timeout,
+     * then returns the pressed inputs.
+     *
+     * When this is being called, a separate thread must be calling ControllerInterface's
+     * dispatchKeyEvent and dispatchGenericMotionEvent, otherwise no inputs will be registered.
+     *
+     * @param controller The device to detect inputs from.
+     * @param allDevices Whether to also detect inputs from devices other than the specified one.
+     * @return The input(s) pressed by the user in the form of an InputCommon expression,
+     * or an empty string if there were no inputs.
+     */
+    external fun detectInput(controller: EmulatedController, allDevices: Boolean): String
+
+    external fun getExpressionForControl(
+        control: String,
+        device: String,
+        defaultDevice: String
+    ): String
+
+    external fun save()
+}