CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

android: Fix cast for abstract settings

master
Charles Lombardo 2023-04-20 17:42:27 +07:00 committed by bunnei
parent 7531641ecc
commit b6f57da70a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt
Unescape Escape View File

@ -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!!

2
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt
Unescape Escape View File

@ -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!!

4
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt
Unescape Escape View File

@ -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

2
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt
Unescape Escape View File

@ -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!!