Skip to content

Commit

Permalink
Mini nav bar assets #14
Browse files Browse the repository at this point in the history
  • Loading branch information
@soffes
soffes committed Jul 28, 2012
1 parent 1cac7f5 commit 6628ab5
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 23 deletions.
32 changes: 32 additions & 0 deletions Cheddar for iOS.xcodeproj/project.pbxproj
View file
Expand Up @@ -157,6 +157,14 @@
B28FD2E215BF755600365CD6 /* Cheddar.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B28FD2E015BF755600365CD6 /* Cheddar.xcdatamodeld */; };
B28FD2E815BF774D00365CD6 /* CDIDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = B28FD2E715BF774D00365CD6 /* CDIDefines.m */; };
B2A2B07B15C0BE7300772CF6 /* CDKTask+CheddariOSAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A2B07A15C0BE7300772CF6 /* CDKTask+CheddariOSAdditions.m */; };
B2AD02E315C46F7300D9B909 /* nav-back-mini-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02DF15C46F7300D9B909 /* nav-back-mini-highlighted.png */; };
B2AD02E415C46F7300D9B909 /* nav-back-mini.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02E015C46F7300D9B909 /* nav-back-mini.png */; };
B2AD02E515C46F7300D9B909 /* nav-button-mini-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02E115C46F7300D9B909 /* nav-button-mini-highlighted.png */; };
B2AD02E615C46F7300D9B909 /* nav-button-mini.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02E215C46F7300D9B909 /* nav-button-mini.png */; };
B2AD02EB15C475B100D9B909 /* nav-back-mini-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02E715C475B100D9B909 /* nav-back-mini-highlighted@2x.png */; };
B2AD02EC15C475B100D9B909 /* nav-back-mini@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02E815C475B100D9B909 /* nav-back-mini@2x.png */; };
B2AD02ED15C475B100D9B909 /* nav-button-mini-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02E915C475B100D9B909 /* nav-button-mini-highlighted@2x.png */; };
B2AD02EE15C475B100D9B909 /* nav-button-mini@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2AD02EA15C475B100D9B909 /* nav-button-mini@2x.png */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -416,6 +424,14 @@
B28FD2E715BF774D00365CD6 /* CDIDefines.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDIDefines.m; sourceTree = "<group>"; };
B2A2B07915C0BE7300772CF6 /* CDKTask+CheddariOSAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CDKTask+CheddariOSAdditions.h"; sourceTree = "<group>"; };
B2A2B07A15C0BE7300772CF6 /* CDKTask+CheddariOSAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CDKTask+CheddariOSAdditions.m"; sourceTree = "<group>"; };
B2AD02DF15C46F7300D9B909 /* nav-back-mini-highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-back-mini-highlighted.png"; sourceTree = "<group>"; };
B2AD02E015C46F7300D9B909 /* nav-back-mini.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-back-mini.png"; sourceTree = "<group>"; };
B2AD02E115C46F7300D9B909 /* nav-button-mini-highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-button-mini-highlighted.png"; sourceTree = "<group>"; };
B2AD02E215C46F7300D9B909 /* nav-button-mini.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-button-mini.png"; sourceTree = "<group>"; };
B2AD02E715C475B100D9B909 /* nav-back-mini-highlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-back-mini-highlighted@2x.png"; sourceTree = "<group>"; };
B2AD02E815C475B100D9B909 /* nav-back-mini@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-back-mini@2x.png"; sourceTree = "<group>"; };
B2AD02E915C475B100D9B909 /* nav-button-mini-highlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-button-mini-highlighted@2x.png"; sourceTree = "<group>"; };
B2AD02EA15C475B100D9B909 /* nav-button-mini@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav-button-mini@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -484,6 +500,14 @@
B208BBD615BF63A80080705D /* Images */ = {
isa = PBXGroup;
children = (
B2AD02E715C475B100D9B909 /* nav-back-mini-highlighted@2x.png */,
B2AD02E815C475B100D9B909 /* nav-back-mini@2x.png */,
B2AD02E915C475B100D9B909 /* nav-button-mini-highlighted@2x.png */,
B2AD02EA15C475B100D9B909 /* nav-button-mini@2x.png */,
B2AD02DF15C46F7300D9B909 /* nav-back-mini-highlighted.png */,
B2AD02E015C46F7300D9B909 /* nav-back-mini.png */,
B2AD02E115C46F7300D9B909 /* nav-button-mini-highlighted.png */,
B2AD02E215C46F7300D9B909 /* nav-button-mini.png */,
B208BBD715BF63A80080705D /* add-list-arrow.png */,
B208BBD815BF63A80080705D /* add-list-arrow@2x.png */,
B208BBD915BF63A80080705D /* add-task-arrow.png */,
Expand Down Expand Up @@ -1091,6 +1115,14 @@
B28FD2DD15BF742D00365CD6 /* Gotham-Book.otf in Resources */,
B28FD2DE15BF742D00365CD6 /* Gotham-BookItalic.otf in Resources */,
B28F84DB15C37E1D003E4595 /* SSToolkitResources.bundle in Resources */,
B2AD02E315C46F7300D9B909 /* nav-back-mini-highlighted.png in Resources */,
B2AD02E415C46F7300D9B909 /* nav-back-mini.png in Resources */,
B2AD02E515C46F7300D9B909 /* nav-button-mini-highlighted.png in Resources */,
B2AD02E615C46F7300D9B909 /* nav-button-mini.png in Resources */,
B2AD02EB15C475B100D9B909 /* nav-back-mini-highlighted@2x.png in Resources */,
B2AD02EC15C475B100D9B909 /* nav-back-mini@2x.png in Resources */,
B2AD02ED15C475B100D9B909 /* nav-button-mini-highlighted@2x.png in Resources */,
B2AD02EE15C475B100D9B909 /* nav-button-mini@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
45 changes: 22 additions & 23 deletions Classes/CDIAppDelegate.m
View file
Expand Up @@ -57,22 +57,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:[[CDIListsViewController alloc] init]];
self.window.rootViewController = navigationController;
[self.window makeKeyAndVisible];

UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 20.0f, 5.0f, 5.0f)];
imageView.image = [UIImage imageNamed:@"corner-tl.png"];
[self.window addSubview:imageView];

imageView = [[UIImageView alloc] initWithFrame:CGRectMake(315.0f, 20.0f, 5.0f, 5.0f)];
imageView.image = [UIImage imageNamed:@"corner-tr.png"];
[self.window addSubview:imageView];

imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0, 475.0f, 5.0f, 5.0f)];
imageView.image = [UIImage imageNamed:@"corner-bl.png"];
[self.window addSubview:imageView];

imageView = [[UIImageView alloc] initWithFrame:CGRectMake(315, 475.0f, 5.0f, 5.0f)];
imageView.image = [UIImage imageNamed:@"corner-br.png"];
[self.window addSubview:imageView];
}

// Defer some stuff to make launching faster
Expand Down Expand Up @@ -118,31 +102,46 @@ - (void)applicationWillTerminate:(UIApplication *)application {

+ (void)applyStylesheet {
// Navigation bar
id navigationBar = [UINavigationBar appearance];
UINavigationBar *navigationBar = [UINavigationBar appearance];
[navigationBar setBackgroundImage:[UIImage imageNamed:@"nav-background.png"] forBarMetrics:UIBarMetricsDefault];
[navigationBar setTitleVerticalPositionAdjustment:-1.0f forBarMetrics:UIBarMetricsDefault];
[navigationBar setTitleTextAttributes:[[NSDictionary alloc] initWithObjectsAndKeys:
[UIFont cheddarFontOfSize:22.0f], UITextAttributeFont,
[UIFont cheddarFontOfSize:20.0f], UITextAttributeFont,
[UIColor colorWithWhite:0.0f alpha:0.2f], UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0.0f, 1.0f)], UITextAttributeTextShadowOffset,
[UIColor whiteColor], UITextAttributeTextColor,
nil]];

// Navigation bar button
// Navigation bar mini
[navigationBar setTitleVerticalPositionAdjustment:-2.0f forBarMetrics:UIBarMetricsLandscapePhone];

// Navigation button
NSDictionary *barButtonTitleTextAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
[UIFont cheddarFontOfSize:14.0f], UITextAttributeFont,
[UIColor colorWithWhite:0.0f alpha:0.2f], UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0.0f, 1.0f)], UITextAttributeTextShadowOffset,
nil];
id barButton = [UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil];
[barButton setBackButtonTitlePositionAdjustment:UIOffsetMake(1.0f, -2.0f) forBarMetrics:UIBarMetricsDefault];
UIBarButtonItem *barButton = [UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil];
[barButton setTitlePositionAdjustment:UIOffsetMake(0.0f, 1.0f) forBarMetrics:UIBarMetricsDefault];
[barButton setTitleTextAttributes:barButtonTitleTextAttributes forState:UIControlStateNormal];
[barButton setTitleTextAttributes:barButtonTitleTextAttributes forState:UIControlStateHighlighted];
[barButton setBackButtonBackgroundImage:[[UIImage imageNamed:@"nav-back.png"] stretchableImageWithLeftCapWidth:13 topCapHeight:0] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[barButton setBackButtonBackgroundImage:[[UIImage imageNamed:@"nav-back-highlighted.png"] stretchableImageWithLeftCapWidth:13 topCapHeight:0] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];
[barButton setBackgroundImage:[[UIImage imageNamed:@"nav-button.png"] stretchableImageWithLeftCapWidth:6 topCapHeight:0] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[barButton setBackgroundImage:[[UIImage imageNamed:@"nav-button-highlighted.png"] stretchableImageWithLeftCapWidth:6 topCapHeight:0] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];

// Navigation back button
[barButton setBackButtonTitlePositionAdjustment:UIOffsetMake(1.0f, -2.0f) forBarMetrics:UIBarMetricsDefault];
[barButton setBackButtonBackgroundImage:[[UIImage imageNamed:@"nav-back.png"] stretchableImageWithLeftCapWidth:13 topCapHeight:0] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
[barButton setBackButtonBackgroundImage:[[UIImage imageNamed:@"nav-back-highlighted.png"] stretchableImageWithLeftCapWidth:13 topCapHeight:0] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];

// Navigation button mini
[barButton setTitlePositionAdjustment:UIOffsetMake(0.0f, 1.0f) forBarMetrics:UIBarMetricsLandscapePhone];
[barButton setBackgroundImage:[[UIImage imageNamed:@"nav-button-mini.png"] stretchableImageWithLeftCapWidth:6 topCapHeight:0] forState:UIControlStateNormal barMetrics:UIBarMetricsLandscapePhone];
[barButton setBackgroundImage:[[UIImage imageNamed:@"nav-button-mini-highlighted.png"] stretchableImageWithLeftCapWidth:6 topCapHeight:0] forState:UIControlStateHighlighted barMetrics:UIBarMetricsLandscapePhone];

// Navigation back button mini
[barButton setBackButtonTitlePositionAdjustment:UIOffsetMake(1.0f, -2.0f) forBarMetrics:UIBarMetricsLandscapePhone];
[barButton setBackButtonBackgroundImage:[[UIImage imageNamed:@"nav-back-mini.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0] forState:UIControlStateNormal barMetrics:UIBarMetricsLandscapePhone];
[barButton setBackButtonBackgroundImage:[[UIImage imageNamed:@"nav-back-mini-highlighted.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0] forState:UIControlStateHighlighted barMetrics:UIBarMetricsLandscapePhone];
}

@end
Binary file added Resources/Images/nav-back-mini-highlighted.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-back-mini-highlighted@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-back-mini.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-back-mini@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-button-mini-highlighted.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-button-mini-highlighted@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-button-mini.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/nav-button-mini@2x.png
View file
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 6628ab5

Please sign in to comment.