Making dozens of cleanups to unify the iPhone app. Close button on original story, colors, back/forward buttons.

media/iphone/Classes/FeedDetailTableCell.m

@@ -27,8 +27,6 @@
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
 
     [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
 }
 
 

media/iphone/Classes/FeedDetailTableCell.xib

@@ -72,10 +72,9 @@
 									<int key="NSColorSpace">2</int>
 									<bytes key="NSRGB">MC4xNDUwOTgwNDU1IDAuMTc2NDcwNTkyNiAwLjQyMzUyOTQ0NjEAA</bytes>
 								</object>
-								<nil key="IBUIHighlightedColor"/>
-								<object class="NSColor" key="IBUIShadowColor" id="878586146">
+								<object class="NSColor" key="IBUIHighlightedColor" id="1057934100">
 									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
+									<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
 								</object>
 								<string key="IBUIShadowOffset">{0, 1}</string>
 								<int key="IBUIBaselineAdjustment">1</int>
@@ -105,7 +104,10 @@
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MCAwIDAAA</bytes>
 								</object>
-								<nil key="IBUIHighlightedColor"/>
+								<object class="NSColor" key="IBUIHighlightedColor">
+									<int key="NSColorSpace">2</int>
+									<bytes key="NSRGB">MC4xNDUwOTgwNDU1IDAuMTc2NDcwNTkyNiAwLjQyMzUyOTQ0NjEAA</bytes>
+								</object>
 								<object class="NSColor" key="IBUIShadowColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MSAxIDEgMAA</bytes>
@@ -121,7 +123,10 @@
 								<string key="NSFrame">{{20, 44}, {150, 15}}</string>
 								<reference key="NSSuperview" ref="994014136"/>
 								<reference key="NSWindow"/>
-								<reference key="IBUIBackgroundColor" ref="878586146"/>
+								<object class="NSColor" key="IBUIBackgroundColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -132,8 +137,7 @@
 									<int key="NSColorSpace">2</int>
 									<bytes key="NSRGB">MC41ODgyMzUzMTg3IDAuNTg4MjM1MzE4NyAwLjU4ODIzNTMxODcAA</bytes>
 								</object>
-								<nil key="IBUIHighlightedColor"/>
-								<reference key="IBUIShadowColor" ref="878586146"/>
+								<reference key="IBUIHighlightedColor" ref="1057934100"/>
 								<string key="IBUIShadowOffset">{0, 1}</string>
 								<int key="IBUIBaselineAdjustment">1</int>
 								<float key="IBUIMinimumFontSize">10</float>
@@ -169,7 +173,6 @@
 				<reference key="IBUIBackgroundColor" ref="932003208"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<int key="IBUISeparatorStyle">1</int>
-				<int key="IBUISelectionStyle">2</int>
 				<int key="IBUIAccessoryType">1</int>
 				<reference key="IBUIContentView" ref="994014136"/>
 				<int key="IBUILineBreakMode">0</int>

media/iphone/Classes/FeedDetailViewController.m

@@ -228,11 +228,12 @@
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     int storyCount = [[appDelegate activeFeedStoryLocations] count];
 
-    // The + 1 is for the finished/loading bar.
+    // The +1 is for the finished/loading bar.
     return storyCount + 1;
 }
 
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+- (UITableViewCell *)tableView:(UITableView *)tableView 
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 	static NSString *FeedDetailCellIdentifier = @"FeedDetailCellIdentifier";
 	    
 	FeedDetailTableCell *cell = (FeedDetailTableCell *)[tableView dequeueReusableCellWithIdentifier:FeedDetailCellIdentifier];
@@ -253,12 +254,13 @@
     
     NSDictionary *story = [self getStoryAtRow:indexPath.row];
     if ([[story objectForKey:@"story_authors"] class] != [NSNull class]) {
-        cell.storyAuthor.text = [[story objectForKey:@"story_authors"] uppercaseString];
+        cell.storyAuthor.text = [[story objectForKey:@"story_authors"] 
+                                 uppercaseString];
     } else {
         cell.storyAuthor.text = @"";
     }
+    
     NSString *title = [story objectForKey:@"story_title"];
-//    cell.storyTitle.text = title;
     cell.storyTitle.text = [title stringByDecodingHTMLEntities];
     cell.storyDate.text = [story objectForKey:@"short_parsed_date"];
     int score = [NewsBlurAppDelegate computeStoryScore:[story objectForKey:@"intelligence"]];

media/iphone/Classes/NewsBlurAppDelegate.m

@@ -80,6 +80,7 @@
 
 - (void)showNavigationBar:(BOOL)animated {
     [[self navigationController] setNavigationBarHidden:NO animated:animated];
+    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
 }
 
 #pragma mark -
@@ -94,7 +95,7 @@
     [self setTitle:@"NewsBlur"];
     [feedsViewController fetchFeedList];
     [loginViewController dismissModalViewControllerAnimated:YES];
