Simplify the UI for the warlock.

app/src/main/java/com/pixelized/rplexicon/business/SpellBookUseCase.kt

@@ -52,7 +52,8 @@ class SpellBookUseCase @Inject constructor(
                     val spellList = entry.value.map {
                         factory.toSpellUio(
                             assignedSpell = it,
-                            characterSheet = character
+                            characterSheet = character,
+                            warlockSpellLevel = firstSpellSlot,
                         )
                     }
                     header to spellList
@@ -77,7 +78,8 @@ class SpellBookUseCase @Inject constructor(
                     val spellList = entry.value.map {
                         factory.toSpellUio(
                             assignedSpell = it,
-                            characterSheet = character
+                            characterSheet = character,
+                            warlockSpellLevel = null,
                         )
                     }
                     header to spellList

app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/actions/SpellItem.kt

@@ -53,6 +53,7 @@ data class SpellUio(
     val hit: Dice?,
     val effect: Dice?,
     val changeWithLevel: Boolean,
+    val isWarlock: Boolean,
     val ritual: Boolean,
 ) {
     class Dice(
@@ -180,7 +181,8 @@ fun Spell(
                     )
                 }
                 spell.effect?.let { dice ->
-                    if (spell.changeWithLevel) {
+                    when {
+                        spell.changeWithLevel && spell.isWarlock.not() -> {
                             OutlinedButton(
                                 modifier = Modifier.padding(end = 8.dp),
                                 border = BorderStroke(
@@ -193,7 +195,15 @@ fun Spell(
                                     text = stringResource(id = R.string.character_sheet_action_spell_cast),
                                 )
                             }
-                    } else {
+                        }
+                        spell.changeWithLevel && spell.isWarlock -> {
+                            DiceButton(
+                                icon = dice.icon,
+                                text = dice.label,
+                                onClick = { onCast(spell.name) },
+                            )
+                        }
+                        else -> {
                             DiceButton(
                                 icon = dice.icon,
                                 text = dice.label,
@@ -204,6 +214,7 @@ fun Spell(
                 }
             }
         }
+    }
 }
 
 @Composable
@@ -244,6 +255,7 @@ private class SpellPreviewProvider : PreviewParameterProvider<SpellUio> {
                 label = "1d10",
             ),
             changeWithLevel = false,
+            isWarlock = false,
             ritual = false,
         ),
         SpellUio(
@@ -260,6 +272,7 @@ private class SpellPreviewProvider : PreviewParameterProvider<SpellUio> {
                 label = "1d4",
             ),
             changeWithLevel = false,
+            isWarlock = false,
             ritual = false,
         ),
         SpellUio(
@@ -276,6 +289,24 @@ private class SpellPreviewProvider : PreviewParameterProvider<SpellUio> {
                 label = "1d8+3",
             ),
             changeWithLevel = true,
+            isWarlock = false,
+            ritual = true,
+        ),
+        SpellUio(
+            icon = null,
+            school = Spell.School.EVOCATION,
+            name = "Soins",
+            translated = "Cure Wounds",
+            castingTime = "1 action",
+            range = "contact",
+            duration = "instantanée",
+            hit = null,
+            effect = SpellUio.Dice(
+                icon = R.drawable.ic_d8_24,
+                label = "1d8+3",
+            ),
+            changeWithLevel = true,
+            isWarlock = true,
             ritual = true,
         ),
     )

app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/preview/rememberSpellListStatePreview.kt

@@ -39,6 +39,7 @@ fun rememberSpellListStatePreview(): State<List<Pair<SpellHeaderUio, List<SpellU
                         label = "1d10",
                     ),
                     changeWithLevel = false,
+                    isWarlock = false,
                     ritual = true,
                 ),
                 SpellUio(
@@ -55,6 +56,7 @@ fun rememberSpellListStatePreview(): State<List<Pair<SpellHeaderUio, List<SpellU
                         label = "1d4",
                     ),
                     changeWithLevel = false,
+                    isWarlock = false,
                     ritual = false,
                 ),
             ),
@@ -76,6 +78,7 @@ fun rememberSpellListStatePreview(): State<List<Pair<SpellHeaderUio, List<SpellU
                         label = "1d8+3",
                     ),
                     changeWithLevel = true,
+                    isWarlock = false,
                     ritual = false,
                 ),
             ),

app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SpellUioFactory.kt

@@ -1,22 +1,24 @@
 package com.pixelized.rplexicon.ui.screens.character.factory
 
-import androidx.core.net.toUri
+import androidx.compose.animation.core.spring
 import com.pixelized.rplexicon.data.model.AssignedSpell
 import com.pixelized.rplexicon.data.model.CharacterSheet
 import com.pixelized.rplexicon.data.model.Property
 import com.pixelized.rplexicon.data.repository.character.DescriptionRepository
 import com.pixelized.rplexicon.ui.screens.character.composable.actions.SpellUio
 import com.pixelized.rplexicon.utilitary.extentions.icon
-import com.pixelized.rplexicon.utilitary.extentions.local.icon
 import com.pixelized.rplexicon.utilitary.extentions.modifier
-import com.pixelized.rplexicon.utilitary.extentions.uri
 import javax.inject.Inject
 
 class SpellUioFactory @Inject constructor(
     private val descriptionRepository: DescriptionRepository,
 ) {
 
-    fun toSpellUio(assignedSpell: AssignedSpell, characterSheet: CharacterSheet): SpellUio {
+    fun toSpellUio(
+        assignedSpell: AssignedSpell,
+        characterSheet: CharacterSheet,
+        warlockSpellLevel: Int?,
+    ): SpellUio {
         val hit = assignedSpell.hit?.let { dice ->
             val modifier = dice.modifier.sumOf {
                 when (it) {
@@ -44,11 +46,32 @@ class SpellUioFactory @Inject constructor(
                     Property.CHARISMA -> characterSheet.charisma.modifier
                     else -> 0
                 }
-            }
+            } + dice.flat
+
+            val level = assignedSpell.level
+            val delta = warlockSpellLevel?.minus(assignedSpell.spell.level) ?: 0
+            if (warlockSpellLevel == null || level == null || delta <= 0) {
+                // default case of non warlock character of the spell don't scale
                 SpellUio.Dice(
                     icon = dice.faces.icon,
                     label = "${dice.amount}d${dice.faces}${if (modifier > 0) "+$modifier" else ""}",
                 )
+            } else {
+                // warlock character, upscale the spell to warlock spell level
+                if (dice.faces == level.faces) {
+                    val upscaleModifier = modifier + level.flat * delta
+                    SpellUio.Dice(
+                        icon = dice.faces.icon,
+                        label = "${dice.amount + level.amount * delta}d${dice.faces}${if (upscaleModifier > 0) "+$upscaleModifier" else ""}",
+                    )
+                } else {
+                    SpellUio.Dice(
+                        icon = dice.faces.icon,
+                        label = "${dice.amount}d${dice.faces}${modifier.takeIf { it > 0 }?.let { "+$it" } ?: ""} + " +
+                                "${level.amount}d${level.faces * delta}${(level.flat * delta).takeIf { it > 0 }?.let { "+$it" } ?: ""}",
+                    )
+                }
+            }
         }
         return SpellUio(
             icon = assignedSpell.spell.icon,
@@ -61,6 +84,7 @@ class SpellUioFactory @Inject constructor(
             hit = hit,
             effect = effect,
             changeWithLevel = assignedSpell.level != null,
+            isWarlock = warlockSpellLevel != null,
             ritual = assignedSpell.spell.ritual,
         )
     }