Fix null value handling

steamclock · Mar 23, 2022 · e39aa65 · e39aa65
1 parent 259ea7e
commit e39aa65
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/src/main/java/com/steamclock/debugmenusample/MainActivity.kt b/app/src/main/java/com/steamclock/debugmenusample/MainActivity.kt
@@ -123,7 +123,7 @@ class MainActivity : AppCompatActivity() {
                         showSecretText = showSecretText.value,
                         altButtonText = useAltButtonText.value,
                         altButtonColour = useAltButtonColour.value,
-                        selection = temp2Selection.value)
+                        selection = temp2Selection.value ?: "")
                 }
             }
         }

diff --git a/debugmenu-codegen/src/main/java/com/steamclock/codegen/ClassBuilder.kt b/debugmenu-codegen/src/main/java/com/steamclock/codegen/ClassBuilder.kt
@@ -68,10 +68,10 @@ internal class MenuClassBuilder(
                 }
                 is SelectionProviderWrapper -> {
                     """
-        val ${it.key}Selection = DebugValue(flow<String> {
-            DebugMenu.instance.flow<Int>("${it.key}").collect {
+        val ${it.key}Selection = DebugValue(flow<String?> {
+            DebugMenu.instance.flow<Int?>("${it.key}").collect {
                 val option = (DebugMenu.instance.optionForKey("${it.key}") as? OptionSelection) ?: return@collect
-                emit(option.options.get(it))
+                emit(if (it != null) option.options.get(it) else null)
             }
         })
                     """
@@ -95,10 +95,10 @@ internal class MenuClassBuilder(
                 is SelectionWrapper -> {
                     val toggle = it.selectionValue
 """
-        val ${toggle.key} = DebugValue(flow<String> {
-            DebugMenu.instance.flow<Int>("${toggle.key}").collect {
+        val ${toggle.key} = DebugValue(flow<String?> {
+            DebugMenu.instance.flow<Int?>("${toggle.key}").collect {
                 val option = (DebugMenu.instance.optionForKey("${toggle.key}") as? OptionSelection) ?: return@collect
-                emit(option.options.get(it))
+                emit(if (it != null) option.options.get(it) else null)
             }
         })
 """

diff --git a/debugmenu-core/src/main/java/com/steamclock/debugmenu/DebugMenuExtensions.kt b/debugmenu-core/src/main/java/com/steamclock/debugmenu/DebugMenuExtensions.kt
@@ -24,7 +24,7 @@ suspend inline fun <reified T: Any> DebugMenu.value(key: String): T? {
     return state.persistence.readValue(key)
 }
 
-inline fun <reified T: Any> DebugMenu.flow(key: String): Flow<T> {
+inline fun <reified T: Any?> DebugMenu.flow(key: String): Flow<T> {
     return state.persistence.flowValue(key)
 }