Android: Convert IntSetting to Kotlin

2 files changed, 219 insertions, 196 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
deleted file mode 100644
index df562c6998..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
+++ /dev/null
@@ -1,196 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.settings.model;
-
-import android.content.pm.ActivityInfo;
-
-import androidx.annotation.NonNull;
-
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-public enum IntSetting implements AbstractIntSetting
-{
-  // These entries have the same names and order as in C++, just for consistency.
-
-  MAIN_CPU_CORE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUCore",
-          NativeLibrary.DefaultCPUCore()),
-  MAIN_GC_LANGUAGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SelectedLanguage", 0),
-  MAIN_MEM1_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MEM1Size", 0x01800000),
-  MAIN_MEM2_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MEM2Size", 0x04000000),
-  MAIN_SLOT_A(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotA", 8),
-  MAIN_SLOT_B(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotB", 255),
-  MAIN_SERIAL_PORT_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SerialPort1", 255),
-  MAIN_FALLBACK_REGION(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FallbackRegion", 2),
-  MAIN_SI_DEVICE_0(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice0", 6),
-  MAIN_SI_DEVICE_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice1", 0),
-  MAIN_SI_DEVICE_2(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice2", 0),
-  MAIN_SI_DEVICE_3(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice3", 0),
-
-  MAIN_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume", 100),
-
-  MAIN_OVERLAY_GC_CONTROLLER(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID,
-          "OverlayGCController", 0),  // Defaults to GameCube controller 1
-  MAIN_OVERLAY_WII_CONTROLLER(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID,
-          "OverlayWiiController", 4),  // Defaults to Wii Remote 1
-  MAIN_CONTROL_SCALE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "ControlScale", 50),
-  MAIN_CONTROL_OPACITY(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "ControlOpacity", 65),
-  MAIN_EMULATION_ORIENTATION(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID,
-          "EmulationOrientation", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
-  MAIN_INTERFACE_THEME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "InterfaceTheme", 0),
-  MAIN_INTERFACE_THEME_MODE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID,
-          "InterfaceThemeMode", -1),
-  MAIN_LAST_PLATFORM_TAB(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "LastPlatformTab", 0),
-  MAIN_IR_MODE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "IRMode",
-          InputOverlayPointer.MODE_FOLLOW),
-
-  MAIN_DOUBLE_TAP_BUTTON(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
-          "DoubleTapButton", NativeLibrary.ButtonType.WIIMOTE_BUTTON_A),
-
-  SYSCONF_LANGUAGE(Settings.FILE_SYSCONF, "IPL", "LNG", 0x01),
-  SYSCONF_SOUND_MODE(Settings.FILE_SYSCONF, "IPL", "SND", 0x01),
-
-  SYSCONF_SENSOR_BAR_POSITION(Settings.FILE_SYSCONF, "BT", "BAR", 0x01),
-  SYSCONF_SENSOR_BAR_SENSITIVITY(Settings.FILE_SYSCONF, "BT", "SENS", 0x03),
-  SYSCONF_SPEAKER_VOLUME(Settings.FILE_SYSCONF, "BT", "SPKV", 0x58),
-
-  GFX_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "AspectRatio", 0),
-  GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "SafeTextureCacheColorSamples", 128),
-  GFX_PNG_COMPRESSION_LEVEL(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "PNGCompressionLevel",
-          6),
-  GFX_MSAA(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "MSAA", 1),
-  GFX_EFB_SCALE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "InternalResolution", 1),
-  GFX_SHADER_COMPILATION_MODE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "ShaderCompilationMode", 0),
-
-  GFX_ENHANCE_FORCE_TEXTURE_FILTERING(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
-          "ForceTextureFiltering", 0),
-
-  GFX_ENHANCE_MAX_ANISOTROPY(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS, "MaxAnisotropy",
-          0),
-
-  GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode", 0),
-  GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20),
-  GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY,
-          "StereoConvergencePercentage", 100),
-
-  GFX_PERF_SAMP_WINDOW(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "PerfSampWindowMS", 1000),
-
-  LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity", 1),
-
-  WIIMOTE_1_SOURCE(Settings.FILE_WIIMOTE, "Wiimote1", "Source", 1),
-  WIIMOTE_2_SOURCE(Settings.FILE_WIIMOTE, "Wiimote2", "Source", 0),
-  WIIMOTE_3_SOURCE(Settings.FILE_WIIMOTE, "Wiimote3", "Source", 0),
-  WIIMOTE_4_SOURCE(Settings.FILE_WIIMOTE, "Wiimote4", "Source", 0),
-  WIIMOTE_BB_SOURCE(Settings.FILE_WIIMOTE, "BalanceBoard", "Source", 0);
-
-  private static final IntSetting[] NOT_RUNTIME_EDITABLE_ARRAY = new IntSetting[]{
-          MAIN_CPU_CORE,
-          MAIN_GC_LANGUAGE,
-          MAIN_MEM1_SIZE,
-          MAIN_MEM2_SIZE,
-          MAIN_SLOT_A,  // Can actually be changed, but specific code is required
-          MAIN_SLOT_B,  // Can actually be changed, but specific code is required
-          MAIN_SERIAL_PORT_1,
-          MAIN_FALLBACK_REGION,
-          MAIN_SI_DEVICE_0,  // Can actually be changed, but specific code is required
-          MAIN_SI_DEVICE_1,  // Can actually be changed, but specific code is required
-          MAIN_SI_DEVICE_2,  // Can actually be changed, but specific code is required
-          MAIN_SI_DEVICE_3,  // Can actually be changed, but specific code is required
-  };
-
-  private static final Set<IntSetting> NOT_RUNTIME_EDITABLE =
-          new HashSet<>(Arrays.asList(NOT_RUNTIME_EDITABLE_ARRAY));
-
-  private final String mFile;
-  private final String mSection;
-  private final String mKey;
-  private final int mDefaultValue;
-
-  IntSetting(String file, String section, String key, int defaultValue)
-  {
-    mFile = file;
-    mSection = section;
-    mKey = key;
-    mDefaultValue = defaultValue;
-  }
-
-  @Override
-  public boolean isOverridden()
-  {
-    return NativeConfig.isOverridden(mFile, mSection, mKey);
-  }
-
-  @Override
-  public boolean isRuntimeEditable()
-  {
-    if (mFile.equals(Settings.FILE_SYSCONF))
-      return false;
-
-    for (IntSetting setting : NOT_RUNTIME_EDITABLE)
-    {
-      if (setting == this)
-        return false;
-    }
-
-    return NativeConfig.isSettingSaveable(mFile, mSection, mKey);
-  }
-
-  @Override
-  public boolean delete(@NonNull Settings settings)
-  {
-    if (!NativeConfig.isSettingSaveable(mFile, mSection, mKey))
-    {
-      throw new UnsupportedOperationException(
-              "Unsupported setting: " + mFile + ", " + mSection + ", " + mKey);
-    }
-
-    return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
-  }
-
-  @Override
-  public int getInt()
-  {
-    return NativeConfig.getInt(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
-  }
-
-  @Override
-  public void setInt(@NonNull Settings settings, int newValue)
-  {
-    if (!NativeConfig.isSettingSaveable(mFile, mSection, mKey))
-    {
-      throw new UnsupportedOperationException(
-              "Unsupported setting: " + mFile + ", " + mSection + ", " + mKey);
-    }
-
-    NativeConfig.setInt(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
-  }
-
-  public void setInt(int layer, int newValue)
-  {
-    if (!NativeConfig.isSettingSaveable(mFile, mSection, mKey))
-    {
-      throw new UnsupportedOperationException(
-              "Unsupported setting: " + mFile + ", " + mSection + ", " + mKey);
-    }
-
-    NativeConfig.setInt(layer, mFile, mSection, mKey, newValue);
-  }
-
-  public static IntSetting getSettingForSIDevice(int channel)
-  {
-    return new IntSetting[]{MAIN_SI_DEVICE_0, MAIN_SI_DEVICE_1, MAIN_SI_DEVICE_2, MAIN_SI_DEVICE_3}
-            [channel];
-  }
-
-  public static IntSetting getSettingForWiimoteSource(int index)
-  {
-    return new IntSetting[]{WIIMOTE_1_SOURCE, WIIMOTE_2_SOURCE, WIIMOTE_3_SOURCE, WIIMOTE_4_SOURCE,
-            WIIMOTE_BB_SOURCE}[index];
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
new file mode 100644
index 0000000000..256e68007e
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
@@ -0,0 +1,219 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model
+
+import android.content.pm.ActivityInfo
+import org.dolphinemu.dolphinemu.NativeLibrary
+import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer
+import java.util.*
+
+enum class IntSetting(
+    private val file: String,
+    private val section: String,
+    private val key: String,
+    private val defaultValue: Int
+) : AbstractIntSetting {
+    // These entries have the same names and order as in C++, just for consistency.
+    MAIN_CPU_CORE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "CPUCore",
+        NativeLibrary.DefaultCPUCore()
+    ),
+    MAIN_GC_LANGUAGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SelectedLanguage", 0),
+    MAIN_MEM1_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MEM1Size", 0x01800000),
+    MAIN_MEM2_SIZE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MEM2Size", 0x04000000),
+    MAIN_SLOT_A(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotA", 8),
+    MAIN_SLOT_B(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotB", 255),
+    MAIN_SERIAL_PORT_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SerialPort1", 255),
+    MAIN_FALLBACK_REGION(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FallbackRegion", 2),
+    MAIN_SI_DEVICE_0(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice0", 6),
+    MAIN_SI_DEVICE_1(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice1", 0),
+    MAIN_SI_DEVICE_2(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice2", 0),
+    MAIN_SI_DEVICE_3(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SIDevice3", 0),
+    MAIN_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume", 100),
+    MAIN_OVERLAY_GC_CONTROLLER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "OverlayGCController",
+        0
+    ),
+
+    // Defaults to GameCube controller 1
+    MAIN_OVERLAY_WII_CONTROLLER(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "OverlayWiiController",
+        4
+    ),
+
+    // Defaults to Wii Remote 1
+    MAIN_CONTROL_SCALE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "ControlScale", 50),
+    MAIN_CONTROL_OPACITY(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "ControlOpacity", 65),
+    MAIN_EMULATION_ORIENTATION(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "EmulationOrientation",
+        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+    ),
+    MAIN_INTERFACE_THEME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "InterfaceTheme", 0),
+    MAIN_INTERFACE_THEME_MODE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "InterfaceThemeMode",
+        -1
+    ),
+    MAIN_LAST_PLATFORM_TAB(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "LastPlatformTab",
+        0
+    ),
+    MAIN_IR_MODE(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID,
+        "IRMode",
+        InputOverlayPointer.MODE_FOLLOW
+    ),
+    MAIN_DOUBLE_TAP_BUTTON(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_ANDROID_OVERLAY_BUTTONS,
+        "DoubleTapButton",
+        NativeLibrary.ButtonType.WIIMOTE_BUTTON_A
+    ),
+    SYSCONF_LANGUAGE(Settings.FILE_SYSCONF, "IPL", "LNG", 0x01),
+    SYSCONF_SOUND_MODE(Settings.FILE_SYSCONF, "IPL", "SND", 0x01),
+    SYSCONF_SENSOR_BAR_POSITION(Settings.FILE_SYSCONF, "BT", "BAR", 0x01),
+    SYSCONF_SENSOR_BAR_SENSITIVITY(Settings.FILE_SYSCONF, "BT", "SENS", 0x03),
+    SYSCONF_SPEAKER_VOLUME(Settings.FILE_SYSCONF, "BT", "SPKV", 0x58),
+    GFX_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "AspectRatio", 0),
+    GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "SafeTextureCacheColorSamples",
+        128
+    ),
+    GFX_PNG_COMPRESSION_LEVEL(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "PNGCompressionLevel",
+        6
+    ),
+    GFX_MSAA(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "MSAA", 1),
+    GFX_EFB_SCALE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "InternalResolution", 1),
+    GFX_SHADER_COMPILATION_MODE(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "ShaderCompilationMode",
+        0
+    ),
+    GFX_ENHANCE_FORCE_TEXTURE_FILTERING(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "ForceTextureFiltering",
+        0
+    ),
+    GFX_ENHANCE_MAX_ANISOTROPY(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_ENHANCEMENTS,
+        "MaxAnisotropy",
+        0
+    ),
+    GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode", 0),
+    GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20),
+    GFX_STEREO_CONVERGENCE_PERCENTAGE(
+        Settings.FILE_GFX,
+        Settings.SECTION_STEREOSCOPY,
+        "StereoConvergencePercentage",
+        100
+    ),
+    GFX_PERF_SAMP_WINDOW(
+        Settings.FILE_GFX,
+        Settings.SECTION_GFX_SETTINGS,
+        "PerfSampWindowMS",
+        1000
+    ),
+    LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity", 1),
+    WIIMOTE_1_SOURCE(Settings.FILE_WIIMOTE, "Wiimote1", "Source", 1),
+    WIIMOTE_2_SOURCE(Settings.FILE_WIIMOTE, "Wiimote2", "Source", 0),
+    WIIMOTE_3_SOURCE(Settings.FILE_WIIMOTE, "Wiimote3", "Source", 0),
+    WIIMOTE_4_SOURCE(Settings.FILE_WIIMOTE, "Wiimote4", "Source", 0),
+    WIIMOTE_BB_SOURCE(Settings.FILE_WIIMOTE, "BalanceBoard", "Source", 0);
+
+    override val isOverridden: Boolean
+        get() = NativeConfig.isOverridden(file, section, key)
+
+    override val isRuntimeEditable: Boolean
+        get() {
+            if (file == Settings.FILE_SYSCONF) return false
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) return false
+            }
+            return NativeConfig.isSettingSaveable(file, section, key)
+        }
+
+    override fun delete(settings: Settings): Boolean {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        return NativeConfig.deleteKey(settings.writeLayer, file, section, key)
+    }
+
+    override val int: Int
+        get() = NativeConfig.getInt(NativeConfig.LAYER_ACTIVE, file, section, key, defaultValue)
+
+    override fun setInt(settings: Settings, newValue: Int) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setInt(settings.writeLayer, file, section, key, newValue)
+    }
+
+    fun setInt(layer: Int, newValue: Int) {
+        if (!NativeConfig.isSettingSaveable(file, section, key)) {
+            throw UnsupportedOperationException("Unsupported setting: $file, $section, $key")
+        }
+        NativeConfig.setInt(layer, file, section, key, newValue)
+    }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE_ARRAY = arrayOf(
+            MAIN_CPU_CORE,
+            MAIN_GC_LANGUAGE,
+            MAIN_MEM1_SIZE,
+            MAIN_MEM2_SIZE,
+            MAIN_SLOT_A,
+            MAIN_SLOT_B,
+            MAIN_SERIAL_PORT_1,
+            MAIN_FALLBACK_REGION,
+            MAIN_SI_DEVICE_0,
+            MAIN_SI_DEVICE_1,
+            MAIN_SI_DEVICE_2,
+            MAIN_SI_DEVICE_3
+        )
+
+        private val NOT_RUNTIME_EDITABLE: Set<IntSetting> =
+            HashSet(listOf(*NOT_RUNTIME_EDITABLE_ARRAY))
+
+        @JvmStatic
+        fun getSettingForSIDevice(channel: Int): IntSetting {
+            return arrayOf(
+                MAIN_SI_DEVICE_0,
+                MAIN_SI_DEVICE_1,
+                MAIN_SI_DEVICE_2,
+                MAIN_SI_DEVICE_3
+            )[channel]
+        }
+
+        @JvmStatic
+        fun getSettingForWiimoteSource(index: Int): IntSetting {
+            return arrayOf(
+                WIIMOTE_1_SOURCE,
+                WIIMOTE_2_SOURCE,
+                WIIMOTE_3_SOURCE,
+                WIIMOTE_4_SOURCE,
+                WIIMOTE_BB_SOURCE
+            )[index]
+        }
+    }
+}