Merge pull request #250 from fmasa/journal-crash

Trim all text field values and make TextInput API safer

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/NonCompendiumTrappingForm.kt

@@ -456,10 +456,10 @@ private class TrappingTypeFormData(
     override fun toValue(): TrappingType? = when (type.value) {
         TrappingTypeOption.AMMUNITION -> TrappingType.Ammunition(
             weaponGroups = ammunitionWeaponGroups.value,
-            range = AmmunitionRangeExpression(ammunitionRange.normalizedValue),
+            range = AmmunitionRangeExpression(ammunitionRange.value),
             qualities = weaponQualities.toMap(),
             flaws = weaponFlaws.toMap(),
-            damage = DamageExpression(damage.normalizedValue),
+            damage = DamageExpression(damage.value),
         )
         TrappingTypeOption.ARMOUR -> TrappingType.Armour(
             locations = armourLocations.value,
@@ -483,16 +483,16 @@ private class TrappingTypeFormData(
         TrappingTypeOption.MELEE_WEAPON -> TrappingType.MeleeWeapon(
             group = meleeWeaponGroup.value,
             reach = weaponReach.value,
-            damage = DamageExpression(damage.normalizedValue),
+            damage = DamageExpression(damage.value),
             qualities = weaponQualities.toMap(),
             flaws = weaponFlaws.toMap(),
             equipped = weaponEquipped.value,
         )
         TrappingTypeOption.PROSTHETIC -> TrappingType.Prosthetic(worn = worn.value)
         TrappingTypeOption.RANGED_WEAPON -> TrappingType.RangedWeapon(
             group = rangedWeaponGroup.value,
-            range = WeaponRangeExpression(weaponRange.normalizedValue),
-            damage = DamageExpression(damage.normalizedValue),
+            range = WeaponRangeExpression(weaponRange.value),
+            damage = DamageExpression(damage.value),
             qualities = weaponQualities.toMap(),
             flaws = weaponFlaws.toMap(),
             equipped = weaponEquipped.value,

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/journal/JournalEntryDialog.kt

@@ -105,8 +105,8 @@ private data class JournalEntryFormData(
             .split(JournalEntry.PARENT_SEPARATOR)
             .filter { it.isNotBlank() }
             .map { it.trim() },
-        text = text.normalizedValue,
-        gmText = gmText.normalizedValue,
+        text = text.value,
+        gmText = gmText.value,
         isPinned = isPinned,
         isVisibleToPlayers = isVisibleToPlayers,
     )

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/trapping/TrappingDialog.kt

@@ -505,7 +505,7 @@ private class TrappingTypeFormData(
     override fun toValue(): TrappingType? = when (type.value) {
         TrappingTypeOption.AMMUNITION -> TrappingType.Ammunition(
             weaponGroups = ammunitionWeaponGroups.value,
-            range = AmmunitionRangeExpression(ammunitionRange.normalizedValue),
+            range = AmmunitionRangeExpression(ammunitionRange.value),
             qualities = weaponQualities.toMap(),
             flaws = weaponFlaws.toMap(),
             damage = DamageExpression(damage.value.trim()),
@@ -528,15 +528,15 @@ private class TrappingTypeFormData(
         TrappingTypeOption.MELEE_WEAPON -> TrappingType.MeleeWeapon(
             group = meleeWeaponGroup.value,
             reach = weaponReach.value,
-            damage = DamageExpression(damage.normalizedValue),
+            damage = DamageExpression(damage.value),
             qualities = weaponQualities.toMap(),
             flaws = weaponFlaws.toMap(),
         )
         TrappingTypeOption.PROSTHETIC -> TrappingType.Prosthetic
         TrappingTypeOption.RANGED_WEAPON -> TrappingType.RangedWeapon(
             group = rangedWeaponGroup.value,
-            range = WeaponRangeExpression(weaponRange.normalizedValue),
-            damage = DamageExpression(damage.normalizedValue),
+            range = WeaponRangeExpression(weaponRange.value),
+            damage = DamageExpression(damage.value),
             qualities = weaponQualities.toMap(),
             flaws = weaponFlaws.toMap(),
         )

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/TextInput.kt

@@ -60,6 +60,7 @@ interface Filter {
 // TODO: Use this version everywhere where input must be validated
 // as it allows to define validation only on InputValue and then use value.isValid()
 @Composable
+@OptIn(InternalTextInputApi::class)
 fun TextInput(
     value: InputValue,
     validate: Boolean,
@@ -77,9 +78,9 @@ fun TextInput(
     visualTransformation: VisualTransformation = VisualTransformation.None,
     filters: List<Filter> = emptyList(),
 ) {
-    TextInput(
-        value = value.value,
-        onValueChange = { value.value = it },
+    TextInputImpl(
+        value = value.rawTextFieldValue,
+        onValueChange = { value.rawTextFieldValue = it },
         label = label,
         helperText = helperText,
         validate = validate,
@@ -99,7 +100,7 @@ fun TextInput(
 }
 
 @Composable
-private fun TextInput(
+private fun TextInputImpl(
     value: String,
     onValueChange: (String) -> Unit,
     validate: Boolean,
@@ -201,14 +202,24 @@ private fun TextInput(
     }
 }
 
+@Target(AnnotationTarget.PROPERTY)
+@RequiresOptIn(level = RequiresOptIn.Level.ERROR)
+annotation class InternalTextInputApi
+
 @Stable
 class InputValue(
     state: MutableState<String>,
     internal val rules: Rules,
     private val normalize: (String) -> String = { it.trim() },
 ) {
-    var value: String by state
-    val normalizedValue get() = normalize(value)
+    @InternalTextInputApi
+    var rawTextFieldValue by state
+    @OptIn(InternalTextInputApi::class)
+    var value: String
+        get() = normalize(rawTextFieldValue)
+        set(value) {
+            rawTextFieldValue = value
+        }
 
     fun isValid() = rules.errorMessage(value) == null
 

desktop/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/desktop/auth/ResetPasswordDialog.kt

@@ -79,7 +79,7 @@ fun ResetPasswordDialog(
                         processing = true
                         coroutineScope.launchLogged(Dispatchers.IO) {
                             try {
-                                when (auth.resetPassword(email.normalizedValue)) {
+                                when (auth.resetPassword(email.value)) {
                                     PasswordResetResult.Success -> {
                                         snackbarHolder.showSnackbar(
                                             messageEmailSent,