diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt index 46ed42905..757d25865 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt @@ -20,7 +20,8 @@ class SliderSetting( val units: String, val key: String? = null, val defaultValue: Float? = null, - override var isEnabled: Boolean = true + override var isEnabled: Boolean = true, + val showSlider: Boolean = true ) : SettingsItem(setting, titleId, descriptionId) { override val type = TYPE_SLIDER val selectedFloat: Float diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt index bc55bd5d6..6a444e894 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt @@ -15,6 +15,7 @@ import android.text.InputType import android.text.TextWatcher import android.text.format.DateFormat import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity @@ -315,7 +316,6 @@ class SettingsAdapter( clickedPosition = position sliderProgress = (item.selectedFloat * 100f).roundToInt() / 100f - val inflater = LayoutInflater.from(context) val sliderBinding = DialogSliderBinding.inflate(inflater) textInputLayout = sliderBinding.textInput @@ -335,6 +335,11 @@ class SettingsAdapter( valueFrom = item.min.toFloat() valueTo = item.max.toFloat() value = sliderProgress + if (!item.showSlider) { + isEnabled = false + visibility = View.GONE + } + textSliderValue?.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable) { var textValue = s.toString().toFloatOrNull(); diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt index d4baf6166..bf672b633 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -230,10 +230,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) R.string.frame_limit_slider, R.string.frame_limit_slider_description, 1, - 200, + 9999, "%", IntSetting.FRAME_LIMIT.key, - IntSetting.FRAME_LIMIT.defaultValue.toFloat() + IntSetting.FRAME_LIMIT.defaultValue.toFloat(), + showSlider = false ) ) add( @@ -241,11 +242,12 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) IntSetting.TURBO_LIMIT, R.string.turbo_limit, R.string.turbo_limit_description, - 100, - 400, + 1, + 9999, "%", IntSetting.TURBO_LIMIT.key, - IntSetting.TURBO_LIMIT.defaultValue.toFloat() + IntSetting.TURBO_LIMIT.defaultValue.toFloat(), + showSlider = false ) ) add(