From 065c80fb4d979209efd97bf5e5bb0983b6dc83eb Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Mar 2023 03:29:22 -0400 Subject: [PATCH] Android: Convert SliderSetting to Kotlin --- .../settings/model/view/SliderSetting.java | 61 ------------------- .../settings/model/view/SliderSetting.kt | 47 ++++++++++++++ 2 files changed, 47 insertions(+), 61 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java deleted file mode 100644 index fccbe0a0b1..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java +++ /dev/null @@ -1,61 +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.Settings; - -public abstract class SliderSetting extends SettingsItem -{ - private int mMin; - private int mMax; - private String mUnits; - private int mStepSize; - - public SliderSetting(Context context, int nameId, int descriptionId, int min, int max, - String units, int stepSize) - { - super(context, nameId, descriptionId); - mMin = min; - mMax = max; - mUnits = units; - mStepSize = stepSize; - } - - public SliderSetting(CharSequence name, CharSequence description, int min, int max, String units) - { - super(name, description); - mMin = min; - mMax = max; - mUnits = units; - } - - public abstract int getSelectedValue(); - - public int getMin() - { - return mMin; - } - - public int getMax() - { - return mMax; - } - - public String getUnits() - { - return mUnits; - } - - public int getStepSize() - { - return mStepSize; - } - - @Override - public int getType() - { - return TYPE_SLIDER; - } -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.kt new file mode 100644 index 0000000000..f595c4cea3 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.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 + +abstract class SliderSetting : SettingsItem { + override val type: Int = TYPE_SLIDER + + var min: Int + private set + var max: Int + private set + var units: String? + private set + var stepSize = 0 + private set + + constructor( + context: Context, + nameId: Int, + descriptionId: Int, + min: Int, + max: Int, + units: String?, + stepSize: Int + ) : super(context, nameId, descriptionId) { + this.min = min + this.max = max + this.units = units + this.stepSize = stepSize + } + + constructor( + name: CharSequence, + description: CharSequence?, + min: Int, + max: Int, + units: String? + ) : super(name, description) { + this.min = min + this.max = max + this.units = units + } + + abstract val selectedValue: Int +}