Merge pull request #261 from fmasa/max-times-taken

Add max times taken to Character talents

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/NonCompendiumTalentForm.kt

@@ -74,6 +74,13 @@ internal fun NonCompendiumTalentForm(
             maxLength = CompendiumTalent.TESTS_MAX_LENGTH,
         )
 
+        TextInput(
+            label = stringResource(Str.talents_label_max_times_taken),
+            value = formData.maxTimesTaken,
+            validate = validate,
+            maxLength = Talent.MAX_TIMES_TAKEN_MAX_LENGTH,
+        )
+
         TextInput(
             label = stringResource(Str.talents_label_description),
             value = formData.description,
@@ -89,6 +96,7 @@ private class NonCompendiumTalentFormData(
     val id: Uuid,
     val name: InputValue,
     val tests: InputValue,
+    val maxTimesTaken: InputValue,
     val description: InputValue,
     val taken: MutableState<Int>,
 ) : HydratedFormData<Talent> {
@@ -98,6 +106,7 @@ private class NonCompendiumTalentFormData(
             id = remember { talent?.id ?: uuid4() },
             name = inputValue(talent?.name ?: "", Rules.NotBlank()),
             tests = inputValue(talent?.tests ?: ""),
+            maxTimesTaken = inputValue(talent?.maxTimesTaken ?: ""),
             description = inputValue(talent?.description ?: ""),
             taken = rememberSaveable { mutableStateOf(talent?.taken ?: 1) },
         )
@@ -108,6 +117,7 @@ private class NonCompendiumTalentFormData(
         compendiumId = null,
         name = name.value,
         tests = tests.value,
+        maxTimesTaken = maxTimesTaken.value,
         description = description.value.trim(),
         taken = taken.value,
     )

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/TalentDetail.kt

@@ -37,7 +37,7 @@ fun TalentDetail(
             subheadBar()
 
             TalentDetailBody(
-                maxTimesTaken = null,
+                maxTimesTaken = talent.maxTimesTaken,
                 tests = talent.tests,
                 description = talent.description,
             )
@@ -47,14 +47,12 @@ fun TalentDetail(
 
 @Composable
 fun TalentDetailBody(
-    maxTimesTaken: String?,
+    maxTimesTaken: String,
     tests: String,
     description: String,
 ) {
     Column(Modifier.padding(Spacing.bodyPadding)) {
-        if (maxTimesTaken != null) {
-            SingleLineTextValue(stringResource(Str.talents_label_max_times_taken), maxTimesTaken)
-        }
+        SingleLineTextValue(stringResource(Str.talents_label_max_times_taken), maxTimesTaken)
 
         if (tests.isNotBlank()) {
             SingleLineTextValue(stringResource(Str.talents_label_tests), tests)

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/talents/Talent.kt

@@ -25,6 +25,7 @@ data class Talent(
     @Contextual override val compendiumId: Uuid? = null,
     val name: String,
     val tests: String = "", // TODO: Remove default value in 3.0
+    val maxTimesTaken: String = "", // TODO: Remove default value in 3.0
     val description: String,
     val taken: Int
 ) : CharacterItem<Talent, CompendiumTalent>, EffectSource {
@@ -61,6 +62,7 @@ data class Talent(
     companion object {
         const val NAME_MAX_LENGTH = 50
         const val DESCRIPTION_MAX_LENGTH = 1500
+        const val MAX_TIMES_TAKEN_MAX_LENGTH = CompendiumTalent.MAX_TIMES_TAKEN_MAX_LENGTH
 
         fun fromCompendium(compendiumTalent: CompendiumTalent, timesTaken: Int): Talent {
             return Talent(
@@ -69,6 +71,7 @@ data class Talent(
                 name = compendiumTalent.name,
                 tests = compendiumTalent.tests,
                 description = compendiumTalent.description,
+                maxTimesTaken = compendiumTalent.maxTimesTaken,
                 taken = timesTaken,
             )
         }

common/src/commonTest/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectManagerTest.kt

@@ -51,6 +51,7 @@ class EffectManagerTest {
             id = uuid4(),
             compendiumId = null,
             name = "Hardy",
+            maxTimesTaken = "",
             tests = "",
             description = "",
             taken = 2,
@@ -105,6 +106,7 @@ class EffectManagerTest {
             compendiumId = null,
             name = "Hardy",
             tests = "",
+            maxTimesTaken = "",
             description = "",
             taken = 2,
         )
@@ -163,6 +165,7 @@ class EffectManagerTest {
             compendiumId = null,
             name = "Savvy",
             tests = "",
+            maxTimesTaken = "",
             description = "",
             taken = 2,
         )
@@ -297,6 +300,7 @@ class EffectManagerTest {
                     compendiumId = null,
                     name = "Hardy",
                     tests = "",
+                    maxTimesTaken = "",
                     description = "",
                     taken = 2,
                 ),
@@ -313,6 +317,7 @@ class EffectManagerTest {
                     compendiumId = null,
                     name = "Savvy (IT)",
                     tests = "",
+                    maxTimesTaken = "",
                     description = "",
                     taken = 2,
                 ),

firebase/firestore.rules

@@ -368,7 +368,7 @@ service cloud.firestore {
                     allow delete: if canEditCharacter();
 
                     function isValidTalent(talent) {
-                        return ["id", "name", "description", "taken", "compendiumId", "tests"].hasAll(talent.keys())
+                        return ["id", "name", "description", "taken", "compendiumId", "tests", "maxTimesTaken"].hasAll(talent.keys())
                             && talent.id is string && talent.id == talentId && isValidUuid(talent.id)
                             && talent.name is string && isNotBlank(talent.name) && talent.name.size() <= 50
                             && talent.description is string && talent.description.size() <= 1500
@@ -379,7 +379,8 @@ service cloud.firestore {
                                     || (talent.compendiumId is string && exists(/databases/$(database)/documents/parties/$(partyId)/talents/$(talent.compendiumId)))
                                 )
                             )
-                            && (! ("tests" in talent) || (talent.tests is string && talent.tests.size() <= 200));
+                            && (! ("tests" in talent) || (talent.tests is string && talent.tests.size() <= 200))
+                            && (! ("maxTimesTaken" in talent) || (talent.maxTimesTaken is string && talent.maxTimesTaken.size() <= 100));
                     }
                 }