Skip to content

Commit

Permalink
Use asset-catalog because, itms wants it
Browse files Browse the repository at this point in the history
  • Loading branch information
feliciaan committed Sep 8, 2014
1 parent f3046fe commit b325abc
Show file tree
Hide file tree
Showing 16 changed files with 103 additions and 41 deletions.
44 changes: 6 additions & 38 deletions iOS/Hydra-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,11 @@
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIcons</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Icon-Small-iOS7</string>
<string>Icon-Small-iOS6</string>
<string>Icon-iOS7</string>
<string>Icon-iOS6</string>
<string>Icon.png</string>
<string>[email protected]</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>Icon already includes gloss effects</key>
<true/>
</dict>
<key>CFBundleIcons~ipad</key>
<dict>
<key>Icon already includes gloss effects</key>
<true/>
</dict>
Expand All @@ -49,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.2</string>
<string>1.1.4</string>
<key>FacebookAppID</key>
<string>146947948791011</string>
<key>LSRequiresIPhoneOS</key>
Expand All @@ -58,29 +49,6 @@
<array>
<string>audio</string>
</array>
<key>UILaunchImages</key>
<array>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>ios7-Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{320, 568}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>ios7-Default</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{320, 480}</string>
</dict>
</array>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIStatusBarHidden</key>
Expand Down
12 changes: 10 additions & 2 deletions iOS/Hydra.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
904BC46D17E2014A0000FED6 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 904BC46917E2014A0000FED6 /* [email protected] */; };
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 */; };
Expand Down Expand Up @@ -251,6 +252,7 @@
906C1D8717C8A4A600145CD3 /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapViewController.h; sourceTree = "<group>"; };
906C1D8817C8A4A600145CD3 /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewController.m; sourceTree = "<group>"; };
908DFF02188E932D00D526DC /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
908E536419BE4F3900F1DA57 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
90B1029617A85E9200669CCD /* kalender.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = kalender.css; sourceTree = "<group>"; };
90BAB264162749BC0043BA92 /* SchamperDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchamperDetailViewController.h; sourceTree = "<group>"; };
90BAB265162749BC0043BA92 /* SchamperDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SchamperDetailViewController.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -856,6 +858,7 @@
F5EBF11F159E09C700EB5D26 /* Models */,
3B93FBA01630942500C962DC /* Services */,
F59CEE9716A189290038FD24 /* Social */,
908E536419BE4F3900F1DA57 /* Images.xcassets */,
);
path = Hydra;
sourceTree = "<group>";
Expand Down Expand Up @@ -1097,6 +1100,7 @@
F5BC3D8E162EBB5100E4A902 /* [email protected] in Resources */,
F5D3B612162EF02F00698C3E /* button-feedback.png in Resources */,
F5D3B613162EF02F00698C3E /* [email protected] in Resources */,
908E536519BE4F3900F1DA57 /* Images.xcassets in Resources */,
F533DABA16315E87001269A8 /* schamper.css in Resources */,
F533DABC163163E2001269A8 /* schamper-bg.png in Resources */,
F557EA46163431FC00635CDD /* [email protected] in Resources */,
Expand Down Expand Up @@ -1374,14 +1378,16 @@
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} β";
CUSTOM_IDENTIFIER_SUFFIX = "-dev";
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;
Expand All @@ -1392,14 +1398,16 @@
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}";
CUSTOM_IDENTIFIER_SUFFIX = "";
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;
Expand Down
2 changes: 1 addition & 1 deletion iOS/Hydra/Hydra-Prefix.pch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
44 changes: 44 additions & 0 deletions iOS/Hydra/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"images" : [
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon-iOS6.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small-iOS6.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions iOS/Hydra/Images.xcassets/LaunchImage.launchimage/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"images" : [
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "[email protected]",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "[email protected]",
"minimum-system-version" : "7.0",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "Default.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "[email protected]",
"subtype" : "retina4",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b325abc

Please sign in to comment.