diff --git a/iOS/Hydra-Info.plist b/iOS/Hydra-Info.plist index dff38109..996ad230 100644 --- a/iOS/Hydra-Info.plist +++ b/iOS/Hydra-Info.plist @@ -10,20 +10,11 @@ ${EXECUTABLE_NAME} CFBundleIcons - CFBundlePrimaryIcon - - CFBundleIconFiles - - Icon-Small-iOS7 - Icon-Small-iOS6 - Icon-iOS7 - Icon-iOS6 - Icon.png - Icon@2x.png - - UIPrerenderedIcon - - + Icon already includes gloss effects + + + CFBundleIcons~ipad + Icon already includes gloss effects @@ -49,7 +40,7 @@ CFBundleVersion - 1.1.2 + 1.1.4 FacebookAppID 146947948791011 LSRequiresIPhoneOS @@ -58,29 +49,6 @@ audio - UILaunchImages - - - UILaunchImageMinimumOSVersion - 7.0 - UILaunchImageName - ios7-Default - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 568} - - - UILaunchImageMinimumOSVersion - 7.0 - UILaunchImageName - ios7-Default - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 480} - - UIPrerenderedIcon UIStatusBarHidden diff --git a/iOS/Hydra.xcodeproj/project.pbxproj b/iOS/Hydra.xcodeproj/project.pbxproj index 41eaf048..5efbf481 100644 --- a/iOS/Hydra.xcodeproj/project.pbxproj +++ b/iOS/Hydra.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ 904BC46D17E2014A0000FED6 /* dot-question@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 904BC46917E2014A0000FED6 /* dot-question@2x.png */; }; 906C1D8917C8A4A600145CD3 /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 906C1D8817C8A4A600145CD3 /* MapViewController.m */; }; 908DFF03188E932D00D526DC /* Pods-acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 908DFF02188E932D00D526DC /* Pods-acknowledgements.plist */; }; + 908E536519BE4F3900F1DA57 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 908E536419BE4F3900F1DA57 /* Images.xcassets */; }; 90B1029717A85E9200669CCD /* kalender.css in Resources */ = {isa = PBXBuildFile; fileRef = 90B1029617A85E9200669CCD /* kalender.css */; }; 90BAB266162749BD0043BA92 /* SchamperDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BAB265162749BC0043BA92 /* SchamperDetailViewController.m */; }; 90C532AB16A325A200857EB0 /* FacebookEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C532AA16A325A200857EB0 /* FacebookEvent.m */; }; @@ -251,6 +252,7 @@ 906C1D8717C8A4A600145CD3 /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapViewController.h; sourceTree = ""; }; 906C1D8817C8A4A600145CD3 /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewController.m; sourceTree = ""; }; 908DFF02188E932D00D526DC /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = ""; }; + 908E536419BE4F3900F1DA57 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 90B1029617A85E9200669CCD /* kalender.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = kalender.css; sourceTree = ""; }; 90BAB264162749BC0043BA92 /* SchamperDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchamperDetailViewController.h; sourceTree = ""; }; 90BAB265162749BC0043BA92 /* SchamperDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SchamperDetailViewController.m; sourceTree = ""; }; @@ -856,6 +858,7 @@ F5EBF11F159E09C700EB5D26 /* Models */, 3B93FBA01630942500C962DC /* Services */, F59CEE9716A189290038FD24 /* Social */, + 908E536419BE4F3900F1DA57 /* Images.xcassets */, ); path = Hydra; sourceTree = ""; @@ -1097,6 +1100,7 @@ F5BC3D8E162EBB5100E4A902 /* Default-568h@2x.png in Resources */, F5D3B612162EF02F00698C3E /* button-feedback.png in Resources */, F5D3B613162EF02F00698C3E /* button-feedback@2x.png in Resources */, + 908E536519BE4F3900F1DA57 /* Images.xcassets in Resources */, F533DABA16315E87001269A8 /* schamper.css in Resources */, F533DABC163163E2001269A8 /* schamper-bg.png in Resources */, F557EA46163431FC00635CDD /* schamper-bg@2x.png in Resources */, @@ -1374,6 +1378,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24046D4357E2426386B31283 /* Pods.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CUSTOM_BUNDLE_DISPLAY_NAME = "${PRODUCT_NAME} β"; @@ -1381,7 +1387,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Hydra/Hydra-Prefix.pch"; INFOPLIST_FILE = "Hydra-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; @@ -1392,6 +1398,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24046D4357E2426386B31283 /* Pods.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CUSTOM_BUNDLE_DISPLAY_NAME = "${PRODUCT_NAME}"; @@ -1399,7 +1407,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Hydra/Hydra-Prefix.pch"; INFOPLIST_FILE = "Hydra-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; diff --git a/iOS/Hydra/Hydra-Prefix.pch b/iOS/Hydra/Hydra-Prefix.pch index 34a9653b..243a510c 100644 --- a/iOS/Hydra/Hydra-Prefix.pch +++ b/iOS/Hydra/Hydra-Prefix.pch @@ -19,7 +19,7 @@ #import "UIColor+AppColors.h" #endif -#define PUBLIC_RELEASE 0 +#define PUBLIC_RELEASE 1 #define BETA_RELEASE !PUBLIC_RELEASE #if PUBLIC_RELEASE diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Contents.json b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..75227b59 --- /dev/null +++ b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,44 @@ +{ + "images" : [ + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon-iOS6.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon-iOS6@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-iOS7@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small-iOS6.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small-iOS6@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-Small-iOS7@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS6.png b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS6.png new file mode 100644 index 00000000..32c83c2a Binary files /dev/null and b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS6.png differ diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS6@2x.png b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS6@2x.png new file mode 100644 index 00000000..b89597a0 Binary files /dev/null and b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS6@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS7@2x.png b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS7@2x.png new file mode 100644 index 00000000..1fc37475 Binary files /dev/null and b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-Small-iOS7@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS6.png b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS6.png new file mode 100644 index 00000000..53c635eb Binary files /dev/null and b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS6.png differ diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS6@2x.png b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS6@2x.png new file mode 100644 index 00000000..1606c2df Binary files /dev/null and b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS6@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS7@2x.png b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS7@2x.png new file mode 100644 index 00000000..0fdd8a2a Binary files /dev/null and b/iOS/Hydra/Images.xcassets/AppIcon.appiconset/Icon-iOS7@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Contents.json b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 00000000..eb54dc35 --- /dev/null +++ b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,42 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "ios7-Default@2x.png", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "ios7-Default-568h@2x.png", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default.png", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png new file mode 100644 index 00000000..88d0ec89 Binary files /dev/null and b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default.png b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default.png new file mode 100644 index 00000000..9144233e Binary files /dev/null and b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default.png differ diff --git a/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default@2x.png new file mode 100644 index 00000000..48219e32 Binary files /dev/null and b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Default@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/ios7-Default-568h@2x.png b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/ios7-Default-568h@2x.png new file mode 100644 index 00000000..a545a480 Binary files /dev/null and b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/ios7-Default-568h@2x.png differ diff --git a/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/ios7-Default@2x.png b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/ios7-Default@2x.png new file mode 100644 index 00000000..e0ef2fde Binary files /dev/null and b/iOS/Hydra/Images.xcassets/LaunchImage.launchimage/ios7-Default@2x.png differ