Fixing add/settings buttons on iPad.

media/ios/Classes/FeedDetailViewController.m

@@ -69,8 +69,7 @@
     self.storyTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4);
 
     rightToolbar = [[TransparentToolbar alloc]
-                    initWithFrame:CGRectMake(0, 0, 76,
-                                             44)];
+                    initWithFrame:CGRectMake(0, 0, 76, 44)];
     
     spacerBarButton = [[UIBarButtonItem alloc]
                        initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];

media/ios/Classes/NewsBlurViewController.m

@@ -25,7 +25,6 @@
 #import "Utilities.h"
 #import "UIBarButtonItem+WEPopover.h"
 
-
 #define kPhoneTableViewRowHeight 31;
 #define kTableViewRowHeight 31;
 #define kBlurblogTableViewRowHeight 32;
@@ -349,7 +348,9 @@ static const CGFloat kFolderTitleHeight = 28;
 
 - (void) layoutForInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
     CGSize toolbarSize = [self.feedViewToolbar sizeThatFits:self.view.bounds.size];
-    self.feedViewToolbar.frame = (CGRect){CGPointMake(0.f, CGRectGetHeight(self.view.bounds) - toolbarSize.height), toolbarSize};
+    self.feedViewToolbar.frame = CGRectMake(-10.0f,
+                                            CGRectGetHeight(self.view.bounds) - toolbarSize.height,
+                                            toolbarSize.width + 20, toolbarSize.height);
     self.innerView.frame = (CGRect){CGPointZero, CGSizeMake(CGRectGetWidth(self.view.bounds), CGRectGetMinY(self.feedViewToolbar.frame))};
 
     int height = 16;
@@ -480,7 +481,7 @@ static const CGFloat kFolderTitleHeight = 28;
     [addButton setImage:addImage forState:UIControlStateNormal];
     [addButton addTarget:self action:@selector(tapAddSite:) forControlEvents:UIControlEventTouchUpInside];
     [addBarButton setCustomView:addButton];
-    
+
     UIImage *settingsImage = [UIImage imageNamed:@"nav_icn_settings.png"];
     UIButton *settingsButton = [UIButton buttonWithType:UIButtonTypeCustom];
     settingsButton.bounds = CGRectMake(0, 0, 34, 44);

media/ios/Classes/ShareViewController.m

@@ -197,7 +197,6 @@
         facebookButton.hidden = YES;
         twitterButton.hidden = YES;
         appdotnetButton.hidden = YES;
-//        self.navigationItem.title = @"Edit Your Reply";
         [submitButton setAction:(@selector(doReplyToComment:))];
         self.activeReplyId = replyId;
         
@@ -222,10 +221,7 @@
         appdotnetButton.hidden = YES;
         [submitButton setAction:(@selector(doReplyToComment:))];
         
