Remove alcoholic beverages

2025-11-02 21:02:39 +01:00
parent 842e6faf24
commit 08b5ec6312
8 changed files with 71 additions and 88 deletions
--- a/.gitea/workflows/sonar.yaml
+++ b/.gitea/workflows/sonar.yaml
@@ -20,7 +20,7 @@ jobs:
        uses: actions/setup-java@v4
        with:
          java-version: 21
-          distribution: 'temurin' # Alternative distribution options are available.
+          distribution: 'temurin'
      - name: Setup Android SDK
        uses: android-actions/setup-android@v3
      - name: Cache SonarQube packages
--- a/commonUI/src/commonMain/composeResources/values-de/strings.xml
+++ b/commonUI/src/commonMain/composeResources/values-de/strings.xml
@@ -39,11 +39,11 @@

    <!-- Drinks -->
    <string name="milk">Milch</string>
-    <string name="wine">Wein</string>
-    <string name="cocktail">Cocktail</string>
+    <string name="mate">Mate</string>
+    <string name="water">Wasser</string>
    <string name="coffee">Kaffee</string>
    <string name="tea">Tee</string>
-    <string name="beer">Bier</string>
+    <string name="bubble_tea">Bubble Tea</string>
    <string name="beverage">Süssgetränk</string>

    <!-- Fruits -->
--- a/commonUI/src/commonMain/composeResources/values/strings.xml
+++ b/commonUI/src/commonMain/composeResources/values/strings.xml
@@ -39,11 +39,11 @@

    <!-- Drinks -->
    <string name="milk">Milk</string>
-    <string name="wine">Wine</string>
-    <string name="cocktail">Cocktail</string>
+    <string name="mate">Mate</string>
+    <string name="water">Water</string>
    <string name="coffee">Coffee</string>
    <string name="tea">Tea</string>
-    <string name="beer">Beer</string>
+    <string name="bubble_tea">Bubble Tea</string>
    <string name="beverage">Beverage</string>

    <!-- Fruits -->
--- a/commonUI/src/commonMain/kotlin/ch/dissem/yaep/ui/common/names.kt
+++ b/commonUI/src/commonMain/kotlin/ch/dissem/yaep/ui/common/names.kt
@@ -13,7 +13,7 @@ import yaep.commonui.generated.resources.Res
 import yaep.commonui.generated.resources.ant
 import yaep.commonui.generated.resources.astronaut
 import yaep.commonui.generated.resources.banana
-import yaep.commonui.generated.resources.beer
+import yaep.commonui.generated.resources.bubble_tea
 import yaep.commonui.generated.resources.beverage
 import yaep.commonui.generated.resources.bicycle
 import yaep.commonui.generated.resources.british
@@ -22,7 +22,7 @@ import yaep.commonui.generated.resources.cake
 import yaep.commonui.generated.resources.canadian
 import yaep.commonui.generated.resources.cherries
 import yaep.commonui.generated.resources.chocolate
-import yaep.commonui.generated.resources.cocktail
+import yaep.commonui.generated.resources.water
 import yaep.commonui.generated.resources.coffee
 import yaep.commonui.generated.resources.cookie
 import yaep.commonui.generated.resources.cupcake
@@ -64,7 +64,7 @@ import yaep.commonui.generated.resources.teacher
 import yaep.commonui.generated.resources.tram_car
 import yaep.commonui.generated.resources.ukrainian
 import yaep.commonui.generated.resources.watermelon
-import yaep.commonui.generated.resources.wine
+import yaep.commonui.generated.resources.mate
 import yaep.commonui.generated.resources.zebra

 val ItemClass<*>.localName: StringResource
