Android: Convert FloatSliderSetting to Kotlin

2 files changed, 47 insertions, 44 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.java
deleted file mode 100644
index 29432aaaa7..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.settings.model.view;
-
-import android.content.Context;
-
-import org.dolphinemu.dolphinemu.features.settings.model.AbstractFloatSetting;
-import org.dolphinemu.dolphinemu.features.settings.model.AbstractSetting;
-import org.dolphinemu.dolphinemu.features.settings.model.Settings;
-
-public class FloatSliderSetting extends SliderSetting
-{
-  protected AbstractFloatSetting mSetting;
-
-  public FloatSliderSetting(Context context, AbstractFloatSetting setting, int titleId,
-          int descriptionId, int min, int max, String units, int stepSize)
-  {
-    super(context, titleId, descriptionId, min, max, units, stepSize);
-    mSetting = setting;
-  }
-
-  public FloatSliderSetting(AbstractFloatSetting setting, CharSequence name,
-          CharSequence description, int min, int max, String units)
-  {
-    super(name, description, min, max, units);
-    mSetting = setting;
-  }
-
-  public int getSelectedValue()
-  {
-    return Math.round(mSetting.getFloat());
-  }
-
-  public void setSelectedValue(Settings settings, float selection)
-  {
-    mSetting.setFloat(settings, selection);
-  }
-
-  @Override
-  public AbstractSetting getSetting()
-  {
-    return mSetting;
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt
new file mode 100644
index 0000000000..5b2ee40fe7
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.settings.model.view
+
+import android.content.Context
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractFloatSetting
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractSetting
+import org.dolphinemu.dolphinemu.features.settings.model.Settings
+import kotlin.math.roundToInt
+
+open class FloatSliderSetting : SliderSetting {
+    var floatSetting: AbstractFloatSetting
+
+    override val setting: AbstractSetting
+        get() = floatSetting
+
+    constructor(
+        context: Context,
+        setting: AbstractFloatSetting,
+        titleId: Int,
+        descriptionId: Int,
+        min: Int,
+        max: Int,
+        units: String?,
+        stepSize: Int
+    ) : super(context, titleId, descriptionId, min, max, units, stepSize) {
+        floatSetting = setting
+    }
+
+    constructor(
+        setting: AbstractFloatSetting,
+        name: CharSequence,
+        description: CharSequence?,
+        min: Int,
+        max: Int,
+        units: String?
+    ) : super(name, description, min, max, units) {
+        floatSetting = setting
+    }
+
+    override val selectedValue: Int
+        get() = floatSetting.float.roundToInt()
+
+    open fun setSelectedValue(settings: Settings?, selection: Float) {
+        floatSetting.setFloat(settings!!, selection)
+    }
+}