The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-22 15:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a rudimentary OSC button vibration setting

Browse Source
This commit is contained in:
Abandoned Cart 2022-11-21 17:09:53 -05:00 committed by Billy Laws
parent 2afd33b305
commit cfd3bfecba
6 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/emu/skyline/EmulationActivity.kt
View File

@ -265,6 +265,7 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
isGone = controllerType == ControllerType.None || !preferenceSettings.onScreenControl
setOnButtonStateChangedListener(::onButtonStateChanged)
setOnStickStateChangedListener(::onStickStateChanged)
hapticFeedback = preferenceSettings.onScreenControl && preferenceSettings.onScreenControlFeedback
recenterSticks = preferenceSettings.onScreenControlRecenterSticks
}

5
app/src/main/java/emu/skyline/input/ControllerActivity.kt
View File

@ -91,6 +91,11 @@ class ControllerActivity : AppCompatActivity() {
adapter.notifyItemChanged(position)
})
items.add(ControllerCheckBoxViewItem(getString(R.string.osc_feedback), "", preferenceSettings.onScreenControlFeedback) { item, position ->
preferenceSettings.onScreenControlFeedback = item.checked
adapter.notifyItemChanged(position)
})
items.add(ControllerCheckBoxViewItem(getString(R.string.osc_recenter_sticks), "", preferenceSettings.onScreenControlRecenterSticks) { item, position ->
preferenceSettings.onScreenControlRecenterSticks = item.checked
adapter.notifyItemChanged(position)

2
app/src/main/java/emu/skyline/input/onscreen/OnScreenButton.kt
View File

@ -74,6 +74,8 @@ abstract class OnScreenButton(
var isPressed = false
var hapticFeedback = false
var isEditing = false
private set

22
app/src/main/java/emu/skyline/input/onscreen/OnScreenControllerView.kt
View File

@ -9,8 +9,14 @@ import android.animation.Animator
import android.animation.AnimatorListenerAdapter
import android.animation.ValueAnimator
import android.content.Context
import android.content.Context.VIBRATOR_MANAGER_SERVICE
import android.content.Context.VIBRATOR_SERVICE
import android.graphics.Canvas
import android.graphics.PointF
import android.os.Build
import android.os.VibrationEffect
import android.os.Vibrator
import android.os.VibratorManager
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
@ -55,6 +61,11 @@ class OnScreenControllerView @JvmOverloads constructor(context : Context, attrs
field = value
controls.joysticks.forEach { it.recenterSticks = recenterSticks }
}
var hapticFeedback = false
set(value) {
field = value
(controls.circularButtons + controls.rectangularButtons + controls.triggerButtons).forEach { it.hapticFeedback = hapticFeedback }
}
override fun onDraw(canvas : Canvas) {
super.onDraw(canvas)
@ -73,6 +84,16 @@ class OnScreenControllerView @JvmOverloads constructor(context : Context, attrs
}
}
private val vibrationEffect = VibrationEffect.createOneShot(20, VibrationEffect.DEFAULT_AMPLITUDE)
private val vibrate = {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
(context.getSystemService(VIBRATOR_MANAGER_SERVICE) as VibratorManager).defaultVibrator.vibrate(vibrationEffect)
} else {
@Suppress("DEPRECATION")
(context.getSystemService(VIBRATOR_SERVICE) as Vibrator).vibrate(vibrationEffect)
}
}
private val playingTouchHandler = OnTouchListener { _, event ->
var handled = false
val actionIndex = event.actionIndex
@ -102,6 +123,7 @@ class OnScreenControllerView @JvmOverloads constructor(context : Context, attrs
if (button.config.enabled && button.isTouched(x, y)) {
button.touchPointerId = pointerId
button.onFingerDown(x, y)
if (hapticFeedback) vibrate()
performClick()
onButtonStateChangedListener?.invoke(button.buttonId, ButtonState.Pressed)
handled = true

1
app/src/main/java/emu/skyline/utils/PreferenceSettings.kt
View File

@ -51,6 +51,7 @@ class PreferenceSettings @Inject constructor(@ApplicationContext private val con
// Input
var onScreenControl by sharedPreferences(context, true)
var onScreenControlFeedback by sharedPreferences(context, true)
var onScreenControlRecenterSticks by sharedPreferences(context, true)
// Other

1
app/src/main/res/values/strings.xml
View File

@ -110,6 +110,7 @@
<string name="osc_enable">Enable On-Screen Controls</string>
<string name="osc_not_shown">On-Screen Controls won\'t be shown</string>
<string name="osc_shown">On-Screen Controls will be shown</string>
<string name="osc_feedback">Enable Haptic Feedback</string>
<string name="osc_edit">Edit On-Screen Controls layout</string>
<string name="setup_guide">Setup Guide</string>
<string name="setup_guide_description">Sequentially map every stick and button</string>