-    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.6];
+    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
 }
    
 - (void)loadFeedDetailView {
@@ -106,7 +107,7 @@
     [navController pushViewController:feedDetailViewController animated:YES];
     [feedDetailViewController fetchFeedDetail:1];
     [self showNavigationBar:YES];
-    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.8];
+    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
 }
 
 - (void)loadStoryDetailView {

media/iphone/Classes/NewsBlurViewController.m

@@ -83,7 +83,8 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
     [self.intelligenceControl addTarget:self
 								 action:@selector(selectIntelligence)
 					   forControlEvents:UIControlEventValueChanged];
-    [self.intelligenceControl setSelectedSegmentIndex:[appDelegate selectedIntelligence]+1];
+    [self.intelligenceControl 
+	 setSelectedSegmentIndex:[appDelegate selectedIntelligence]+1];
     [appDelegate showNavigationBar:animated];
 }
 
@@ -141,11 +142,12 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 #pragma mark Initialization
 
 - (void)fetchFeedList {
-	NSURL *urlFeedList = [NSURL URLWithString:[NSString 
-											   stringWithFormat:@"http://www.newsblur.com/reader/feeds?flat=true"]];
+	NSURL *urlFeedList = [NSURL URLWithString:
+						  [NSString stringWithFormat:@"http://www.newsblur.com/reader/feeds?flat=true"]];
 	responseData = [[NSMutableData data] retain];
 	NSURLRequest *request = [[NSURLRequest alloc] initWithURL: urlFeedList];
-	NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+	NSURLConnection *connection = [[NSURLConnection alloc] 
+								   initWithRequest:request delegate:self];
 	[connection release];
 	[request release];
 	
@@ -177,7 +179,8 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 	NSString *jsonString = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
 	[responseData release];
 	if ([jsonString length] > 0) {
-		NSDictionary *results = [[NSDictionary alloc] initWithDictionary:[jsonString JSONValue]];
+		NSDictionary *results = [[NSDictionary alloc] 
+								 initWithDictionary:[jsonString JSONValue]];
 		appDelegate.activeUsername = [results objectForKey:@"user"];
 		[appDelegate setTitle:[results objectForKey:@"user"]];
 		self.dictFolders = [results objectForKey:@"flat_folders"];
@@ -192,6 +195,9 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 		
 		self.dictFoldersArray = [NSMutableArray array];
 		for (id f in self.dictFolders) {
+			NSString *folderTitle = [f 
+									 stringByTrimmingCharactersInSet:
+									 [NSCharacterSet whitespaceCharacterSet]];
 			[self.dictFoldersArray addObject:f];
 //			NSArray *folder = [self.dictFolders objectForKey:f];
 //			NSLog(@"F: %@", f);
@@ -323,7 +329,7 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 	}
 	
 	cell.positiveCount = [[feed objectForKey:@"ps"] intValue];
-	cell.neutralCount = [[feed objectForKey:@"nt"] intValue];
+	cell.neutralCount  = [[feed objectForKey:@"nt"] intValue];
 	cell.negativeCount = [[feed objectForKey:@"ng"] intValue];
 	
 	return cell;
@@ -376,7 +382,7 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 	headerLabel.textColor = [UIColor colorWithRed:0.3 green:0.3 blue:0.3 alpha:1.0];
 	headerLabel.highlightedTextColor = [UIColor whiteColor];
 	headerLabel.font = [UIFont boldSystemFontOfSize:11];
-	headerLabel.frame = CGRectMake(26.0, 1.0, 286.0, 20.0);
+	headerLabel.frame = CGRectMake(36.0, 1.0, 286.0, 20.0);
 	headerLabel.text = [[self.dictFoldersArray objectAtIndex:section] uppercaseString];
 	headerLabel.shadowColor = [UIColor colorWithRed:.94 green:0.94 blue:0.97 alpha:1.0];
 	headerLabel.shadowOffset = CGSizeMake(1.0, 1.0);
@@ -385,7 +391,7 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 	
 	UIImage *folderImage = [UIImage imageNamed:@"folder.png"];
 	UIImageView *folderImageView = [[UIImageView alloc] initWithImage:folderImage];
-	folderImageView.frame = CGRectMake(10.0, 2.0, 16.0, 16.0);
+	folderImageView.frame = CGRectMake(14.0, 2.0, 16.0, 16.0);
 	[customView addSubview:folderImageView];
 	[folderImageView release];
 	
@@ -393,6 +399,10 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+	NSString *folder = [self.dictFoldersArray objectAtIndex:section];
+	if ([[folder stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] == 0) {
+		return 0;
+	}
 	return 21;
 }
 

media/iphone/Classes/OriginalStoryViewController.m

@@ -9,6 +9,7 @@
 #import "NewsBlurAppDelegate.h"
 #import "OriginalStoryViewController.h"
 #import "NSString+HTML.h"
+#import "TransparentToolbar.h"
 
 
 @implementation OriginalStoryViewController
@@ -67,7 +68,7 @@
     UITextField *address = [[UITextField alloc] initWithFrame:addressFrame];
     address.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     address.borderStyle = UITextBorderStyleRoundedRect;
-    address.font = [UIFont systemFontOfSize:15];
+    address.font = [UIFont systemFontOfSize:14];
     [address setAdjustsFontSizeToFitWidth:YES];
     address.keyboardType = UIKeyboardTypeURL;
     address.autocapitalizationType = UITextAutocapitalizationTypeNone;
@@ -79,17 +80,26 @@
     
     CGRect webViewFrame = self.webView.frame;
     webViewFrame.origin.y = navBarFrame.origin.y + navBarFrame.size.height;
-//    webViewFrame.size.height = self.toolbar.frame.origin.y - webViewFrame.origin.y;
     self.webView.frame = webViewFrame;
     
+    UIBarButtonItem *close = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStyleBordered target:self action:@selector(doCloseOriginalStoryViewController)];
+
     CGRect closeButtonFrame = CGRectMake(addressFrame.size.width + kMargin*2, 
-                                         addressFrame.origin.y, 48,
-                                         addressFrame.size.height);
-    UIButton *close = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-    [close setFrame:closeButtonFrame];
-    [close setTitle:@"Close" forState:UIControlStateNormal];
-    [close addTarget:self action:@selector(doCloseOriginalStoryViewController) forControlEvents:UIControlEventTouchUpInside];
-    [navBar addSubview:close];
+                                         addressFrame.origin.y, 
+                                         navBarFrame.size.width - addressFrame.size.width - kMargin*3,
+                                         addressFrame.size.height - 1);    
+    TransparentToolbar* tools = [[TransparentToolbar alloc] initWithFrame:closeButtonFrame];
+    NSMutableArray* buttons = [[NSMutableArray alloc] initWithCapacity:1];
+    
+    [buttons addObject:close];
+    [tools setItems:buttons animated:NO];
+//    [tools setBarStyle:UIBarStyleBlack];
+    [tools setTintColor:[UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9]];
+//    [tools setTranslucent:YES];
+    [navBar addSubview:tools];
+    [close release];
+    [buttons release];
+    [tools release];
     
     navBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
     

