Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Commit

Permalink
Switching to Asset Catalog, closes #1124.
Browse files Browse the repository at this point in the history
Also: some fancy images to be updated, or maybe not.
  • Loading branch information
folletto committed Oct 14, 2013
1 parent c03c1f2 commit 8f05905
Show file tree
Hide file tree
Showing 53 changed files with 336 additions and 110 deletions.
104 changes: 10 additions & 94 deletions Baker.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Baker/AppDelegate.m
Expand Up @@ -132,12 +132,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// Background is 64px high: in iOS7, it will be used as the background for the status bar as well.
[navigationBar setTintColor:[UIColor colorWithHexString:ISSUES_ACTION_BUTTON_BACKGROUND_COLOR]];
[navigationBar setBarTintColor:[UIColor colorWithHexString:@"ffffff"]];
[navigationBar setBackgroundImage:[UIImage imageNamed:@"navigation-bar-bg.png"] forBarMetrics:UIBarMetricsDefault];
[navigationBar setBackgroundImage:[UIImage imageNamed:@"navigation-bar-bg"] forBarMetrics:UIBarMetricsDefault];
navigationBar.titleTextAttributes = [NSDictionary dictionaryWithObject:[UIColor colorWithHexString:@"000000"] forKey:UITextAttributeTextColor];
} else {
// Background is 44px: in iOS6 and below, a higher background image would make the navigation bar
// appear higher than it should be.
[navigationBar setBackgroundImage:[UIImage imageNamed:@"navigation-bar-bg-ios6.png"] forBarMetrics:UIBarMetricsDefault];
[navigationBar setBackgroundImage:[UIImage imageNamed:@"navigation-bar-bg-ios6"] forBarMetrics:UIBarMetricsDefault];
[navigationBar setTintColor:[UIColor colorWithHexString:@"333333"]]; // black will not trigger a pushed status
}

Expand Down
10 changes: 0 additions & 10 deletions Baker/Baker-Info.plist
Expand Up @@ -10,16 +10,6 @@
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIcons</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>ios-icon-iphone</string>
<string>ios-icon-ipad</string>
</array>
<key>UIPrerenderedIcon</key>
<false/>
</dict>
<key>UINewsstandIcon</key>
<dict>
<key>CFBundleIconFiles</key>
Expand Down
95 changes: 95 additions & 0 deletions Baker/BakerAssets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,95 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "iPhone App iOS6.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "iPhone App iOS6@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "iPhone App iOS7@2x.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "2x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "iPad App iOS6.png",
"scale" : "1x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "iPad App iOS6@2x.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "iPad App iOS7.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "iPad App iOS7@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions Baker/BakerAssets.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,85 @@
{
"images" : [
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "iPhone Portrait iOS7@2x.png",
"scale" : "2x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "iPhone Portrait iOS7 R4.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "iPad Portrait iOS7.png",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "iPad Landscape iOS7.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "iPad Portrait iOS7@2x.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "iPad Landscape iOS7@2x.png",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"filename" : "iPad Portrait iOS6 no status bar.png",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"filename" : "iPad Landscape iOS6 no status bar.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"filename" : "iPad Portrait iOS6 no status bar@2x.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"filename" : "iPad Landscape iOS6 no status bar@2x-1.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Baker/BakerAssets.xcassets/back.imageset/Contents.json
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "back.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "back@2x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
File renamed without changes
File renamed without changes
18 changes: 18 additions & 0 deletions Baker/BakerAssets.xcassets/forward.imageset/Contents.json
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "forward.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "forward@2x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
File renamed without changes
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "navigation-bar-bg-ios6.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "navigation-bar-bg-ios6@2x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "navigation-bar-bg.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "navigation-bar-bg@2x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
@@ -0,0 +1,34 @@
{
"images" : [
{
"idiom" : "iphone",
"scale" : "1x",
"filename" : "shelf-bg-landscape~iphone.png"
},
{
"idiom" : "iphone",
"scale" : "2x",
"filename" : "shelf-bg-landscape@2x~iphone.png"
},
{
"idiom" : "iphone",
"filename" : "shelf-bg-landscape-568h.png",
"subtype" : "retina4",
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"filename" : "shelf-bg-landscape~ipad.png"
},
{
"idiom" : "ipad",
"scale" : "2x",
"filename" : "shelf-bg-landscape@2x~ipad.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
@@ -0,0 +1,34 @@
{
"images" : [
{
"idiom" : "iphone",
"scale" : "1x",
"filename" : "shelf-bg-portrait~iphone.png"
},
{
"idiom" : "iphone",
"scale" : "2x",
"filename" : "shelf-bg-portrait@2x~iphone.png"
},
{
"idiom" : "iphone",
"filename" : "shelf-bg-portrait-568h.png",
"subtype" : "retina4",
"scale" : "2x"
},
{
"idiom" : "ipad",
"scale" : "1x",
"filename" : "shelf-bg-portrait~ipad.png"
},
{
"idiom" : "ipad",
"scale" : "2x",
"filename" : "shelf-bg-portrait@2x~ipad.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file removed Baker/icon/ios-icon-ipad.png
Diff not rendered.
Binary file removed Baker/icon/ios-icon-ipad@2x.png
Diff not rendered.
Binary file removed Baker/icon/ios-icon-iphone.png
Diff not rendered.
Binary file removed Baker/icon/ios-icon-iphone@2x.png
Diff not rendered.
4 changes: 2 additions & 2 deletions BakerShelf/ShelfViewController.m
Expand Up @@ -271,9 +271,9 @@ - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrie
}

if (size.height == 568) {
image = [NSString stringWithFormat:@"%@-568h.png", image];
image = [NSString stringWithFormat:@"%@-568h", image];
} else {
image = [NSString stringWithFormat:@"%@.png", image];
image = [NSString stringWithFormat:@"%@", image];
}

int bannerHeight = [ShelfViewController getBannerHeight];
Expand Down
4 changes: 2 additions & 2 deletions BakerView/ModalViewController.m
Expand Up @@ -104,11 +104,11 @@ - (void)loadView {

UIBarButtonItem *btnAction = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(openInSafari)] autorelease];

self.btnGoBack = [[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back.png"] style:UIBarButtonItemStylePlain target:self action:@selector(goBack)] autorelease];
self.btnGoBack = [[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back"] style:UIBarButtonItemStylePlain target:self action:@selector(goBack)] autorelease];
btnGoBack.enabled = NO;
btnGoBack.width = 30;

self.btnGoForward = [[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"forward.png"] style:UIBarButtonItemStylePlain target:self action:@selector(goForward)] autorelease];
self.btnGoForward = [[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"forward"] style:UIBarButtonItemStylePlain target:self action:@selector(goForward)] autorelease];
btnGoForward.enabled = NO;
btnGoForward.width = 30;

Expand Down
Binary file removed Default-568h@2x.png
Diff not rendered.

0 comments on commit 8f05905

Please sign in to comment.