@@ -80,37 +80,37 @@ val ItemClass<*>.localName: StringResource

 private val Animal.stringResource: StringResource
    get() = when (this) {
-        Animal.ZEBRA -> Res.string.zebra
-        Animal.OCTOPUS -> Res.string.octopus
-        Animal.GOAT -> Res.string.goat
-        Animal.SLOTH -> Res.string.sloth
-        Animal.DOG -> Res.string.dog
-        Animal.SNAIL -> Res.string.snail
        Animal.ANT -> Res.string.ant
+        Animal.DOG -> Res.string.dog
+        Animal.GOAT -> Res.string.goat
+        Animal.OCTOPUS -> Res.string.octopus
+        Animal.SLOTH -> Res.string.sloth
+        Animal.SNAIL -> Res.string.snail
+        Animal.ZEBRA -> Res.string.zebra
    }

 private val Dessert.stringResource: StringResource
    get() = when (this) {
-        Dessert.ICE_CREAM -> Res.string.ice_cream
-        Dessert.DOUGHNUT -> Res.string.doughnut
-        Dessert.COOKIE -> Res.string.cookie
        Dessert.CAKE -> Res.string.cake
-        Dessert.CUPCAKE -> Res.string.cupcake
-        Dessert.PIE -> Res.string.pie
        Dessert.CHOCOLATE -> Res.string.chocolate
-        Dessert.LOLLIPOP -> Res.string.lollipop
+        Dessert.COOKIE -> Res.string.cookie
+        Dessert.CUPCAKE -> Res.string.cupcake
        Dessert.CUSTARD -> Res.string.custard
+        Dessert.DOUGHNUT -> Res.string.doughnut
+        Dessert.ICE_CREAM -> Res.string.ice_cream
+        Dessert.LOLLIPOP -> Res.string.lollipop
+        Dessert.PIE -> Res.string.pie
    }

 private val Drink.stringResource: StringResource
    get() = when (this) {
-        Drink.MILK -> Res.string.milk
-        Drink.WINE -> Res.string.wine
-        Drink.COCKTAIL -> Res.string.cocktail
-        Drink.COFFEE -> Res.string.coffee
-        Drink.TEA -> Res.string.tea
-        Drink.BEER -> Res.string.beer
        Drink.BEVERAGE -> Res.string.beverage
+        Drink.BUBBLE_TEA -> Res.string.bubble_tea
+        Drink.COFFEE -> Res.string.coffee
+        Drink.MATE -> Res.string.mate
+        Drink.MILK -> Res.string.milk
+        Drink.TEA -> Res.string.tea
+        Drink.WATER -> Res.string.water
    }

 private val Fruit.stringResource: StringResource
@@ -142,22 +142,22 @@ private val Nationality.stringResource: StringResource
 private val Profession.stringResource: StringResource
    get() = when (this) {
        Profession.ASTRONAUT -> Res.string.astronaut
-        Profession.HEALTH_WORKER -> Res.string.health_worker
        Profession.FARMER -> Res.string.farmer
+        Profession.FIREFIGHTER -> Res.string.firefighter
+        Profession.HEALTH_WORKER -> Res.string.health_worker
        Profession.ROCK_STAR -> Res.string.rock_star
        Profession.SCIENTIST -> Res.string.scientist
        Profession.SOFTWARE_DEV -> Res.string.software_dev
-        Profession.FIREFIGHTER -> Res.string.firefighter
        Profession.TEACHER -> Res.string.teacher
    }

 private val Transportation.stringResource: StringResource
    get() = when (this) {
        Transportation.BICYCLE -> Res.string.bicycle
+        Transportation.BUS -> Res.string.bus
+        Transportation.LOCOMOTIVE -> Res.string.locomotive
        Transportation.MOTOR_SCOOTER -> Res.string.motor_scooter
        Transportation.SKATEBOARD -> Res.string.skateboard
        Transportation.TAXI -> Res.string.taxi
-        Transportation.LOCOMOTIVE -> Res.string.locomotive
        Transportation.TRAM_CAR -> Res.string.tram_car
-        Transportation.BUS -> Res.string.bus
    }