media/iphone/Classes/OriginalStoryViewController.xib

@@ -2,23 +2,21 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1024</int>
-		<string key="IBDocument.SystemVersion">10K540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">11A511</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.HIToolboxVersion">566.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">301</string>
+			<string key="NS.object.0">534</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>IBProxyObject</string>
+			<string>IBUIWebView</string>
 			<string>IBUIBarButtonItem</string>
 			<string>IBUIToolbar</string>
-			<string>IBUIWebView</string>
-			<string>IBUINavigationBar</string>
-			<string>IBUINavigationItem</string>
 			<string>IBUIView</string>
+			<string>IBProxyObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -49,7 +47,7 @@
 					<object class="IBUIWebView" id="812726678">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{0, 44}, {320, 377}}</string>
+						<string key="NSFrame">{{0, 44}, {320, 372}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="623759027"/>
@@ -66,7 +64,7 @@
 					<object class="IBUIToolbar" id="623759027">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{0, 421}, {320, 44}}</string>
+						<string key="NSFrame">{{0, 416}, {320, 44}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -75,20 +73,30 @@
 						<object class="NSMutableArray" key="IBUIItems">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBUIBarButtonItem" id="443591754">
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">back_button.png</string>
+								</object>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<reference key="IBUIToolbar" ref="623759027"/>
-								<int key="IBUISystemItemIdentifier">8</int>
 							</object>
-							<object class="IBUIBarButtonItem" id="1027460252">
+							<object class="IBUIBarButtonItem" id="718772107">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<float key="IBUIWidth">29</float>
 								<reference key="IBUIToolbar" ref="623759027"/>
-								<int key="IBUISystemItemIdentifier">6</int>
+								<int key="IBUISystemItemIdentifier">5</int>
 							</object>
 							<object class="IBUIBarButtonItem" id="1062965078">
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">forward_button.png</string>
+								</object>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<reference key="IBUIToolbar" ref="623759027"/>
-								<int key="IBUISystemItemIdentifier">17</int>
+							</object>
+							<object class="IBUIBarButtonItem" id="164040638">
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIToolbar" ref="623759027"/>
+								<int key="IBUISystemItemIdentifier">5</int>
 							</object>
 							<object class="IBUIBarButtonItem" id="1070386646">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -100,11 +108,10 @@
 								<reference key="IBUIToolbar" ref="623759027"/>
 								<int key="IBUISystemItemIdentifier">13</int>
 							</object>
-							<object class="IBUIBarButtonItem" id="936609264">
+							<object class="IBUIBarButtonItem" id="1026790494">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<float key="IBUIWidth">29</float>
 								<reference key="IBUIToolbar" ref="623759027"/>
-								<int key="IBUISystemItemIdentifier">6</int>
+								<int key="IBUISystemItemIdentifier">5</int>
 							</object>
 							<object class="IBUIBarButtonItem" id="65736986">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -113,34 +120,11 @@
 							</object>
 						</object>
 					</object>
-					<object class="IBUINavigationBar" id="697918929">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="812726678"/>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<object class="NSArray" key="IBUIItems">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUINavigationItem" id="672170344">
-								<reference key="IBUINavigationBar" ref="697918929"/>
-								<string key="IBUITitle"/>
-								<object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="891842664">
-									<string key="IBUITitle">Close</string>
-									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-									<int key="IBUIStyle">1</int>
-									<reference key="IBUINavigationItem" ref="672170344"/>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-						</object>
-					</object>
 				</object>
 				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="697918929"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -160,22 +144,6 @@
 					</object>
 					<int key="connectionID">7</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">doCloseOriginalStoryViewController</string>
-						<reference key="source" ref="891842664"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">11</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">closeButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="891842664"/>
-					</object>
-					<int key="connectionID">12</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">webView</string>
@@ -248,6 +216,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">toolbar</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="623759027"/>
+					</object>
+					<int key="connectionID">45</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -263,7 +239,6 @@
 						<reference key="object" ref="191373211"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="697918929"/>
 							<reference ref="812726678"/>
 							<reference ref="623759027"/>
 						</object>
@@ -290,13 +265,14 @@
 						<reference key="object" ref="623759027"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="443591754"/>
 							<reference ref="1062965078"/>
 							<reference ref="416628934"/>
 							<reference ref="65736986"/>
-							<reference ref="1027460252"/>
+							<reference ref="443591754"/>
+							<reference ref="718772107"/>
+							<reference ref="1026790494"/>
+							<reference ref="164040638"/>
 							<reference ref="1070386646"/>
-							<reference ref="936609264"/>
 						</object>
 						<reference key="parent" ref="191373211"/>
 					</object>
@@ -305,34 +281,11 @@
 						<reference key="object" ref="443591754"/>
 						<reference key="parent" ref="623759027"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="697918929"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="672170344"/>
-						</object>
-						<reference key="parent" ref="191373211"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">14</int>
 						<reference key="object" ref="1062965078"/>
 						<reference key="parent" ref="623759027"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="672170344"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="891842664"/>
-						</object>
-						<reference key="parent" ref="697918929"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="891842664"/>
-						<reference key="parent" ref="672170344"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">16</int>
 						<reference key="object" ref="416628934"/>
@@ -343,19 +296,24 @@
 						<reference key="object" ref="65736986"/>
 						<reference key="parent" ref="623759027"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="1027460252"/>
-						<reference key="parent" ref="623759027"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">36</int>
 						<reference key="object" ref="1070386646"/>
 						<reference key="parent" ref="623759027"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">37</int>
-						<reference key="object" ref="936609264"/>
+						<int key="objectID">40</int>
+						<reference key="object" ref="718772107"/>
+						<reference key="parent" ref="623759027"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">41</int>
+						<reference key="object" ref="1026790494"/>
+						<reference key="parent" ref="623759027"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">44</int>
+						<reference key="object" ref="164040638"/>
 						<reference key="parent" ref="623759027"/>
 					</object>
 				</object>
@@ -365,30 +323,26 @@
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.CustomClassName</string>
+					<string>-1.IBPluginDependency</string>
 					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
+					<string>-2.IBPluginDependency</string>
 					<string>1.IBPluginDependency</string>
-					<string>10.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
 					<string>16.IBPluginDependency</string>
 					<string>17.IBPluginDependency</string>
-					<string>20.IBPluginDependency</string>
 					<string>36.IBPluginDependency</string>
-					<string>37.IBPluginDependency</string>
 					<string>4.IBPluginDependency</string>
-					<string>4.IBViewBoundsToFrameTransform</string>
+					<string>40.IBPluginDependency</string>
+					<string>41.IBPluginDependency</string>
+					<string>44.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
-					<string>5.IBViewBoundsToFrameTransform</string>
 					<string>6.IBPluginDependency</string>
-					<string>8.IBPluginDependency</string>
-					<string>8.IBViewBoundsToFrameTransform</string>
-					<string>9.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>OriginalStoryViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIResponder</string>
-					<string>{{556, 376}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -398,18 +352,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw9GAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw+eAAA</bytes>
-					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAADCxgAAwZAAAA</bytes>
-					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
@@ -425,7 +369,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">39</int>
+			<int key="maxID">45</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -433,6 +377,38 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">FeedDetailViewController</string>
 					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>markAllRead</string>
+							<string>selectIntelligence</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>markAllRead</string>
+							<string>selectIntelligence</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">markAllRead</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">selectIntelligence</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
@@ -441,6 +417,7 @@
 							<string>feedMarkReadButton</string>
 							<string>feedScoreSlider</string>
 							<string>feedViewToolbar</string>
+							<string>intelligenceControl</string>
 							<string>storyTitlesTable</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -449,6 +426,7 @@
 							<string>UIBarButtonItem</string>
 							<string>UISlider</string>
 							<string>UIToolbar</string>
+							<string>UISegmentedControl</string>
 							<string>UITableView</string>
 						</object>
 					</object>
@@ -460,6 +438,7 @@
 							<string>feedMarkReadButton</string>
 							<string>feedScoreSlider</string>
 							<string>feedViewToolbar</string>
+							<string>intelligenceControl</string>
 							<string>storyTitlesTable</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -480,6 +459,10 @@
 								<string key="name">feedViewToolbar</string>
 								<string key="candidateClassName">UIToolbar</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">intelligenceControl</string>
+								<string key="candidateClassName">UISegmentedControl</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">storyTitlesTable</string>
 								<string key="candidateClassName">UITableView</string>
@@ -643,14 +626,42 @@
 					<string key="className">NewsBlurViewController</string>
 					<string key="superclassName">UIViewController</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">doLogoutButton</string>
-						<string key="NS.object.0">id</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doLogoutButton</string>
+							<string>selectIntelligence</string>
+							<string>switchSitesUnread</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">doLogoutButton</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">doLogoutButton</string>
-							<string key="candidateClassName">id</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doLogoutButton</string>
+							<string>selectIntelligence</string>
+							<string>switchSitesUnread</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">doLogoutButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">selectIntelligence</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">switchSitesUnread</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -659,17 +670,21 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
 							<string>feedScoreSlider</string>
+							<string>feedTitlesTable</string>
 							<string>feedViewToolbar</string>
+							<string>intelligenceControl</string>
 							<string>logoutButton</string>
-							<string>viewTableFeedTitles</string>
+							<string>sitesButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
 							<string>UISlider</string>
-							<string>UIToolbar</string>
-							<string>UIBarButtonItem</string>
 							<string>UITableView</string>
+							<string>UIToolbar</string>
+							<string>UISegmentedControl</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -678,9 +693,11 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
 							<string>feedScoreSlider</string>
+							<string>feedTitlesTable</string>
 							<string>feedViewToolbar</string>
+							<string>intelligenceControl</string>
 							<string>logoutButton</string>
-							<string>viewTableFeedTitles</string>
+							<string>sitesButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -692,17 +709,25 @@
 								<string key="name">feedScoreSlider</string>
 								<string key="candidateClassName">UISlider</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedTitlesTable</string>
+								<string key="candidateClassName">UITableView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">feedViewToolbar</string>
 								<string key="candidateClassName">UIToolbar</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">intelligenceControl</string>
+								<string key="candidateClassName">UISegmentedControl</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">logoutButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">viewTableFeedTitles</string>
-								<string key="candidateClassName">UITableView</string>
+								<string key="name">sitesButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
 						</object>
 					</object>
@@ -860,6 +885,7 @@
 							<string>appDelegate</string>
 							<string>buttonNext</string>
 							<string>buttonPrevious</string>
+							<string>progressView</string>
 							<string>toolbar</string>
 							<string>webView</string>
 						</object>
@@ -868,6 +894,7 @@
 							<string>NewsBlurAppDelegate</string>
 							<string>UIBarButtonItem</string>
 							<string>UIBarButtonItem</string>
+							<string>UIProgressView</string>
 							<string>UIToolbar</string>
 							<string>UIWebView</string>
 						</object>
@@ -879,6 +906,7 @@
 							<string>appDelegate</string>
 							<string>buttonNext</string>
 							<string>buttonPrevious</string>
+							<string>progressView</string>
 							<string>toolbar</string>
 							<string>webView</string>
 						</object>
@@ -896,6 +924,10 @@
 								<string key="name">buttonPrevious</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">progressView</string>
+								<string key="candidateClassName">UIProgressView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">toolbar</string>
 								<string key="candidateClassName">UIToolbar</string>
@@ -925,6 +957,19 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">301</string>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>back_button.png</string>
+				<string>forward_button.png</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{16, 24}</string>
+				<string>{16, 24}</string>
+			</object>
+		</object>
+		<string key="IBCocoaTouchPluginVersion">534</string>
 	</data>
 </archive>

media/iphone/NewsBlur.xcodeproj/FeedTableCell.m

@@ -72,13 +72,6 @@ static CGFloat *psColors = nil;
 - (void) setPositiveCount:(int)ps {    
 	if (ps == _positiveCount) return;
     
-	if (ps > 99 && _positiveCount < 100) {
-		[indicatorFont release];
-		indicatorFont = [[UIFont boldSystemFontOfSize:10.0] retain];
-	} else if (ps < 100 && _positiveCount > 99) {
-		[indicatorFont release];
-		indicatorFont = [[UIFont boldSystemFontOfSize:12.0] retain];
-	}
 	_positiveCount = ps;
 	_positiveCountStr = [[NSString stringWithFormat:@"%d", ps] retain];
 	[self setNeedsDisplay];
@@ -87,13 +80,6 @@ static CGFloat *psColors = nil;
 - (void) setNeutralCount:(int)nt {    
 	if (nt == _neutralCount) return;
     
-	if (nt > 99 && _neutralCount < 100) {
-		[indicatorFont release];
-		indicatorFont = [[UIFont boldSystemFontOfSize:10.0] retain];
-	} else if (nt < 100 && _neutralCount > 99) {
-		[indicatorFont release];
-		indicatorFont = [[UIFont boldSystemFontOfSize:12.0] retain];
-	}
 	_neutralCount = nt;
 	_neutralCountStr = [[NSString stringWithFormat:@"%d", nt] retain];
 	[self setNeedsDisplay];
@@ -102,13 +88,6 @@ static CGFloat *psColors = nil;
 - (void) setNegativeCount:(int)ng {    
 	if (ng == _negativeCount) return;
     
-	if (ng > 99 && _negativeCount < 100) {
-		[indicatorFont release];
-		indicatorFont = [[UIFont boldSystemFontOfSize:10.0] retain];
-	} else if (ng < 100 && _negativeCount > 99) {
-		[indicatorFont release];
-		indicatorFont = [[UIFont boldSystemFontOfSize:12.0] retain];
-	}
 	_negativeCount = ng;
 	_negativeCountStr = [[NSString stringWithFormat:@"%d", ng] retain];
 	[self setNeedsDisplay];
@@ -119,28 +98,27 @@ static CGFloat *psColors = nil;
     
 	CGContextRef context = UIGraphicsGetCurrentContext();
 	
-	UIColor *backgroundColor = self.selected || self.highlighted ? [UIColor colorWithRed:0.15 green:0.55 blue:0.95 alpha:1.0] : [UIColor colorWithRed:0.95 green:0.95 blue:0.95 alpha:1.0];
+	UIColor *backgroundColor = self.selected || self.highlighted ? 
+                        [UIColor colorWithRed:0.15 green:0.55 blue:0.95 alpha:1.0] : 
+                        [UIColor colorWithRed:0.95 green:0.95 blue:0.95 alpha:1.0];
 	
 	[backgroundColor set];
 	CGContextFillRect(context, r);
 	
 	
 	CGRect rect = CGRectInset(r, 12, 12);
-	rect.size.width -= 25;
+	rect.size.width -= 18; // Scrollbar padding
 	
     int psWidth = _positiveCount == 0 ? 0 : _positiveCount < 10 ? 
-                    12 : _positiveCount < 100 ? 20 : 26;
+                    14 : _positiveCount < 100 ? 20 : 26;
     int ntWidth = _neutralCount  == 0 ? 0 : _neutralCount < 10 ? 
-                    12 : _neutralCount  < 100 ? 20 : 26;
+                    14 : _neutralCount  < 100 ? 20 : 26;
     int ngWidth = _negativeCount == 0 ? 0 : _negativeCount < 10 ? 
-                    12 : _negativeCount < 100 ? 20 : 26;
+                    14 : _negativeCount < 100 ? 20 : 26;
     
-    int psOffset = _positiveCount == 0 ? 0 : _positiveCount < 10 ? 
-                    -8 : _positiveCount < 100 ? 0 : 6;
-    int ntOffset = _neutralCount  == 0 ? 0 : _neutralCount < 10 ? 
-                    -8 : _neutralCount  < 100 ? 0 : 6;
-    int ngOffset = _negativeCount == 0 ? 0 : _negativeCount < 10 ? 
-                    -8 : _negativeCount < 100 ? 0 : 6;
+    int psOffset = _positiveCount == 0 ? 0 : psWidth - 20;
+    int ntOffset = _neutralCount  == 0 ? 0 : ntWidth - 20;
+    int ngOffset = _negativeCount == 0 ? 0 : ngWidth - 20;
     
     int psPadding = _positiveCount == 0 ? 0 : 2;
     int ntPadding = _neutralCount  == 0 ? 0 : 2;
@@ -156,7 +134,9 @@ static CGFloat *psColors = nil;
         CGSize size = [_positiveCountStr sizeWithFont:indicatorFont];   
         float x_pos = (rr.size.width - size.width) / 2; 
         float y_pos = (rr.size.height - size.height) / 2; 
-        [_positiveCountStr drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) withFont:indicatorFont];
+        [_positiveCountStr 
+         drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) 
+         withFont:indicatorFont];
     }
 	if(_neutralCount > 0){		
 		[neutralBackgroundColor set];
@@ -168,7 +148,9 @@ static CGFloat *psColors = nil;
         CGSize size = [_neutralCountStr sizeWithFont:indicatorFont];   
         float x_pos = (rr.size.width - size.width) / 2; 
         float y_pos = (rr.size.height - size.height) / 2; 
-        [_neutralCountStr drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) withFont:indicatorFont];     
+        [_neutralCountStr 
+         drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) 
+         withFont:indicatorFont];     
 	}
 	if(_negativeCount > 0){		
 		[negativeBackgroundColor set];
@@ -180,14 +162,22 @@ static CGFloat *psColors = nil;
         CGSize size = [_negativeCountStr sizeWithFont:indicatorFont];   
         float x_pos = (rr.size.width - size.width) / 2; 
         float y_pos = (rr.size.height - size.height) / 2; 
-        [_negativeCountStr drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) withFont:indicatorFont];    
+        [_negativeCountStr 
+         drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos) 
+         withFont:indicatorFont];    
 	}
     
     
 	
