summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2023-04-20 17:42:27 -0400
committerGravatar bunnei2023-06-03 00:05:54 -0700
commitb6f57da70abe762107b44964b775cd13cf0201ed (patch)
tree2c0d508ae6074fc63a20164a2f64774e039e94e0 /src/android
parentandroid: Create xml for Material You theme (diff)
downloadyuzu-b6f57da70abe762107b44964b775cd13cf0201ed.tar.gz
yuzu-b6f57da70abe762107b44964b775cd13cf0201ed.tar.xz
yuzu-b6f57da70abe762107b44964b775cd13cf0201ed.zip
android: Fix cast for abstract settings
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt2
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt2
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt4
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt
index cf60798ff..3f399dec9 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt
@@ -18,7 +18,7 @@ class DateTimeSetting(
18 18
19 val value: String 19 val value: String
20 get() = if (setting != null) { 20 get() = if (setting != null) {
21 val setting = setting as StringSetting 21 val setting = setting as AbstractStringSetting
22 setting.string 22 setting.string
23 } else { 23 } else {
24 defaultValue!! 24 defaultValue!!
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt
index ed1742ac6..9eac9904e 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt
@@ -19,7 +19,7 @@ class SingleChoiceSetting(
19 19
20 val selectedValue: Int 20 val selectedValue: Int
21 get() = if (setting != null) { 21 get() = if (setting != null) {
22 val setting = setting as IntSetting 22 val setting = setting as AbstractIntSetting
23 setting.int 23 setting.int
24 } else { 24 } else {
25 defaultValue!! 25 defaultValue!!
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt
index e216d0b69..842648ce4 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt
@@ -27,8 +27,8 @@ class SliderSetting(
27 get() { 27 get() {
28 val setting = setting ?: return defaultValue!! 28 val setting = setting ?: return defaultValue!!
29 return when (setting) { 29 return when (setting) {
30 is IntSetting -> setting.int 30 is AbstractIntSetting -> setting.int
31 is FloatSetting -> setting.float.roundToInt() 31 is AbstractFloatSetting -> setting.float.roundToInt()
32 else -> { 32 else -> {
33 Log.error("[SliderSetting] Error casting setting type.") 33 Log.error("[SliderSetting] Error casting setting type.")
34 -1 34 -1
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt
index 1a8173b3c..9e9b00d10 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt
@@ -27,7 +27,7 @@ class StringSingleChoiceSetting(
27 27
28 val selectedValue: String 28 val selectedValue: String
29 get() = if (setting != null) { 29 get() = if (setting != null) {
30 val setting = setting as StringSetting 30 val setting = setting as AbstractStringSetting
31 setting.string 31 setting.string
32 } else { 32 } else {
33 defaultValue!! 33 defaultValue!!