--- a/domain/src/commonMain/kotlin/ch/dissem/yaep/domain/items.kt
+++ b/domain/src/commonMain/kotlin/ch/dissem/yaep/domain/items.kt
@@ -1,13 +1,13 @@
 package ch.dissem.yaep.domain

 enum class Animal(symbol: String) : ItemClass<Animal> {
-    ZEBRA("🦓"),
-    OCTOPUS("🐙"),
-    GOAT("🐐"),
-    SLOTH("🦥"),
+    ANT("🐜"),
    DOG("🐕"),
+    GOAT("🐐"),
+    OCTOPUS("🐙"),
+    SLOTH("🦥"),
    SNAIL("🐌"),
-    ANT("🐜");
+    ZEBRA("🦓");

    override val symbols: Array<String> = arrayOf(symbol)

@@ -20,14 +20,14 @@ enum class Animal(symbol: String) : ItemClass<Animal> {
 }

 enum class Nationality(symbol: String) : ItemClass<Nationality> {
-    UNITED_KINGDOM("🇬🇧"),
-    UKRAINE("🇺🇦"),
+    CANADA("🇨🇦"),
+    JAPAN("🇯🇵"),
+    NORWAY("🇳🇴"),
    SPAIN("🇪🇸"),
    SWEDEN("🇸🇪"),
-    NORWAY("🇳🇴"),
-    JAPAN("🇯🇵"),
    SWITZERLAND("🇨🇭"),
-    CANADA("🇨🇦");
+    UNITED_KINGDOM("🇬🇧"),
+    UKRAINE("🇺🇦");

    override val symbols: Array<String> = arrayOf(symbol)

@@ -40,13 +40,13 @@ enum class Nationality(symbol: String) : ItemClass<Nationality> {
 }

 enum class Drink(symbol: String) : ItemClass<Drink> {
-    MILK("🥛"),
-    WINE("🍷"),
-    COCKTAIL("🍸"),
+    BEVERAGE("🧃"),
+    BUBBLE_TEA("🧋"),
    COFFEE("☕"),
+    MATE("🧉"),
+    MILK("🥛"),
    TEA("🍵"),
-    BEER("🍺"),
-    BEVERAGE("🧃");
+    WATER("🥤");

    override val symbols: Array<String> = arrayOf(symbol)

@@ -60,12 +60,12 @@ enum class Drink(symbol: String) : ItemClass<Drink> {

 enum class Profession(symbol: String) : ItemClass<Profession> {
    ASTRONAUT("\u200D\uD83D\uDE80"),
-    HEALTH_WORKER("\u200D⚕\uFE0F"),
    FARMER("\u200D\uD83C\uDF3E"),
+    FIREFIGHTER("\u200D\uD83D\uDE92"),
+    HEALTH_WORKER("\u200D⚕\uFE0F"),
    ROCK_STAR("\u200D\uD83C\uDFA4"),
    SCIENTIST("\u200D\uD83D\uDD2C"),
    SOFTWARE_DEV("\u200D\uD83D\uDCBB"),
-    FIREFIGHTER("\u200D\uD83D\uDE92"),
    TEACHER("\u200D\uD83C\uDFEB");

    override val symbols: Array<String> = idic(symbol)
@@ -79,16 +79,16 @@ enum class Profession(symbol: String) : ItemClass<Profession> {
 }

 enum class Fruit(symbol: String) : ItemClass<Fruit> {
-    GRAPES("🍇"),
-    WATERMELON("🍉"),
-    LEMON("🍋"),
    BANANA("🍌"),
-    PINEAPPLE("🍍"),
    CHERRIES("🍒"),
-    STRAWBERRY("🍓"),
+    GRAPES("🍇"),
    KIWI("🥝"),
+    LEMON("🍋"),
+    MANGO("🥭"),
    PEAR("🍐"),
-    MANGO("🥭");
+    PINEAPPLE("🍍"),
+    STRAWBERRY("🍓"),
+    WATERMELON("🍉");

    override val symbols: Array<String> = arrayOf(symbol)

@@ -101,15 +101,15 @@ enum class Fruit(symbol: String) : ItemClass<Fruit> {
 }

 enum class Dessert(symbol: String) : ItemClass<Dessert> {
-    ICE_CREAM("🍨"),
-    DOUGHNUT("🍩"),
-    COOKIE("🍪"),
    CAKE("🍰"),
-    CUPCAKE("🧁"),
-    PIE("🥧"),
    CHOCOLATE("🍫"),
+    COOKIE("🍪"),
+    CUPCAKE("🧁"),
+    CUSTARD("🍮"),
+    DOUGHNUT("🍩"),
+    ICE_CREAM("🍨"),
    LOLLIPOP("🍭"),
-    CUSTARD("🍮");
+    PIE("🥧");

    override val symbols: Array<String> = arrayOf(symbol)

@@ -123,12 +123,12 @@ enum class Dessert(symbol: String) : ItemClass<Dessert> {

 enum class Transportation(symbol: String) : ItemClass<Transportation> {
    BICYCLE("🚲"),
+    BUS("🚌"),
+    LOCOMOTIVE("🚂"),
    MOTOR_SCOOTER("🛵"),
    SKATEBOARD("🛹"),
    TAXI("🚕"),
-    LOCOMOTIVE("🚂"),
-    TRAM_CAR("🚋"),
-    BUS("🚌");
+    TRAM_CAR("🚋");

    override val symbols: Array<String> = arrayOf(symbol)

@@ -138,7 +138,6 @@ enum class Transportation(symbol: String) : ItemClass<Transportation> {
    companion object : ItemClassCompanion<Transportation> {
        override val items: List<Transportation> = entries
    }
-
 }

 private val GENDERS = arrayOf("\uD83E\uDDD1", "\uD83D\uDC68", "\uD83D\uDC69")
@@ -151,7 +150,7 @@ private fun idic(symbol: String): Array<String> = Array(GENDERS.size * SKIN_TONE
    g + t + symbol
 }

-sealed interface ItemClass<out SELF : ItemClass<SELF>>: Comparable<ItemClass<*>> {
+sealed interface ItemClass<out SELF : ItemClass<SELF>> : Comparable<ItemClass<*>> {
    val symbols: Array<String>

    val name: String
--- a/domain/src/commonTest/kotlin/ch/dissem/yaep/domain/GameTest.kt
+++ b/domain/src/commonTest/kotlin/ch/dissem/yaep/domain/GameTest.kt
@@ -134,15 +134,8 @@ class GameTest {
    fun `ensure specific game is solvable`() {
        val game = Game.parse(
            """
-            👩🏿‍⚕️👨🏽‍🎤👩🏿‍⚕️  👩🏾‍🚀🧑🏿‍🏫
-            🐜🐕  🐐  🐐
-            🍉🥭🍐🍇🍍  
-            🧁🍨🍩🍰🥧  
-            🇨🇭🇬🇧🇯🇵🇺🇦🇬🇧🇨🇦
-            🍷🧃🍺🧃    
-
            * ZEBRA is between the neighbours PIE and PEAR to both sides
-            * WINE is at position 0
+            * MATE is at position 0
            * SLOTH is between the neighbours ZEBRA and COFFEE to both sides
            * ICE_CREAM is left of MANGO
            * SWITZERLAND is at position 0
@@ -156,7 +149,7 @@ class GameTest {
            * SLOTH is between the neighbours CUSTARD and CAKE to both sides
            * SPAIN is between the neighbours CUSTARD and GRAPES to both sides
            * SCIENTIST is between the neighbours SNAIL and SLOTH to both sides
-            * DOG is between the neighbours CUPCAKE and BEER to both sides
+            * DOG is between the neighbours CUPCAKE and BUBBLE_TEA to both sides
            * SNAIL is between the neighbours BANANA and GRAPES to both sides
            * SLOTH is between the neighbours GRAPES and CANADA to both sides
            * UKRAINE and SCIENTIST are in the same column
--- a/domain/src/commonTest/resources/games/001.yaep
+++ b/domain/src/commonTest/resources/games/001.yaep
@@ -1,10 +1,3 @@
-⬛⬛⬛⬛⬛⬛
-⬛⬛⬛⬛⬛⬛
-⬛⬛⬛⬛⬛⬛
-⬛⬛⬛🥧⬛⬛
-⬛⬛⬛⬛⬛⬛
-⬛⬛⬛⬛⬛⬛
-
 * CUSTARD is between the neighbours COOKIE and ASTRONAUT to both sides
 * CHOCOLATE is between the neighbours SKATEBOARD and BEVERAGE to both sides
 * SWITZERLAND is between the neighbours TEACHER and TAXI to both sides
@@ -13,12 +6,12 @@
 * MILK is between the neighbours TAXI and BUS to both sides
 * SNAIL is between the neighbours BEVERAGE and SKATEBOARD to both sides
 * HEALTH_WORKER is between the neighbours FIREFIGHTER and ASTRONAUT to both sides
-* BEER is left of GOAT
-* DOG is between the neighbours COCKTAIL and COOKIE to both sides
+* BUBBLE_TEA is left of GOAT
+* DOG is between the neighbours WATER and COOKIE to both sides
 * UKRAINE is left of GOAT
 * TAXI is between the neighbours MOTOR_SCOOTER and MILK to both sides
 * FIREFIGHTER is left of SWEDEN
-* PIE is between the neighbours UNITED_KINGDOM and WINE to both sides
+* PIE is between the neighbours UNITED_KINGDOM and MATE to both sides
 * BEVERAGE is between the neighbours TRAM_CAR and TAXI to both sides
 * BEVERAGE is left of FIREFIGHTER
 * ZEBRA and SOFTWARE_DEV are in the same column
--- a/flatpak/info/ch.dissem.YAEP.metainfo.xml
+++ b/flatpak/info/ch.dissem.YAEP.metainfo.xml
@@ -74,9 +74,7 @@
        </screenshot>
    </screenshots>

-    <content_rating type="oars-1.1">
-        <content_attribute id="drugs-alcohol">mild</content_attribute>
-    </content_rating>
+    <content_rating type="oars-1.1" />

    <url type="homepage">https://dissem.ch/YAEP/</url>
    <url type="bugtracker">https://git.dissem.ch/chris/YAEP/issues</url>