Implement action add new items on monster edit (#241)

* Implement action add new items on monster edit * Implement add new items on monster edit
alexandregpereira · Jan 25, 2024 · 4c35865 · 4c35865
1 parent e146912
commit 4c35865
Show file tree

Hide file tree

Showing 37 changed files with 1,199 additions and 675 deletions.
diff --git a/domain/app/data/src/iosMain/kotlin/br/alexandregpereira/hunter/data/IosDispatchers.kt b/domain/app/data/src/iosMain/kotlin/br/alexandregpereira/hunter/data/IosDispatchers.kt
@@ -16,6 +16,8 @@
 
 package br.alexandregpereira.hunter.data
 
+import kotlinx.cinterop.BetaInteropApi
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.StableRef
 import kotlinx.cinterop.autoreleasepool
 import kotlinx.cinterop.cstr
@@ -34,8 +36,9 @@ object IosDispatchers {
     val IO: CoroutineDispatcher = NSQueueDispatcher(QOS_CLASS_UTILITY)
 }
 
+@OptIn(ExperimentalForeignApi::class)
 class NSQueueDispatcher(private val qosClass: qos_class_t) : CoroutineDispatcher() {
-    private val queue = dispatch_get_global_queue(qosClass.toLong(), 0)
+    private val queue = dispatch_get_global_queue(qosClass.toLong(), 0.toULong())
 
     init {
         val key = "NSQueueDispatcher:$qosClass"
@@ -45,6 +48,7 @@ class NSQueueDispatcher(private val qosClass: qos_class_t) : CoroutineDispatcher
         }
     }
 
+    @OptIn(BetaInteropApi::class)
     override fun dispatch(context: CoroutineContext, block: Runnable) {
         dispatch_async(queue) {
             autoreleasepool {

diff --git a/...core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/AbilityDescription.kt b/...core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/AbilityDescription.kt
@@ -22,4 +22,16 @@ import kotlin.native.ObjCName
 data class AbilityDescription(
     val name: String,
     val description: String
-)
+) {
+
+    companion object {
+
+        fun create(
+            name: String = "",
+            description: String = ""
+        ) = AbilityDescription(
+            name = name,
+            description = description
+        )
+    }
+}
diff --git a/domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Action.kt b/domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Action.kt
@@ -24,10 +24,37 @@ data class Action(
     val damageDices: List<DamageDice>,
     val attackBonus: Int?,
     val abilityDescription: AbilityDescription
-)
+) {
+
+    companion object {
+
+        fun create(
+            damageDices: List<DamageDice> = emptyList(),
+            attackBonus: Int? = null,
+            abilityDescription: AbilityDescription = AbilityDescription.create()
+        ) = Action(
+            id = "",
+            damageDices = damageDices,
+            attackBonus = attackBonus,
+            abilityDescription = abilityDescription
+        )
+    }
+}
 
 @ObjCName(name = "DamageDice", exact = true)
 data class DamageDice(
     val dice: String,
     val damage: Damage
-)
+) {
+
+    companion object {
+
+        fun create(
+            dice: String = "",
+            damage: Damage = Damage.create()
+        ) = DamageDice(
+            dice = dice,
+            damage = damage
+        )
+    }
+}
diff --git a/.../monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Condition.kt b/.../monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Condition.kt
@@ -23,7 +23,20 @@ data class Condition(
     val index: String,
     val type: ConditionType,
     val name: String
-)
+) {
+
+    companion object {
+
+        fun create(
+            type: ConditionType = ConditionType.BLINDED,
+            name: String = ""
+        ) = Condition(
+            index = "",
+            type = type,
+            name = name
+        )
+    }
+}
 
 @ObjCName(name = "ConditionType", exact = true)
 enum class ConditionType {

diff --git a/domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Damage.kt b/domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Damage.kt
@@ -23,7 +23,20 @@ data class Damage(
     val index: String,
     val type: DamageType,
     val name: String
-)
+) {
+
+    companion object {
+
+        fun create(
+            type: DamageType = DamageType.ACID,
+            name: String = ""
+        ) = Damage(
+            index = "",
+            type = type,
+            name = name
+        )
+    }
+}
 
 @ObjCName(name = "DamageType", exact = true)
 enum class DamageType {

diff --git a/...onster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/SavingThrow.kt b/...onster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/SavingThrow.kt
@@ -23,4 +23,18 @@ data class SavingThrow(
     val index: String,
     val modifier: Int,
     val type: AbilityScoreType
-)
+) {
+    companion object {
+
+        fun create(
+            modifier: Int = 0,
+            type: AbilityScoreType = AbilityScoreType.STRENGTH,
+        ): SavingThrow {
+            return SavingThrow(
+                index = "",
+                modifier = modifier,
+                type = type
+            )
+        }
+    }
+}
diff --git a/domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Skill.kt b/domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/Skill.kt
@@ -23,4 +23,17 @@ data class Skill(
     val index: String,
     val modifier: Int,
     val name: String
-)
+) {
+
+    companion object {
+
+        fun create(
+            modifier: Int = 0,
+            name: String = "",
+        ) = Skill(
+            index = "",
+            modifier = modifier,
+            name = name
+        )
+    }
+}
diff --git a/...monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/SpeedValue.kt b/...monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/model/SpeedValue.kt
@@ -28,7 +28,21 @@ data class Speed(
 data class SpeedValue(
     val type: SpeedType,
     val valueFormatted: String
-)
+) {
+
+    companion object {
+
+        fun create(
+            type: SpeedType = SpeedType.WALK,
+            valueFormatted: String = "",
+        ): SpeedValue {
+            return SpeedValue(
+                type = type,
+                valueFormatted = valueFormatted
+            )
+        }
+    }
+}
 
 @ObjCName(name = "SpeedType", exact = true)
 enum class SpeedType {

diff --git a/.../commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/spell/model/SpellPreview.kt b/.../commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/spell/model/SpellPreview.kt
@@ -24,7 +24,22 @@ data class SpellPreview(
     val name: String,
     val level: Int,
     val school: SchoolOfMagic,
-)
+) {
+
+        companion object {
+
+            fun create(
+                name: String = "",
+                level: Int = 0,
+                school: SchoolOfMagic = SchoolOfMagic.ABJURATION
+            ) = SpellPreview(
+                index = "",
+                name = name,
+                level = level,
+                school = school,
+            )
+        }
+}
 
 @ObjCName(name = "SchoolOfMagic", exact = true)
 enum class SchoolOfMagic {

diff --git a/...rc/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/spell/model/SpellUsage.kt b/...rc/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/spell/model/SpellUsage.kt
@@ -22,4 +22,16 @@ import kotlin.native.ObjCName
 data class SpellUsage(
     val group: String,
     val spells: List<SpellPreview>
-)
+) {
+
+    companion object {
+
+        fun create(
+            group: String = "",
+            spells: List<SpellPreview> = emptyList()
+        ) = SpellUsage(
+            group = group,
+            spells = spells
+        )
+    }
+}
diff --git a/.../commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/spell/model/Spellcasting.kt b/.../commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/spell/model/Spellcasting.kt
@@ -23,4 +23,18 @@ data class Spellcasting(
     val description: String,
     val type: SpellcastingType,
     val usages: List<SpellUsage>
-)
+) {
+
+    companion object {
+
+        fun create(
+            description: String = "",
+            type: SpellcastingType = SpellcastingType.SPELLCASTER,
+            usages: List<SpellUsage> = emptyList()
+        ) = Spellcasting(
+            description = description,
+            type = type,
+            usages = usages
+        )
+    }
+}
diff --git a/...nster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/ActionBlock.kt b/...nster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/ActionBlock.kt
@@ -54,7 +54,7 @@ private fun ActionDamageGrid(
 ) = Grid(modifier = modifier) {
 
     val iconSize = 48.dp
-    attackBonus?.let {
+    attackBonus.takeUnless { it == 0 }?.let {
         Bonus(value = it, name = stringResource(R.string.monster_detail_attack), iconSize = iconSize)
     }
 

diff --git a/...nster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterInfo.kt b/...nster-detail/android/src/main/kotlin/br/alexandregpereira/hunter/detail/ui/MonsterInfo.kt
@@ -86,17 +86,6 @@ fun LazyListScope.monsterInfo(
         onSpellClicked = onSpellClicked
     )
 
-    item(key = "reactions") {
-        MonsterOptionalSectionAlphaTransition(
-            valueToValidate = { it.reactions },
-            dataList = monsters,
-            pagerState = pagerState,
-            getItemsKeys = getItemsKeys,
-        ) {
-            ReactionBlock(reactions = it)
-        }
-    }
-
     item(key = "space") {
         Spacer(
             modifier = Modifier
@@ -297,6 +286,17 @@ private fun LazyListScope.monsterInfoPart5(
         }
     }
 
+    item(key = "reactions") {
+        MonsterOptionalSectionAlphaTransition(
+            valueToValidate = { it.reactions },
+            dataList = monsters,
+            pagerState = pagerState,
+            getItemsKeys = getItemsKeys,
+        ) {
+            ReactionBlock(reactions = it)
+        }
+    }
+
     item(key = "legendaryActions") {
         MonsterOptionalSectionAlphaTransition(
             valueToValidate = { it.legendaryActions },