Add image background edit field (#225)

alexandregpereira · Jan 13, 2024 · 78af2aa · 78af2aa
1 parent f077357
commit 78af2aa
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/...main/kotlin/br/alexandregpereira/hunter/monster/registration/ui/form/MonsterHeaderForm.kt b/...main/kotlin/br/alexandregpereira/hunter/monster/registration/ui/form/MonsterHeaderForm.kt
@@ -4,6 +4,7 @@ import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import br.alexandregpereira.hunter.domain.model.Color
 import br.alexandregpereira.hunter.domain.model.Monster
 import br.alexandregpereira.hunter.domain.model.MonsterType
 import br.alexandregpereira.hunter.monster.registration.R
@@ -39,6 +40,18 @@ internal fun MonsterHeaderForm(
         }
     )
 
+    AppTextField(
+        text = monster.imageData.backgroundColor.light,
+        label = stringResource(R.string.monster_registration_image_background_color),
+        onValueChange = {
+            onMonsterChanged(
+                monster.copy(imageData = monster.imageData.copy(
+                    backgroundColor = Color(light = it, dark = it)
+                ))
+            )
+        }
+    )
+
     PickerField(
         value = stringResource(monster.type.toMonsterTypeState().stringRes),
         label = stringResource(R.string.monster_registration_type),

diff --git a/feature/monster-registration/android/src/main/res/values-pt-rBR/strings.xml b/feature/monster-registration/android/src/main/res/values-pt-rBR/strings.xml
@@ -81,4 +81,5 @@
     <string name="monster_registration_special_abilities">Habilidades Especiais</string>
     <string name="monster_registration_reactions">Reações</string>
     <string name="monster_registration_legendary_actions">Ações Lendárias</string>
+    <string name="monster_registration_image_background_color">Cor de Fundo da Imagem</string>
 </resources>
diff --git a/feature/monster-registration/android/src/main/res/values/strings.xml b/feature/monster-registration/android/src/main/res/values/strings.xml
@@ -81,4 +81,5 @@
     <string name="monster_registration_special_abilities">Special Abilities</string>
     <string name="monster_registration_reactions">Reactions</string>
     <string name="monster_registration_legendary_actions">Legendary Actions</string>
+    <string name="monster_registration_image_background_color">Image Background Color</string>
 </resources>
diff --git a/...kotlin/br/alexandregpereira/hunter/monster/registration/domain/NormalizeMonsterUseCase.kt b/...kotlin/br/alexandregpereira/hunter/monster/registration/domain/NormalizeMonsterUseCase.kt
@@ -16,6 +16,7 @@
 
 package br.alexandregpereira.hunter.monster.registration.domain
 
+import br.alexandregpereira.hunter.domain.model.Color
 import br.alexandregpereira.hunter.domain.model.Monster
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
@@ -56,6 +57,18 @@ private fun Monster.changeAbilityScoresModifier(): Monster {
                     else -> 10
                 }
             )
-        }
+        },
+        imageData = monster.imageData.copy(
+            backgroundColor = monster.imageData.backgroundColor.normalizeColor(),
+        ),
     )
-}
+}
+
+private fun Color.normalizeColor(): Color {
+    val newColor = this.light.takeIf { it.isNotBlank() }
+        ?.replace("#", "")?.let { "#$it" }?.uppercase().orEmpty()
+    return this.copy(
+        light = newColor,
+        dark = newColor,
+    )
+}
diff --git a/ui/core/src/main/kotlin/br/alexandregpereira/hunter/ui/util/Color.kt b/ui/core/src/main/kotlin/br/alexandregpereira/hunter/ui/util/Color.kt
@@ -21,5 +21,5 @@ import androidx.core.graphics.toColorInt
 
 fun String.toColor(): Color {
     if (this.isEmpty()) return Color.Transparent
-    return Color(this.toColorInt())
+    return runCatching { this.toColorInt() }.getOrNull()?.let(::Color) ?: Color.Transparent
 }