Remove alcoholic beverages

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 -->

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 -->

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
     }