diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/data/KnownItems.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/data/KnownItems.kt index e8614e72cb7012d3ceb972e14d8ecc5493442c7c..dddb90cebe1fd15ee7f61548b390a51b4b155c54 100644 --- a/app/src/main/java/net/novagamestudios/kaffeekasse/data/KnownItems.kt +++ b/app/src/main/java/net/novagamestudios/kaffeekasse/data/KnownItems.kt @@ -32,6 +32,7 @@ val KnownItem.category get() = when (this) { CocaCola330 -> ItemCategory.ColdBeverage CokeZero -> ItemCategory.ColdBeverage CokeZeroCaffeineFree -> ItemCategory.ColdBeverage + FritzCola -> ItemCategory.ColdBeverage ChouffeBier -> ItemCategory.ColdBeverage EiflerLandbier -> ItemCategory.ColdBeverage EngelbertApple -> ItemCategory.ColdBeverage @@ -66,6 +67,8 @@ val KnownItem.category get() = when (this) { Milka -> ItemCategory.Snack Balisto -> ItemCategory.Snack Duplo -> ItemCategory.Snack + PickUp -> ItemCategory.Snack + LindtHase -> ItemCategory.Snack OreoCookies -> ItemCategory.Snack Trolli -> ItemCategory.Snack Twix -> ItemCategory.Snack @@ -110,6 +113,7 @@ val KnownItem.cleanProductName get() = when (this) { CocaCola05Glass -> "Coca-Cola" CokeZero -> "Coca-Cola Zero" CokeZeroCaffeineFree -> "Coca-Cola Zero" + FritzCola -> "Fritz Cola" EngelbertApple -> "Engelbert Apfel" EngelbertNatural -> "Engelbert Naturell" EngelbertSprudel -> "Engelbert Sprudel" @@ -138,6 +142,8 @@ val KnownItem.cleanProductName get() = when (this) { Milka -> "Milka" Balisto -> "Balisto" Duplo -> "Duplo" + PickUp -> "PickUp" + LindtHase -> "Lindt" OreoCookies -> "Oreo" Trolli -> "Trolli" Twix -> "Twix" @@ -184,6 +190,7 @@ val KnownItem.cleanVariantName get() = when (this) { CoffeeLarge -> "groß" HariboBag -> "Beutel" Katjes -> "Beutel" + LindtHase -> "Hase" DuplexColor -> "Farbe" DuplexBlackWhite -> "S/W" SimplexColor -> "Farbe" @@ -193,72 +200,75 @@ val KnownItem.cleanVariantName get() = when (this) { } val KnownItem.estimatedPrice get() = when (this) { Almdudler -> null - Bier330 -> null + Bier330 -> 1.06 Bier500 -> 1.25 Bionade -> 0.82 - ChouffeBier -> null + ChouffeBier -> 1.80 ClubMate -> null - CocaCola -> null - CocaCola330 -> null - CocaCola05Glass -> null + CocaCola -> 1.73 + CocaCola330 -> 1.22 + CocaCola05Glass -> 1.35 CokeZero -> 1.66 CokeZeroCaffeineFree -> null + FritzCola -> 1.57 CafeAuLait -> 0.33 Cappuccino -> 0.42 - CoffeeSmall -> null + CoffeeSmall -> 0.19 CoffeeLarge -> 0.32 ChocolateCreamCocoa -> 0.41 - ErdingerAlcoholFree330 -> null - ErdingerAlcoholFree500 -> null - EiflerLandbier -> null - EngelbertApple -> null - EngelbertNatural -> null - EngelbertSprudel -> null + ErdingerAlcoholFree330 -> 1.15 + ErdingerAlcoholFree500 -> 1.45 + EiflerLandbier -> 1.15 + EngelbertApple -> 0.98 + EngelbertNatural -> 0.57 + EngelbertSprudel -> 0.57 Espresso -> 0.19 Erdnuesse -> 1.30 Fanta -> 1.55 Fassbrause -> 0.82 Gerolsteiner -> 0.93 - Leffe -> null + Leffe -> 2.00 LatteMacchiato -> 0.55 - Monster -> null + Monster -> 1.69 MilkMachine -> 0.25 MioMioMate -> 1.03 Moccachoc -> 0.55 - Rockstar -> null - RheinfelsSprudel -> null + Rockstar -> 1.69 + RheinfelsSprudel -> 0.57 Hanuta -> 0.28 HariboBag -> 1.15 Knoppers -> 0.32 KnoppersBar -> 0.45 - Milka -> null + Milka -> 0.99 Balisto -> 0.25 Duplo -> 0.26 + PickUp -> 0.34 + LindtHase -> 1.00 OreoCookies -> 0.40 Trolli -> 0.99 Twix -> null Yogurette -> 0.19 KinderChocolate -> null NutsRoyalNuts -> 2.25 - CujaMaraSplit -> null + CujaMaraSplit -> 0.65 Magnum -> 0.99 NUII -> 0.99 IceCornetto -> 0.50 - IceNogger -> null - IceMars -> null - IceSnickers -> null - IceTwix -> null - IceBounty -> null + IceNogger -> 0.65 + IceMars -> 0.68 + IceSnickers -> 0.68 + IceTwix -> 0.68 + IceBounty -> 0.68 Pizza -> 2.99 - Apple -> null + Apple -> 0.30 Tangerine -> null Clementine -> null DuplexColor -> 0.05 - DuplexBlackWhite -> null - SimplexColor -> null - SimplexBlackWhite -> null - Tissues -> null - ThreeDPrintingPerGram -> null + DuplexBlackWhite -> 0.03 + SimplexColor -> 0.03 + SimplexBlackWhite -> 0.02 + Tissues -> 0.12 + ThreeDPrintingPerGram -> 0.02 Euglueh -> null Katjes -> 0.99 } diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/kaffeekasse/KnownItem.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/kaffeekasse/KnownItem.kt index 35f502543207f0ecd9b4c48b601e8be21e5ef990..23ac1b21ef3026a650c08842fc31ba63624b7372 100644 --- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/kaffeekasse/KnownItem.kt +++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/kaffeekasse/KnownItem.kt @@ -18,6 +18,7 @@ enum class KnownItem( CocaCola330 (266, "Coca Cola 0,33l"), CokeZero ( 78, "Coke ZERO"), CokeZeroCaffeineFree (246, "Coke Zero koffeinfrei"), + FritzCola (186, "Fritz Cola"), DuplexColor (155, "Duplex Farbe"), ChouffeBier (262, "Chouffe Bier"), DuplexBlackWhite ( 91, "Duplex S/W"), @@ -57,6 +58,8 @@ enum class KnownItem( Apple (195, "Apfel"), Balisto (105, "Balisto"), Duplo (231, "Duplo"), + PickUp (106, "PickUp!"), + LindtHase (267, "Lindt Hase"), IceCornetto (128, "Eis: Cornetto"), IceNogger (101, "Eis: Nogger"), IceMars (136, "Eis: Mars/Snickers/Twix/Bounty"),