From a0e91e3a93673d6478ecaa7eea158b2289d61f97 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 7 Mar 2023 16:36:14 -0500
Subject: [PATCH] android: Convert SingleChoiceSetting to Kotlin

---
 .../model/view/SingleChoiceSetting.java       | 60 -------------------
 .../model/view/SingleChoiceSetting.kt         | 44 ++++++++++++++
 2 files changed, 44 insertions(+), 60 deletions(-)
 delete mode 100644 src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.java
 create mode 100644 src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.java
deleted file mode 100644
index 619df6d52..000000000
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.yuzu.yuzu_emu.features.settings.model.view;
-
-import org.yuzu.yuzu_emu.features.settings.model.IntSetting;
-import org.yuzu.yuzu_emu.features.settings.model.Setting;
-
-public final class SingleChoiceSetting extends SettingsItem {
-    private int mDefaultValue;
-
-    private int mChoicesId;
-    private int mValuesId;
-
-    public SingleChoiceSetting(String key, String section, int titleId, int descriptionId,
-                               int choicesId, int valuesId, int defaultValue, Setting setting) {
-        super(key, section, setting, titleId, descriptionId);
-        mValuesId = valuesId;
-        mChoicesId = choicesId;
-        mDefaultValue = defaultValue;
-    }
-
-    public int getChoicesId() {
-        return mChoicesId;
-    }
-
-    public int getValuesId() {
-        return mValuesId;
-    }
-
-    public int getSelectedValue() {
-        if (getSetting() != null) {
-            IntSetting setting = (IntSetting) getSetting();
-            return setting.getValue();
-        } else {
-            return mDefaultValue;
-        }
-    }
-
-    /**
-     * Write a value to the backing int. If that int was previously null,
-     * initializes a new one and returns it, so it can be added to the Hashmap.
-     *
-     * @param selection New value of the int.
-     * @return null if overwritten successfully otherwise; a newly created IntSetting.
-     */
-    public IntSetting setSelectedValue(int selection) {
-        if (getSetting() == null) {
-            IntSetting setting = new IntSetting(getKey(), getSection(), selection);
-            setSetting(setting);
-            return setting;
-        } else {
-            IntSetting setting = (IntSetting) getSetting();
-            setting.setValue(selection);
-            return null;
-        }
-    }
-
-    @Override
-    public int getType() {
-        return TYPE_SINGLE_CHOICE;
-    }
-}
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt
new file mode 100644
index 000000000..060d324c1
--- /dev/null
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt
@@ -0,0 +1,44 @@
+package org.yuzu.yuzu_emu.features.settings.model.view
+
+import org.yuzu.yuzu_emu.features.settings.model.IntSetting
+import org.yuzu.yuzu_emu.features.settings.model.Setting
+
+class SingleChoiceSetting(
+    key: String,
+    section: String,
+    setting: Setting?,
+    titleId: Int,
+    descriptionId: Int,
+    val choicesId: Int,
+    val valuesId: Int,
+    private val defaultValue: Int,
+) : SettingsItem(key, section, setting, titleId, descriptionId) {
+    override val type = TYPE_SINGLE_CHOICE
+
+    val selectedValue: Int
+        get() = if (setting != null) {
+            val setting = setting as IntSetting
+            setting.value
+        } else {
+            defaultValue
+        }
+
+    /**
+     * Write a value to the backing int. If that int was previously null,
+     * initializes a new one and returns it, so it can be added to the Hashmap.
+     *
+     * @param selection New value of the int.
+     * @return null if overwritten successfully otherwise; a newly created IntSetting.
+     */
+    fun setSelectedValue(selection: Int): IntSetting? {
+        return if (setting == null) {
+            val newSetting = IntSetting(key!!, section!!, selection)
+            setting = newSetting
+            newSetting
+        } else {
+            val newSetting = setting as IntSetting
+            newSetting.value = selection
+            null
+        }
+    }
+}