Quellcode durchsuchen

android: Fix cast for abstract settings

Charles Lombardo vor 3 Jahren
Ursprung
Commit
b6f57da70a

+ 1 - 1
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
     val value: String
         get() = if (setting != null) {
         get() = if (setting != null) {
-            val setting = setting as StringSetting
+            val setting = setting as AbstractStringSetting
             setting.string
             setting.string
         } else {
         } else {
             defaultValue!!
             defaultValue!!

+ 1 - 1
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
     val selectedValue: Int
         get() = if (setting != null) {
         get() = if (setting != null) {
-            val setting = setting as IntSetting
+            val setting = setting as AbstractIntSetting
             setting.int
             setting.int
         } else {
         } else {
             defaultValue!!
             defaultValue!!

+ 2 - 2
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt

@@ -27,8 +27,8 @@ class SliderSetting(
         get() {
         get() {
             val setting = setting ?: return defaultValue!!
             val setting = setting ?: return defaultValue!!
             return when (setting) {
             return when (setting) {
-                is IntSetting -> setting.int
-                is FloatSetting -> setting.float.roundToInt()
+                is AbstractIntSetting -> setting.int
+                is AbstractFloatSetting -> setting.float.roundToInt()
                 else -> {
                 else -> {
                     Log.error("[SliderSetting] Error casting setting type.")
                     Log.error("[SliderSetting] Error casting setting type.")
                     -1
                     -1

+ 1 - 1
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
     val selectedValue: String
         get() = if (setting != null) {
         get() = if (setting != null) {
-            val setting = setting as StringSetting
+            val setting = setting as AbstractStringSetting
             setting.string
             setting.string
         } else {
         } else {
             defaultValue!!
             defaultValue!!