Skip to content

Commit 7fc9f8e

Browse files
authored
Merge pull request #63 from fmasa/cleanup-icons
Remove unused armour icons
2 parents e12988a + 3c913b5 commit 7fc9f8e

File tree

9 files changed

+2
-44
lines changed

9 files changed

+2
-44
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
99
@Stable
1010
fun trappingIcon(trappingType: TrappingType?) = when (trappingType) {
1111
is TrappingType.Ammunition -> Resources.Drawable.TrappingAmmunition
12-
is TrappingType.Armour -> Resources.Drawable.ArmorChest
12+
is TrappingType.Armour -> Resources.Drawable.Armour
1313
is TrappingType.MeleeWeapon -> Resources.Drawable.WeaponSkill
1414
is TrappingType.Container -> Resources.Drawable.TrappingContainer
1515
is TrappingType.RangedWeapon -> Resources.Drawable.BallisticSkill

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Resources.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,7 @@ object Resources {
5454
TrappingContainer("drawable/ic_container.xml"),
5555
TrappingMiscellaneous("drawable/ic_miscellaneous.xml"),
5656
TrappingEncumbrance("drawable/ic_encumbrance.xml"),
57-
58-
// Armor
59-
ArmorArmLeft("drawable/ic_armor_arm_left.xml"),
60-
ArmorArmRight("drawable/ic_armor_arm_right.xml"),
61-
ArmorChest("drawable/ic_armor_chest.xml"),
62-
ArmorHead("drawable/ic_armor_head.xml"),
63-
ArmorLegLeft("drawable/ic_armor_leg_left.xml"),
64-
ArmorLegRight("drawable/ic_armor_leg_right.xml"),
65-
ArmorShield("drawable/ic_armor_shield.xml"),
57+
Armour("drawable/ic_armour.xml"),
6658

6759
// Raster images
6860
GoogleLogo("drawable/google_logo.png"),

common/src/commonMain/resources/drawable/ic_armor_arm_left.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

common/src/commonMain/resources/drawable/ic_armor_arm_right.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

common/src/commonMain/resources/drawable/ic_armor_head.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

common/src/commonMain/resources/drawable/ic_armor_leg_left.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

common/src/commonMain/resources/drawable/ic_armor_leg_right.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

common/src/commonMain/resources/drawable/ic_armor_shield.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)