VERY experimental Nintendo Switch 2 emulator
C++
android: Add StringInputSetting settings item
t8957d2f11fac63b
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.ktindex 03d81ceb37..40d7c4df77 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt@@ -90,6 +90,7 @@ abstract class SettingsItem(const val TYPE_INPUT = 8const val TYPE_INT_SINGLE_CHOICE = 9const val TYPE_INPUT_PROFILE = 10+ const val TYPE_STRING_INPUT = 11const val FASTMEM_COMBINED = "fastmem_combined"diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringInputSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringInputSetting.ktnew file mode 100644index 0000000000..1eb999416a--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringInputSetting.kt@@ -0,0 +1,22 @@+// SPDX-FileCopyrightText: 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++package org.yuzu.yuzu_emu.features.settings.model.view++import androidx.annotation.StringRes+import org.yuzu.yuzu_emu.features.settings.model.AbstractStringSetting++class StringInputSetting(+ setting: AbstractStringSetting,+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = ""+) : SettingsItem(setting, titleId, titleString, descriptionId, descriptionString) {+ override val type = TYPE_STRING_INPUT++ fun getSelectedValue(needsGlobal: Boolean = false) = setting.getValueAsString(needsGlobal)++ fun setSelectedValue(selection: String) =+ (setting as AbstractStringSetting).setString(selection)+}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.ktindex 45c8faa102..500ac6e66e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt@@ -85,6 +85,10 @@ class SettingsAdapter(InputProfileViewHolder(ListItemSettingBinding.inflate(inflater), this)}+ SettingsItem.TYPE_STRING_INPUT -> {+ StringInputViewHolder(ListItemSettingBinding.inflate(inflater), this)+ }+else -> {HeaderViewHolder(ListItemSettingsHeaderBinding.inflate(inflater), this)}@@ -392,6 +396,15 @@ class SettingsAdapter(popup.show()}+ fun onStringInputClick(item: StringInputSetting, position: Int) {+ SettingsDialogFragment.newInstance(+ settingsViewModel,+ item,+ SettingsItem.TYPE_STRING_INPUT,+ position+ ).show(fragment.childFragmentManager, SettingsDialogFragment.TAG)+ }+fun onLongClick(item: SettingsItem, position: Int): Boolean {SettingsDialogFragment.newInstance(settingsViewModel,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.ktindex a81ff6b1a9..7f562a1f41 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt@@ -14,6 +14,7 @@ import androidx.fragment.app.activityViewModelsimport com.google.android.material.dialog.MaterialAlertDialogBuilderimport com.google.android.material.slider.Sliderimport org.yuzu.yuzu_emu.R+import org.yuzu.yuzu_emu.databinding.DialogEditTextBindingimport org.yuzu.yuzu_emu.databinding.DialogSliderBindingimport org.yuzu.yuzu_emu.features.input.NativeInputimport org.yuzu.yuzu_emu.features.input.model.AnalogDirection@@ -23,6 +24,7 @@ import org.yuzu.yuzu_emu.features.settings.model.view.IntSingleChoiceSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SliderSetting+import org.yuzu.yuzu_emu.features.settings.model.view.StringInputSettingimport org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSettingimport org.yuzu.yuzu_emu.utils.ParamPackageimport org.yuzu.yuzu_emu.utils.collect@@ -37,6 +39,7 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListenerprivate val settingsViewModel: SettingsViewModel by activityViewModels()private lateinit var sliderBinding: DialogSliderBinding+ private lateinit var stringInputBinding: DialogEditTextBindingoverride fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)@@ -131,6 +134,18 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener.create()}+ SettingsItem.TYPE_STRING_INPUT -> {+ stringInputBinding = DialogEditTextBinding.inflate(layoutInflater)+ val item = settingsViewModel.clickedItem as StringInputSetting+ stringInputBinding.editText.setText(item.getSelectedValue())+ MaterialAlertDialogBuilder(requireContext())+ .setTitle(item.title)+ .setView(stringInputBinding.root)+ .setPositiveButton(android.R.string.ok, this)+ .setNegativeButton(android.R.string.cancel, defaultCancelListener)+ .create()+ }+SettingsItem.TYPE_STRING_SINGLE_CHOICE -> {val item = settingsViewModel.clickedItem as StringSingleChoiceSettingMaterialAlertDialogBuilder(requireContext())@@ -158,6 +173,7 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener): View? {return when (type) {SettingsItem.TYPE_SLIDER -> sliderBinding.root+ SettingsItem.TYPE_STRING_INPUT -> stringInputBinding.rootelse -> super.onCreateView(inflater, container, savedInstanceState)}}@@ -200,6 +216,13 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListenerval sliderSetting = settingsViewModel.clickedItem as SliderSettingsliderSetting.setSelectedValue(settingsViewModel.sliderProgress.value)}++ is StringInputSetting -> {+ val stringInputSetting = settingsViewModel.clickedItem as StringInputSetting+ stringInputSetting.setSelectedValue(+ (stringInputBinding.editText.text ?: "").toString()+ )+ }}closeDialog()}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/StringInputViewHolder.ktnew file mode 100644index 0000000000..a4fd36f628--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt@@ -0,0 +1,45 @@+// SPDX-FileCopyrightText: 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++package org.yuzu.yuzu_emu.features.settings.ui.viewholder++import android.view.View+import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding+import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem+import org.yuzu.yuzu_emu.features.settings.model.view.StringInputSetting+import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter+import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible++class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :+ SettingViewHolder(binding.root, adapter) {+ private lateinit var setting: StringInputSetting++ override fun bind(item: SettingsItem) {+ setting = item as StringInputSetting+ binding.textSettingName.text = setting.title+ binding.textSettingDescription.setVisible(setting.description.isNotEmpty())+ binding.textSettingDescription.text = setting.description+ binding.textSettingValue.setVisible(true)+ binding.textSettingValue.text = setting.getSelectedValue()++ binding.buttonClear.setVisible(setting.clearable)+ binding.buttonClear.setOnClickListener {+ adapter.onClearClick(setting, bindingAdapterPosition)+ }++ setStyle(setting.isEditable, binding)+ }++ override fun onClick(clicked: View) {+ if (setting.isEditable) {+ adapter.onStringInputClick(setting, bindingAdapterPosition)+ }+ }++ override fun onLongClick(clicked: View): Boolean {+ if (setting.isEditable) {+ return adapter.onLongClick(setting, bindingAdapterPosition)+ }+ return false+ }+}