Skip to content

Commit

Permalink
Cleaned up Main View Controller. Freshened the background, added a to…
Browse files Browse the repository at this point in the history 
…uch of leather. Premium, pre-worn leather bitches.
  • Loading branch information
Rob Rhyne committed May 1, 2010
1 parent e95af09 commit 5386eba
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 42 deletions.
20 changes: 8 additions & 12 deletions Briefs.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@
D47F4B78113CC3E400EEB871 /* BFSceneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A39799113B7591004971E9 /* BFSceneManager.m */; };
D482E4FD10EEECC700678404 /* BFMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D482E4FB10EEECC700678404 /* BFMainViewController.m */; };
D482E4FE10EEECC700678404 /* BFMainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D482E4FC10EEECC700678404 /* BFMainViewController.xib */; };
D482E50210EEF08A00678404 /* menu-bg.png in Resources */ = {isa = PBXBuildFile; fileRef = D482E50110EEF08A00678404 /* menu-bg.png */; };
D482E51910EEFB0D00678404 /* blue-button-bg.png in Resources */ = {isa = PBXBuildFile; fileRef = D482E51710EEFB0D00678404 /* blue-button-bg.png */; };
D482E51A10EEFB0D00678404 /* gray-button-bg.png in Resources */ = {isa = PBXBuildFile; fileRef = D482E51810EEFB0D00678404 /* gray-button-bg.png */; };
D482E54510F03FE000678404 /* BFConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D482E54410F03FE000678404 /* BFConfig.m */; };
D4991095109FEA85008C5E17 /* BFParagraphCellController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4991094109FEA85008C5E17 /* BFParagraphCellController.m */; };
D4A0C262116AD85C0088E5F6 /* BFLoadingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0C260116AD85C0088E5F6 /* BFLoadingViewController.m */; };
Expand Down Expand Up @@ -149,6 +146,8 @@
D4D4BC8411727A7C009D70D0 /* built-in-button.png in Resources */ = {isa = PBXBuildFile; fileRef = D4D4BC8311727A7C009D70D0 /* built-in-button.png */; };
D4D4BC9B11728150009D70D0 /* UINavigationBar+CustomBackground.m in Sources */ = {isa = PBXBuildFile; fileRef = D4D4BC9A11728150009D70D0 /* UINavigationBar+CustomBackground.m */; };
D4D4BC9D11728248009D70D0 /* navigation-bar.png in Resources */ = {isa = PBXBuildFile; fileRef = D4D4BC9C11728248009D70D0 /* navigation-bar.png */; };
D4F210D3118BD5E20041F87C /* root-menu-bg.png in Resources */ = {isa = PBXBuildFile; fileRef = D4F210D2118BD5E20041F87C /* root-menu-bg.png */; };
D4F210D5118BD6520041F87C /* top-nav-button.png in Resources */ = {isa = PBXBuildFile; fileRef = D4F210D4118BD6520041F87C /* top-nav-button.png */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -269,9 +268,6 @@
D482E4FA10EEECC700678404 /* BFMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFMainViewController.h; sourceTree = "<group>"; };
D482E4FB10EEECC700678404 /* BFMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFMainViewController.m; sourceTree = "<group>"; };
D482E4FC10EEECC700678404 /* BFMainViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = BFMainViewController.xib; path = Classes/BFMainViewController.xib; sourceTree = "<group>"; };
D482E50110EEF08A00678404 /* menu-bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "menu-bg.png"; path = "images/menu-bg.png"; sourceTree = "<group>"; };
D482E51710EEFB0D00678404 /* blue-button-bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "blue-button-bg.png"; path = "images/blue-button-bg.png"; sourceTree = "<group>"; };
D482E51810EEFB0D00678404 /* gray-button-bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "gray-button-bg.png"; path = "images/gray-button-bg.png"; sourceTree = "<group>"; };
D482E54310F03FE000678404 /* BFConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFConfig.h; sourceTree = "<group>"; };
D482E54410F03FE000678404 /* BFConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFConfig.m; sourceTree = "<group>"; };
D4991093109FEA85008C5E17 /* BFParagraphCellController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFParagraphCellController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -365,6 +361,8 @@
D4D4BC8311727A7C009D70D0 /* built-in-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "built-in-button.png"; path = "images/buttons/built-in-button.png"; sourceTree = "<group>"; };
D4D4BC9A11728150009D70D0 /* UINavigationBar+CustomBackground.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationBar+CustomBackground.m"; sourceTree = "<group>"; };
D4D4BC9C11728248009D70D0 /* navigation-bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "navigation-bar.png"; path = "images/bg/navigation-bar.png"; sourceTree = "<group>"; };
D4F210D2118BD5E20041F87C /* root-menu-bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "root-menu-bg.png"; path = "images/bg/root-menu-bg.png"; sourceTree = "<group>"; };
D4F210D4118BD6520041F87C /* top-nav-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "top-nav-button.png"; path = "images/buttons/top-nav-button.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -562,6 +560,7 @@
D43CE16C114F0DC800DA07D5 /* backgrounds */ = {
isa = PBXGroup;
children = (
D4F210D2118BD5E20041F87C /* root-menu-bg.png */,
D4A459D81172DCDD00D9C1DF /* cell-bottom-sel.png */,
D4A459D91172DCDD00D9C1DF /* cell-top-sel.png */,
D4A459CE1172D7AF00D9C1DF /* cell-middle-sel.png */,
Expand Down Expand Up @@ -632,6 +631,7 @@
D43CE955115FC76E00DA07D5 /* buttons */ = {
isa = PBXGroup;
children = (
D4F210D4118BD6520041F87C /* top-nav-button.png */,
D4D4BC8311727A7C009D70D0 /* built-in-button.png */,
D4D4BB2E11710E52009D70D0 /* confirm-action.png */,
D4D4BB2F11710E52009D70D0 /* confirm-cancel.png */,
Expand Down Expand Up @@ -719,9 +719,6 @@
D43CE16C114F0DC800DA07D5 /* backgrounds */,
D4A39830113C6E7F004971E9 /* icons */,
D4A394B91130F926004971E9 /* flag.png */,
D482E51710EEFB0D00678404 /* blue-button-bg.png */,
D482E51810EEFB0D00678404 /* gray-button-bg.png */,
D482E50110EEF08A00678404 /* menu-bg.png */,
D472018E10A294BA00601755 /* 58-bookmark.png */,
D47200B910A11A0500601755 /* small-gradient.png */,
D47200A710A1139500601755 /* 37-suitcase.png */,
Expand Down Expand Up @@ -973,9 +970,6 @@
D46A15D310D1FF1000B92FDF /* actions-sample.brieflist in Resources */,
0005E52D10E83C99006D44A2 /* TransitionsGallery.brieflist in Resources */,
D482E4FE10EEECC700678404 /* BFMainViewController.xib in Resources */,
D482E50210EEF08A00678404 /* menu-bg.png in Resources */,
D482E51910EEFB0D00678404 /* blue-button-bg.png in Resources */,
D482E51A10EEFB0D00678404 /* gray-button-bg.png in Resources */,
D4A394BA1130F926004971E9 /* flag.png in Resources */,
D4A39819113C6DBB004971E9 /* app-icon.png in Resources */,
D4A39833113C6E9D004971E9 /* Briefcast.png in Resources */,
Expand Down Expand Up @@ -1028,6 +1022,8 @@
D4A459DA1172DCDD00D9C1DF /* cell-bottom-sel.png in Resources */,
D4A459DB1172DCDD00D9C1DF /* cell-top-sel.png in Resources */,
D4A3B6C2118BCF720082CA9F /* Briefcast 32.png in Resources */,
D4F210D3118BD5E20041F87C /* root-menu-bg.png in Resources */,
D4F210D5118BD6520041F87C /* top-nav-button.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 4 additions & 0 deletions Classes/BFBrowseBriefcastsViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ - (void)constructTableGroups
[allControllers addObject:controller];
}

// show footer if there are no briefcasts listed
// if ([knownBriefcasts count] <= 0)
// tableFooterView.alpha = 1.0f;

self.tableGroups = [NSArray arrayWithObjects:allControllers, nil];
}

Expand Down
2 changes: 1 addition & 1 deletion Classes/BFMainViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ - (void)showMenuWithAnimation
[UIView setAnimationDuration:0.3f];
[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
CGSize size = menuView.frame.size;
menuView.frame = CGRectMake(0.0f, 280.0f, size.width, size.height);
menuView.frame = CGRectMake(0.0f, 290.0f, size.width, size.height);

[UIView commitAnimations];
}
Expand Down
65 changes: 39 additions & 26 deletions Classes/BFMainViewController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">768</int>
<string key="IBDocument.SystemVersion">10D573</string>
<string key="IBDocument.InterfaceBuilderVersion">740</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">460.00</string>
<string key="IBDocument.SystemVersion">10C2234</string>
<string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.25</string>
<string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">62</string>
<string key="NS.object.0">87</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="12"/>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand All @@ -31,9 +31,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
Expand All @@ -48,6 +50,7 @@
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">main-bg.png</string>
Expand All @@ -66,22 +69,24 @@
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">menu-bg.png</string>
<string key="NSResourceName">root-menu-bg.png</string>
</object>
</object>
<object class="IBUIButton" id="586857513">
<reference key="NSNextResponder" ref="209958199"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{8, 74}, {305, 52}}</string>
<string key="NSFrame">{{8, 65}, {305, 52}}</string>
<reference key="NSSuperview" ref="209958199"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC45MDQ1MjIwNjEzIDAuOTI0ODIwOTU5NiAwLjk0MTAwOTUyMTUgMAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentVerticalAlignment">0</int>
<object class="NSFont" key="IBUIFont" id="680178886">
<string key="NSName">Helvetica-Bold</string>
Expand Down Expand Up @@ -110,26 +115,23 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4wOTgwMzkyMTcyOSAwLjA5ODAzOTIxNzI5IDAuMDk4MDM5MjE3MjkAA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Briefcast.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="852302017">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">gray-button-bg.png</string>
<string key="NSResourceName">top-nav-button.png</string>
</object>
</object>
<object class="IBUIButton" id="355732051">
<reference key="NSNextResponder" ref="209958199"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{8, 14}, {305, 52}}</string>
<string key="NSFrame">{{8, 9}, {305, 52}}</string>
<reference key="NSSuperview" ref="209958199"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC43MDE5NjA4MDIxIDAuNzAxOTYwODAyMSAwLjcwMTk2MDgwMjEgMAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="680178886"/>
<double key="IBUITitleEdgeInsets.top">1</double>
Expand All @@ -148,14 +150,7 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4yMDAwMDAwMDMgMC4yMDAwMDAwMDMgMC4yMDAwMDAwMDMAA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Briefs.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">blue-button-bg.png</string>
</object>
<reference key="IBUINormalBackgroundImage" ref="852302017"/>
</object>
</object>
<string key="NSFrame">{{0, 415}, {320, 136}}</string>
Expand All @@ -168,6 +163,7 @@
</object>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<string key="NSFrameSize">{320, 416}</string>
Expand All @@ -181,6 +177,7 @@
<object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
<bool key="IBUIPrompted">NO</bool>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
Expand Down Expand Up @@ -596,6 +593,7 @@
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="768" key="NS.object.0"/>
Expand All @@ -607,6 +605,21 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../Briefs.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">3.1</string>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>main-bg.png</string>
<string>root-menu-bg.png</string>
<string>top-nav-button.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{320, 416}</string>
<string>{320, 125}</string>
<string>{306, 52}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">87</string>
</data>
</archive>
3 changes: 0 additions & 3 deletions Classes/BriefsAppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@
@property (nonatomic, retain) IBOutlet UIWindow *window;


- (void)navigationController:(UINavigationController *)nav willShowViewController:(UIViewController *)view animated:(BOOL)animated;
- (void)navigationController:(UINavigationController *)nav didShowViewController:(UIViewController *)view animated:(BOOL)animated;

@end

Binary file modified images/bg/main-bg-focused.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/bg/main-bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/bg/root-menu-bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/blue-button-bg.png
View file
Binary file not shown.
Binary file added images/buttons/top-nav-button.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/gray-button-bg.png
View file
Binary file not shown.
Binary file removed images/menu-bg.png
View file
Binary file not shown.

0 comments on commit 5386eba

Please sign in to comment.