-    UIColor *textColor = self.selected || self.highlighted ? [UIColor whiteColor] : [UIColor blackColor];
+    UIColor *textColor = self.selected || self.highlighted ? 
+                         [UIColor whiteColor] : 
+                         [UIColor blackColor];
     [textColor set];
-    [feedTitle drawInRect:CGRectMake(36.0, 12.0, rect.size.width - psWidth - psPadding - ntWidth - ntPadding - ngWidth - 10, 20.0) withFont:[UIFont boldSystemFontOfSize:13.0] lineBreakMode:UILineBreakModeTailTruncation alignment:UITextAlignmentLeft];
+    [feedTitle 
+     drawInRect:CGRectMake(36.0, 12.0, rect.size.width - psWidth - psPadding - ntWidth - ntPadding - ngWidth - 10, 20.0) 
+     withFont:[UIFont boldSystemFontOfSize:13.0] 
+     lineBreakMode:UILineBreakModeTailTruncation 
+     alignment:UITextAlignmentLeft];
     
     [self.feedFavicon drawInRect:CGRectMake(14.0, 12.0, 16.0, 16.0)];
     

media/iphone/NewsBlur.xcodeproj/project.pbxproj

@@ -59,6 +59,13 @@
 		FF38DB1A13F21B2C00251891 /* ABTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF38DB1913F21B2C00251891 /* ABTableViewCell.m */; };
 		FF435EDB13E9AF4A0083043F /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = FF435EDA13E9AF4A0083043F /* Base64.m */; };
 		FF435EDE13E9B04E0083043F /* world.png in Resources */ = {isa = PBXBuildFile; fileRef = FF435EDD13E9B04E0083043F /* world.png */; };
