Fix formatting issues per review feedback

Fix formatting issues per review feedback
This commit is contained in:
hae-carrie-perez 2026-03-20 11:42:08 -04:00
parent 01413018c3
commit 33ef73e792
4 changed files with 1050 additions and 1049 deletions

View File

@ -98,8 +98,8 @@ object ControllerInterface {
external fun getAllDeviceStrings(): Array<String>
external fun getDevice(deviceString: String): CoreDevice?
external fun getDescriptorForDevice(deviceString: String): String
external fun getDescriptorForDevice(deviceString: String): String
private fun onInputStateChanged() {
// When a single SensorEvent is dispatched, this method is likely to get called many times.

View File

@ -25,6 +25,7 @@ import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroup
import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroupContainer
import org.dolphinemu.dolphinemu.features.input.model.controlleremu.EmulatedController
import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting
import org.dolphinemu.dolphinemu.features.input.model.ControllerInterface
import org.dolphinemu.dolphinemu.features.input.model.view.InputDeviceSetting
import org.dolphinemu.dolphinemu.features.input.model.view.InputMappingControlSetting
import org.dolphinemu.dolphinemu.features.input.ui.ProfileDialog
@ -32,7 +33,6 @@ import org.dolphinemu.dolphinemu.features.input.ui.ProfileDialogPresenter
import org.dolphinemu.dolphinemu.features.settings.model.*
import org.dolphinemu.dolphinemu.features.settings.model.view.*
import org.dolphinemu.dolphinemu.features.settings.model.AchievementModel.logout
import org.dolphinemu.dolphinemu.features.input.model.ControllerInterface
import org.dolphinemu.dolphinemu.features.settings.model.view.InputStringSetting
import org.dolphinemu.dolphinemu.model.GpuDriverMetadata
import org.dolphinemu.dolphinemu.utils.*
@ -504,16 +504,16 @@ class SettingsFragmentPresenter(
override val isOverridden: Boolean
get() = BooleanSetting.MAIN_DSP_HLE.isOverridden ||
BooleanSetting.MAIN_DSP_JIT.isOverridden
BooleanSetting.MAIN_DSP_JIT.isOverridden
override val isRuntimeEditable: Boolean
get() = BooleanSetting.MAIN_DSP_HLE.isRuntimeEditable &&
BooleanSetting.MAIN_DSP_JIT.isRuntimeEditable
BooleanSetting.MAIN_DSP_JIT.isRuntimeEditable
override fun delete(settings: Settings): Boolean {
// Not short circuiting
return BooleanSetting.MAIN_DSP_HLE.delete(settings) and
BooleanSetting.MAIN_DSP_JIT.delete(settings)
BooleanSetting.MAIN_DSP_JIT.delete(settings)
}
}
@ -972,8 +972,8 @@ class SettingsFragmentPresenter(
0,
false
) {
fragmentView.showDialogFragment(LoginDialog(this))
loadSettingsList()
fragmentView.showDialogFragment(LoginDialog(this))
loadSettingsList()
})
} else {
sl.add(
@ -985,8 +985,8 @@ class SettingsFragmentPresenter(
0,
false
) {
logout()
loadSettingsList()
logout()
loadSettingsList()
})
}
sl.add(
@ -1083,16 +1083,16 @@ class SettingsFragmentPresenter(
override val isOverridden: Boolean
get() = BooleanSetting.MAIN_SYNC_ON_SKIP_IDLE.isOverridden ||
BooleanSetting.MAIN_SYNC_GPU.isOverridden
BooleanSetting.MAIN_SYNC_GPU.isOverridden
override val isRuntimeEditable: Boolean
get() = BooleanSetting.MAIN_SYNC_ON_SKIP_IDLE.isRuntimeEditable &&
BooleanSetting.MAIN_SYNC_GPU.isRuntimeEditable
BooleanSetting.MAIN_SYNC_GPU.isRuntimeEditable
override fun delete(settings: Settings): Boolean {
// Not short circuiting
return BooleanSetting.MAIN_SYNC_ON_SKIP_IDLE.delete(settings) and
BooleanSetting.MAIN_SYNC_GPU.delete(settings)
BooleanSetting.MAIN_SYNC_GPU.delete(settings)
}
}
@ -2209,7 +2209,7 @@ class SettingsFragmentPresenter(
BooleanSetting.MAIN_DEBUG_JIT_ENABLE_PROFILING,
R.string.debug_jit_enable_block_profiling,
0
)
)
)
sl.add(
RunRunnable(
@ -2547,6 +2547,7 @@ class SettingsFragmentPresenter(
controller
)
)
sl.add(
InputStringSetting(
context,
@ -2648,11 +2649,11 @@ class SettingsFragmentPresenter(
* @param groupTypeFilter If this is non-null, only groups whose types match this are considered.
*/
private fun addControllerMappingSettings(
sl: ArrayList<SettingsItem>,
controller: EmulatedController,
groupTypeFilter: Set<Int>?
sl: ArrayList<SettingsItem>,
controller: EmulatedController,
groupTypeFilter: Set<Int>?
) {
addContainerMappingSettings(sl, controller, controller, groupTypeFilter)
addContainerMappingSettings(sl, controller, controller, groupTypeFilter)
}
/**
@ -2747,7 +2748,7 @@ class SettingsFragmentPresenter(
val defaultDevice = controller.getDefaultDevice()
hasOldControllerSettings = defaultDevice.startsWith("Android/") &&
defaultDevice.endsWith("/Touchscreen")
defaultDevice.endsWith("/Touchscreen")
fragmentView.setOldControllerSettingsWarningVisibility(hasOldControllerSettings)
}

View File

@ -32,8 +32,8 @@
<string name="wiimote_extensions">Extension</string>
<string name="input_device">Device</string>
<string name="input_controller_label">Controller Label</string>
<string name="input_controller_label_description">Give this controller a unique name</string>
<string name="input_controller_label">Controller Label</string>
<string name="input_controller_label_description">Give this controller a unique name</string>
<string name="input_device_all_devices">Create Mappings for Other Devices</string>
<string name="input_device_all_devices_description">Detects inputs from all devices, not just the selected device.</string>
<string name="input_profile">Profile</string>

File diff suppressed because it is too large Load Diff