diff --git a/VGApp/Assets.xcassets/apple.imageset/Contents.json b/VGApp/Assets.xcassets/apple.imageset/Contents.json index 0fcd2b1..991247c 100644 --- a/VGApp/Assets.xcassets/apple.imageset/Contents.json +++ b/VGApp/Assets.xcassets/apple.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "apple.png", + "filename" : "svg_29732.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/apple.imageset/apple.png b/VGApp/Assets.xcassets/apple.imageset/apple.png deleted file mode 100644 index 22e3a7f..0000000 Binary files a/VGApp/Assets.xcassets/apple.imageset/apple.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/apple.imageset/svg_29732.svg b/VGApp/Assets.xcassets/apple.imageset/svg_29732.svg new file mode 100644 index 0000000..4583826 --- /dev/null +++ b/VGApp/Assets.xcassets/apple.imageset/svg_29732.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/avocado.imageset/Contents.json b/VGApp/Assets.xcassets/avocado.imageset/Contents.json index 9960d83..e0da9b5 100644 --- a/VGApp/Assets.xcassets/avocado.imageset/Contents.json +++ b/VGApp/Assets.xcassets/avocado.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "avocado.png", + "filename" : "untitled.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/avocado.imageset/avocado.png b/VGApp/Assets.xcassets/avocado.imageset/avocado.png deleted file mode 100644 index 294c100..0000000 Binary files a/VGApp/Assets.xcassets/avocado.imageset/avocado.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/avocado.imageset/untitled.svg b/VGApp/Assets.xcassets/avocado.imageset/untitled.svg new file mode 100644 index 0000000..b12fc04 --- /dev/null +++ b/VGApp/Assets.xcassets/avocado.imageset/untitled.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/banana.imageset/Contents.json b/VGApp/Assets.xcassets/banana.imageset/Contents.json index 33c7c0a..e0da9b5 100644 --- a/VGApp/Assets.xcassets/banana.imageset/Contents.json +++ b/VGApp/Assets.xcassets/banana.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "banana.png", + "filename" : "untitled.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/banana.imageset/banana.png b/VGApp/Assets.xcassets/banana.imageset/banana.png deleted file mode 100644 index fb434f3..0000000 Binary files a/VGApp/Assets.xcassets/banana.imageset/banana.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/banana.imageset/untitled.svg b/VGApp/Assets.xcassets/banana.imageset/untitled.svg new file mode 100644 index 0000000..0a3cefd --- /dev/null +++ b/VGApp/Assets.xcassets/banana.imageset/untitled.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/brocolli.imageset/Contents.json b/VGApp/Assets.xcassets/brocolli.imageset/Contents.json index 3af4615..e0da9b5 100644 --- a/VGApp/Assets.xcassets/brocolli.imageset/Contents.json +++ b/VGApp/Assets.xcassets/brocolli.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "brocolli.png", + "filename" : "untitled.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/brocolli.imageset/brocolli.png b/VGApp/Assets.xcassets/brocolli.imageset/brocolli.png deleted file mode 100644 index 7250b10..0000000 Binary files a/VGApp/Assets.xcassets/brocolli.imageset/brocolli.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/brocolli.imageset/untitled.svg b/VGApp/Assets.xcassets/brocolli.imageset/untitled.svg new file mode 100644 index 0000000..da5036f --- /dev/null +++ b/VGApp/Assets.xcassets/brocolli.imageset/untitled.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/carrot.imageset/Contents.json b/VGApp/Assets.xcassets/carrot.imageset/Contents.json index c347ac7..ddb1704 100644 --- a/VGApp/Assets.xcassets/carrot.imageset/Contents.json +++ b/VGApp/Assets.xcassets/carrot.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "carrot.png", + "filename" : "carrot-solid.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/carrot.imageset/carrot-solid.svg b/VGApp/Assets.xcassets/carrot.imageset/carrot-solid.svg new file mode 100644 index 0000000..4de83c2 --- /dev/null +++ b/VGApp/Assets.xcassets/carrot.imageset/carrot-solid.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/carrot.imageset/carrot.png b/VGApp/Assets.xcassets/carrot.imageset/carrot.png deleted file mode 100644 index 2b877c3..0000000 Binary files a/VGApp/Assets.xcassets/carrot.imageset/carrot.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/cherry.imageset/Contents.json b/VGApp/Assets.xcassets/cherry.imageset/Contents.json index e19d97e..28e0ebe 100644 --- a/VGApp/Assets.xcassets/cherry.imageset/Contents.json +++ b/VGApp/Assets.xcassets/cherry.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "cherry.png", + "filename" : "svg_36911.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/cherry.imageset/cherry.png b/VGApp/Assets.xcassets/cherry.imageset/cherry.png deleted file mode 100644 index 8a84324..0000000 Binary files a/VGApp/Assets.xcassets/cherry.imageset/cherry.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/cherry.imageset/svg_36911.svg b/VGApp/Assets.xcassets/cherry.imageset/svg_36911.svg new file mode 100644 index 0000000..a92c368 --- /dev/null +++ b/VGApp/Assets.xcassets/cherry.imageset/svg_36911.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/citrus.imageset/citrus.png b/VGApp/Assets.xcassets/citrus.imageset/citrus.png deleted file mode 100644 index f830734..0000000 Binary files a/VGApp/Assets.xcassets/citrus.imageset/citrus.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/grapes.imageset/Contents.json b/VGApp/Assets.xcassets/grapes.imageset/Contents.json index b6201dc..7c1fe1f 100644 --- a/VGApp/Assets.xcassets/grapes.imageset/Contents.json +++ b/VGApp/Assets.xcassets/grapes.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "grapes.png", + "filename" : "svg_36915.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/grapes.imageset/grapes.png b/VGApp/Assets.xcassets/grapes.imageset/grapes.png deleted file mode 100644 index 7966041..0000000 Binary files a/VGApp/Assets.xcassets/grapes.imageset/grapes.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/grapes.imageset/svg_36915.svg b/VGApp/Assets.xcassets/grapes.imageset/svg_36915.svg new file mode 100644 index 0000000..d0f126b --- /dev/null +++ b/VGApp/Assets.xcassets/grapes.imageset/svg_36915.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/citrus.imageset/Contents.json b/VGApp/Assets.xcassets/lemon.imageset/Contents.json similarity index 88% rename from VGApp/Assets.xcassets/citrus.imageset/Contents.json rename to VGApp/Assets.xcassets/lemon.imageset/Contents.json index 35e85da..9f067be 100644 --- a/VGApp/Assets.xcassets/citrus.imageset/Contents.json +++ b/VGApp/Assets.xcassets/lemon.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "citrus.png", + "filename" : "svg_8999.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/lemon.imageset/svg_8999.svg b/VGApp/Assets.xcassets/lemon.imageset/svg_8999.svg new file mode 100644 index 0000000..526cab4 --- /dev/null +++ b/VGApp/Assets.xcassets/lemon.imageset/svg_8999.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/orange.imageset/Contents.json b/VGApp/Assets.xcassets/orange.imageset/Contents.json index 724afb0..84e661d 100644 --- a/VGApp/Assets.xcassets/orange.imageset/Contents.json +++ b/VGApp/Assets.xcassets/orange.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "orange.png", + "filename" : "svg_23090.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/orange.imageset/orange.png b/VGApp/Assets.xcassets/orange.imageset/orange.png deleted file mode 100644 index c05835c..0000000 Binary files a/VGApp/Assets.xcassets/orange.imageset/orange.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/orange.imageset/svg_23090.svg b/VGApp/Assets.xcassets/orange.imageset/svg_23090.svg new file mode 100644 index 0000000..54b4841 --- /dev/null +++ b/VGApp/Assets.xcassets/orange.imageset/svg_23090.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/paprika.imageset/paprika.png b/VGApp/Assets.xcassets/paprika.imageset/paprika.png deleted file mode 100644 index 2cd36bb..0000000 Binary files a/VGApp/Assets.xcassets/paprika.imageset/paprika.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/pear.imageset/Contents.json b/VGApp/Assets.xcassets/pear.imageset/Contents.json index 13ffb9b..18e9947 100644 --- a/VGApp/Assets.xcassets/pear.imageset/Contents.json +++ b/VGApp/Assets.xcassets/pear.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "pear.png", + "filename" : "untitled-2.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/pear.imageset/pear.png b/VGApp/Assets.xcassets/pear.imageset/pear.png deleted file mode 100644 index ff72f21..0000000 Binary files a/VGApp/Assets.xcassets/pear.imageset/pear.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/pear.imageset/untitled-2.svg b/VGApp/Assets.xcassets/pear.imageset/untitled-2.svg new file mode 100644 index 0000000..ee215c8 --- /dev/null +++ b/VGApp/Assets.xcassets/pear.imageset/untitled-2.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/paprika.imageset/Contents.json b/VGApp/Assets.xcassets/pepper.imageset/Contents.json similarity index 88% rename from VGApp/Assets.xcassets/paprika.imageset/Contents.json rename to VGApp/Assets.xcassets/pepper.imageset/Contents.json index 35320b4..3c5135e 100644 --- a/VGApp/Assets.xcassets/paprika.imageset/Contents.json +++ b/VGApp/Assets.xcassets/pepper.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "paprika.png", + "filename" : "svg_12372.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/pepper.imageset/svg_12372.svg b/VGApp/Assets.xcassets/pepper.imageset/svg_12372.svg new file mode 100644 index 0000000..15b71ff --- /dev/null +++ b/VGApp/Assets.xcassets/pepper.imageset/svg_12372.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/strawberry.imageset/Contents.json b/VGApp/Assets.xcassets/strawberry.imageset/Contents.json index 9386237..29ebbd9 100644 --- a/VGApp/Assets.xcassets/strawberry.imageset/Contents.json +++ b/VGApp/Assets.xcassets/strawberry.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "strawberry.png", + "filename" : "untitled-3.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/strawberry.imageset/strawberry.png b/VGApp/Assets.xcassets/strawberry.imageset/strawberry.png deleted file mode 100644 index ca0b70a..0000000 Binary files a/VGApp/Assets.xcassets/strawberry.imageset/strawberry.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/strawberry.imageset/untitled-3.svg b/VGApp/Assets.xcassets/strawberry.imageset/untitled-3.svg new file mode 100644 index 0000000..76e4a19 --- /dev/null +++ b/VGApp/Assets.xcassets/strawberry.imageset/untitled-3.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/VGApp/Assets.xcassets/tomato.imageset/Contents.json b/VGApp/Assets.xcassets/tomato.imageset/Contents.json index 17154fd..e0da9b5 100644 --- a/VGApp/Assets.xcassets/tomato.imageset/Contents.json +++ b/VGApp/Assets.xcassets/tomato.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "tomato.png", + "filename" : "untitled.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/VGApp/Assets.xcassets/tomato.imageset/tomato.png b/VGApp/Assets.xcassets/tomato.imageset/tomato.png deleted file mode 100644 index b3ab7bd..0000000 Binary files a/VGApp/Assets.xcassets/tomato.imageset/tomato.png and /dev/null differ diff --git a/VGApp/Assets.xcassets/tomato.imageset/untitled.svg b/VGApp/Assets.xcassets/tomato.imageset/untitled.svg new file mode 100644 index 0000000..e6232cd --- /dev/null +++ b/VGApp/Assets.xcassets/tomato.imageset/untitled.svg @@ -0,0 +1,7 @@ + + + + Layer 1 + + + \ No newline at end of file diff --git a/VGApp/Util/IconManager.swift b/VGApp/Util/IconManager.swift index 8dbc82d..44f8f9d 100644 --- a/VGApp/Util/IconManager.swift +++ b/VGApp/Util/IconManager.swift @@ -13,8 +13,9 @@ let icons: [String: Image] = [ "avocado": Image("avocado"), "banana": Image("banana"), "brocolli": Image("brocolli"), + "pepper": Image("pepper"), "cherry": Image("cherry"), - "citrus": Image("citrus"), + "lemon": Image("lemon"), "grapes": Image("grapes"), "orange": Image("orange"), "pear": Image("pear"), @@ -34,9 +35,10 @@ let names: [String: [String]] = [ "banana": ["banane", "bananen"], "brocolli": ["brokkoli"], "cherry": ["kirsche", "kirschen"], - "citrus": ["zitrone", "zitronen"], + "lemon": ["zitrone", "zitronen"], "grapes": ["trauben", "weintrauben"], "orange": ["orange", "orangen"], + "pepper": ["paprika", "paprikas"], "pear": ["birne", "birnen"], "strawberry": ["erdbeere", "erdbeeren"], "tomato": ["tomate", "tomaten"],