Deduplicate compendium chooser

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/blessings/dialog/CompendiumBlessingChooser.kt renamed to common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CompendiumItemChooser.kt

@@ -1,4 +1,4 @@
-package cz.frantisekmasa.wfrp_master.common.character.religion.blessings.dialog
+package cz.frantisekmasa.wfrp_master.common.character
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -21,8 +21,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import cz.frantisekmasa.wfrp_master.common.character.religion.blessings.BlessingsScreenModel
-import cz.frantisekmasa.wfrp_master.common.core.domain.religion.Blessing
+import cz.frantisekmasa.wfrp_master.common.core.CharacterItemScreenModel
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem
+import cz.frantisekmasa.wfrp_master.common.core.domain.compendium.CompendiumItem
 import cz.frantisekmasa.wfrp_master.common.core.shared.IO
 import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
 import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton
@@ -37,62 +38,60 @@ import kotlinx.coroutines.launch
 
 
 @Composable
-internal fun CompendiumBlessingChooser(
-    screenModel: BlessingsScreenModel,
-    onComplete: () -> Unit,
-    onCustomBlessingRequest: () -> Unit,
+internal fun <A : CharacterItem, B : CompendiumItem<B>> CompendiumItemChooser(
+    title: String,
+    icon: @Composable (B) -> Resources.Drawable,
+    screenModel: CharacterItemScreenModel<A, B>,
+    onSelect: suspend (B) -> Unit,
+    onCustomItemRequest: () -> Unit,
     onDismissRequest: () -> Unit,
+    customItemButtonText: String,
+    emptyUiIcon: Resources.Drawable,
 ) {
-    val strings = LocalStrings.current.blessings
-
     Scaffold(
         topBar = {
             TopAppBar(
                 navigationIcon = { CloseButton(onDismissRequest) },
-                title = { Text(strings.titleChooseCompendiumBlessing) },
+                title = { Text(title) },
             )
         }
     ) {
-        val compendiumBlessings = screenModel.notUsedItemsFromCompendium.collectWithLifecycle(null).value
-        val totalCompendiumBlessingCount = screenModel.compendiumItemsCount.collectWithLifecycle(null).value
+        val compendiumItems =
+            screenModel.notUsedItemsFromCompendium.collectWithLifecycle(null).value
+        val totalCompendiumItemCount =
+            screenModel.compendiumItemsCount.collectWithLifecycle(null).value
         var saving by remember { mutableStateOf(false) }
 
-        if (compendiumBlessings == null || totalCompendiumBlessingCount == null || saving) {
+        if (compendiumItems == null || totalCompendiumItemCount == null || saving) {
             FullScreenProgress()
             return@Scaffold
         }
 
         Column(Modifier.fillMaxSize()) {
             Box(Modifier.weight(1f)) {
-                if (compendiumBlessings.isEmpty()) {
+                if (compendiumItems.isEmpty()) {
                     EmptyUI(
-                        icon = Resources.Drawable.Blessing,
-                        text = strings.messages.noBlessingsInCompendium,
-                        subText = if (totalCompendiumBlessingCount == 0)
-                            strings.messages.noBlessingsInCompendiumSubtextPlayer
+                        icon = emptyUiIcon,
+                        text = LocalStrings.current.compendium.messages.noItems,
+                        subText = if (totalCompendiumItemCount == 0)
+                            LocalStrings.current.compendium.messages.noItemsInCompendiumSubtextPlayer
                         else null,
                     )
                 } else {
                     val coroutineScope = rememberCoroutineScope()
 
                     LazyColumn(contentPadding = PaddingValues(Spacing.bodyPadding)) {
-                        items(compendiumBlessings, key = { it.id }) { blessing ->
+                        items(compendiumItems, key = { it.id }) { item ->
                             ListItem(
                                 modifier = Modifier.clickable(
                                     onClick = {
                                         saving = false
 
-                                        coroutineScope.launch(Dispatchers.IO) {
-                                            screenModel.saveItem(
-                                                Blessing.fromCompendium(blessing)
-                                            )
-
-                                            onComplete()
-                                        }
+                                        coroutineScope.launch(Dispatchers.IO) { onSelect(item) }
                                     }
                                 ),
-                                icon = { ItemIcon(Resources.Drawable.Blessing, ItemIcon.Size.Small) },
-                                text = { Text(blessing.name) }
+                                icon = { ItemIcon(icon(item), ItemIcon.Size.Small) },
+                                text = { Text(item.name) }
                             )
                         }
                     }
@@ -103,9 +102,9 @@ internal fun CompendiumBlessingChooser(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(Spacing.bodyPadding),
-                onClick = onCustomBlessingRequest,
+                onClick = onCustomItemRequest,
             ) {
-                Text(strings.buttonAddNonCompendium)
+                Text(customItemButtonText)
             }
         }
     }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/blessings/dialog/AddBlessingDialog.kt

@@ -5,10 +5,14 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser
 import cz.frantisekmasa.wfrp_master.common.character.religion.blessings.BlessingsScreenModel
+import cz.frantisekmasa.wfrp_master.common.core.domain.religion.Blessing
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize
+import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
 import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog
+import cz.frantisekmasa.wfrp_master.common.localization.LocalStrings
 
 
 @Composable
@@ -26,13 +30,17 @@ internal fun AddBlessingDialog(screenModel: BlessingsScreenModel, onDismissReque
     ) {
         when (state) {
             ChoosingCompendiumMiracle ->
-                CompendiumBlessingChooser(
+                CompendiumItemChooser(
                     screenModel = screenModel,
-                    onComplete = onDismissRequest,
-                    onCustomBlessingRequest = { state = FillingInCustomMiracle },
+                    title = LocalStrings.current.blessings.titleChooseCompendiumBlessing,
                     onDismissRequest = onDismissRequest,
+                    icon = { Resources.Drawable.Blessing },
+                    onSelect = { screenModel.saveItem(Blessing.fromCompendium(it)) },
+                    onCustomItemRequest = { state = FillingInCustomBlessing },
+                    customItemButtonText = LocalStrings.current.blessings.buttonAddNonCompendium,
+                    emptyUiIcon = Resources.Drawable.Blessing,
                 )
-            is FillingInCustomMiracle -> NonCompendiumBlessingForm(
+            is FillingInCustomBlessing -> NonCompendiumBlessingForm(
                 screenModel = screenModel,
                 existingBlessing = null,
                 onDismissRequest = onDismissRequest,
@@ -47,4 +55,4 @@ private sealed class AddMiracleDialogState : Parcelable
 private object ChoosingCompendiumMiracle : AddMiracleDialogState()
 
 @Parcelize
-private object FillingInCustomMiracle : AddMiracleDialogState()
+private object FillingInCustomBlessing : AddMiracleDialogState()

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/miracles/dialog/AddMiracleDialog.kt

@@ -5,10 +5,14 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser
 import cz.frantisekmasa.wfrp_master.common.character.religion.miracles.MiraclesScreenModel
+import cz.frantisekmasa.wfrp_master.common.core.domain.religion.Miracle
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize
+import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
 import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog
+import cz.frantisekmasa.wfrp_master.common.localization.LocalStrings
 
 @Composable
 internal fun AddMiracleDialog(screenModel: MiraclesScreenModel, onDismissRequest: () -> Unit) {
@@ -25,11 +29,15 @@ internal fun AddMiracleDialog(screenModel: MiraclesScreenModel, onDismissRequest
     ) {
         when (state) {
             ChoosingCompendiumMiracle ->
-                CompendiumMiracleChooser(
+                CompendiumItemChooser(
                     screenModel = screenModel,
-                    onComplete = onDismissRequest,
-                    onCustomMiracleRequest = { state = FillingInCustomMiracle },
+                    title = LocalStrings.current.miracles.titleChooseCompendiumMiracle,
                     onDismissRequest = onDismissRequest,
+                    icon = { Resources.Drawable.Miracle },
+                    onSelect = { screenModel.saveItem(Miracle.fromCompendium(it)) },
+                    onCustomItemRequest = { state = FillingInCustomMiracle },
+                    customItemButtonText = LocalStrings.current.miracles.buttonAddNonCompendium,
+                    emptyUiIcon = Resources.Drawable.Miracle,
                 )
             is FillingInCustomMiracle -> NonCompendiumMiracleForm(
                 screenModel = screenModel,

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/miracles/dialog/CompendiumMiracleChooser.kt

@@ -34,7 +34,7 @@ internal fun SkillsCard(
     skillsScreenModel: SkillsScreenModel,
     onRemove: (Skill) -> Unit,
 ) {
-    val skills = skillsScreenModel.skills.collectWithLifecycle(null).value ?: return
+    val skills = skillsScreenModel.items.collectWithLifecycle(null).value ?: return
     val characteristics = characterScreenModel.character
         .collectWithLifecycle(null).value?.characteristics ?: return
 

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/skills/SkillsCard.kt

@@ -1,40 +1,22 @@
 package cz.frantisekmasa.wfrp_master.common.character.skills
 
-import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.coroutineScope
 import com.benasher44.uuid.Uuid
+import cz.frantisekmasa.wfrp_master.common.core.CharacterItemScreenModel
 import cz.frantisekmasa.wfrp_master.common.core.domain.compendium.Compendium
 import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
 import cz.frantisekmasa.wfrp_master.common.core.domain.skills.Skill
 import cz.frantisekmasa.wfrp_master.common.core.domain.skills.SkillRepository
 import cz.frantisekmasa.wfrp_master.common.core.shared.IO
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combineTransform
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.Skill as CompendiumSkill
 
 class SkillsScreenModel(
     private val characterId: CharacterId,
     private val skillRepository: SkillRepository,
     private val compendium: Compendium<CompendiumSkill>
-) : ScreenModel {
-    val skills: Flow<List<Skill>> = skillRepository.findAllForCharacter(characterId)
-
-    val compendiumSkillsCount: Flow<Int> by lazy {
-        compendiumSkills.map { it.size }
-    }
-    val notUsedSkillsFromCompendium: Flow<List<CompendiumSkill>> by lazy {
-        compendiumSkills.combineTransform(skills) { compendiumSkills, characterSkills ->
-            val skillsUsedByCharacter = characterSkills.mapNotNull { it.compendiumId }.toSet()
-
-            emit(compendiumSkills.filter { !skillsUsedByCharacter.contains(it.id) })
-        }
-    }
-
-    private val compendiumSkills by lazy { compendium.liveForParty(characterId.partyId) }
-
+) : CharacterItemScreenModel<Skill, CompendiumSkill>(characterId, skillRepository, compendium) {
     suspend fun saveSkill(skill: Skill) = skillRepository.save(characterId, skill)
 
     suspend fun saveCompendiumSkill(skillId: Uuid, compendiumSkillId: Uuid, advances: Int) {

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/skills/SkillsScreenModel.kt

@@ -6,10 +6,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import com.benasher44.uuid.Uuid
+import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser
 import cz.frantisekmasa.wfrp_master.common.character.skills.SkillsScreenModel
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize
+import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
 import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog
+import cz.frantisekmasa.wfrp_master.common.localization.LocalStrings
 
 @Composable
 fun AddSkillDialog(screenModel: SkillsScreenModel, onDismissRequest: () -> Unit) {
@@ -26,11 +29,15 @@ fun AddSkillDialog(screenModel: SkillsScreenModel, onDismissRequest: () -> Unit)
     ) {
         when (val currentState = state) {
             ChoosingCompendiumSkill ->
-                CompendiumSkillChooser(
+                CompendiumItemChooser(
                     screenModel = screenModel,
-                    onSkillSelected = { state = FillingInAdvances(it.id, it.advanced) },
-                    onCustomSkillRequest = { state = FillingInCustomSkill },
+                    title = LocalStrings.current.skills.titleChooseCompendiumSkill,
                     onDismissRequest = onDismissRequest,
+                    icon = { it.characteristic.getIcon() },
+                    onSelect = { state = FillingInAdvances(it.id, it.advanced) },
+                    onCustomItemRequest = { state = FillingInCustomSkill },
+                    customItemButtonText = LocalStrings.current.skills.buttonAddNonCompendium,
+                    emptyUiIcon = Resources.Drawable.Skill,
                 )
             is FillingInAdvances ->
                 AdvancesForm(