Top toolbar in story detail. Need to rewrite the bottom toolbar to be a floating nav.

media/ios/Classes/FeedDetailViewController.m

@@ -105,6 +105,7 @@
 
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
     [self checkScroll];
+    [appDelegate.storyPageControl refreshPages];
 }
 
 - (void)viewWillAppear:(BOOL)animated {

media/ios/Classes/StoryPageControl.h

@@ -10,6 +10,7 @@
 #import "BaseViewController.h"
 #import "NewsBlurAppDelegate.h"
 #import "WEPopoverController.h"
+#import "TransparentToolbar.h"
 
 @class NewsBlurAppDelegate;
 @class ASIHTTPRequest;
@@ -27,6 +28,7 @@
     UIActivityIndicatorView *loadingIndicator;
     UIToolbar *bottomPlaceholderToolbar;
     UIBarButtonItem *buttonBack;
+    TransparentToolbar * rightToolbar;
     
     WEPopoverController *popoverController;
 	Class popoverClass;
@@ -52,6 +54,11 @@
 @property (nonatomic) IBOutlet UIBarButtonItem *activity;
 @property (nonatomic) IBOutlet UIBarButtonItem *buttonAction;
 @property (nonatomic) IBOutlet UIToolbar *bottomPlaceholderToolbar;
+@property (nonatomic) IBOutlet UIBarButtonItem * spacerBarButton;
+@property (nonatomic) IBOutlet UIBarButtonItem * spacer2BarButton;
+@property (nonatomic) IBOutlet UIBarButtonItem * spacer3BarButton;
+@property (nonatomic) IBOutlet UIBarButtonItem * separatorBarButton;
+@property (nonatomic) IBOutlet TransparentToolbar * rightToolbar;
 @property (nonatomic) IBOutlet UIBarButtonItem *fontSettingsButton;
 @property (nonatomic) IBOutlet UIBarButtonItem *originalStoryButton;
 @property (nonatomic, strong) IBOutlet UIBarButtonItem *subscribeButton;

media/ios/Classes/StoryPageControl.m

@@ -23,6 +23,8 @@
 #import "DataUtilities.h"
 #import "JSON.h"
 #import "SHK.h"
+#import "TransparentToolbar.h"
+#import "UIBarButtonItem+Image.h"
 
 @implementation StoryPageControl
 
@@ -30,7 +32,9 @@
 @synthesize currentPage, nextPage, previousPage;
 @synthesize progressView;
 @synthesize progressViewContainer;
-@synthesize toolbar;
+@synthesize separatorBarButton;
+@synthesize spacerBarButton, spacer2BarButton, spacer3BarButton;
+@synthesize toolbar, rightToolbar;
 @synthesize buttonPrevious;
 @synthesize buttonNext;
 @synthesize buttonAction;
@@ -89,20 +93,29 @@
     [self.progressViewContainer addGestureRecognizer:tap];
     self.progressViewContainer.hidden = YES;
     
+    rightToolbar = [[TransparentToolbar alloc]
+                    initWithFrame:CGRectMake(0, 0, 68,
+                                             self.toolbar.frame.size.height)];
     
-    UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"nav_icn_settings.png"] style:UIBarButtonItemStylePlain target:self action:@selector(toggleFontSize:)];
+    spacerBarButton = [[UIBarButtonItem alloc]
+                       initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    spacerBarButton.width = -12;
+    spacer2BarButton = [[UIBarButtonItem alloc]
+                        initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    spacer2BarButton.width = -4;
+    spacer3BarButton = [[UIBarButtonItem alloc]
+                        initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    spacer3BarButton.width = -4;
     
-    self.fontSettingsButton = settingsButton;
+    UIImage *separatorImage = [UIImage imageNamed:@"bar-separator.png"];
+    separatorBarButton = [UIBarButtonItem barItemWithImage:separatorImage target:nil action:nil];
+    [separatorBarButton setEnabled:NO];
     
-    // original button for iPhone
+    UIImage *settingsImage = [UIImage imageNamed:@"nav_icn_settings.png"];
-    UIBarButtonItem *originalButton = [[UIBarButtonItem alloc]
+    fontSettingsButton = [UIBarButtonItem barItemWithImage:settingsImage target:self action:@selector(toggleFontSize:)];
-                                       initWithTitle:@"Original"
-                                       style:UIBarButtonItemStyleBordered
-                                       target:self
-                                       action:@selector(showOriginalSubview:)
-                                       ];
     
-    self.originalStoryButton = originalButton;
+    UIImage *markreadImage = [UIImage imageNamed:@"original_button.png"];
+    originalStoryButton = [UIBarButtonItem barItemWithImage:markreadImage target:self action:@selector(showOriginalSubview:)];
     
     UIBarButtonItem *subscribeBtn = [[UIBarButtonItem alloc]
                                      initWithTitle:@"Follow User"
@@ -119,12 +132,19 @@
     self.buttonBack = backButton;
     
     
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {        
+//    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {        
-        self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects: originalButton, settingsButton, nil];
+        [rightToolbar setItems: [NSArray arrayWithObjects:
-    } else {
+                                 spacerBarButton,
-        self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
+                                 fontSettingsButton,
-        self.bottomPlaceholderToolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
+                                 spacer2BarButton,
-    }
+                                 separatorBarButton,
+                                 spacer3BarButton,
+                                 originalStoryButton, nil]];
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar];
+//    } else {
+//        self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
+//        self.bottomPlaceholderToolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
+//    }
     
     [self.scrollView addObserver:self forKeyPath:@"contentOffset"
                          options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
@@ -528,9 +548,9 @@
     self.bottomPlaceholderToolbar.hidden = YES;
     self.progressViewContainer.hidden = NO;
     
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+//    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects: originalStoryButton, fontSettingsButton, nil];
+//        self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects: originalStoryButton, fontSettingsButton, nil];
-    }
+//    }
     
     [self setNextPreviousButtons];
     [appDelegate changeActiveFeedDetailRow];

media/ios/NewsBlur.xcodeproj/project.pbxproj

@@ -283,6 +283,8 @@
 		FF4151C016DED9660013E84B /* UIBarButtonItem+Image.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4151BF16DED9660013E84B /* UIBarButtonItem+Image.m */; };
 		FF4151C316DEDF9D0013E84B /* markread.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151C116DEDF9D0013E84B /* markread.png */; };
 		FF4151C416DEDF9D0013E84B /* markread@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151C216DEDF9D0013E84B /* markread@2x.png */; };
