Merge pull request #412 from fmasa/fix-encumbrance

Make encumbrance text input parsing more robust
fmasa · Feb 11, 2025 · f89ef35 · f89ef35
2 parents 604c35e + 88b8617
commit f89ef35
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/...tlin/cz/frantisekmasa/wfrp_master/common/character/trappings/NonCompendiumTrappingForm.kt b/...tlin/cz/frantisekmasa/wfrp_master/common/character/trappings/NonCompendiumTrappingForm.kt
@@ -97,7 +97,7 @@ fun NonCompendiumTrappingForm(
             maxLength = 8,
             validate = validate,
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number),
-            filters = listOf(Filter.DigitsAndDotSymbolsOnly),
+            filters = listOf(Filter.DecimalNumber),
         )
 
         TextInput(
@@ -348,7 +348,11 @@ private class InventoryItemFormData(
         ) = InventoryItemFormData(
             id = remember(item) { item?.id ?: uuid4() },
             name = inputValue(item?.name ?: "", Rules.NotBlank()),
-            encumbrance = inputValue(item?.encumbrance?.toString() ?: "0"),
+            encumbrance =
+                inputValue(
+                    item?.encumbrance?.toInputString() ?: "0",
+                    Rules.NonNegativeDecimal(),
+                ),
             quantity = inputValue(item?.quantity?.toString() ?: "1", Rules.PositiveInteger()),
             itemQualities =
                 rememberSaveable(item?.id) {

diff --git a/...mmonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/trapping/TrappingDialog.kt b/...mmonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/trapping/TrappingDialog.kt
@@ -96,7 +96,7 @@ fun TrappingDialog(
                 maxLength = 8,
                 validate = validate,
                 keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number),
-                filters = listOf(Filter.DigitsAndDotSymbolsOnly),
+                filters = listOf(Filter.DecimalNumber),
             )
 
             TextInput(
@@ -490,7 +490,11 @@ private class TrappingFormData(
             TrappingFormData(
                 id = remember(item) { item?.id ?: uuid4() },
                 name = inputValue(item?.name ?: "", Rules.NotBlank()),
-                encumbrance = inputValue(item?.encumbrance?.toString() ?: "0"),
+                encumbrance =
+                    inputValue(
+                        item?.encumbrance?.toInputString() ?: "0",
+                        Rules.NonNegativeDecimal(),
+                    ),
                 description = inputValue(item?.description ?: ""),
                 type = TrappingTypeFormData.fromTrappingType(item?.trappingType),
                 isVisibleToPlayers = item?.isVisibleToPlayers ?: false,

diff --git a/...ommonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Encumbrance.kt b/...ommonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Encumbrance.kt
@@ -6,6 +6,8 @@ import dev.icerock.moko.parcelize.Parcelable
 import dev.icerock.moko.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Locale
 import kotlin.jvm.JvmInline
 
 @Parcelize
@@ -17,6 +19,7 @@ value class Encumbrance(private val value: Double) : Parcelable {
         val One: Encumbrance = Encumbrance(1.0)
         val Zero: Encumbrance = Encumbrance(0.0)
         private val formatter = DecimalFormat("#,##0.###")
+        private val inputFormatter = DecimalFormat("##0.###", DecimalFormatSymbols(Locale.ENGLISH))
 
         fun maximumForCharacter(characteristics: Stats): Encumbrance =
             Encumbrance(
@@ -37,6 +40,10 @@ value class Encumbrance(private val value: Double) : Parcelable {
     operator fun minus(other: Encumbrance) = Encumbrance((value - other.value).coerceAtLeast(0.0))
 
     override fun toString(): String = formatter.format(value)
+
+    fun toInputString(): String = inputFormatter.format(value)
+
+    fun toDouble(): Double = value
 }
 
 fun Iterable<Encumbrance>.sum(): Encumbrance = fold(Encumbrance.Zero) { a, b -> a + b }
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/Rules.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/Rules.kt
@@ -26,6 +26,12 @@ class Rules(private vararg val rules: Rule) : Rule {
                 it.toIntOrNull() != null && it.toInt() >= 0
             }
 
+        @Composable
+        fun NonNegativeDecimal() =
+            rule(stringResource(Str.validation_non_negative)) {
+                it.toDoubleOrNull() != null && it.toDouble() >= 0
+            }
+
         /**
          * This is useful usually for inputs that:
          * - Have small width that doesn't allow us to show full error message

diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/TextInput.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/TextInput.kt
@@ -36,14 +36,17 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Expression
 import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing
 
 interface Filter {
-    companion object {
-        val DigitsAndDotSymbolsOnly: Filter = AllowedCharacters(('0'..'9').toList() + '.')
-    }
-
     fun process(value: String): String
 
-    private class AllowedCharacters(private val characters: List<Char>) : Filter {
-        override fun process(value: String) = value.filter { it in characters }
+    object DecimalNumber : Filter {
+        private val ALLOWED_CHARACTERS = ('0'..'9').toSet() + '.'
+
+        override fun process(value: String) =
+            value
+                .asSequence()
+                .map { if (it == ',') '.' else it }
+                .filter { it in ALLOWED_CHARACTERS }
+                .joinToString("")
     }
 
     class MaxLength(private val maxLength: Int) : Filter {