dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-20 12:55:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[android] fix firmware overlay multiple updates (#252)

Browse source 
Signed-off-by: Aleksandr Popovich <alekpopo@pm.me>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/252
Co-authored-by: Aleksandr Popovich <alekpopo@pm.me>
Co-committed-by: Aleksandr Popovich <alekpopo@pm.me>
This commit is contained in:
Aleksandr Popovich 2025-07-04 20:24:03 +00:00 • committed by CamilleLaVey
parent cb3521272f
commit aeb2aec13b
No known key found for this signature in database
GPG key ID: BA8734FD0EE46976
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt
View file

@ -361,7 +361,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {
// setup listeners etc // setup listeners etc
val roomNameWatcher = object : TextValidatorWatcher( val roomNameWatcher = object : TextValidatorWatcher(
binding.btnConfirm, // TODO(alekpop, crueter): Figure out a better way to deal with this? binding.btnConfirm,
binding.layoutRoomName, binding.layoutRoomName,
context.getString( context.getString(
R.string.multiplayer_room_name_error R.string.multiplayer_room_name_error

3
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
View file

@ -56,6 +56,7 @@ class SettingsFragmentPresenter(
} }
val pairedSettingKey = item.setting.pairedSettingKey val pairedSettingKey = item.setting.pairedSettingKey
if (pairedSettingKey.isNotEmpty()) { if (pairedSettingKey.isNotEmpty()) {
val pairedSettingValue = NativeConfig.getBoolean( val pairedSettingValue = NativeConfig.getBoolean(
pairedSettingKey, pairedSettingKey,
@ -220,7 +221,6 @@ class SettingsFragmentPresenter(
private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) { private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
sl.apply { sl.apply {
// TODO(crueter): reorganize this, this is awful
add(HeaderSetting(R.string.backend)) add(HeaderSetting(R.string.backend))
add(IntSetting.RENDERER_ACCURACY.key) add(IntSetting.RENDERER_ACCURACY.key)
@ -436,7 +436,6 @@ class SettingsFragmentPresenter(
} }
} }
// TODO(alekpop): sort these into headers.
private fun addEdenVeilSettings(sl: ArrayList<SettingsItem>) { private fun addEdenVeilSettings(sl: ArrayList<SettingsItem>) {
sl.apply { sl.apply {
add(HeaderSetting(R.string.veil_extensions)) add(HeaderSetting(R.string.veil_extensions))

1
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
View file

@ -22,6 +22,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter
binding.textSettingDescription.setVisible(setting.description.isNotEmpty()) binding.textSettingDescription.setVisible(setting.description.isNotEmpty())
binding.textSettingDescription.text = setting.description binding.textSettingDescription.text = setting.description
// TODO(alekpop): A race condition occurs here if the button is clicked too fast
binding.switchWidget.setOnCheckedChangeListener(null) binding.switchWidget.setOnCheckedChangeListener(null)
binding.switchWidget.isChecked = setting.getIsChecked(setting.needsRuntimeGlobal) binding.switchWidget.isChecked = setting.getIsChecked(setting.needsRuntimeGlobal)
binding.switchWidget.setOnCheckedChangeListener { _: CompoundButton, _: Boolean -> binding.switchWidget.setOnCheckedChangeListener { _: CompoundButton, _: Boolean ->

4
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
View file

@ -105,6 +105,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
private var isInFoldableLayout = false private var isInFoldableLayout = false
private lateinit var gpuModel: String private lateinit var gpuModel: String
private lateinit var fwVersion: String
override fun onAttach(context: Context) { override fun onAttach(context: Context) {
super.onAttach(context) super.onAttach(context)
@ -186,6 +187,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
} }
gpuModel = GpuDriverHelper.getGpuModel().toString() gpuModel = GpuDriverHelper.getGpuModel().toString()
fwVersion = NativeLibrary.firmwareVersion()
binding.surfaceEmulation.holder.addCallback(this) binding.surfaceEmulation.holder.addCallback(this)
binding.doneControlConfig.setOnClickListener { stopConfiguringControls() } binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
@ -755,7 +757,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
if (BooleanSetting.SHOW_FW_VERSION.getBoolean(NativeConfig.isPerGameConfigLoaded())) { if (BooleanSetting.SHOW_FW_VERSION.getBoolean(NativeConfig.isPerGameConfigLoaded())) {
if (sb.isNotEmpty()) sb.append(" | ") if (sb.isNotEmpty()) sb.append(" | ")
sb.append(NativeLibrary.firmwareVersion()) sb.append(fwVersion)
} }
binding.showSocOverlayText.text = sb.toString() binding.showSocOverlayText.text = sb.toString()

8
src/android/app/src/main/jni/android_settings.h
View file

@ -127,22 +127,22 @@ namespace AndroidSettings {
Settings::Setting<bool> show_device_model{linkage, true, "show_device_model", Settings::Setting<bool> show_device_model{linkage, true, "show_device_model",
Settings::Category::Overlay, Settings::Category::Overlay,
Settings::Specialization::Default, true, true, Settings::Specialization::Default, true, true,
&show_performance_overlay}; &show_soc_overlay};
Settings::Setting<bool> show_gpu_model{linkage, true, "show_gpu_model", Settings::Setting<bool> show_gpu_model{linkage, true, "show_gpu_model",
Settings::Category::Overlay, Settings::Category::Overlay,
Settings::Specialization::Default, true, true, Settings::Specialization::Default, true, true,
&show_performance_overlay}; &show_soc_overlay};
Settings::Setting<bool> show_soc_model{linkage, true, "show_soc_model", Settings::Setting<bool> show_soc_model{linkage, true, "show_soc_model",
Settings::Category::Overlay, Settings::Category::Overlay,
Settings::Specialization::Default, true, true, Settings::Specialization::Default, true, true,
&show_performance_overlay}; &show_soc_overlay};
Settings::Setting<bool> show_fw_version{linkage, true, "show_firmware_version", Settings::Setting<bool> show_fw_version{linkage, true, "show_firmware_version",
Settings::Category::Overlay, Settings::Category::Overlay,
Settings::Specialization::Default, true, true, Settings::Specialization::Default, true, true,
&show_performance_overlay}; &show_soc_overlay};
Settings::Setting<bool> soc_overlay_background{linkage, false, "soc_overlay_background", Settings::Setting<bool> soc_overlay_background{linkage, false, "soc_overlay_background",
Settings::Category::Overlay, Settings::Category::Overlay,