-        if (![self.currentType isEqualToString:@"share"] &&
-            ![self.currentType isEqualToString:@"reply"]) {
-            self.commentField.text = @"";
-        }
+        self.commentField.text = @"";
     } else if ([type isEqualToString: @"edit-share"]) {
         facebookButton.hidden = NO;
         twitterButton.hidden = NO;
@@ -234,13 +230,6 @@
         // get old comment
         self.commentField.text = [self stringByStrippingHTML:[appDelegate.activeComment objectForKey:@"comments"]];
         
-//        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-//            self.navigationItem.title = @"Edit Your Comment";
-//            [submitButton setTitle:@"Save your comments"];
-//        } else {
-//            self.navigationItem.title = @"Edit Comment";
-//            [submitButton setTitle:@"Save"];
-//        }
         [submitButton setTitle:@"Save your comments"];
         [submitButton setAction:(@selector(doShareThisStory:))];
     } else if ([type isEqualToString: @"share"]) {        

media/ios/Resources-iPhone/NewsBlurViewController.xib

@@ -244,7 +244,7 @@
 						<reference key="source" ref="372490531"/>
 						<reference key="destination" ref="816230383"/>
 					</object>
-					<int key="connectionID">109</int>
+					<int key="connectionID">120</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
@@ -252,7 +252,7 @@
 						<reference key="source" ref="372490531"/>
 						<reference key="destination" ref="934474311"/>
 					</object>
-					<int key="connectionID">110</int>
+					<int key="connectionID">121</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
@@ -287,14 +287,6 @@
 					</object>
 					<int key="connectionID">64</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showSettingsPopover:</string>
-						<reference key="source" ref="934474311"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">108</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">tapAddSite:</string>
@@ -451,7 +443,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">110</int>
+			<int key="maxID">121</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1957,6 +1949,14 @@
 						<string key="minorKey">./Classes/NBContainerViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NewsBlurAppDelegate</string>
 					<string key="superclassName">BaseViewController</string>
@@ -2240,6 +2240,7 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>activitiesButton</string>
+							<string>addBar</string>
 							<string>addBarButton</string>
 							<string>appDelegate</string>
 							<string>feedScoreSlider</string>
@@ -2248,14 +2249,20 @@
 							<string>homeButton</string>
 							<string>innerView</string>
 							<string>intelligenceControl</string>
+							<string>leftToolbar</string>
 							<string>noFocusMessage</string>
+							<string>rightToolbar</string>
+							<string>settingsBar</string>
 							<string>settingsBarButton</string>
+							<string>spacer2BarButton</string>
+							<string>spacerBarButton</string>
 							<string>toolbarLeftMargin</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>UIBarButtonItem</string>
 							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
 							<string>NewsBlurAppDelegate</string>
 							<string>UISlider</string>
 							<string>UITableView</string>
@@ -2263,7 +2270,12 @@
 							<string>UIBarButtonItem</string>
 							<string>UIView</string>
 							<string>UISegmentedControl</string>
+							<string>TransparentToolbar</string>
 							<string>UIView</string>
+							<string>TransparentToolbar</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
 							<string>UIBarButtonItem</string>
 							<string>UIBarButtonItem</string>
 						</object>
@@ -2273,6 +2285,7 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>activitiesButton</string>
+							<string>addBar</string>
 							<string>addBarButton</string>
 							<string>appDelegate</string>
 							<string>feedScoreSlider</string>
@@ -2281,8 +2294,13 @@
 							<string>homeButton</string>
 							<string>innerView</string>
 							<string>intelligenceControl</string>
+							<string>leftToolbar</string>
 							<string>noFocusMessage</string>
+							<string>rightToolbar</string>
+							<string>settingsBar</string>
 							<string>settingsBarButton</string>
+							<string>spacer2BarButton</string>
+							<string>spacerBarButton</string>
 							<string>toolbarLeftMargin</string>
 						</object>
 						<object class="NSArray" key="dict.values">
@@ -2291,6 +2309,10 @@
 								<string key="name">activitiesButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addBar</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">addBarButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
@@ -2323,14 +2345,34 @@
 								<string key="name">intelligenceControl</string>
 								<string key="candidateClassName">UISegmentedControl</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">leftToolbar</string>
+								<string key="candidateClassName">TransparentToolbar</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">noFocusMessage</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">rightToolbar</string>
+								<string key="candidateClassName">TransparentToolbar</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">settingsBar</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">settingsBarButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacer2BarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spacerBarButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">toolbarLeftMargin</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
@@ -2531,16 +2573,22 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
+							<string>appdotnetButton</string>
 							<string>commentField</string>
 							<string>facebookButton</string>
+							<string>keyboardHeight</string>
+							<string>storyTitle</string>
 							<string>submitButton</string>
 							<string>twitterButton</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
+							<string>UIButton</string>
 							<string>UITextView</string>
 							<string>UIButton</string>
+							<string>NSLayoutConstraint</string>
+							<string>UILabel</string>
 							<string>UIBarButtonItem</string>
 							<string>UIButton</string>
 						</object>
@@ -2550,8 +2598,11 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
+							<string>appdotnetButton</string>
 							<string>commentField</string>
 							<string>facebookButton</string>
+							<string>keyboardHeight</string>
+							<string>storyTitle</string>
 							<string>submitButton</string>
 							<string>twitterButton</string>
 						</object>
@@ -2561,6 +2612,10 @@
 								<string key="name">appDelegate</string>
 								<string key="candidateClassName">NewsBlurAppDelegate</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">appdotnetButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">commentField</string>
 								<string key="candidateClassName">UITextView</string>
@@ -2569,6 +2624,14 @@
 								<string key="name">facebookButton</string>
 								<string key="candidateClassName">UIButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">keyboardHeight</string>
+								<string key="candidateClassName">NSLayoutConstraint</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">storyTitle</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">submitButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>