+		FF4151C716DEF1A80013E84B /* original_button.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151C516DEF1A80013E84B /* original_button.png */; };
+		FF4151C816DEF1A80013E84B /* original_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151C616DEF1A80013E84B /* original_button@2x.png */; };
 		FF546DF71602930100948020 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF546DF61602930100948020 /* Default-568h@2x.png */; };
 		FF546DF9160298E500948020 /* fleuron@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF546DF8160298E500948020 /* fleuron@2x.png */; };
 		FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF5EA47D143B691000B7563D /* AddSiteViewController.m */; };
@@ -754,6 +756,8 @@
 		FF4151BF16DED9660013E84B /* UIBarButtonItem+Image.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIBarButtonItem+Image.m"; path = "Other Sources/UIBarButtonItem+Image.m"; sourceTree = "<group>"; };
 		FF4151C116DEDF9D0013E84B /* markread.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = markread.png; sourceTree = "<group>"; };
 		FF4151C216DEDF9D0013E84B /* markread@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "markread@2x.png"; sourceTree = "<group>"; };
+		FF4151C516DEF1A80013E84B /* original_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = original_button.png; sourceTree = "<group>"; };
+		FF4151C616DEF1A80013E84B /* original_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "original_button@2x.png"; sourceTree = "<group>"; };
 		FF546DF61602930100948020 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 		FF546DF8160298E500948020 /* fleuron@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fleuron@2x.png"; sourceTree = "<group>"; };
 		FF5EA47C143B691000B7563D /* AddSiteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteViewController.h; sourceTree = "<group>"; };
@@ -1067,6 +1071,8 @@
 		431B857615A132B600DCE497 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				FF4151C516DEF1A80013E84B /* original_button.png */,
+				FF4151C616DEF1A80013E84B /* original_button@2x.png */,
 				FF4151C116DEDF9D0013E84B /* markread.png */,
 				FF4151C216DEDF9D0013E84B /* markread@2x.png */,
 				FF4151BA16DED7D10013E84B /* bar-separator.png */,
@@ -1958,6 +1964,8 @@
 				FF4151BD16DED7D10013E84B /* bar-separator@2x.png in Resources */,
 				FF4151C316DEDF9D0013E84B /* markread.png in Resources */,
 				FF4151C416DEDF9D0013E84B /* markread@2x.png in Resources */,
+				FF4151C716DEF1A80013E84B /* original_button.png in Resources */,
+				FF4151C816DEF1A80013E84B /* original_button@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};