+		FF4BBC0F13F73DA7001EBEBD /* backbutton.psd in Resources */ = {isa = PBXBuildFile; fileRef = FF4BBC0E13F73DA7001EBEBD /* backbutton.psd */; };
+		FF4BBC1713F740B0001EBEBD /* back_button.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4BBC1213F740B0001EBEBD /* back_button.png */; };
+		FF4BBC1813F740B0001EBEBD /* back_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4BBC1313F740B0001EBEBD /* back_button@2x.png */; };
+		FF4BBC1913F740B0001EBEBD /* forward_button.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4BBC1413F740B0001EBEBD /* forward_button.png */; };
+		FF4BBC1A13F740B0001EBEBD /* forward_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4BBC1513F740B0001EBEBD /* forward_button@2x.png */; };
+		FF4BBC1B13F740B0001EBEBD /* toolbar_back_button.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4BBC1613F740B0001EBEBD /* toolbar_back_button.png */; };
+		FF4BBC1E13F7487A001EBEBD /* TransparentToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4BBC1D13F7487A001EBEBD /* TransparentToolbar.m */; };
 		FF793E1B13F1A9F700F282D2 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = FF793E1813F1A9F700F282D2 /* ASIDataCompressor.m */; };
 		FF793E1C13F1A9F700F282D2 /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = FF793E1A13F1A9F700F282D2 /* ASIDataDecompressor.m */; };
 		FF79E11D13EB756A0095C852 /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = FF79E11913EB756A0095C852 /* arrow.png */; };
