Use unsigned integers for values that should not be below zero

Universite-Gustave-Eiffel · Dec 5, 2024 · 3ad40b1 · 3ad40b1
1 parent c06facb
commit 3ad40b1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/composeApp/src/commonMain/kotlin/org/noiseplanet/noisecapture/services/SettingsKey.kt b/composeApp/src/commonMain/kotlin/org/noiseplanet/noisecapture/services/SettingsKey.kt
@@ -58,9 +58,9 @@ sealed class SettingsKey<T>(val serializer: KSerializer<T>, val defaultValue: T)
         defaultValue = false,
     )
 
-    data object SettingMaxMeasurementDuration : SettingsKey<Int>(
-        Int.serializer(),
-        defaultValue = 30,
+    data object SettingMaxMeasurementDuration : SettingsKey<UInt>(
+        UInt.serializer(),
+        defaultValue = 30u,
     )
 
     data object SettingSpectrogramScaleMode : SettingsKey<SpectrogramScaleMode>(
@@ -74,14 +74,14 @@ sealed class SettingsKey<T>(val serializer: KSerializer<T>, val defaultValue: T)
         defaultValue = 0.0,
     )
 
-    data object SettingCalibrationCountdown : SettingsKey<Int>(
-        Int.serializer(),
-        defaultValue = 4,
+    data object SettingCalibrationCountdown : SettingsKey<UInt>(
+        UInt.serializer(),
+        defaultValue = 4u,
     )
 
-    data object SettingCalibrationDuration : SettingsKey<Int>(
-        Int.serializer(),
-        defaultValue = 6,
+    data object SettingCalibrationDuration : SettingsKey<UInt>(
+        UInt.serializer(),
+        defaultValue = 6u,
     )
 
     data object SettingTestSignalAudioOutput : SettingsKey<CalibrationTestAudioOutput>(
@@ -90,8 +90,8 @@ sealed class SettingsKey<T>(val serializer: KSerializer<T>, val defaultValue: T)
     )
 
     // Map
-    data object SettingMapMaxMeasurementsCount : SettingsKey<Int>(
-        Int.serializer(),
-        defaultValue = 500,
+    data object SettingMapMaxMeasurementsCount : SettingsKey<UInt>(
+        UInt.serializer(),
+        defaultValue = 500u,
     )
 }
diff --git a/.../commonMain/kotlin/org/noiseplanet/noisecapture/ui/features/settings/item/SettingsItem.kt b/.../commonMain/kotlin/org/noiseplanet/noisecapture/ui/features/settings/item/SettingsItem.kt
@@ -77,6 +77,12 @@ fun <T : Any> SettingsItem(
                     SettingsBooleanInput(viewModel as SettingsItemViewModel<Boolean>)
                 }
 
+                // UInt and ULong are not handled as Number types in Kotlin so we need to handle
+                // those in a separate when branch
+                is UInt, ULong -> {
+                    SettingsNumericalInput(viewModel)
+                }
+
                 is Number -> {
                     SettingsNumericalInput(viewModel)
                 }

diff --git a/...n/kotlin/org/noiseplanet/noisecapture/ui/features/settings/item/SettingsNumericalInput.kt b/...n/kotlin/org/noiseplanet/noisecapture/ui/features/settings/item/SettingsNumericalInput.kt
@@ -70,6 +70,9 @@ fun <T : Any> SettingsNumericalInput(
     fun getNumericalValue(): T? {
         return when (viewModel.settingKey.defaultValue) {
             is Int -> textFieldValueState.text.toIntOrNull() as T?
+            is UInt -> textFieldValueState.text.toUIntOrNull() as T?
+            is Long -> textFieldValueState.text.toLongOrNull() as T?
+            is ULong -> textFieldValueState.text.toULongOrNull() as T?
             is Double -> textFieldValueState.text.toDoubleOrNull() as T?
             is Float -> textFieldValueState.text.toFloatOrNull() as T?
             else -> null