dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2026-04-09 10:51:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup + Rebrand feature to "Quick Configure"

Browse Source
This commit is contained in:
OpenSauce04 2024-07-10 23:39:55 +01:00 committed by OpenSauce
parent 781652a1c0
commit 14377cde15
5 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/ControllerAutomappingDialog.kt → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/ControllerQuickConfigDialog.kt
View File

@ -11,12 +11,12 @@ import android.view.MotionEvent
import android.view.View
import androidx.core.content.ContextCompat
import org.citra.citra_emu.R
import org.citra.citra_emu.databinding.DialogControllerautomappingBinding
import org.citra.citra_emu.databinding.DialogControllerQuickConfigBinding
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting
import kotlin.math.abs
class ControllerAutomappingDialog(
class ControllerQuickConfigDialog(
private var context: Context,
buttons: ArrayList<List<String>>,
titles: ArrayList<List<Int>>,
@ -25,7 +25,7 @@ class ControllerAutomappingDialog(
private var index = 0
val inflater = LayoutInflater.from(context)
val automappingBinding = DialogControllerautomappingBinding.inflate(inflater)
val automappingBinding = DialogControllerQuickConfigBinding.inflate(inflater)
var dialog: AlertDialog? = null
var allButtons = arrayListOf<String>()
@ -149,11 +149,8 @@ class ControllerAutomappingDialog(
private var prevDeviceId = 0
private var waitingForEvent = true
private var setting: InputBindingSetting? = null
private var debounceTimestamp = System.currentTimeMillis()
private fun onKeyEvent(event: KeyEvent): Boolean {
return when (event.action) {
KeyEvent.ACTION_UP -> {
@ -179,7 +176,6 @@ class ControllerAutomappingDialog(
if (event.action != MotionEvent.ACTION_MOVE) return false
val input = event.device
val motionRanges = input.motionRanges
if (input.id != prevDeviceId) {

9
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt
View File

@ -65,7 +65,7 @@ import org.citra.citra_emu.features.settings.ui.viewholder.SubmenuViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.SwitchSettingViewHolder
import org.citra.citra_emu.fragments.MessageDialogFragment
import org.citra.citra_emu.fragments.MotionBottomSheetDialogFragment
import org.citra.citra_emu.utils.PermissionsHandler.preferences
import org.citra.citra_emu.utils.PermissionsHandler
import org.citra.citra_emu.utils.SystemSaveGame
import java.lang.NumberFormatException
import java.text.SimpleDateFormat
@ -597,7 +597,7 @@ class SettingsAdapter(
.show()
}
fun onClickAutoconfigureControls() {
fun onClickControllerQuickConfig() {
val buttons = arrayListOf(
Settings.buttonKeys,
@ -617,10 +617,7 @@ class SettingsAdapter(
Settings.triggerTitles
)
Settings.buttonTitles
ControllerAutomappingDialog(context, buttons, titles, preferences).show()
ControllerQuickConfigDialog(context, buttons, titles, PermissionsHandler.preferences).show()
}
fun closeDialog() {

6
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -761,15 +761,13 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
private fun addControlsSettings(sl: ArrayList<SettingsItem>) {
settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_controls))
sl.apply {
add(HeaderSetting(R.string.auto_configure))
add(
RunnableSetting(
R.string.auto_configure,
R.string.controller_quick_config,
0,
false,
0,
{ settingsAdapter.onClickAutoconfigureControls() }
{ settingsAdapter.onClickControllerQuickConfig() }
)
)

0
src/android/app/src/main/res/layout/dialog_controllerautomapping.xml → src/android/app/src/main/res/layout/dialog_controller_quick_config.xml
View File

2
src/android/app/src/main/res/values/strings.xml
View File

@ -125,6 +125,7 @@
<string name="controller_dpad_button_description">Only map the D-pad to these if you\'re facing issues with the D-Pad (Axis) button mappings.</string>
<string name="controller_axis_vertical">Up/Down Axis</string>
<string name="controller_axis_horizontal">Left/Right Axis</string>
<string name="controller_quick_config">Quick Configure</string>
<string name="direction_up">Up</string>
<string name="direction_down">Down</string>
<string name="direction_left">Left</string>
@ -175,7 +176,6 @@
<string name="home_menu">HOME Menu</string>
<!-- Generic buttons (Shared with lots of stuff) -->
<string name="auto_configure">Auto Configuration</string>
<string name="generic_buttons">Buttons</string>
<string name="button">Button</string>