@@ -156,6 +163,14 @@
 		FF435ED913E9AF4A0083043F /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
 		FF435EDA13E9AF4A0083043F /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
 		FF435EDD13E9B04E0083043F /* world.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = world.png; sourceTree = "<group>"; };
+		FF4BBC0E13F73DA7001EBEBD /* backbutton.psd */ = {isa = PBXFileReference; lastKnownFileType = file; path = backbutton.psd; sourceTree = "<group>"; };
+		FF4BBC1213F740B0001EBEBD /* back_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_button.png; sourceTree = "<group>"; };
+		FF4BBC1313F740B0001EBEBD /* back_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_button@2x.png"; sourceTree = "<group>"; };
+		FF4BBC1413F740B0001EBEBD /* forward_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward_button.png; sourceTree = "<group>"; };
+		FF4BBC1513F740B0001EBEBD /* forward_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "forward_button@2x.png"; sourceTree = "<group>"; };
+		FF4BBC1613F740B0001EBEBD /* toolbar_back_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_back_button.png; sourceTree = "<group>"; };
+		FF4BBC1C13F7487A001EBEBD /* TransparentToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransparentToolbar.h; sourceTree = "<group>"; };
+		FF4BBC1D13F7487A001EBEBD /* TransparentToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransparentToolbar.m; sourceTree = "<group>"; };
 		FF793E1713F1A9F700F282D2 /* ASIDataCompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIDataCompressor.h; sourceTree = "<group>"; };
 		FF793E1813F1A9F700F282D2 /* ASIDataCompressor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIDataCompressor.m; sourceTree = "<group>"; };
 		FF793E1913F1A9F700F282D2 /* ASIDataDecompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIDataDecompressor.h; sourceTree = "<group>"; };
@@ -258,6 +273,8 @@
 				FF38DB1613F211DC00251891 /* UIImage+TKCategory.m */,
 				FF38DB1813F21B2C00251891 /* ABTableViewCell.h */,
 				FF38DB1913F21B2C00251891 /* ABTableViewCell.m */,
