From 073b8ac61dbd9f917a17eb6a75bd651cf2e7192f Mon Sep 17 00:00:00 2001 From: Thomas Andres Gomez Date: Tue, 10 Oct 2023 09:18:58 +0200 Subject: [PATCH] Remove translation from the alteration class. --- .../parser/spell/SpellBookParser.kt | 5 ----- .../character/composable/actions/SpellItem.kt | 22 ++++++++++--------- .../character/factory/SpellUioFactory.kt | 7 ++++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/pixelized/rplexicon/repository/parser/spell/SpellBookParser.kt b/app/src/main/java/com/pixelized/rplexicon/repository/parser/spell/SpellBookParser.kt index a4d40ba..e9851cd 100644 --- a/app/src/main/java/com/pixelized/rplexicon/repository/parser/spell/SpellBookParser.kt +++ b/app/src/main/java/com/pixelized/rplexicon/repository/parser/spell/SpellBookParser.kt @@ -31,7 +31,6 @@ class SpellBookParser @Inject constructor() { row is List<*> -> { val name = row.parse(NAME) val level = row.parse(LEVEL)?.toIntOrNull() - val originalName = row.parse(T_NAME) val school = parseSchool(row.parse(SCHOOL)) val castingTime = row.parse(CASTING_TIME) val range = row.parse(RANGE) @@ -40,7 +39,6 @@ class SpellBookParser @Inject constructor() { val ritual = row.parse(RITUAL)?.toBoolean() ?: false if (name != null && level != null - && originalName != null && school != null && castingTime != null && range != null @@ -49,7 +47,6 @@ class SpellBookParser @Inject constructor() { ) { Spell( name = name, - originalName = originalName, level = level, school = school, castingTime = castingTime, @@ -77,7 +74,6 @@ class SpellBookParser @Inject constructor() { companion object { private const val NAME = "Nom" - private const val T_NAME = "Traduction" private const val SCHOOL = "École" private const val LEVEL = "Niveau" private const val CASTING_TIME = "Temps d'incantation" @@ -89,7 +85,6 @@ class SpellBookParser @Inject constructor() { private val COLUMNS get() = listOf( NAME, - T_NAME, LEVEL, SCHOOL, CASTING_TIME, diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/actions/SpellItem.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/actions/SpellItem.kt index f5f95df..b9b796f 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/actions/SpellItem.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/actions/SpellItem.kt @@ -41,7 +41,7 @@ import com.pixelized.rplexicon.utilitary.extentions.local.icon data class SpellUio( @DrawableRes val icon: Int, val name: String, - val translated: String, + val translated: String?, val castingTime: String, val range: String, val duration: String, @@ -95,15 +95,17 @@ fun Spell( maxLines = 1, text = spell.name, ) - Text( - modifier = Modifier.alignByBaseline(), - style = MaterialTheme.typography.labelSmall, - fontWeight = FontWeight.Light, - fontStyle = FontStyle.Italic, - overflow = TextOverflow.Ellipsis, - maxLines = 1, - text = spell.translated, - ) + spell.translated?.let { + Text( + modifier = Modifier.alignByBaseline(), + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.Light, + fontStyle = FontStyle.Italic, + overflow = TextOverflow.Ellipsis, + maxLines = 1, + text = it, + ) + } } Row( diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SpellUioFactory.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SpellUioFactory.kt index 25d3622..98d36ba 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SpellUioFactory.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SpellUioFactory.kt @@ -3,13 +3,16 @@ package com.pixelized.rplexicon.ui.screens.character.factory import com.pixelized.rplexicon.model.AssignedSpell import com.pixelized.rplexicon.model.CharacterSheet import com.pixelized.rplexicon.model.Property +import com.pixelized.rplexicon.repository.data.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 javax.inject.Inject -class SpellUioFactory @Inject constructor() { +class SpellUioFactory @Inject constructor( + private val descriptionRepository: DescriptionRepository, +) { fun toUio(assignedSpell: AssignedSpell, characterSheet: CharacterSheet): SpellUio { val hit = assignedSpell.hit?.let { dice -> @@ -48,7 +51,7 @@ class SpellUioFactory @Inject constructor() { return SpellUio( icon = assignedSpell.spell.school.icon, name = assignedSpell.spell.name, - translated = assignedSpell.spell.originalName, + translated = descriptionRepository.find(name = assignedSpell.spell.name)?.original, castingTime = assignedSpell.spell.castingTime, range = assignedSpell.spell.range, duration = assignedSpell.spell.duration,