From d22afdb97f26a0163ac191a19e35dadf30a56676 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Sat, 13 Apr 2024 16:27:48 +0100 Subject: [PATCH] Updated default opacity to 50% This change accounts for the change in overlay image opacity to roughly equal how the overlay looks in 2108 --- .../github/lime3ds/android/fragments/EmulationFragment.kt | 6 +++--- .../java/io/github/lime3ds/android/overlay/InputOverlay.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt index c99d918bb..f47a9e2a1 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt @@ -810,7 +810,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram sliderBinding.apply { slider.valueTo = 100f - slider.value = preferences.getInt("controlOpacity", 100).toFloat() + slider.value = preferences.getInt("controlOpacity", 50).toFloat() slider.addOnChangeListener( Slider.OnChangeListener { slider: Slider, progress: Float, _: Boolean -> textValue.text = (progress.toInt()).toString() @@ -831,7 +831,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram setControlOpacity(sliderBinding.slider.value.toInt()) } .setNeutralButton(R.string.slider_default) { _: DialogInterface?, _: Int -> - setControlOpacity(100) + setControlOpacity(50) } .show() } @@ -863,7 +863,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram private fun resetInputOverlay() { preferences.edit() .putInt("controlScale", 50) - .putInt("controlOpacity", 100) + .putInt("controlOpacity", 50) .apply() val editor = preferences.edit() diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt index afcadf5f2..ef251b468 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt @@ -939,7 +939,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex scale *= (preferences.getInt("controlScale", 50) + 50).toFloat() scale /= 100f - val opacity: Int = preferences.getInt("controlOpacity", 100) * 255 / 100 + val opacity: Int = preferences.getInt("controlOpacity", 50) * 255 / 100 // Initialize the InputOverlayDrawableButton. val defaultStateBitmap = getBitmap(context, defaultResId, scale) @@ -997,7 +997,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex scale *= (preferences.getInt("controlScale", 50) + 50).toFloat() scale /= 100f - val opacity: Int = preferences.getInt("controlOpacity", 100) * 255 / 100 + val opacity: Int = preferences.getInt("controlOpacity", 50) * 255 / 100 // Initialize the InputOverlayDrawableDpad. val defaultStateBitmap = getBitmap(context, defaultResId, scale) @@ -1057,7 +1057,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex scale *= (preferences.getInt("controlScale", 50) + 50).toFloat() scale /= 100f - val opacity: Int = preferences.getInt("controlOpacity", 100) * 255 / 100 + val opacity: Int = preferences.getInt("controlOpacity", 50) * 255 / 100 // Initialize the InputOverlayDrawableJoystick. val bitmapOuter = getBitmap(context, resOuter, scale)