diff --git a/AVIRO.xcodeproj/project.pbxproj b/AVIRO.xcodeproj/project.pbxproj index d794fdf9..b499eaf4 100644 --- a/AVIRO.xcodeproj/project.pbxproj +++ b/AVIRO.xcodeproj/project.pbxproj @@ -2423,8 +2423,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; + CURRENT_PROJECT_VERSION = 1.2.1; DEVELOPMENT_TEAM = C4K2HXA435; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = AVIRO/App/Info.plist; @@ -2442,9 +2443,10 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.1; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = SeonghunJeon.VeganRestaurant; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -2458,8 +2460,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = AVIRO/AVIRO.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; + CURRENT_PROJECT_VERSION = 1.2.1; DEVELOPMENT_TEAM = C4K2HXA435; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = AVIRO/App/Info.plist; @@ -2477,9 +2480,10 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.1; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = SeonghunJeon.VeganRestaurant; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; diff --git a/AVIRO.xcodeproj/project.xcworkspace/xcuserdata/jeonseonghun.xcuserdatad/UserInterfaceState.xcuserstate b/AVIRO.xcodeproj/project.xcworkspace/xcuserdata/jeonseonghun.xcuserdatad/UserInterfaceState.xcuserstate index 2fa856da..4793704c 100644 Binary files a/AVIRO.xcodeproj/project.xcworkspace/xcuserdata/jeonseonghun.xcuserdatad/UserInterfaceState.xcuserstate and b/AVIRO.xcodeproj/project.xcworkspace/xcuserdata/jeonseonghun.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar.png new file mode 100644 index 00000000..cbb83c7b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar@2x.png new file mode 100644 index 00000000..da85c31d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar@3x.png new file mode 100644 index 00000000..860260c8 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/All_Box_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/Contents.json new file mode 100644 index 00000000..6d3fc450 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Box_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Box_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Box_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread.png new file mode 100644 index 00000000..c492f3eb Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread@2x.png new file mode 100644 index 00000000..79880a7d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread@3x.png new file mode 100644 index 00000000..73029265 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/All_Box_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/Contents.json new file mode 100644 index 00000000..a366b29e --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Box_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Box_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Box_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee.png new file mode 100644 index 00000000..1ca24fd1 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee@2x.png new file mode 100644 index 00000000..fb682a10 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee@3x.png new file mode 100644 index 00000000..416f7191 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/All_Box_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/Contents.json new file mode 100644 index 00000000..a62e0bec --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Box_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Box_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Box_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant.png new file mode 100644 index 00000000..f5aeeafd Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant@2x.png new file mode 100644 index 00000000..e9aecb14 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant@3x.png new file mode 100644 index 00000000..0ff721b6 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/All_Box_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..87c49d78 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Box_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Box_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Box_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Box_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar.png new file mode 100644 index 00000000..6c8daeae Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar@2x.png new file mode 100644 index 00000000..380e839d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar@3x.png new file mode 100644 index 00000000..274f1c91 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/All_Clicked_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/Contents.json new file mode 100644 index 00000000..52166872 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Clicked_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Clicked_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Clicked_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread.png new file mode 100644 index 00000000..06799469 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread@2x.png new file mode 100644 index 00000000..599999d6 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread@3x.png new file mode 100644 index 00000000..a417e414 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/All_Clicked_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/Contents.json new file mode 100644 index 00000000..dc3c59c7 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Clicked_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Clicked_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Clicked_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee.png new file mode 100644 index 00000000..f2c13e91 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee@2x.png new file mode 100644 index 00000000..bee477d0 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee@3x.png new file mode 100644 index 00000000..128cf214 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/All_Clicked_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/Contents.json new file mode 100644 index 00000000..99f86c7a --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Clicked_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Clicked_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Clicked_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant.png new file mode 100644 index 00000000..57f9610b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant@2x.png new file mode 100644 index 00000000..678da53f Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant@3x.png new file mode 100644 index 00000000..51e2c9dd Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/All_Clicked_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..39f6ad8e --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Clicked_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Clicked_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Clicked_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Clicked_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar.png new file mode 100644 index 00000000..98f74fed Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar@2x.png new file mode 100644 index 00000000..32fb5147 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar@3x.png new file mode 100644 index 00000000..e81c1e55 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/All_Default_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/Contents.json new file mode 100644 index 00000000..a3b54d43 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Default_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Default_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Default_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread.png new file mode 100644 index 00000000..fdcfd36b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread@2x.png new file mode 100644 index 00000000..8ad47923 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread@3x.png new file mode 100644 index 00000000..7c95ebf7 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/All_Default_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/Contents.json new file mode 100644 index 00000000..70d79318 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Default_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Default_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Default_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee.png new file mode 100644 index 00000000..3be1f40d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee@2x.png new file mode 100644 index 00000000..a4ce6b62 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee@3x.png new file mode 100644 index 00000000..3bce30e6 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/All_Default_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/Contents.json new file mode 100644 index 00000000..f13f6163 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Default_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Default_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Default_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant.png new file mode 100644 index 00000000..c3221860 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant@2x.png new file mode 100644 index 00000000..982bae0f Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant@3x.png new file mode 100644 index 00000000..084263db Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/All_Default_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..907f4f10 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/All_Default_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "All_Default_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "All_Default_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "All_Default_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn.png new file mode 100644 index 00000000..7794b3b0 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn@2x.png new file mode 100644 index 00000000..2f3ba945 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn@3x.png new file mode 100644 index 00000000..fc47cb01 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Cancel_btn@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Contents.json new file mode 100644 index 00000000..e48d8e5a --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Cancel_btn.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Cancel_btn.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Cancel_btn@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Cancel_btn@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Contents.json new file mode 100644 index 00000000..fb93d49a --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Default_btn_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Default_btn_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Default_btn_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar.png new file mode 100644 index 00000000..132e4bdf Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar@2x.png new file mode 100644 index 00000000..57e8df43 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar@3x.png new file mode 100644 index 00000000..42bd6af9 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bar.imageset/Default_btn_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Contents.json new file mode 100644 index 00000000..d1ed7a26 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Default_btn_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Default_btn_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Default_btn_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread.png new file mode 100644 index 00000000..c37e630c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread@2x.png new file mode 100644 index 00000000..12b57515 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread@3x.png new file mode 100644 index 00000000..d11f9580 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Bread.imageset/Default_btn_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Contents.json new file mode 100644 index 00000000..e425002a --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Default_btn_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Default_btn_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Default_btn_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee.png new file mode 100644 index 00000000..c617088f Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee@2x.png new file mode 100644 index 00000000..b10fa8d0 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee@3x.png new file mode 100644 index 00000000..250f87a0 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Coffee.imageset/Default_btn_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..2c66fd3f --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Default_btn_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Default_btn_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Default_btn_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant.png new file mode 100644 index 00000000..617ee4ad Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant@2x.png new file mode 100644 index 00000000..8389c3a7 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant@3x.png new file mode 100644 index 00000000..77bf990a Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Default_btn_Restaurant.imageset/Default_btn_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Contents.json new file mode 100644 index 00000000..78462092 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Off_btn_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Off_btn_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Off_btn_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar.png new file mode 100644 index 00000000..1fa9c38b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar@2x.png new file mode 100644 index 00000000..f83adc0e Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar@3x.png new file mode 100644 index 00000000..fea1e4a8 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bar.imageset/Off_btn_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Contents.json new file mode 100644 index 00000000..ceabbab0 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Off_btn_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Off_btn_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Off_btn_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread.png new file mode 100644 index 00000000..9198285b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread@2x.png new file mode 100644 index 00000000..17b06090 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread@3x.png new file mode 100644 index 00000000..28d134ae Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Bread.imageset/Off_btn_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Contents.json new file mode 100644 index 00000000..4fc1c2cb --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Off_btn_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Off_btn_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Off_btn_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee.png new file mode 100644 index 00000000..77566a7c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee@2x.png new file mode 100644 index 00000000..9d93c536 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee@3x.png new file mode 100644 index 00000000..cf1ddb7d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Coffee.imageset/Off_btn_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..00b2adcb --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Off_btn_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Off_btn_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Off_btn_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant.png new file mode 100644 index 00000000..5204de0c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant@2x.png new file mode 100644 index 00000000..7875dc62 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant@3x.png new file mode 100644 index 00000000..2a8a08a5 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Off_btn_Restaurant.imageset/Off_btn_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/Contents.json new file mode 100644 index 00000000..ada9283e --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "On_btn_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "On_btn_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "On_btn_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar.png new file mode 100644 index 00000000..31db4e78 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar@2x.png new file mode 100644 index 00000000..06378536 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar@3x.png new file mode 100644 index 00000000..23f591c7 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bar.imageset/On_btn_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/Contents.json new file mode 100644 index 00000000..4989ea4d --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "On_btn_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "On_btn_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "On_btn_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread.png new file mode 100644 index 00000000..7e6d33ca Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread@2x.png new file mode 100644 index 00000000..9688c5b6 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread@3x.png new file mode 100644 index 00000000..5ffd9619 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Bread.imageset/On_btn_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/Contents.json new file mode 100644 index 00000000..4df598ea --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "On_btn_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "On_btn_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "On_btn_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee.png new file mode 100644 index 00000000..7faa96dc Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee@2x.png new file mode 100644 index 00000000..6028b3ce Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee@3x.png new file mode 100644 index 00000000..4f41ae27 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Coffee.imageset/On_btn_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..56bf14c9 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "On_btn_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "On_btn_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "On_btn_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant.png new file mode 100644 index 00000000..d3d5a17b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant@2x.png new file mode 100644 index 00000000..cef4d355 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant@3x.png new file mode 100644 index 00000000..02ed6ff9 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/On_btn_Restaurant.imageset/On_btn_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Contents.json new file mode 100644 index 00000000..59941a34 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Box_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Box_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Box_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar.png new file mode 100644 index 00000000..1d130b4c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar@2x.png new file mode 100644 index 00000000..1164d866 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar@3x.png new file mode 100644 index 00000000..3fdbd3c4 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bar.imageset/Request_Box_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Contents.json new file mode 100644 index 00000000..d8de7a5e --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Box_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Box_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Box_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread.png new file mode 100644 index 00000000..38cd0252 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread@2x.png new file mode 100644 index 00000000..e0b2f14d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread@3x.png new file mode 100644 index 00000000..145b7171 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Bread.imageset/Request_Box_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Contents.json new file mode 100644 index 00000000..028bfa03 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Box_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Box_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Box_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee.png new file mode 100644 index 00000000..0608dcca Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee@2x.png new file mode 100644 index 00000000..d5d65e98 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee@3x.png new file mode 100644 index 00000000..fce64159 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Coffee.imageset/Request_Box_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..06cb6517 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Box_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Box_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Box_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant.png new file mode 100644 index 00000000..d3d3d980 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant@2x.png new file mode 100644 index 00000000..20484dda Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant@3x.png new file mode 100644 index 00000000..21a87f81 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Box_Restaurant.imageset/Request_Box_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Contents.json new file mode 100644 index 00000000..90c4b222 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Clicked_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Clicked_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Clicked_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar.png new file mode 100644 index 00000000..e7f8c58e Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar@2x.png new file mode 100644 index 00000000..93ba501e Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar@3x.png new file mode 100644 index 00000000..0fdc3982 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bar.imageset/Request_Clicked_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Contents.json new file mode 100644 index 00000000..a9cdfd39 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Clicked_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Clicked_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Clicked_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread.png new file mode 100644 index 00000000..ac8a5529 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread@2x.png new file mode 100644 index 00000000..fdbfb8c3 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread@3x.png new file mode 100644 index 00000000..4db96066 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Bread.imageset/Request_Clicked_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Contents.json new file mode 100644 index 00000000..b29a7022 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Clicked_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Clicked_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Clicked_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee.png new file mode 100644 index 00000000..34f7c241 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee@2x.png new file mode 100644 index 00000000..8b17a525 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee@3x.png new file mode 100644 index 00000000..c1f1e4e7 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Coffee.imageset/Request_Clicked_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..c0658c7c --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Clicked_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Clicked_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Clicked_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant.png new file mode 100644 index 00000000..e400fda8 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant@2x.png new file mode 100644 index 00000000..523ee14b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant@3x.png new file mode 100644 index 00000000..fbf6ae66 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Clicked_Restaurant.imageset/Request_Clicked_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Contents.json new file mode 100644 index 00000000..d4252f02 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Default_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Default_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Default_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar.png new file mode 100644 index 00000000..0b6d7adc Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar@2x.png new file mode 100644 index 00000000..9db5bcf4 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar@3x.png new file mode 100644 index 00000000..07f52ed3 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bar.imageset/Request_Default_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Contents.json new file mode 100644 index 00000000..835fdd1e --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Default_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Default_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Default_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread.png new file mode 100644 index 00000000..318dc4f0 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread@2x.png new file mode 100644 index 00000000..8699c3ae Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread@3x.png new file mode 100644 index 00000000..cbac4c6c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Bread.imageset/Request_Default_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Contents.json new file mode 100644 index 00000000..0a25e475 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Default_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Default_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Default_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee.png new file mode 100644 index 00000000..c2855644 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee@2x.png new file mode 100644 index 00000000..658e778c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee@3x.png new file mode 100644 index 00000000..2a7a71c3 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Coffee.imageset/Request_Default_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..b8ec8a28 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Request_Default_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Request_Default_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Request_Default_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant.png new file mode 100644 index 00000000..4f39f664 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant@2x.png new file mode 100644 index 00000000..0d6e824d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant@3x.png new file mode 100644 index 00000000..428338c4 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Request_Default_Restaurant.imageset/Request_Default_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Contents.json new file mode 100644 index 00000000..84c750a1 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Box_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Box_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Box_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar.png new file mode 100644 index 00000000..0b0ec78e Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar@2x.png new file mode 100644 index 00000000..dd5c1db2 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar@3x.png new file mode 100644 index 00000000..37112764 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bar.imageset/Some_Box_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Contents.json new file mode 100644 index 00000000..2ca60e5e --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Box_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Box_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Box_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread.png new file mode 100644 index 00000000..603526cb Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread@2x.png new file mode 100644 index 00000000..bcea2aab Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread@3x.png new file mode 100644 index 00000000..82db3aa1 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Bread.imageset/Some_Box_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Contents.json new file mode 100644 index 00000000..be8bec8a --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Box_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Box_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Box_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee.png new file mode 100644 index 00000000..d9666521 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee@2x.png new file mode 100644 index 00000000..49d35dce Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee@3x.png new file mode 100644 index 00000000..e122879e Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Coffee.imageset/Some_Box_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..8b735c36 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Box_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Box_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Box_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant.png new file mode 100644 index 00000000..3bb26942 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant@2x.png new file mode 100644 index 00000000..23a8226b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant@3x.png new file mode 100644 index 00000000..bb2597a1 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Box_Restaurant.imageset/Some_Box_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Contents.json new file mode 100644 index 00000000..ae73dba2 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Clicked_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Clicked_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Clicked_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar.png new file mode 100644 index 00000000..cdec40a9 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar@2x.png new file mode 100644 index 00000000..555315de Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar@3x.png new file mode 100644 index 00000000..0073fe55 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bar.imageset/Some_Clicked_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Contents.json new file mode 100644 index 00000000..c8a6686a --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Clicked_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Clicked_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Clicked_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread.png new file mode 100644 index 00000000..25c6f259 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread@2x.png new file mode 100644 index 00000000..9d08eee1 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread@3x.png new file mode 100644 index 00000000..4560d819 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Bread.imageset/Some_Clicked_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Contents.json new file mode 100644 index 00000000..662259f5 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Clicked_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Clicked_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Clicked_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee.png new file mode 100644 index 00000000..6a885bf1 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee@2x.png new file mode 100644 index 00000000..43dd54fc Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee@3x.png new file mode 100644 index 00000000..ed788c9b Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Coffee.imageset/Some_Clicked_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..8dc65bf1 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Clicked_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Clicked_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Clicked_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant.png new file mode 100644 index 00000000..8b48f436 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant@2x.png new file mode 100644 index 00000000..012539dd Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant@3x.png new file mode 100644 index 00000000..258085eb Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Clicked_Restaurant.imageset/Some_Clicked_Restaurant@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Contents.json new file mode 100644 index 00000000..8ec51e07 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Default_Bar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Default_Bar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Default_Bar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar.png new file mode 100644 index 00000000..f437170c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar@2x.png new file mode 100644 index 00000000..5945a4c2 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar@3x.png new file mode 100644 index 00000000..632cc48c Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bar.imageset/Some_Default_Bar@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Contents.json new file mode 100644 index 00000000..7d7383b0 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Default_Bread.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Default_Bread@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Default_Bread@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread.png new file mode 100644 index 00000000..edeef1e0 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread@2x.png new file mode 100644 index 00000000..4fb345e8 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread@3x.png new file mode 100644 index 00000000..5855e8a4 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Bread.imageset/Some_Default_Bread@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Contents.json new file mode 100644 index 00000000..c84e94c5 --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Default_Coffee.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Default_Coffee@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Default_Coffee@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee.png new file mode 100644 index 00000000..bcef5dbb Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee@2x.png new file mode 100644 index 00000000..a541f3c8 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee@3x.png new file mode 100644 index 00000000..6c4ebb3d Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Coffee.imageset/Some_Default_Coffee@3x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Contents.json b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Contents.json new file mode 100644 index 00000000..8a1082ef --- /dev/null +++ b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Some_Default_Restaurant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Some_Default_Restaurant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Some_Default_Restaurant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant.png new file mode 100644 index 00000000..e9488e20 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant@2x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant@2x.png new file mode 100644 index 00000000..b112fc07 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant@2x.png differ diff --git a/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant@3x.png b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant@3x.png new file mode 100644 index 00000000..2b4c04e1 Binary files /dev/null and b/AVIRO/App/Assets.xcassets/ImageSet/Icon_2.0/Some_Default_Restaurant.imageset/Some_Default_Restaurant@3x.png differ diff --git a/AVIRO/Custom/Constants/Enum+.swift b/AVIRO/Custom/Constants/Enum+.swift index b837d3c9..628ac727 100644 --- a/AVIRO/Custom/Constants/Enum+.swift +++ b/AVIRO/Custom/Constants/Enum+.swift @@ -78,80 +78,6 @@ enum Gender: String, Codable { } } -// MARK: Map Marker -enum MapPlace { - case All - case Some - case Request -} - -enum MapIcon { - case allMap - case allMapClicked - case allMapStar - case allMapStarClicked - - case someMap - case someMapClicked - case someMapStar - case someMapStarClicked - - case requestMap - case requestMapClicked - case requestMapStar - case requestMapStarClicked - - private static let allMapImage = NMFOverlayImage(image: .allIcon) - private static let someMapImage = NMFOverlayImage(image: .someIcon) - private static let requestMapImage = NMFOverlayImage(image: .requestIcon) - - private static let allMapClickedImage = NMFOverlayImage(image: .allIconClicked) - private static let someMapClickedImage = NMFOverlayImage(image: .someIconClicked) - private static let requestMapClickedImage = NMFOverlayImage(image: .requestIconClicked) - - private static let allMapStarImage = NMFOverlayImage(image: .allIconStar) - private static let someMapStarImage = NMFOverlayImage(image: .someIconStar) - private static let requestMapStarImage = NMFOverlayImage(image: .requestIconStar) - - private static let allMapStarClickedImage = NMFOverlayImage(image: .allIconStarClicked) - private static let someMapStarClickedImage = NMFOverlayImage(image: .someIconStarClicked) - private static let requestMapStarClickedImage = NMFOverlayImage(image: .requestIconStarClicked) - - var image: NMFOverlayImage { - switch self { - case .allMap: - return MapIcon.allMapImage - case .allMapClicked: - return MapIcon.allMapClickedImage - - case .someMap: - return MapIcon.someMapImage - case .someMapClicked: - return MapIcon.someMapClickedImage - - case .requestMap: - return MapIcon.requestMapImage - case .requestMapClicked: - return MapIcon.requestMapClickedImage - - case .allMapStar: - return MapIcon.allMapStarImage - case .allMapStarClicked: - return MapIcon.allMapStarClickedImage - - case .someMapStar: - return MapIcon.someMapStarImage - case .someMapStarClicked: - return MapIcon.someMapStarClickedImage - - case .requestMapStar: - return MapIcon.requestMapStarImage - case .requestMapStarClicked: - return MapIcon.requestMapStarClickedImage - } - } -} - // MARK: Vegan Option enum VeganOption { case all diff --git a/AVIRO/Custom/Constants/UIImage+Extension.swift b/AVIRO/Custom/Constants/UIImage+Extension.swift index 48bf9b6e..25004dfd 100644 --- a/AVIRO/Custom/Constants/UIImage+Extension.swift +++ b/AVIRO/Custom/Constants/UIImage+Extension.swift @@ -8,17 +8,17 @@ import UIKit extension UIImage { - // MARK: Launch Screen + // MARK: - Launch Screen static let launchtitle = UIImage(named: "LaunchTitle")! static let launchBG = UIImage(named: "Launchbg")! - // MARK: Screen Shot + // MARK: - Screen Shot static let screen1 = UIImage(named: "Contents 1") static let screen2 = UIImage(named: "Contents 2") static let screen3 = UIImage(named: "Contents 3") static let screen4 = UIImage(named: "Contents 4") - // MARK: Main + // MARK: - Main static let loginCharacter = UIImage(named: "LoginCharacter")! static let enrollCharacter = UIImage(named: "EnrollCharacter")! static let noResultCharacter = UIImage(named: "NoResultCharacter")! @@ -29,7 +29,7 @@ extension UIImage { static let myIcon4 = UIImage(named: "MyIcon4") static let myIcon5 = UIImage(named: "MyIcon5") - // MARK: Icon 관련 Image + // MARK: - Main Icon Ver 1.1 ~ static let allBox = UIImage(named: "AllBox")! static let someBox = UIImage(named: "SomeBox")! static let requestBox = UIImage(named: "RequestBox")! @@ -59,6 +59,76 @@ extension UIImage { static let someOptionButton = UIImage(named: "SomeOption")! static let requestOptionButton = UIImage(named: "RequestOption")! + // MARK: - Main Icon Ver 1.2 ~ + // Box + static let allBoxBar = UIImage(named: "All_Box_Bar")! + static let allBoxBread = UIImage(named: "All_Box_Bread")! + static let allBoxCoffee = UIImage(named: "All_Box_Coffee")! + static let allBoxRestaurant = UIImage(named: "All_Box_Restaurant")! + + static let someBoxBar = UIImage(named: "Some_Box_Bar")! + static let someBoxBread = UIImage(named: "Some_Box_Bread")! + static let someBoxCoffee = UIImage(named: "Some_Box_Coffee")! + static let someBoxRestaurant = UIImage(named: "Some_Box_Restaurant")! + + static let requestBoxBar = UIImage(named: "Request_Box_Bar")! + static let requestBoxBread = UIImage(named: "Request_Box_Bread")! + static let requestBoxCoffee = UIImage(named: "Request_Box_Coffee")! + static let requestBoxRestaurant = UIImage(named: "Request_Box_Restaurant")! + + // Clicked Map Icon + static let allClickedBar = UIImage(named: "All_Clicked_Bar")! + static let allClickedBread = UIImage(named: "All_Clicked_Bread")! + static let allClickedCoffee = UIImage(named: "All_Clicked_Coffee")! + static let allClickedRestaurant = UIImage(named: "All_Clicked_Restaurant")! + + static let someClickedBar = UIImage(named: "Some_Clicked_Bar")! + static let someClickedBread = UIImage(named: "Some_Clicked_Bread")! + static let someClickedCoffee = UIImage(named: "Some_Clicked_Coffee")! + static let someClickedRestaurant = UIImage(named: "Some_Clicked_Restaurant")! + + static let requestClickedBar = UIImage(named: "Request_Clicked_Bar")! + static let requestClickedBread = UIImage(named: "Request_Clicked_Bread")! + static let requestClickedCoffee = UIImage(named: "Request_Clicked_Coffee")! + static let requestClickedRestaurant = UIImage(named: "Request_Clicked_Restaurant")! + + // Default Map Icon + static let allDefaultBar = UIImage(named: "All_Default_Bar")! + static let allDefaultBread = UIImage(named: "All_Default_Bread")! + static let allDefaultCoffee = UIImage(named: "All_Default_Coffee")! + static let allDefaultRestaurant = UIImage(named: "All_Default_Restaurant")! + + static let someDefaultBar = UIImage(named: "Some_Default_Bar")! + static let someDefaultBread = UIImage(named: "Some_Default_Bread")! + static let someDefaultCoffee = UIImage(named: "Some_Default_Coffee")! + static let someDefaultRestaurant = UIImage(named: "Some_Default_Restaurant")! + + static let requestDefaultBar = UIImage(named: "Request_Default_Bar")! + static let requestDefaultBread = UIImage(named: "Request_Default_Bread")! + static let requestDefaultCoffee = UIImage(named: "Request_Default_Coffee")! + static let requestDefaultRestaurant = UIImage(named: "Request_Default_Restaurant")! + + // Default Category + static let defaultCategoryBar = UIImage(named: "Default_btn_Bar")! + static let defaultCategoryBread = UIImage(named: "Default_btn_Bread")! + static let defaultCategoryCoffee = UIImage(named: "Default_btn_Coffee")! + static let defaultCategoryRestaurant = UIImage(named: "Default_btn_Restaurant")! + + // Off Category + static let offCategoryBar = UIImage(named: "Off_btn_Bar")! + static let offCategoryBread = UIImage(named: "Off_btn_Bread")! + static let offCategoryCoffee = UIImage(named: "Off_btn_Coffee")! + static let offCategoryRestaurant = UIImage(named: "Off_btn_Restaurant")! + + // On Category + static let onCategoryBar = UIImage(named: "On_btn_Bar")! + static let onCategoryBread = UIImage(named: "On_btn_Bread")! + static let onCategoryCoffee = UIImage(named: "On_btn_Coffee")! + static let onCategoryRestaurant = UIImage(named: "On_btn_Restaurant")! + + // cancel Category + static let cancelCategory = UIImage(named: "Cancel_btn")! + // MARK: Tab Bar Icon static let homeTab = UIImage(named: "HomeTab")! static let plusTab = UIImage(named: "PlusTab")! diff --git a/AVIRO/Custom/Extension/Marker+Extension.swift b/AVIRO/Custom/Extension/Marker+Extension.swift index 57f00226..91c445f6 100644 --- a/AVIRO/Custom/Extension/Marker+Extension.swift +++ b/AVIRO/Custom/Extension/Marker+Extension.swift @@ -10,41 +10,85 @@ import Foundation import NMapsMap extension NMFMarker { - func makeIcon(_ place: MapPlace) { - switch place { + func makeIcon(veganType: VeganType, categoryType: CategoryType) { + switch veganType { case .All: - self.iconImage = MapIcon.allMap.image + switch categoryType { + case .Bar: + self.iconImage = MapIcon.allBar.image + case .Bread: + self.iconImage = MapIcon.allBread.image + case .Coffee: + self.iconImage = MapIcon.allCoffee.image + case .Restaurant: + self.iconImage = MapIcon.allRestaurant.image + } case .Some: - self.iconImage = MapIcon.someMap.image + switch categoryType { + case .Bar: + self.iconImage = MapIcon.someBar.image + case .Bread: + self.iconImage = MapIcon.someBread.image + case .Coffee: + self.iconImage = MapIcon.someCoffee.image + case .Restaurant: + self.iconImage = MapIcon.someRestaurant.image + } case .Request: - self.iconImage = MapIcon.requestMap.image + switch categoryType { + case .Bar: + self.iconImage = MapIcon.requestBar.image + case .Bread: + self.iconImage = MapIcon.requestBread.image + case .Coffee: + self.iconImage = MapIcon.requestCoffee.image + case .Restaurant: + self.iconImage = MapIcon.requestRestaurant.image + } } } - func changeIcon(_ place: MapPlace, _ isSelected: Bool) { - switch place { + func changeIcon(veganType: VeganType, categoryType: CategoryType, isSelected: Bool) { + switch veganType { case .All: - self.iconImage = isSelected ? - MapIcon.allMapClicked.image - : - MapIcon.allMap.image - + switch categoryType { + case .Bar: + self.iconImage = isSelected ? MapIcon.allBarClicked.image : MapIcon.allBar.image + case .Bread: + self.iconImage = isSelected ? MapIcon.allBreadClicked.image : MapIcon.allBread.image + case .Coffee: + self.iconImage = isSelected ? MapIcon.allCoffeeClicked.image : MapIcon.allCoffee.image + case .Restaurant: + self.iconImage = isSelected ? MapIcon.allRestaurantClicked.image : MapIcon.allRestaurant.image + } case .Some: - self.iconImage = isSelected ? - MapIcon.someMapClicked.image - : - MapIcon.someMap.image + switch categoryType { + case .Bar: + self.iconImage = isSelected ? MapIcon.someBarClicked.image : MapIcon.someBar.image + case .Bread: + self.iconImage = isSelected ? MapIcon.someBreadClicked.image : MapIcon.someBread.image + case .Coffee: + self.iconImage = isSelected ? MapIcon.someCoffeeClicked.image : MapIcon.someCoffee.image + case .Restaurant: + self.iconImage = isSelected ? MapIcon.someRestaurantClicked.image : MapIcon.someRestaurant.image + } case .Request: - self.iconImage = isSelected ? - MapIcon.requestMapClicked.image - : - MapIcon.requestMap.image + switch categoryType { + case .Bar: + self.iconImage = isSelected ? MapIcon.requestBarClicked.image : MapIcon.requestBar.image + case .Bread: + self.iconImage = isSelected ? MapIcon.requestBreadClicked.image : MapIcon.requestBread.image + case .Coffee: + self.iconImage = isSelected ? MapIcon.requestCoffeeClicked.image : MapIcon.requestCoffee.image + case .Restaurant: + self.iconImage = isSelected ? MapIcon.requestRestaurantClicked.image : MapIcon.requestRestaurant.image + } } } - func changeStarIcon(_ place: MapPlace, _ isSelected: Bool) { - switch place { + func changeStarIcon(veganType: VeganType, isSelected: Bool) { + switch veganType { case .All: self.iconImage = isSelected ? MapIcon.allMapStarClicked.image diff --git a/AVIRO/Custom/Utility/TimeUtility.swift b/AVIRO/Custom/Utility/TimeUtility.swift index 56a45064..5d71c70e 100644 --- a/AVIRO/Custom/Utility/TimeUtility.swift +++ b/AVIRO/Custom/Utility/TimeUtility.swift @@ -29,7 +29,6 @@ final class TimeUtility { let formattedDateTime = formatter.string(from: date) - print(formattedDateTime) return formattedDateTime } diff --git a/AVIRO/Manager/APIManager/AVIROManager/AVIROAPI.swift b/AVIRO/Manager/APIManager/AVIROManager/AVIROAPI.swift index 9e5ef23f..a6143980 100644 --- a/AVIRO/Manager/APIManager/AVIROManager/AVIROAPI.swift +++ b/AVIRO/Manager/APIManager/AVIROManager/AVIROAPI.swift @@ -709,7 +709,7 @@ extension AVIROAPI { // print(url) self?.onRequest.remove(url) } - + if let error = error { completionHandler(.failure(.networkError(error))) return diff --git a/AVIRO/Manager/APIManager/AVIROManager/AVIRODeleteAPI.swift b/AVIRO/Manager/APIManager/AVIROManager/AVIRODeleteAPI.swift index 39781fab..1b99148f 100644 --- a/AVIRO/Manager/APIManager/AVIROManager/AVIRODeleteAPI.swift +++ b/AVIRO/Manager/APIManager/AVIROManager/AVIRODeleteAPI.swift @@ -25,7 +25,7 @@ struct AVIRODeleteAPI { "X-API-KEY": "\(AVIROConfiguration.apikey)" ] // MARK: Path - static let commentDeletePath = "/1/map/update/comment" + static let commentDeletePath = "/2/map/update/comment" // MARK: Key static let commentId = "commentId" diff --git a/AVIRO/Manager/APIManager/AVIROManager/AVIROPostAPI.swift b/AVIRO/Manager/APIManager/AVIROManager/AVIROPostAPI.swift index 70699c33..7a01984d 100644 --- a/AVIRO/Manager/APIManager/AVIROManager/AVIROPostAPI.swift +++ b/AVIRO/Manager/APIManager/AVIROManager/AVIROPostAPI.swift @@ -33,31 +33,32 @@ struct AVIROPostAPI { "X-API-KEY": "\(AVIROConfiguration.apikey)" ] - static let placeEnrollPath = "/1/map/add/place" - static let placeListMatchedAVIROPath = "/1/map/check/place" - static let placeListReportPath = "/1/map/report/place" - - static let editPlaceLocationPath = "/1/map/report/address" - static let editPlacePhonePath = "/1/map/report/phone" - static let editPlaceOperationPath = "/1/map/update/time" - static let editPlaceURLPath = "/1/map/report/url" - - static let commentUploadPath = "/1/map/add/comment" - static let commentEditPath = "/1/map/update/comment" - static let commentReportPath = "/1/map/report/comment" - static let afterUploadCommentRecommendPlace = "/1/map/add/recommend" + // MARK: - URL Property + static let placeEnrollPath = "/2/map/add/place" + static let placeListMatchedAVIROPath = "/2/map/check/place" + static let placeListReportPath = "/2/map/report/place" + + static let editPlaceLocationPath = "/2/map/report/address" + static let editPlacePhonePath = "/2/map/report/phone" + static let editPlaceOperationPath = "/2/map/update/time" + static let editPlaceURLPath = "/2/map/report/url" + + static let commentUploadPath = "/2/map/add/comment" + static let commentEditPath = "/2/map/update/comment" + static let commentReportPath = "/2/map/report/comment" + static let afterUploadCommentRecommendPlace = "/2/map/add/recommend" - static let bookmarkPostPath = "/1/map/add/bookmark" + static let bookmarkPostPath = "/2/map/add/bookmark" - static let editMenuPath = "/1/map/update/menu" + static let editMenuPath = "/2/map/update/menu" - static let appleUserAutoLoginPath = "/1/member/apple" - static let appleUserCheckPath = "/1/member" - static let appleUserSignUpPath = "/1/member/sign-up" - static let appleUserRevokePath = "/1/member/revoke" + static let appleUserAutoLoginPath = "/2/member/apple" + static let appleUserCheckPath = "/2/member" + static let appleUserSignUpPath = "/2/member/sign-up" + static let appleUserRevokePath = "/2/member/revoke" - static let userNicnameCheckPath = "/1/member/check" - static let userNicknameChangeablePath = "/1/member/update/nickname" + static let userNicnameCheckPath = "/2/member/check" + static let userNicknameChangeablePath = "/2/member/update/nickname" // MARK: Place Enroll mutating func placeEnroll() -> URLComponents { diff --git a/AVIRO/Manager/APIManager/AVIROManager/AVIRORequestAPI.swift b/AVIRO/Manager/APIManager/AVIROManager/AVIRORequestAPI.swift index aeee3829..17ef4e43 100644 --- a/AVIRO/Manager/APIManager/AVIROManager/AVIRORequestAPI.swift +++ b/AVIRO/Manager/APIManager/AVIROManager/AVIRORequestAPI.swift @@ -26,21 +26,21 @@ struct AVIRORequestAPI { ] // MARK: Path - static let getNerbyStorePath = "/1/map" - static let getBookmarkPath = "/1/map/load/bookmark" + static let getNerbyStorePath = "/2/map" + static let getBookmarkPath = "/2/map/load/bookmark" - static let checkPlacePath = "/1/map/check/place" - static let checkPlaceReport = "/1/map/check/place/report" + static let checkPlacePath = "/2/map/check/place" + static let checkPlaceReport = "/2/map/check/place/report" - static let placeSummaryPath = "/1/map/load/summary" - static let placeInfoPath = "/1/map/load/place" - static let menuInfoPath = "/1/map/load/menu" - static let commentPath = "/1/map/load/comment" - static let operationHourPath = "/1/map/load/timetable" + static let placeSummaryPath = "/2/map/load/summary" + static let placeInfoPath = "/2/map/load/place" + static let menuInfoPath = "/2/map/load/menu" + static let commentPath = "/2/map/load/comment" + static let operationHourPath = "/2/map/load/timetable" - static let myContributionCount = "/1/mypage/count" - static let challengeInfo = "/1/mypage/challenge" - static let myChallengeLevel = "/1/mypage/challenge/level" + static let myContributionCount = "/2/mypage/count" + static let challengeInfo = "/2/mypage/challenge" + static let myChallengeLevel = "/2/mypage/challenge/level" // MARK: Key static let userId = "userId" diff --git a/AVIRO/Manager/FacadeManager/MarkerModelManager.swift b/AVIRO/Manager/FacadeManager/MarkerModelManager.swift index ded3724d..3cda6303 100644 --- a/AVIRO/Manager/FacadeManager/MarkerModelManager.swift +++ b/AVIRO/Manager/FacadeManager/MarkerModelManager.swift @@ -19,14 +19,15 @@ protocol MarkerModelManagerProtocol { func getAllMarkers() -> [NMFMarker] func getAllMarkerModel() -> [MarkerModel] - func updateMarkerModels(with marker: MarkerModel) - func updateSelectedMarkerModel(index: Int, model: MarkerModel) func getUpdatedMarkers() -> [NMFMarker] func getMarkerModelFromCoordinates(lat: Double, lng: Double) -> (MarkerModel?, Int?) func getMarkerModelFromMarker(with marker: NMFMarker) -> (MarkerModel?, Int?) func getMarkerModelFromSerachModel(with searchModel: MatchedPlaceModel) -> (MarkerModel?, Int?) + func updateMarkerModels(with marker: MarkerModel) + func updateSelectedMarkerModel(index: Int, model: MarkerModel) + func updateMarkerModelWhenClicked(with markerModel: MarkerModel) func updateMarkerModelWhenOnStarButton(isTapped: Bool, markerModel: [MarkerModel]?) @@ -55,10 +56,29 @@ final class MarkerModelManager: MarkerModelManagerProtocol { func fetchRawData( completionHandler: @escaping (Result<[AVIROMarkerModel], APIError>) -> Void ) { - let realm = try! Realm() - let storedDataCount = realm.objects(MarkerModelFromRealm.self).count + /// 버전 + // realm 마이그레이션 실행 + let config = Realm.Configuration( + schemaVersion: 1, + migrationBlock: { migration, oldSchemaVersion in + // oldScehemaVersion이 현재 스키마 버전보다 낮은 경우 마이그레이션을 수행 + if oldSchemaVersion < 1 { + migration.enumerateObjects(ofType: MarkerModelFromRealm.className()) { _, newObject in + // 새로운 프로퍼티에 대한 기본값 설정 + newObject?["title"] = "" + newObject?["category"] = "" + } + } + } + ) - if storedDataCount > 0 { + Realm.Configuration.defaultConfiguration = config + print("realm 위치: ", Realm.Configuration.defaultConfiguration.fileURL!) + let realm = try! Realm() + let haveStoredData = realm.objects(MarkerModelFromRealm.self).count > 0 ? true : false + let hasTitleInRealm = realm.objects(MarkerModelFromRealm.self).filter("title != ''").count > 0 ? true : false + + if haveStoredData && hasTitleInRealm { fetchRawDataFromRealm(completionHandler: completionHandler) } else { fetchRawDataFromServer(completionHandler: completionHandler) @@ -86,6 +106,8 @@ final class MarkerModelManager: MarkerModelManagerProtocol { placeId: model.placeId, latitude: model.y, longitude: model.x, + title: model.title, + category: model.category, isAll: model.allVegan, isSome: model.someMenuVegan, isRequest: model.ifRequestVegan @@ -144,6 +166,8 @@ final class MarkerModelManager: MarkerModelManagerProtocol { placeId: model.placeId, latitude: model.y, longitude: model.x, + title: model.title, + category: model.category, isAll: model.allVegan, isSome: model.someMenuVegan, isRequest: model.ifRequestVegan) @@ -209,6 +233,8 @@ final class MarkerModelManager: MarkerModelManagerProtocol { placeId: model.placeId, latitude: model.y, longitude: model.x, + title: model.title, + category: model.category, isAll: model.allVegan, isSome: model.someMenuVegan, isRequest: model.ifRequestVegan diff --git a/AVIRO/Model/APIResonseModel/AVIRO/AVIROGet/Marker/AVIROMapMarker+DTO.swift b/AVIRO/Model/APIResonseModel/AVIRO/AVIROGet/Marker/AVIROMapMarker+DTO.swift index 9886ead9..9987377d 100644 --- a/AVIRO/Model/APIResonseModel/AVIRO/AVIROGet/Marker/AVIROMapMarker+DTO.swift +++ b/AVIRO/Model/APIResonseModel/AVIRO/AVIROGet/Marker/AVIROMapMarker+DTO.swift @@ -28,6 +28,8 @@ struct AVIROMapModelResultDataDTO: Decodable { struct AVIROMarkerModel: Codable, Hashable { let placeId: String + let title: String + let category: String let x: Double let y: Double let allVegan: Bool diff --git a/AVIRO/Model/HomeViewModel/EditModel/EditMenuChangedMarkerModel.swift b/AVIRO/Model/HomeViewModel/EditModel/EditMenuChangedMarkerModel.swift index 1c731a31..166f33fa 100644 --- a/AVIRO/Model/HomeViewModel/EditModel/EditMenuChangedMarkerModel.swift +++ b/AVIRO/Model/HomeViewModel/EditModel/EditMenuChangedMarkerModel.swift @@ -8,7 +8,7 @@ import Foundation struct EditMenuChangedMarkerModel { - var mapPlace: MapPlace + var mapPlace: VeganType var isAll: Bool var isSome: Bool var isRequest: Bool diff --git a/AVIRO/Model/HomeViewModel/MarkerModel.swift b/AVIRO/Model/HomeViewModel/MarkerModel.swift index 85703007..34ecf629 100644 --- a/AVIRO/Model/HomeViewModel/MarkerModel.swift +++ b/AVIRO/Model/HomeViewModel/MarkerModel.swift @@ -9,6 +9,196 @@ import UIKit import NMapsMap +// MARK: - Map Marker +enum VeganType { + case All + case Some + case Request +} + +// MARK: - Map Marker + Category +enum CategoryType { + case Bar + case Bread + case Coffee + case Restaurant +} + +// MARK: - Map Icon +enum MapIcon { + // All + case allBar + case allBarClicked + + case allBread + case allBreadClicked + + case allCoffee + case allCoffeeClicked + + case allRestaurant + case allRestaurantClicked + + case allMapStar + case allMapStarClicked + + // Some + case someBar + case someBarClicked + + case someBread + case someBreadClicked + + case someCoffee + case someCoffeeClicked + + case someRestaurant + case someRestaurantClicked + + case someMapStar + case someMapStarClicked + + // Request + case requestBar + case requestBarClicked + + case requestBread + case requestBreadClicked + + case requestCoffee + case requestCoffeeClicked + + case requestRestaurant + case requestRestaurantClicked + + case requestMapStar + case requestMapStarClicked + + // MARK: - Map Icon Image + private static let allBarImage = NMFOverlayImage(image: .allDefaultBar) + private static let allBarClickedImage = NMFOverlayImage(image: .allClickedBar) + + private static let allBreadImage = NMFOverlayImage(image: .allDefaultBread) + private static let allBreadClickedImage = NMFOverlayImage(image: .allClickedBread) + + private static let allCoffeeImage = NMFOverlayImage(image: .allDefaultCoffee) + private static let allCoffeeClickedImage = NMFOverlayImage(image: .allClickedCoffee) + + private static let allRestaurantImage = NMFOverlayImage(image: .allDefaultRestaurant) + private static let allRestaurantClickedImage = NMFOverlayImage(image: .allClickedRestaurant) + + private static let someBarImage = NMFOverlayImage(image: .someDefaultBar) + private static let someBarClickedImage = NMFOverlayImage(image: .someClickedBar) + + private static let someBreadImage = NMFOverlayImage(image: .someDefaultBread) + private static let someBreadClickedImage = NMFOverlayImage(image: .someClickedBread) + + private static let someCoffeeImage = NMFOverlayImage(image: .someDefaultCoffee) + private static let someCoffeeClickedImage = NMFOverlayImage(image: .someClickedCoffee) + + private static let someRestaurantImage = NMFOverlayImage(image: .someDefaultRestaurant) + private static let someRestaurantClickedImage = NMFOverlayImage(image: .someClickedRestaurant) + + private static let requestBarImage = NMFOverlayImage(image: .requestDefaultBar) + private static let requestBarClickedImage = NMFOverlayImage(image: .requestClickedBar) + + private static let requestBreadImage = NMFOverlayImage(image: .requestDefaultBread) + private static let requestBreadClickedImage = NMFOverlayImage(image: .requestClickedBread) + + private static let requestCoffeeImage = NMFOverlayImage(image: .requestDefaultCoffee) + private static let requestCoffeeClickedImage = NMFOverlayImage(image: .requestClickedCoffee) + + private static let requestRestaurantImage = NMFOverlayImage(image: .requestDefaultRestaurant) + private static let requestRestaurantClickedImage = NMFOverlayImage(image: .requestClickedRestaurant) + + private static let allMapStarImage = NMFOverlayImage(image: .allIconStar) + private static let someMapStarImage = NMFOverlayImage(image: .someIconStar) + private static let requestMapStarImage = NMFOverlayImage(image: .requestIconStar) + + private static let allMapStarClickedImage = NMFOverlayImage(image: .allIconStarClicked) + private static let someMapStarClickedImage = NMFOverlayImage(image: .someIconStarClicked) + private static let requestMapStarClickedImage = NMFOverlayImage(image: .requestIconStarClicked) + + var image: NMFOverlayImage { + switch self { + case .allBar: + return MapIcon.allBarImage + case .allBarClicked: + return MapIcon.allBarClickedImage + + case .allBread: + return MapIcon.allBreadImage + case .allBreadClicked: + return MapIcon.allBreadClickedImage + + case .allCoffee: + return MapIcon.allCoffeeImage + case .allCoffeeClicked: + return MapIcon.allCoffeeClickedImage + + case .allRestaurant: + return MapIcon.allRestaurantImage + case .allRestaurantClicked: + return MapIcon.allRestaurantClickedImage + + case .someBar: + return MapIcon.someBarImage + case .someBarClicked: + return MapIcon.someBarClickedImage + + case .someBread: + return MapIcon.someBreadImage + case .someBreadClicked: + return MapIcon.someBreadClickedImage + + case .someCoffee: + return MapIcon.someCoffeeImage + case .someCoffeeClicked: + return MapIcon.someCoffeeClickedImage + + case .someRestaurant: + return MapIcon.someRestaurantImage + case .someRestaurantClicked: + return MapIcon.someRestaurantClickedImage + + case .requestBar: + return MapIcon.requestBarImage + case .requestBarClicked: + return MapIcon.requestBarClickedImage + + case .requestBread: + return MapIcon.requestBreadImage + case .requestBreadClicked: + return MapIcon.requestBreadClickedImage + + case .requestCoffee: + return MapIcon.requestCoffeeImage + case .requestCoffeeClicked: + return MapIcon.requestCoffeeClickedImage + + case .requestRestaurant: + return MapIcon.requestRestaurantImage + case .requestRestaurantClicked: + return MapIcon.requestRestaurantClickedImage + + case .allMapStar: + return MapIcon.allMapStarImage + case .allMapStarClicked: + return MapIcon.allMapStarClickedImage + + case .someMapStar: + return MapIcon.someMapStarImage + case .someMapStarClicked: + return MapIcon.someMapStarClickedImage + + case .requestMapStar: + return MapIcon.requestMapStarImage + case .requestMapStarClicked: + return MapIcon.requestMapStarClickedImage + } + } +} + // MARK: Map Place didSet 수정 확인 struct MarkerModel: Equatable { let placeId: String @@ -16,7 +206,13 @@ struct MarkerModel: Equatable { // MARK: 수정 중 일때만 Map Place 변경 가능 // 해당 변수는 지도에 표시될 마커 구분을 위한 변수 - var mapPlace: MapPlace { + var veganType: VeganType { + didSet { + updateMarkerIcon() + } + } + + var categoryType: CategoryType { didSet { updateMarkerIcon() } @@ -41,9 +237,9 @@ struct MarkerModel: Equatable { private func updateMarkerIcon() { if isStar { - marker.changeStarIcon(mapPlace, isClicked) + marker.changeStarIcon(veganType: veganType, isSelected: isClicked) } else { - marker.changeIcon(mapPlace, isClicked) + marker.changeIcon(veganType: veganType, categoryType: categoryType, isSelected: isClicked) } } } diff --git a/AVIRO/Model/HomeViewModel/PlaceViewModel/PlaceTopModel.swift b/AVIRO/Model/HomeViewModel/PlaceViewModel/PlaceTopModel.swift index 5f3ad26f..5cf3cad3 100644 --- a/AVIRO/Model/HomeViewModel/PlaceViewModel/PlaceTopModel.swift +++ b/AVIRO/Model/HomeViewModel/PlaceViewModel/PlaceTopModel.swift @@ -8,7 +8,7 @@ import Foundation struct PlaceTopModel { - let placeState: MapPlace + let placeState: VeganType let placeTitle: String let placeCategory: String let distance: String diff --git a/AVIRO/Model/LocalDataModel/MarkerModelCache.swift b/AVIRO/Model/LocalDataModel/MarkerModelCache.swift index 3d4d61cd..7d9d6ee0 100644 --- a/AVIRO/Model/LocalDataModel/MarkerModelCache.swift +++ b/AVIRO/Model/LocalDataModel/MarkerModelCache.swift @@ -11,18 +11,23 @@ import NMapsMap.NMFMarker protocol MarkerModelCacheProtocol { func getMarkers() -> [NMFMarker] func getMarkerModels() -> [MarkerModel] - func updateMarkerModelWhenClicked(with markerModel: MarkerModel) + func getOnlyStarMarkerModels() -> [MarkerModel] func getMarker(with marker: NMFMarker) -> (MarkerModel?, Int?) func getMarker(with afterSearchModel: MatchedPlaceModel ) -> (MarkerModel?, Int?) func getMarker(x: Double, y: Double) -> (MarkerModel?, Int?) + func getUpdatedMarkers() -> [NMFMarker] + func setMarkerModel(_ markerModels: [MarkerModel]) - func updateMarkerModel(_ index: Int, _ markerModel: MarkerModel) - func resetAllStarMarkers() + func updateWhenStarButton(_ markerModel: [MarkerModel]) + func updateMarkerModelWhenClicked(with markerModel: MarkerModel) + func updateMarkerModel(_ index: Int, _ markerModel: MarkerModel) func updateMarkerModel(_ markerModel: MarkerModel) - func getUpdatedMarkers() -> [NMFMarker] + + func resetAllStarMarkers() + func deleteMarkerModel(with placeId: String) func deleteAllMarkerModel() } @@ -65,11 +70,14 @@ final class MarkerModelCache: MarkerModelCacheProtocol { DispatchQueue.main.sync { [weak self] in self?.markers[index].marker.position = updateMarker.marker.position + // 실행 중 변경임으로 changeIcon self?.markers[index].marker.changeIcon( - updateMarker.mapPlace, - updateMarker.isClicked + veganType: updateMarker.veganType, + categoryType: updateMarker.categoryType, + isSelected: updateMarker.isClicked ) - + + // marker는 class 참조 값이여서 직접 대입 후 변경 updateMarker.marker = (self?.markers[index].marker)! self?.markers[index] = updateMarker diff --git a/AVIRO/Model/LocalDataModel/MarkerModelLocalDB.swift b/AVIRO/Model/LocalDataModel/MarkerModelLocalDB.swift index d56e265e..86f308a5 100644 --- a/AVIRO/Model/LocalDataModel/MarkerModelLocalDB.swift +++ b/AVIRO/Model/LocalDataModel/MarkerModelLocalDB.swift @@ -14,6 +14,8 @@ final class MarkerModelFromRealm: Object { @Persisted var latitude: Double @Persisted var longitude: Double + @Persisted var title: String + @Persisted var category: String @Persisted var isAll: Bool @Persisted var isSome: Bool @Persisted var isRequest: Bool @@ -23,6 +25,8 @@ final class MarkerModelFromRealm: Object { placeId: String, latitude: Double, longitude: Double, + title: String, + category: String, isAll: Bool, isSome: Bool, isRequest: Bool @@ -32,6 +36,8 @@ final class MarkerModelFromRealm: Object { self.placeId = placeId self.latitude = latitude self.longitude = longitude + self.title = title + self.category = category self.isAll = isAll self.isSome = isSome self.isRequest = isRequest @@ -40,6 +46,8 @@ final class MarkerModelFromRealm: Object { func toAVIROMarkerModel() -> AVIROMarkerModel { return AVIROMarkerModel( placeId: placeId, + title: title, + category: category, x: longitude, y: latitude, allVegan: isAll, diff --git a/AVIRO/Scene/Feature/Enroll/ViewPresenter/EnrollPlacePresenter.swift b/AVIRO/Scene/Feature/Enroll/ViewPresenter/EnrollPlacePresenter.swift index 431c14fe..969e07a6 100644 --- a/AVIRO/Scene/Feature/Enroll/ViewPresenter/EnrollPlacePresenter.swift +++ b/AVIRO/Scene/Feature/Enroll/ViewPresenter/EnrollPlacePresenter.swift @@ -125,7 +125,6 @@ final class EnrollPlacePresenter { AVIROAPI.manager.createPlaceModel(with: veganModel) { [weak self] result in switch result { case .success(let resultModel): - print(resultModel) if resultModel.statusCode == 200 { self?.amplitude.uploadPlace(with: veganModel.title) @@ -142,7 +141,6 @@ final class EnrollPlacePresenter { self?.viewController?.pushAlertController() } case .failure(let error): - print(error) if let error = error.errorDescription { self?.viewController?.showErrorAlert(with: error, title: nil) } diff --git a/AVIRO/Scene/Feature/Home/EditMenu/ViewPresenter/EditMenuPresenter.swift b/AVIRO/Scene/Feature/Home/EditMenu/ViewPresenter/EditMenuPresenter.swift index a74c5a44..a1777f97 100644 --- a/AVIRO/Scene/Feature/Home/EditMenu/ViewPresenter/EditMenuPresenter.swift +++ b/AVIRO/Scene/Feature/Home/EditMenu/ViewPresenter/EditMenuPresenter.swift @@ -889,7 +889,7 @@ final class EditMenuPresenter { let isRequest = isRequest else { return } - var mapPlace: MapPlace! + var mapPlace: VeganType! if isAll { mapPlace = .All diff --git a/AVIRO/Scene/Feature/Home/HomeSearch/ViewPresenter/HomeSearchPresenter.swift b/AVIRO/Scene/Feature/Home/HomeSearch/ViewPresenter/HomeSearchPresenter.swift index cf8e4bd7..06078301 100644 --- a/AVIRO/Scene/Feature/Home/HomeSearch/ViewPresenter/HomeSearchPresenter.swift +++ b/AVIRO/Scene/Feature/Home/HomeSearch/ViewPresenter/HomeSearchPresenter.swift @@ -246,7 +246,6 @@ final class HomeSearchPresenter { self?.isLoading = false if let error = error.errorDescription { - print(error) self?.viewController?.showErrorAlert(with: error, title: nil) } } diff --git a/AVIRO/Scene/Feature/Home/ViewController/HomeViewController.swift b/AVIRO/Scene/Feature/Home/ViewController/HomeViewController.swift index 84732409..8ddb93f5 100644 --- a/AVIRO/Scene/Feature/Home/ViewController/HomeViewController.swift +++ b/AVIRO/Scene/Feature/Home/ViewController/HomeViewController.swift @@ -404,6 +404,8 @@ extension HomeViewController: HomeViewProtocol { view.addGestureRecognizer(whenSlideTapGesture) } + + /// Fetcing이 진행 중일 때를 알려주는 indicator show func isFectingData() { isFectchingindicatorView.isHidden = false isFecthingLabel.isHidden = false @@ -534,7 +536,7 @@ extension HomeViewController: HomeViewProtocol { } } - func updateMapPlace(_ mapPlace: MapPlace) { + func updateMapPlace(_ mapPlace: VeganType) { placeView.updateMapPlace(mapPlace) } @@ -1192,7 +1194,6 @@ extension HomeViewController: AfterHomeViewControllerProtocol { } func showLevelUpAlert(with level: Int) { - print(level) levelUpAlertView.setMainTitle(with: level) tabBarDelegate?.hideBlurEffectView(with: false) diff --git a/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/PlaceView.swift b/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/PlaceView.swift index fd4d9450..61afbb0f 100644 --- a/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/PlaceView.swift +++ b/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/PlaceView.swift @@ -127,7 +127,7 @@ final class PlaceView: UIView { segmentedControlView.refreshMenuData(menuModel) } - func updateMapPlace(_ mapPlace: MapPlace) { + func updateMapPlace(_ mapPlace: VeganType) { summaryView.updateMapPlace(mapPlace) } diff --git a/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/SubView/PlaceSummaryView.swift b/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/SubView/PlaceSummaryView.swift index 089b8162..647c19d0 100644 --- a/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/SubView/PlaceSummaryView.swift +++ b/AVIRO/Scene/Feature/Home/ViewController/PlaceDetailView/SubView/PlaceSummaryView.swift @@ -343,7 +343,7 @@ final class PlaceSummaryView: UIView { self.reviewsLabel.text = "\(count)개" } - func updateMapPlace(_ mapPlace: MapPlace) { + func updateMapPlace(_ mapPlace: VeganType) { var placeIconImage: UIImage? var whenSlideTopLabelString: String? diff --git a/AVIRO/Scene/Feature/Home/ViewPresenter/HomeViewPresenter.swift b/AVIRO/Scene/Feature/Home/ViewPresenter/HomeViewPresenter.swift index 7ad66ec6..b355d2f4 100644 --- a/AVIRO/Scene/Feature/Home/ViewPresenter/HomeViewPresenter.swift +++ b/AVIRO/Scene/Feature/Home/ViewPresenter/HomeViewPresenter.swift @@ -41,7 +41,7 @@ protocol HomeViewProtocol: NSObject { ) func updateMenus(_ menuData: AVIROPlaceMenus?) - func updateMapPlace(_ mapPlace: MapPlace) + func updateMapPlace(_ mapPlace: VeganType) func deleteMyReview(_ commentId: String) func pushPlaceInfoOpreationHoursViewController(_ models: [EditOperationHoursModel]) @@ -269,8 +269,6 @@ final class HomeViewPresenter: NSObject { guard let markerModel = markerModel, let index = index else { return } - print(markerModel) - getPlaceSummaryModel(markerModel) hasTouchedMarkerBefore = true @@ -291,17 +289,36 @@ final class HomeViewPresenter: NSObject { let latLng = NMGLatLng(lat: data.y, lng: data.x) let marker = NMFMarker(position: latLng) let placeId = data.placeId - var place: MapPlace + var veganType: VeganType + var categoryType: CategoryType + // TODO: - String에서 Enum으로 변경 필요 (Network DTO 값을 Domain으로 변경하도록 Refectoring 필요) + /// Clean Architecture 적용 하면서 수행 if data.allVegan { - place = MapPlace.All + veganType = .All } else if data.someMenuVegan { - place = MapPlace.Some + veganType = .Some + } else { + veganType = .Request + } + + + /// 빵집 / 술집 / + if data.category == "빵집" { + categoryType = .Bread + } else if data.category == "술집" { + categoryType = .Bar + } else if data.category == "식당" { + categoryType = .Restaurant + } else if data.category == "카페" { + categoryType = .Coffee } else { - place = MapPlace.Request + // 값이 아에 없을때 확인 + categoryType = .Restaurant } - marker.makeIcon(place) + + marker.makeIcon(veganType: veganType, categoryType: categoryType) marker.touchHandler = { [weak self] _ in self?.touchedMarker(marker) return true @@ -310,7 +327,8 @@ final class HomeViewPresenter: NSObject { let markerModel = MarkerModel( placeId: placeId, marker: marker, - mapPlace: place, + veganType: veganType, + categoryType: categoryType, isAll: data.allVegan, isSome: data.someMenuVegan, isRequest: data.ifRequestVegan @@ -371,7 +389,7 @@ final class HomeViewPresenter: NSObject { // MARK: Load Place Sumamry private func getPlaceSummaryModel(_ markerModel: MarkerModel) { - let mapPlace = markerModel.mapPlace + let mapPlace = markerModel.veganType let placeX = markerModel.marker.position.lng let placeY = markerModel.marker.position.lat let placeId = markerModel.placeId @@ -783,7 +801,7 @@ final class HomeViewPresenter: NSObject { func afterEditMenuChangedMarker(_ changedMarkerModel: EditMenuChangedMarkerModel) { guard var selectedMarkerModel = selectedMarkerModel else { return } - selectedMarkerModel.mapPlace = changedMarkerModel.mapPlace + selectedMarkerModel.veganType = changedMarkerModel.mapPlace selectedMarkerModel.isAll = changedMarkerModel.isAll selectedMarkerModel.isSome = changedMarkerModel.isSome selectedMarkerModel.isRequest = changedMarkerModel.isRequest @@ -866,7 +884,7 @@ final class HomeViewPresenter: NSObject { var image: UIImage! - switch markerModel.mapPlace { + switch markerModel.veganType { case .All: image = .allCell case .Some: @@ -897,7 +915,7 @@ final class HomeViewPresenter: NSObject { var image: UIImage! - switch markerModel.mapPlace { + switch markerModel.veganType { case .All: image = .allCell case .Some: diff --git a/AVIRO/Scene/Feature/Login/ViewPresenter/LoginViewPresenter.swift b/AVIRO/Scene/Feature/Login/ViewPresenter/LoginViewPresenter.swift index 0c0038db..776560fa 100644 --- a/AVIRO/Scene/Feature/Login/ViewPresenter/LoginViewPresenter.swift +++ b/AVIRO/Scene/Feature/Login/ViewPresenter/LoginViewPresenter.swift @@ -76,7 +76,7 @@ final class LoginViewPresenter: NSObject { identityToken: model.identityToken, authorizationCode: model.authorizationCode ) - + AVIROAPI.manager.checkWhenAppleLogin(with: checkAppleLoginModel) { [weak self] result in switch result { case .success(let success):