diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-04-20 17:42:27 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2023-06-03 00:05:54 -0700 |
| commit | b6f57da70abe762107b44964b775cd13cf0201ed (patch) | |
| tree | 2c0d508ae6074fc63a20164a2f64774e039e94e0 | |
| parent | 7531641ecc1cd5770c1e190c26933a4fe6dfa0ab (diff) | |
android: Fix cast for abstract settings
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( val value: String get() = if (setting != null) { - val setting = setting as StringSetting + val setting = setting as AbstractStringSetting setting.string } else { 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( val selectedValue: Int get() = if (setting != null) { - val setting = setting as IntSetting + val setting = setting as AbstractIntSetting setting.int } else { 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( get() { val setting = setting ?: return defaultValue!! return when (setting) { - is IntSetting -> setting.int - is FloatSetting -> setting.float.roundToInt() + is AbstractIntSetting -> setting.int + is AbstractFloatSetting -> setting.float.roundToInt() else -> { Log.error("[SliderSetting] Error casting setting type.") -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( val selectedValue: String get() = if (setting != null) { - val setting = setting as StringSetting + val setting = setting as AbstractStringSetting setting.string } else { defaultValue!! |