+				FF4BBC1C13F7487A001EBEBD /* TransparentToolbar.h */,
+				FF4BBC1D13F7487A001EBEBD /* TransparentToolbar.m */,
 			);
 			name = "Other Sources";
 			sourceTree = "<group>";
@@ -265,6 +282,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				FF4BBC0E13F73DA7001EBEBD /* backbutton.psd */,
 				FF7DB4C313F58486008176BF /* folder.png */,
 				FF79E11913EB756A0095C852 /* arrow.png */,
 				FF79E11A13EB756A0095C852 /* arrow@2x.png */,
@@ -275,6 +293,11 @@
 				FF1C46BB13E5E9BB00E7609E /* Default.png */,
 				7843F50B11EEB4EE00675F64 /* bullet_blue.png */,
 				787B782E129356FC0025F214 /* bullet_green.png */,
+				FF4BBC1213F740B0001EBEBD /* back_button.png */,
+				FF4BBC1313F740B0001EBEBD /* back_button@2x.png */,
+				FF4BBC1413F740B0001EBEBD /* forward_button.png */,
+				FF4BBC1513F740B0001EBEBD /* forward_button@2x.png */,
+				FF4BBC1613F740B0001EBEBD /* toolbar_back_button.png */,
 				7843F50C11EEB4EE00675F64 /* bullet_orange.png */,
 				7843F50D11EEB4EE00675F64 /* bullet_red.png */,
 				7843F50E11EEB4EE00675F64 /* bullet_yellow.png */,
