Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Fields not changing and localize speed #233

Merged
merged 1 commit into from
Jan 15, 2024
Merged

Fix: Fields not changing and localize speed #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...br/alexandregpereira/hunter/monster/registration/ui/form/MonsterAbilityDescriptionForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal fun MonsterAbilityDescriptionForm(
label = stringResource(R.string.monster_registration_description),
multiline = true,
onValueChange = { newValue ->
onChanged(newAbilityDescriptions.changeAt(index) { copy(name = newValue) })
onChanged(newAbilityDescriptions.changeAt(index) { copy(description = newValue) })
}
)

Expand Down
89 changes: 56 additions & 33 deletions ...kotlin/br/alexandregpereira/hunter/monster/registration/ui/form/MonsterSpeedValuesForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import androidx.compose.ui.res.stringResource
import br.alexandregpereira.hunter.domain.model.Monster
import br.alexandregpereira.hunter.domain.model.SpeedType
import br.alexandregpereira.hunter.monster.registration.R
import br.alexandregpereira.hunter.monster.registration.ui.changeAt
import br.alexandregpereira.hunter.ui.compose.AppTextField
import br.alexandregpereira.hunter.ui.compose.Form
import br.alexandregpereira.hunter.ui.compose.FormField
import br.alexandregpereira.hunter.ui.compose.PickerField

@Composable
internal fun MonsterSpeedValuesForm(
Expand All @@ -17,42 +19,63 @@ internal fun MonsterSpeedValuesForm(
) {
val speedValues = monster.speed.values
val types = speedValues.map { it.type }
val options = SpeedType.entries.filterNot { types.contains(it) }.map { it.name }
val options = SpeedType.entries.filterNot { types.contains(it) }
val optionsStrings = options.map { it.toTypeState().getString() }
val newSpeedValues = speedValues.toMutableList()

Form(
modifier = modifier,
title = stringResource(R.string.monster_registration_speed),
formFields = monster.speed.values.map { speedValue ->
listOf(
FormField.Picker(
key = "${speedValue.type.name}-type",
label = stringResource(R.string.monster_registration_speed_type),
value = speedValue.type.name,
options = options,
),
FormField.Text(
key = "${speedValue.type.name}-name",
label = speedValue.type.name,
value = speedValue.valueFormatted,
)
) {
monster.speed.values.mapIndexed { index, speedValue ->
val name = speedValue.type.toTypeState().getString()
PickerField(
value = name,
label = stringResource(R.string.monster_registration_speed_type),
options = optionsStrings,
onValueChange = { optionIndex ->
onMonsterChanged(
monster.copy(
speed = monster.speed.copy(
values = newSpeedValues.changeAt(index) {
copy(
type = options[optionIndex],
)
}
)
)
)
}
)
}.reduceOrNull { acc, texts -> acc + texts } ?: emptyList(),
onFormChanged = { field ->
val newSpeedValues = speedValues.toMutableList()
val index = newSpeedValues.indexOfFirst { field.key.startsWith(it.type.name) }
if (index != -1) {
when (field.key) {
"${newSpeedValues[index].type.name}-type" -> {
newSpeedValues[index] = newSpeedValues[index].copy(
type = SpeedType.valueOf(field.stringValue),

AppTextField(
text = speedValue.valueFormatted,
label = name,
onValueChange = { newValue ->
onMonsterChanged(
monster.copy(
speed = monster.speed.copy(
values = newSpeedValues.changeAt(index) {
copy(valueFormatted = newValue)
}
)
)
}
"${newSpeedValues[index].type.name}-name" -> {
newSpeedValues[index] = newSpeedValues[index].copy(valueFormatted = field.stringValue)
}
)
}
onMonsterChanged(monster.copy(speed = monster.speed.copy(values = newSpeedValues)))
}
},
)
}
)
}
}
}

private enum class SpeedTypeState(val stringRes: Int) {
BURROW(R.string.monster_registration_speed_type_burrow),
CLIMB(R.string.monster_registration_speed_type_climb),
FLY(R.string.monster_registration_speed_type_fly),
WALK(R.string.monster_registration_speed_type_walk),
SWIM(R.string.monster_registration_speed_type_swim),
}

private fun SpeedType.toTypeState() = SpeedTypeState.valueOf(name)

@Composable
private fun SpeedTypeState.getString() = stringResource(stringRes)
6 changes: 6 additions & 0 deletions feature/monster-registration/android/src/main/res/values-pt-rBR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,10 @@
<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>

<string name="monster_registration_speed_type_walk">Deslocamento</string>
<string name="monster_registration_speed_type_fly">Voo</string>
<string name="monster_registration_speed_type_swim">Natação</string>
<string name="monster_registration_speed_type_climb">Escalagem</string>
<string name="monster_registration_speed_type_burrow">Escavação</string>
</resources>
6 changes: 6 additions & 0 deletions feature/monster-registration/android/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,10 @@
<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>

<string name="monster_registration_speed_type_walk">Speed</string>
<string name="monster_registration_speed_type_fly">Fly</string>
<string name="monster_registration_speed_type_swim">Swim</string>
<string name="monster_registration_speed_type_climb">Climb</string>
<string name="monster_registration_speed_type_burrow">Burrow</string>
</resources>
Loading