diff --git a/src/app/icons.rs b/src/app/icons.rs index 39de1e8..9e864db 100644 --- a/src/app/icons.rs +++ b/src/app/icons.rs @@ -14,32 +14,101 @@ fn paths(icon: Icon) -> &'static [&'static str] { "M4 6.5c1.3-.3 2.2.4 2.4 1.5.7 4.4 4 7.6 8.5 8.1 1.6.2 3.3 0 4.8-.6l.6 1.3c-2.2 1.9-5.1 2.8-8 2.4C7 18.5 3.4 13.8 3.3 8.2c0-.8.3-1.5.7-1.7Z", "M3.4 4.6 5.6 4l.5 2.4-1.9.5Z", ], + Icon::Lemon => &[ + "M19.6 6.5c.9-.4 1.1-1.6.4-2.3-.7-.7-1.9-.5-2.3.4-3.4-1.6-8-.4-10.9 2.5S2.6 13.8 4.2 17.2c-.9.4-1.1 1.6-.4 2.3.7.7 1.9.5 2.3-.4 3.4 1.6 8 .4 10.9-2.5s4.2-6.7 2.6-10.1Z", + ], + Icon::Pear => &[ + "M12 5.5c-1.8 0-3 1.4-3 3.3 0 1.6-.6 2.6-1.6 3.8A5.6 5.6 0 0 0 6 16.3C6 19.5 8.7 22 12 22s6-2.5 6-5.7c0-1.4-.5-2.7-1.4-3.7-1-1.2-1.6-2.2-1.6-3.8 0-1.9-1.2-3.3-3-3.3Z", + "M11.4 1.8h1.3l-.1 2.9h-1.2Z", + "M13.4 4c.9-1.4 2.5-2 4.1-1.5-.6 1.6-2.3 2.3-4.1 1.5Z", + ], + Icon::Grapes => &[ + "M5.1 8.5a2.1 2.1 0 1 0 4.2 0 2.1 2.1 0 1 0-4.2 0Z", + "M9.9 8.5a2.1 2.1 0 1 0 4.2 0 2.1 2.1 0 1 0-4.2 0Z", + "M14.7 8.5a2.1 2.1 0 1 0 4.2 0 2.1 2.1 0 1 0-4.2 0Z", + "M7.5 12.7a2.1 2.1 0 1 0 4.2 0 2.1 2.1 0 1 0-4.2 0Z", + "M12.3 12.7a2.1 2.1 0 1 0 4.2 0 2.1 2.1 0 1 0-4.2 0Z", + "M9.9 16.9a2.1 2.1 0 1 0 4.2 0 2.1 2.1 0 1 0-4.2 0Z", + "M11.4 2h1.3v4.1h-1.3Z", + "M13.2 5c1-1.7 3-2.5 5-2-.8 1.8-2.8 2.7-5 2Z", + ], + Icon::Strawberry => &[ + "M5 9.6c0-1 1-1.6 2.6-1.6h8.8c1.6 0 2.6.6 2.6 1.6 0 4.6-3.4 10.6-7 11.9-3.6-1.3-7-7.3-7-11.9Zm4 1.9a.7.7 0 1 0 0-.01Zm6 0a.7.7 0 1 0 0-.01ZM12 13a.7.7 0 1 0 0-.01Zm-2.2 2.8a.7.7 0 1 0 0-.01Zm4.4 0a.7.7 0 1 0 0-.01Z", + "M6.8 6.9c1.4-.9 3-1 4.3-.4L12 3.8l.9 2.7c1.3-.6 2.9-.5 4.3.4-1.4.5-3.2.8-5.2.8s-3.8-.3-5.2-.8Z", + ], + Icon::Cherries => &[ + "M3.9 17a3.6 3.6 0 1 0 7.2 0 3.6 3.6 0 1 0-7.2 0Z", + "M12.4 17.4a3.6 3.6 0 1 0 7.2 0 3.6 3.6 0 1 0-7.2 0Z", + "M7 13.4c.6-3.6 2.4-7 5.6-9.6l.9 1c-3 2.4-4.6 5.5-5.2 8.8Z", + "M13.2 4.4c1.4 2.6 2.4 6 2.7 9.5l-1.3.1c-.3-3.3-1.2-6.5-2.5-8.9Z", + "M13.6 4c1.4-1.6 3.8-2.2 6-1.4-1.2 1.9-3.6 2.6-6 1.4Z", + ], + Icon::Avocado => &[ + "M12 2.5c-2.5 0-3.6 2.4-4.2 5-.5 2-2.3 3.5-2.3 6.5a6.5 6.5 0 0 0 13 0c0-3-1.8-4.5-2.3-6.5-.6-2.6-1.7-5-4.2-5Zm-3 12a3 3 0 1 0 6 0 3 3 0 1 0-6 0Z", + ], + Icon::Tomato => &[ + "M4.5 14.5a7.5 6.5 0 1 0 15 0 7.5 6.5 0 1 0-15 0Z", + "M11.3 2h1.4v3.5h-1.4Z", + "M6.5 7c1.8-1.6 3.8-2 5.5-1.2C13.7 5 15.7 5.4 17.5 7c-2 .6-3.9.5-5.5-.2-1.6.7-3.5.8-5.5.2Z", + ], Icon::Carrot => &[ "M14.8 9.2c-1.3-1.3-3.4-1.3-4.7 0L3.3 19.4c-.4.6.3 1.3.9.9l10.2-6.8c1.6-1.1 1.8-3.3.4-4.3Z", "M15.5 8.5c.2-2 1.2-4.2 3-5.3l.8 1.2c-1.2.8-2 2.3-2.3 3.8 1.5-.3 3-1 3.9-2.2l1.1.9c-1.2 1.8-3.8 2.8-6.5 1.6Z", ], - Icon::Lemon => &[ - "M19.6 6.5c.9-.4 1.1-1.6.4-2.3-.7-.7-1.9-.5-2.3.4-3.4-1.6-8-.4-10.9 2.5S2.6 13.8 4.2 17.2c-.9.4-1.1 1.6-.4 2.3.7.7 1.9.5 2.3-.4 3.4 1.6 8 .4 10.9-2.5s4.2-6.7 2.6-10.1Z", + Icon::Salad => &[ + "M3.5 20.5c0-9.5 5.3-16.5 17-16.5 0 11.5-7.4 16.5-17 16.5Zm2.6-1.6 9.6-10.6-.9-.8-9.6 10.6Z", ], - Icon::Glass => &[ - "M5 3h14l-1.6 16.2A2 2 0 0 1 15.4 21H8.6a2 2 0 0 1-2-1.8Z", + Icon::Onion => &[ + "M12 2.5c.4 2 2 3.3 3.9 4.6 2.3 1.6 4.1 3.6 4.1 6.7 0 4-3.6 6.7-8 6.7s-8-2.7-8-6.7c0-3.1 1.8-5.1 4.1-6.7C10 5.8 11.6 4.5 12 2.5Zm-.9 8.5c-.6 2.8-.6 5.5 0 8h1c-.5-2.5-.5-5.2 0-8Z", + "M9.5 21.2h5V22h-5Z", + ], + Icon::Potato => &[ + "M6.2 6.4C8.7 3.9 13 3.5 16.4 5.2c3.6 1.8 5 5.4 3.8 8.8-1.3 3.7-5 6.4-9.3 6.5-4.4.1-7.6-2.5-7.7-6.2-.1-2.7 1-5.8 3-7.9ZM9 9.2a.9.9 0 1 0 0-.01Zm6.2-.6a.8.8 0 1 0 0-.01Zm-1.8 6.2a.9.9 0 1 0 0-.01ZM8 15a.7.7 0 1 0 0-.01Z", + ], + Icon::Mushroom => &[ + "M3 12C3 6.8 7 3.5 12 3.5s9 3.3 9 8.5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1Z", + "M9 14.5h6l.8 5.2a1.6 1.6 0 0 1-1.6 1.8H9.8a1.6 1.6 0 0 1-1.6-1.8Z", ], Icon::Milk => &[ "M8 2h8v3l2 3.5V20a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2V8.5L8 5Z", ], + Icon::Egg => &[ + "M12 2.5c-3.6 0-7 6.3-7 11.2A7 7 0 0 0 12 21a7 7 0 0 0 7-7.3c0-4.9-3.4-11.2-7-11.2Z", + ], + Icon::Cheese => &[ + "M2.5 11 14 4.5c2.8.3 5.7 2.5 7.5 6.5v8a1 1 0 0 1-1 1h-17a1 1 0 0 1-1-1Zm6 4a1.5 1.5 0 1 0 0-.01Zm8-1.5a1 1 0 1 0 0-.01Z", + ], + Icon::Yogurt => &[ + "M4 3h16v2.2H4Z", + "M5 6.5h14l-1.5 13a2 2 0 0 1-2 1.8h-7a2 2 0 0 1-2-1.8Z", + ], Icon::IceCream => &[ "M12 2a5 5 0 0 0-4.9 4A3.5 3.5 0 0 0 7.5 13h9a3.5 3.5 0 0 0 .4-7A5 5 0 0 0 12 2Z", "M8 14h8l-3.3 7.4a.8.8 0 0 1-1.4 0Z", ], - Icon::Cheese => &[ - "M2.5 11 14 4.5c2.8.3 5.7 2.5 7.5 6.5v8a1 1 0 0 1-1 1h-17a1 1 0 0 1-1-1Zm6 4a1.5 1.5 0 1 0 0-.01Zm8-1.5a1 1 0 1 0 0-.01Z", + Icon::Frozen => &[ + "M11.2 2 12.8 2 12.8 22 11.2 22Z", + "M20.26 6.31 21.06 7.69 3.74 17.69 2.94 16.31Z", + "M21.06 16.31 20.26 17.69 2.94 7.69 3.74 6.31Z", + "M12 5.6 15.4 3 16.2 4.1 12 7.4Z", + "M12 7.4 7.8 4.1 8.6 3 12 5.6Z", + "M17.54 8.8 21.49 10.44 20.94 11.69 15.98 9.7Z", + "M15.98 9.7 16.74 4.41 18.09 4.56 17.54 8.8Z", + "M17.54 15.2 18.09 19.44 16.74 19.59 15.98 14.3Z", + "M15.98 14.3 20.94 12.31 21.49 13.56 17.54 15.2Z", + "M12 18.4 8.6 21 7.8 19.9 12 16.6Z", + "M12 16.6 16.2 19.9 15.4 21 12 18.4Z", + "M6.46 15.2 2.51 13.56 3.06 12.31 8.02 14.3Z", + "M8.02 14.3 7.26 19.59 5.91 19.44 6.46 15.2Z", + "M6.46 8.8 5.91 4.56 7.26 4.41 8.02 9.7Z", + "M8.02 9.7 3.06 11.69 2.51 10.44 6.46 8.8Z", ], - Icon::Egg => &[ - "M12 2.5c-3.6 0-7 6.3-7 11.2A7 7 0 0 0 12 21a7 7 0 0 0 7-7.3c0-4.9-3.4-11.2-7-11.2Z", + Icon::Meat => &[ + "M14.5 3.5c3.6 0 6 2.7 6 6 0 4.4-4.6 8-8.5 8-1.1 0-2 .4-2.6 1.1l-1.7 2a1.8 1.8 0 1 1-2.6-2.4l.3-.3a1.8 1.8 0 1 1 1.1-3.3c.9-.6 1.4-1.6 1.4-2.7 0-4 3-8.4 6.6-8.4Z", ], - Icon::Coffee => &[ - "M3 6h13v6a6 6 0 0 1-6 6H9a6 6 0 0 1-6-6Zm13 1.5h1.5a3 3 0 0 1 0 6h-1.8l.3-2h1.5a1 1 0 0 0 0-2H16Z", - "M3 20h13v1.8H3Z", + Icon::Fish => &[ + "M2 12c2.5-3.6 6-5.5 9.6-5.5 3.7 0 6.6 2.4 8 5.5-1.4 3.1-4.3 5.5-8 5.5C8 17.5 4.5 15.6 2 12Zm14.5-1.2a1.2 1.2 0 1 0 0 .01Z", + "M20.5 12 23 8v8Z", ], Icon::Bread => &[ "M12 3C6.5 3 3 5.3 3 8.3c0 1.4 1 2.4 2 2.7V19a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-8c1-.3 2-1.3 2-2.7C21 5.3 17.5 3 12 3Z", @@ -49,20 +118,75 @@ fn paths(icon: Icon) -> &'static [&'static str] { "M8.3 6.6 6.8 15H4.5L3 9.6Zm7.4 0 5.3 3-1.5 5.4h-2.3Z", "M2 11.5 4 17H2.5L1 13Zm20 0L23 13l-1.5 4H20Z", ], + Icon::Cake => &[ + "M12 1c1 1.2 1.5 2 1.5 2.7a1.5 1.5 0 0 1-3 0c0-.7.5-1.5 1.5-2.7Z", + "M11.2 6h1.6v3.2h-1.6Z", + "M6 10.5h12a2 2 0 0 1 2 2V15H4v-2.5a2 2 0 0 1 2-2Z", + "M4 16.5h16V21H4Z", + ], + Icon::Cookie => &[ + "M3 12a9 9 0 1 0 18 0 9 9 0 1 0-18 0Zm5-2.5a1.3 1.3 0 1 0 0-.01Zm6-3a1.1 1.1 0 1 0 0-.01Zm2.5 6a1.3 1.3 0 1 0 0-.01Zm-5.5 3a1.2 1.2 0 1 0 0-.01Zm.5-5a.9.9 0 1 0 0-.01Z", + ], + Icon::Pizza => &[ + "M3 6c5.8-3 12.2-3 18 0l-9 16Zm1.3 2.2c5.1-2.4 10.3-2.4 15.4 0l.5-.9c-5.4-2.6-11-2.6-16.4 0ZM10 11.2a1.3 1.3 0 1 0 0-.01Zm4.2.4a1.1 1.1 0 1 0 0-.01ZM12 15.5a1.1 1.1 0 1 0 0-.01Z", + ], Icon::Pasta => &[ "M4 10h16v2a8 8 0 0 1-16 0Z", "M7 9c0-3 1.5-6 3-7l1 .6C9.8 4 9 6.4 9 9Zm4 0c0-3 1.5-6 3-7l1 .6c-1.2 1.4-2 3.8-2 6.4Z", ], - Icon::Meat => &[ - "M14.5 3.5c3.6 0 6 2.7 6 6 0 4.4-4.6 8-8.5 8-1.1 0-2 .4-2.6 1.1l-1.7 2a1.8 1.8 0 1 1-2.6-2.4l.3-.3a1.8 1.8 0 1 1 1.1-3.3c.9-.6 1.4-1.6 1.4-2.7 0-4 3-8.4 6.6-8.4Z", + Icon::Can => &[ + "M5 5.5C5 4 8.1 3 12 3s7 1 7 2.5v13C19 20 15.9 21 12 21s-7-1-7-2.5Zm0 1.2c1.6 1 4 1.5 7 1.5s5.4-.5 7-1.5V8c-1.6 1-4 1.5-7 1.5S6.6 9 5 8Zm0 9c1.6 1 4 1.5 7 1.5s5.4-.5 7-1.5V17c-1.6 1-4 1.5-7 1.5S6.6 18 5 17Z", ], - Icon::Fish => &[ - "M2 12c2.5-3.6 6-5.5 9.6-5.5 3.7 0 6.6 2.4 8 5.5-1.4 3.1-4.3 5.5-8 5.5C8 17.5 4.5 15.6 2 12Zm14.5-1.2a1.2 1.2 0 1 0 0 .01Z", - "M20.5 12 23 8v8Z", + Icon::Jar => &[ + "M7 2.5h10v3H7Z", + "M7.5 6.5h9L18 9v10a2.5 2.5 0 0 1-2.5 2.5h-7A2.5 2.5 0 0 1 6 19V9Zm1 5v5h7v-5Z", + ], + Icon::Chocolate => &[ + "M6 3h5.3v5.3H5V4a1 1 0 0 1 1-1Z", + "M12.7 3H18a1 1 0 0 1 1 1v4.3h-6.3Z", + "M5 9.6h6.3v5.3H5Z", + "M12.7 9.6H19v5.3h-6.3Z", + "M5 16.2h6.3V21H6a1 1 0 0 1-1-1Z", + "M12.7 16.2H19V20a1 1 0 0 1-1 1h-5.3Z", + ], + Icon::Candy => &[ + "M7.5 12a4.5 4.5 0 1 0 9 0 4.5 4.5 0 1 0-9 0Z", + "M2 8l5.2 2.4v3.2L2 16Z", + "M22 8l-5.2 2.4v3.2L22 16Z", + ], + Icon::Coffee => &[ + "M3 6h13v6a6 6 0 0 1-6 6H9a6 6 0 0 1-6-6Zm13 1.5h1.5a3 3 0 0 1 0 6h-1.8l.3-2h1.5a1 1 0 0 0 0-2H16Z", + "M3 20h13v1.8H3Z", + ], + Icon::Water => &[ + "M12 2.5C9 7 5.5 10.7 5.5 14.5a6.5 6.5 0 0 0 13 0C18.5 10.7 15 7 12 2.5Z", + ], + Icon::Glass => &[ + "M5 3h14l-1.6 16.2A2 2 0 0 1 15.4 21H8.6a2 2 0 0 1-2-1.8Z", ], Icon::Bottle => &[ "M10 2h4v4.5c2 1 3 2.7 3 4.8V20a2 2 0 0 1-2 2H9a2 2 0 0 1-2-2v-8.7c0-2.1 1-3.8 3-4.8Z", ], + Icon::Wine => &[ + "M6.5 2h11l.4 4.5c.5 3.6-2 6.6-5.2 7V19H16v2H8v-2h3.3v-5.5c-3.2-.4-5.7-3.4-5.2-7Z", + ], + Icon::Spray => &[ + "M7.5 3h8.5l3 2v2h-3v1.2H8Z", + "M15.3 8.8l2.7 3-1 .8-2.5-2.7Z", + "M8 9.5h6.5l1 2.5V20a1.5 1.5 0 0 1-1.5 1.5H8.5A1.5 1.5 0 0 1 7 20v-8Z", + ], + Icon::BabyBottle => &[ + "M10.5 5c0-1.5.6-3 1.5-3s1.5 1.5 1.5 3Z", + "M8.5 6h7v2.5h-7Z", + "M9 9.5h6l.5 1.5v9a1.5 1.5 0 0 1-1.5 1.5h-4A1.5 1.5 0 0 1 8.5 20v-9Zm-.5 3.5h3v.9h-3Zm0 3h3v.9h-3Z", + ], + Icon::Paw => &[ + "M12 11.5c-2.6 0-5.5 3.2-5.5 6 0 1.8 1.3 3 3 3 1 0 1.6-.4 2.5-.4s1.5.4 2.5.4c1.7 0 3-1.2 3-3 0-2.8-2.9-6-5.5-6Z", + "M3.2 10.5a1.8 2.3 0 1 0 3.6 0 1.8 2.3 0 1 0-3.6 0Z", + "M7.1 6.2a1.9 2.5 0 1 0 3.8 0 1.9 2.5 0 1 0-3.8 0Z", + "M13.1 6.2a1.9 2.5 0 1 0 3.8 0 1.9 2.5 0 1 0-3.8 0Z", + "M17.2 10.5a1.8 2.3 0 1 0 3.6 0 1.8 2.3 0 1 0-3.6 0Z", + ], Icon::Basket => &[ "M7.6 9 11 3.4l1.3.8L9.3 9h5.4l-3-4.8 1.3-.8L16.4 9H22l-2 10.5a2 2 0 0 1-2 1.5H6a2 2 0 0 1-2-1.5L2 9Z", ], @@ -73,20 +197,44 @@ pub fn icon_label(icon: Icon) -> &'static str { match icon { Icon::Apple => "Pomme", Icon::Banana => "Banane", - Icon::Carrot => "Carotte", Icon::Lemon => "Citron", - Icon::Glass => "Verre", + Icon::Pear => "Poire", + Icon::Grapes => "Raisin", + Icon::Strawberry => "Fraise", + Icon::Cherries => "Cerises", + Icon::Avocado => "Avocat", + Icon::Tomato => "Tomate", + Icon::Carrot => "Carotte", + Icon::Salad => "Salade", + Icon::Onion => "Oignon", + Icon::Potato => "Pomme de terre", + Icon::Mushroom => "Champignon", Icon::Milk => "Brique de lait", - Icon::IceCream => "Glace", - Icon::Cheese => "Fromage", Icon::Egg => "Œuf", - Icon::Coffee => "Café", - Icon::Bread => "Pain", - Icon::Croissant => "Viennoiserie", - Icon::Pasta => "Pâtes", + Icon::Cheese => "Fromage", + Icon::Yogurt => "Yaourt", + Icon::IceCream => "Glace", + Icon::Frozen => "Surgelés", Icon::Meat => "Viande", Icon::Fish => "Poisson", + Icon::Bread => "Pain", + Icon::Croissant => "Viennoiserie", + Icon::Cake => "Gâteau", + Icon::Cookie => "Biscuit", + Icon::Pizza => "Pizza", + Icon::Pasta => "Pâtes", + Icon::Can => "Conserve", + Icon::Jar => "Bocal", + Icon::Chocolate => "Chocolat", + Icon::Candy => "Bonbon", + Icon::Coffee => "Café", + Icon::Water => "Eau", + Icon::Glass => "Verre", Icon::Bottle => "Bouteille", + Icon::Wine => "Vin", + Icon::Spray => "Produit ménager", + Icon::BabyBottle => "Bébé", + Icon::Paw => "Animaux", Icon::Basket => "Panier", } } diff --git a/src/model.rs b/src/model.rs index 5aa8715..7890529 100644 --- a/src/model.rs +++ b/src/model.rs @@ -245,40 +245,88 @@ impl Category { pub enum Icon { Apple, Banana, - Carrot, Lemon, - Glass, + Pear, + Grapes, + Strawberry, + Cherries, + Avocado, + Tomato, + Carrot, + Salad, + Onion, + Potato, + Mushroom, Milk, - IceCream, - Cheese, Egg, - Coffee, - Bread, - Croissant, - Pasta, + Cheese, + Yogurt, + IceCream, + Frozen, Meat, Fish, + Bread, + Croissant, + Cake, + Cookie, + Pizza, + Pasta, + Can, + Jar, + Chocolate, + Candy, + Coffee, + Water, + Glass, Bottle, + Wine, + Spray, + BabyBottle, + Paw, Basket, } text_enum!(Icon { Apple => "apple", Banana => "banana", - Carrot => "carrot", Lemon => "lemon", - Glass => "glass", + Pear => "pear", + Grapes => "grapes", + Strawberry => "strawberry", + Cherries => "cherries", + Avocado => "avocado", + Tomato => "tomato", + Carrot => "carrot", + Salad => "salad", + Onion => "onion", + Potato => "potato", + Mushroom => "mushroom", Milk => "milk", - IceCream => "ice_cream", - Cheese => "cheese", Egg => "egg", - Coffee => "coffee", - Bread => "bread", - Croissant => "croissant", - Pasta => "pasta", + Cheese => "cheese", + Yogurt => "yogurt", + IceCream => "ice_cream", + Frozen => "frozen", Meat => "meat", Fish => "fish", + Bread => "bread", + Croissant => "croissant", + Cake => "cake", + Cookie => "cookie", + Pizza => "pizza", + Pasta => "pasta", + Can => "can", + Jar => "jar", + Chocolate => "chocolate", + Candy => "candy", + Coffee => "coffee", + Water => "water", + Glass => "glass", Bottle => "bottle", + Wine => "wine", + Spray => "spray", + BabyBottle => "baby_bottle", + Paw => "paw", Basket => "basket", });