@@ -431,6 +454,12 @@
 				FF79E11D13EB756A0095C852 /* arrow.png in Resources */,
 				FF79E11E13EB756A0095C852 /* arrow@2x.png in Resources */,
 				FF7DB4C413F58486008176BF /* folder.png in Resources */,
+				FF4BBC0F13F73DA7001EBEBD /* backbutton.psd in Resources */,
+				FF4BBC1713F740B0001EBEBD /* back_button.png in Resources */,
+				FF4BBC1813F740B0001EBEBD /* back_button@2x.png in Resources */,
+				FF4BBC1913F740B0001EBEBD /* forward_button.png in Resources */,
+				FF4BBC1A13F740B0001EBEBD /* forward_button@2x.png in Resources */,
+				FF4BBC1B13F740B0001EBEBD /* toolbar_back_button.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -472,6 +501,7 @@
 				FF38DB1313F2112D00251891 /* UIView+TKCategory.m in Sources */,
 				FF38DB1713F211DC00251891 /* UIImage+TKCategory.m in Sources */,
 				FF38DB1A13F21B2C00251891 /* ABTableViewCell.m in Sources */,
+				FF4BBC1E13F7487A001EBEBD /* TransparentToolbar.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

media/iphone/NewsBlurViewController.xib

@@ -156,11 +156,8 @@
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="224086083"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MC43NQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MC4yMjcwMjkxMjggMC4zNjIxMzU3NzY0IDAuNDU2NTIxNzM5MQA</bytes>
 				</object>
 				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@@ -283,6 +280,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
 						<reference key="parent" ref="774585933"/>
+						<string key="objectName">Table View</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">11</int>

media/iphone/TransparentToolbar.h

@@ -0,0 +1,2 @@
+@interface TransparentToolbar : UIToolbar
+@end

media/iphone/TransparentToolbar.m

@@ -0,0 +1,44 @@
+//
+//  TransparentToolbar.m
+//  NewsBlur
+//
+//  Created by Samuel Clay on 8/13/11.
+//  Copyright 2011 NewsBlur. All rights reserved.
+//
+
+#import "TransparentToolbar.h"
+
+@implementation TransparentToolbar
+
+// Override draw rect to avoid
+// background coloring
+- (void)drawRect:(CGRect)rect {
+    // do nothing in here
+}
+
+// Set properties to make background
+// translucent.
+- (void) applyTranslucentBackground
+{
+    self.backgroundColor = [UIColor clearColor];
+    self.opaque = NO;
+    self.translucent = YES;
+}
+
+// Override init.
+- (id) init
+{
+    self = [super init];
+    [self applyTranslucentBackground];
+    return self;
+}
+
+// Override initWithFrame.
+- (id) initWithFrame:(CGRect) frame
+{
+    self = [super initWithFrame:frame];
+    [self applyTranslucentBackground];
+    return self;
+}
+
+@end