From 2369977e14246798bd59b5aa3976531ac999e8f0 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Mar 2023 03:27:27 -0400 Subject: [PATCH] Android: Convert IntSliderSetting to Kotlin --- .../settings/model/view/IntSliderSetting.java | 37 ------------------- .../settings/model/view/IntSliderSetting.kt | 29 +++++++++++++++ 2 files changed, 29 insertions(+), 37 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.java deleted file mode 100644 index e8d19f9059..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.java +++ /dev/null @@ -1,37 +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.AbstractIntSetting; -import org.dolphinemu.dolphinemu.features.settings.model.AbstractSetting; -import org.dolphinemu.dolphinemu.features.settings.model.Settings; - -public final class IntSliderSetting extends SliderSetting -{ - private AbstractIntSetting mSetting; - - public IntSliderSetting(Context context, AbstractIntSetting setting, int titleId, - int descriptionId, int min, int max, String units, int stepSize) - { - super(context, titleId, descriptionId, min, max, units, stepSize); - mSetting = setting; - } - - public int getSelectedValue() - { - return mSetting.getInt(); - } - - public void setSelectedValue(Settings settings, int selection) - { - mSetting.setInt(settings, selection); - } - - @Override - public AbstractSetting getSetting() - { - return mSetting; - } -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.kt new file mode 100644 index 0000000000..23bcd49317 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.kt @@ -0,0 +1,29 @@ +// 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.AbstractIntSetting +import org.dolphinemu.dolphinemu.features.settings.model.AbstractSetting +import org.dolphinemu.dolphinemu.features.settings.model.Settings + +class IntSliderSetting( + context: Context, + private val intSetting: AbstractIntSetting, + titleId: Int, + descriptionId: Int, + min: Int, + max: Int, + units: String?, + stepSize: Int +) : SliderSetting(context, titleId, descriptionId, min, max, units, stepSize) { + override val setting: AbstractSetting + get() = intSetting + + override val selectedValue: Int + get() = intSetting.int + + fun setSelectedValue(settings: Settings?, selection: Int) { + intSetting.setInt(settings!!, selection) + } +}