Merge branch 'feat/drop-legacy-armour' into 'master'

Remove legacy Armour mechanism

See merge request fmasa/wfrp-master!256

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/DependencyInjection.kt

@@ -22,11 +22,9 @@ import cz.frantisekmasa.wfrp_master.common.core.PartyScreenModel
 import cz.frantisekmasa.wfrp_master.common.core.cache.CharacterRepositoryIdentityMap
 import cz.frantisekmasa.wfrp_master.common.core.cache.PartyRepositoryIdentityMap
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterAvatarChanger
-import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterFeatureRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItemRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterRepository
-import cz.frantisekmasa.wfrp_master.common.core.domain.character.Feature
 import cz.frantisekmasa.wfrp_master.common.core.domain.compendium.Compendium
 import cz.frantisekmasa.wfrp_master.common.core.domain.compendium.FirestoreCompendium
 import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
@@ -38,11 +36,9 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.religion.MiracleRepositor
 import cz.frantisekmasa.wfrp_master.common.core.domain.skills.SkillRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.spells.SpellRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.talents.TalentRepository
-import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Armour
 import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.InventoryItemRepository
 import cz.frantisekmasa.wfrp_master.common.core.firebase.Schema
 import cz.frantisekmasa.wfrp_master.common.core.firebase.functions.CloudFunctionCharacterAvatarChanger
-import cz.frantisekmasa.wfrp_master.common.core.firebase.repositories.FirestoreCharacterFeatureRepository
 import cz.frantisekmasa.wfrp_master.common.core.firebase.repositories.FirestoreCharacterItemRepository
 import cz.frantisekmasa.wfrp_master.common.core.firebase.repositories.FirestoreCharacterRepository
 import cz.frantisekmasa.wfrp_master.common.core.firebase.repositories.FirestoreEncounterRepository
@@ -76,7 +72,6 @@ import kotlin.random.Random
 import cz.frantisekmasa.wfrp_master.common.core.firebase.serializationAggregateMapper as mapper
 
 
-
 val appModule = DI.Module("Common") {
     import(platformModule)
 
@@ -131,25 +126,16 @@ val appModule = DI.Module("Common") {
 
     bindSingleton<CharacterAvatarChanger> { CloudFunctionCharacterAvatarChanger(instance()) }
 
-    bindSingleton<CharacterFeatureRepository<Armour>> {
-        FirestoreCharacterFeatureRepository(
-            Feature.ARMOR,
-            instance(),
-            Armour(),
-            mapper(),
-        )
-    }
-
     bindFactory { characterId: CharacterId ->
-        TrappingsScreenModel(characterId, instance(), instance(), instance())
+        TrappingsScreenModel(characterId, instance(), instance())
     }
 
     /**
      * ViewModels
      */
 
     bindFactory { characterId: CharacterId ->
-        CharacterCombatScreenModel(characterId, instance(), instance(), instance())
+        CharacterCombatScreenModel(characterId, instance(), instance())
     }
     bindFactory { characterId: CharacterId -> CharacteristicsScreenModel(characterId, instance()) }
     bindFactory { characterId: CharacterId ->

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/combat/CharacterCombatScreenModel.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable
 import cafe.adriel.voyager.core.model.ScreenModel
 import cz.frantisekmasa.wfrp_master.common.core.domain.Damage
 import cz.frantisekmasa.wfrp_master.common.core.domain.HitLocation
-import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterFeatureRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
 import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Armour
@@ -22,7 +21,6 @@ class CharacterCombatScreenModel(
     characterId: CharacterId,
     trappingRepository: InventoryItemRepository,
     characterRepository: CharacterRepository,
-    armorRepository: CharacterFeatureRepository<Armour>,
 ) : ScreenModel {
     private val trappingsFlow = trappingRepository.findAllForCharacter(characterId)
     private val characterFlow = characterRepository.getLive(characterId)
@@ -50,13 +48,7 @@ class CharacterCombatScreenModel(
                     .toList()
             }
 
-    private val legacyArmourFlow = armorRepository
-        .getLive(characterId)
-        .right()
-
-    val armour: Flow<Armour> = legacyArmourFlow.combine(trappingsFlow) { armour, items ->
-        armour + Armour.fromItems(items)
-    }
+    val armour: Flow<Armour> = trappingsFlow.map { items -> Armour.fromItems(items) }
 
     val armourPieces: Flow<Map<HitLocation, List<WornArmourPiece>>> = trappingsFlow.map { trappings ->
         val locations = mutableMapOf<HitLocation, MutableList<WornArmourPiece>>()

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/ArmourCard.kt

@@ -36,6 +36,8 @@ import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.DialogState
 import cz.frantisekmasa.wfrp_master.common.core.ui.flow.collectWithLifecycle
 import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI
 import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing
+import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.UserTip
+import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.UserTipCard
 import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.TopPanel
 import cz.frantisekmasa.wfrp_master.common.localization.LocalStrings
 import kotlinx.coroutines.Dispatchers
@@ -82,9 +84,7 @@ fun TrappingsScreen(
             }
         }
 
-        screenModel.armor.collectWithLifecycle(null).value?.let { armor ->
-            ArmourCard(armor, onChange = { screenModel.updateArmor(it) })
-        }
+        UserTipCard(UserTip.ARMOUR_TRAPPINGS, Modifier.padding(horizontal = 8.dp))
 
         var inventoryItemDialogState: DialogState<InventoryItem?> by remember {
             mutableStateOf(DialogState.Closed())

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/TrappingsScreen.kt

@@ -1,14 +1,11 @@
 package cz.frantisekmasa.wfrp_master.common.character.trappings
 
-import androidx.compose.runtime.Immutable
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.coroutineScope
 import cz.frantisekmasa.wfrp_master.common.core.domain.Money
-import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterFeatureRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.NotEnoughMoney
 import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
-import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Armour
 import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Encumbrance
 import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.InventoryItem
 import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.InventoryItemRepository
@@ -17,15 +14,13 @@ import cz.frantisekmasa.wfrp_master.common.core.shared.IO
 import cz.frantisekmasa.wfrp_master.common.core.utils.right
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 
 class TrappingsScreenModel(
     private val characterId: CharacterId,
     private val inventoryItems: InventoryItemRepository,
-    private val armorRepository: CharacterFeatureRepository<Armour>,
     private val characters: CharacterRepository
 ) : ScreenModel {
 
@@ -38,23 +33,6 @@ class TrappingsScreenModel(
     val totalEncumbrance: Flow<Encumbrance?> = inventory
         .map { items -> items.map { it.effectiveEncumbrance }.sum() }
 
-    val armor: Flow<EquippedArmour> =
-        armorRepository
-            .getLive(characterId)
-            .right()
-            .combine(inventory) { armour, items ->
-                EquippedArmour(
-                    armourFromItems = Armour.fromItems(items),
-                    legacyArmour = armour,
-                )
-            }
-
-    @Immutable
-    data class EquippedArmour(
-        val armourFromItems: Armour,
-        val legacyArmour: Armour,
-    )
-
     val money: Flow<Money> = character.map { it.money }
 
     suspend fun addMoney(amount: Money) {
@@ -80,8 +58,4 @@ class TrappingsScreenModel(
     fun removeInventoryItem(inventoryItem: InventoryItem) = coroutineScope.launch(Dispatchers.IO) {
         inventoryItems.remove(characterId, inventoryItem.id)
     }
-
-    fun updateArmor(armor: Armour) = coroutineScope.launch(Dispatchers.IO) {
-        armorRepository.save(characterId, armor)
-    }
 }