diff options
| author | 2023-08-12 15:41:35 -0400 | |
|---|---|---|
| committer | 2023-08-12 15:42:55 -0400 | |
| commit | 798a439eb1970c0d89b5274c8f0e702aa41daea7 (patch) | |
| tree | bdd8b26082a135c8f9e6b3aafe73343b08c928c5 /src/android | |
| parent | android: Use string resource for slider value/units (diff) | |
| download | yuzu-798a439eb1970c0d89b5274c8f0e702aa41daea7.tar.gz yuzu-798a439eb1970c0d89b5274c8f0e702aa41daea7.tar.xz yuzu-798a439eb1970c0d89b5274c8f0e702aa41daea7.zip | |
android: Reduce opacity of non-editable settings
Diffstat (limited to 'src/android')
7 files changed, 28 insertions, 3 deletions
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.kt index 7006651d0..bc6ff1364 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: List | |||
| 49 | val context = YuzuApplication.appContext | 49 | val context = YuzuApplication.appContext |
| 50 | binding.textSettingName.text = context.getString(license.titleId) | 50 | binding.textSettingName.text = context.getString(license.titleId) |
| 51 | binding.textSettingDescription.text = context.getString(license.descriptionId) | 51 | binding.textSettingDescription.text = context.getString(license.descriptionId) |
| 52 | binding.textSettingValue.visibility = View.GONE | ||
| 52 | } | 53 | } |
| 53 | } | 54 | } |
| 54 | } | 55 | } |
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.kt index 3003768a3..79572fc06 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: SettingsA | |||
| 34 | val zonedTime = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC")) | 34 | val zonedTime = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC")) |
| 35 | val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM) | 35 | val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM) |
| 36 | binding.textSettingValue.text = dateFormatter.format(zonedTime) | 36 | binding.textSettingValue.text = dateFormatter.format(zonedTime) |
| 37 | |||
| 38 | setStyle(setting.isEditable, binding) | ||
| 37 | } | 39 | } |
| 38 | 40 | ||
| 39 | override fun onClick(clicked: View) { | 41 | 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.kt index e6c5165aa..83a2e94f1 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: SettingsA | |||
| 24 | binding.textSettingDescription.visibility = View.GONE | 24 | binding.textSettingDescription.visibility = View.GONE |
| 25 | } | 25 | } |
| 26 | binding.textSettingValue.visibility = View.GONE | 26 | binding.textSettingValue.visibility = View.GONE |
| 27 | |||
| 28 | setStyle(setting.isEditable, binding) | ||
| 27 | } | 29 | } |
| 28 | 30 | ||
| 29 | override fun onClick(clicked: View) { | 31 | 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.kt index f56460893..0fd1d2eaa 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.viewholder | |||
| 5 | 5 | ||
| 6 | import android.view.View | 6 | import android.view.View |
| 7 | import androidx.recyclerview.widget.RecyclerView | 7 | import androidx.recyclerview.widget.RecyclerView |
| 8 | import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding | ||
| 9 | import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding | ||
| 8 | import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem | 10 | import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
| 9 | import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter | 11 | import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter |
| 10 | 12 | ||
| @@ -33,4 +35,18 @@ abstract class SettingViewHolder(itemView: View, protected val adapter: Settings | |||
| 33 | abstract override fun onClick(clicked: View) | 35 | abstract override fun onClick(clicked: View) |
| 34 | 36 | ||
| 35 | abstract override fun onLongClick(clicked: View): Boolean | 37 | abstract override fun onLongClick(clicked: View): Boolean |
| 38 | |||
| 39 | fun setStyle(isEditable: Boolean, binding: ListItemSettingBinding) { | ||
| 40 | val opacity = if (isEditable) 1.0f else 0.5f | ||
| 41 | binding.textSettingName.alpha = opacity | ||
| 42 | binding.textSettingDescription.alpha = opacity | ||
| 43 | binding.textSettingValue.alpha = opacity | ||
| 44 | } | ||
| 45 | |||
| 46 | fun setStyle(isEditable: Boolean, binding: ListItemSettingSwitchBinding) { | ||
| 47 | binding.switchWidget.isEnabled = isEditable | ||
| 48 | val opacity = if (isEditable) 1.0f else 0.5f | ||
| 49 | binding.textSettingName.alpha = opacity | ||
| 50 | binding.textSettingDescription.alpha = opacity | ||
| 51 | } | ||
| 36 | } | 52 | } |
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.kt index 8ec769654..b42d955aa 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: Setti | |||
| 31 | for (i in values.indices) { | 31 | for (i in values.indices) { |
| 32 | if (values[i] == item.selectedValue) { | 32 | if (values[i] == item.selectedValue) { |
| 33 | binding.textSettingValue.text = resMgr.getStringArray(item.choicesId)[i] | 33 | binding.textSettingValue.text = resMgr.getStringArray(item.choicesId)[i] |
| 34 | return | 34 | break |
| 35 | } | 35 | } |
| 36 | } | 36 | } |
| 37 | } else if (item is StringSingleChoiceSetting) { | 37 | } else if (item is StringSingleChoiceSetting) { |
| 38 | for (i in item.values!!.indices) { | 38 | for (i in item.values!!.indices) { |
| 39 | if (item.values[i] == item.selectedValue) { | 39 | if (item.values[i] == item.selectedValue) { |
| 40 | binding.textSettingValue.text = item.choices[i] | 40 | binding.textSettingValue.text = item.choices[i] |
| 41 | return | 41 | break |
| 42 | } | 42 | } |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | |||
| 46 | setStyle(setting.isEditable, binding) | ||
| 45 | } | 47 | } |
| 46 | 48 | ||
| 47 | override fun onClick(clicked: View) { | 49 | 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.kt index f81ccde0d..a23b5d109 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: SettingsAda | |||
| 29 | setting.selectedValue, | 29 | setting.selectedValue, |
| 30 | setting.units | 30 | setting.units |
| 31 | ) | 31 | ) |
| 32 | |||
| 33 | setStyle(setting.isEditable, binding) | ||
| 32 | } | 34 | } |
| 33 | 35 | ||
| 34 | override fun onClick(clicked: View) { | 36 | 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.kt index f09f3e859..ef34bf5f4 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 | |||
| 30 | } | 30 | } |
| 31 | binding.switchWidget.isChecked = setting.isChecked | 31 | binding.switchWidget.isChecked = setting.isChecked |
| 32 | 32 | ||
| 33 | binding.switchWidget.isEnabled = setting.isEditable | 33 | setStyle(setting.isEditable, binding) |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | override fun onClick(clicked: View) { | 36 | override fun onClick(clicked: View) { |