VERY experimental Nintendo Switch 2 emulator
C++
android: Reduce opacity of non-editable settings
Charles Lombardocea5d7d400af
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/LicenseAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/LicenseAdapter.ktindex 7006651d00..bc6ff13643 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/LicenseAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/LicenseAdapter.kt@@ -49,6 +49,7 @@ class LicenseAdapter(private val activity: AppCompatActivity, var licenses: Listval context = YuzuApplication.appContextbinding.textSettingName.text = context.getString(license.titleId)binding.textSettingDescription.text = context.getString(license.descriptionId)+ binding.textSettingValue.visibility = View.GONE}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.ktindex 3003768a31..79572fc06b 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt@@ -34,6 +34,8 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAval zonedTime = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC"))val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)binding.textSettingValue.text = dateFormatter.format(zonedTime)++ setStyle(setting.isEditable, binding)}override fun onClick(clicked: View) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.ktindex e6c5165aa6..83a2e94f13 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt@@ -24,6 +24,8 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAbinding.textSettingDescription.visibility = View.GONE}binding.textSettingValue.visibility = View.GONE++ setStyle(setting.isEditable, binding)}override fun onClick(clicked: View) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SettingViewHolder.ktindex f564608938..0fd1d2eaaa 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SettingViewHolder.kt@@ -5,6 +5,8 @@ package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.Viewimport androidx.recyclerview.widget.RecyclerView+import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding+import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBindingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter@@ -33,4 +35,18 @@ abstract class SettingViewHolder(itemView: View, protected val adapter: Settingsabstract override fun onClick(clicked: View)abstract override fun onLongClick(clicked: View): Boolean++ fun setStyle(isEditable: Boolean, binding: ListItemSettingBinding) {+ val opacity = if (isEditable) 1.0f else 0.5f+ binding.textSettingName.alpha = opacity+ binding.textSettingDescription.alpha = opacity+ binding.textSettingValue.alpha = opacity+ }++ fun setStyle(isEditable: Boolean, binding: ListItemSettingSwitchBinding) {+ binding.switchWidget.isEnabled = isEditable+ val opacity = if (isEditable) 1.0f else 0.5f+ binding.textSettingName.alpha = opacity+ binding.textSettingDescription.alpha = opacity+ }}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.ktindex 8ec7696545..b42d955aa7 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt@@ -31,17 +31,19 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Settifor (i in values.indices) {if (values[i] == item.selectedValue) {binding.textSettingValue.text = resMgr.getStringArray(item.choicesId)[i]- return+ break}}} else if (item is StringSingleChoiceSetting) {for (i in item.values!!.indices) {if (item.values[i] == item.selectedValue) {binding.textSettingValue.text = item.choices[i]- return+ break}}}++ setStyle(setting.isEditable, binding)}override fun onClick(clicked: View) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.ktindex f81ccde0de..a23b5d1099 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt@@ -29,6 +29,8 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdasetting.selectedValue,setting.units)++ setStyle(setting.isEditable, binding)}override fun onClick(clicked: View) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktindex f09f3e8592..ef34bf5f44 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt@@ -30,7 +30,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter}binding.switchWidget.isChecked = setting.isChecked- binding.switchWidget.isEnabled = setting.isEditable+ setStyle(setting.isEditable, binding)}override fun onClick(clicked: View) {