Skip to content

Commit 2ec8779

Browse files
authored
Merge pull request #115 from fmasa/visibility-icons
Show visibility icons for all compendium items
2 parents 7b3081e + 4b6a484 commit 2ec8779

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CareerCompendiumTab.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator
1313
import cafe.adriel.voyager.navigator.currentOrThrow
1414
import com.benasher44.uuid.uuid4
1515
import cz.frantisekmasa.wfrp_master.common.compendium.CompendiumTab
16+
import cz.frantisekmasa.wfrp_master.common.compendium.VisibilityIcon
1617
import cz.frantisekmasa.wfrp_master.common.compendium.domain.Career
1718
import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
1819
import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
@@ -67,7 +68,8 @@ fun CareerCompendiumTab(partyId: PartyId, screenModel: CareerCompendiumScreenMod
6768
) { career ->
6869
ListItem(
6970
icon = { ItemIcon(Resources.Drawable.Career) },
70-
text = { Text(career.name) }
71+
text = { Text(career.name) },
72+
trailing = { VisibilityIcon(career) },
7173
)
7274
Divider()
7375
}

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/miracle/MiracleCompendiumTab.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.Dp
1212
import cafe.adriel.voyager.navigator.LocalNavigator
1313
import cafe.adriel.voyager.navigator.currentOrThrow
1414
import cz.frantisekmasa.wfrp_master.common.compendium.CompendiumTab
15+
import cz.frantisekmasa.wfrp_master.common.compendium.VisibilityIcon
1516
import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
1617
import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
1718
import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI
@@ -53,7 +54,8 @@ fun MiracleCompendiumTab(partyId: PartyId, screenModel: MiracleCompendiumScreenM
5354
) { miracle ->
5455
ListItem(
5556
icon = { ItemIcon(Resources.Drawable.Miracle) },
56-
text = { Text(miracle.name) }
57+
text = { Text(miracle.name) },
58+
trailing = { VisibilityIcon(miracle) },
5759
)
5860
Divider()
5961
}

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/spell/SpellCompendiumTab.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.Dp
1212
import cafe.adriel.voyager.navigator.LocalNavigator
1313
import cafe.adriel.voyager.navigator.currentOrThrow
1414
import cz.frantisekmasa.wfrp_master.common.compendium.CompendiumTab
15+
import cz.frantisekmasa.wfrp_master.common.compendium.VisibilityIcon
1516
import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
1617
import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
1718
import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI
@@ -52,7 +53,8 @@ fun SpellCompendiumTab(partyId: PartyId, screenModel: SpellCompendiumScreenModel
5253
) { spell ->
5354
ListItem(
5455
icon = { ItemIcon(Resources.Drawable.Spell) },
55-
text = { Text(spell.name) }
56+
text = { Text(spell.name) },
57+
trailing = { VisibilityIcon(spell) },
5658
)
5759
Divider()
5860
}

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/talent/TalentCompendiumTab.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.Dp
1212
import cafe.adriel.voyager.navigator.LocalNavigator
1313
import cafe.adriel.voyager.navigator.currentOrThrow
1414
import cz.frantisekmasa.wfrp_master.common.compendium.CompendiumTab
15+
import cz.frantisekmasa.wfrp_master.common.compendium.VisibilityIcon
1516
import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
1617
import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
1718
import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI
@@ -52,7 +53,8 @@ fun TalentCompendiumTab(partyId: PartyId, screenModel: TalentCompendiumScreenMod
5253
) { talent ->
5354
ListItem(
5455
icon = { ItemIcon(Resources.Drawable.Talent) },
55-
text = { Text(talent.name) }
56+
text = { Text(talent.name) },
57+
trailing = { VisibilityIcon(talent) },
5658
)
5759
Divider()
5860
}

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/trait/TraitCompendiumTab.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.Dp
1212
import cafe.adriel.voyager.navigator.LocalNavigator
1313
import cafe.adriel.voyager.navigator.currentOrThrow
1414
import cz.frantisekmasa.wfrp_master.common.compendium.CompendiumTab
15+
import cz.frantisekmasa.wfrp_master.common.compendium.VisibilityIcon
1516
import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
1617
import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
1718
import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI
@@ -56,7 +57,8 @@ fun TraitCompendiumTab(
5657
) { trait ->
5758
ListItem(
5859
icon = { ItemIcon(Resources.Drawable.Trait) },
59-
text = { Text(trait.name) }
60+
text = { Text(trait.name) },
61+
trailing = { VisibilityIcon(trait) },
6062
)
6163
Divider()
6264
}

0 commit comments

Comments
 (0)