fixing bugs and twitter button

media/ios/Classes/FeedDetailViewController.m

@@ -151,6 +151,7 @@
     if (appDelegate.inStoryDetail = YES && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
         appDelegate.inStoryDetail = NO;
         [appDelegate.storyDetailViewController clearStory];
+        [self checkScroll];
     }
     
     NSString *title = appDelegate.isRiverView ?
@@ -497,7 +498,6 @@
                               reuseIdentifier:@"NoReuse"];
     
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    
     if (self.pageFinished) {
         UIImage *img = [UIImage imageNamed:@"fleuron.png"];
         UIImageView *fleuron = [[UIImageView alloc] initWithImage:img];

media/ios/Classes/FriendsListViewController.h

@@ -33,4 +33,5 @@
 - (void)requestFailed:(ASIHTTPRequest *)request;
 - (void)loadSuggestedFriendsList;
 - (void)loadSuggestedFriendsListFinished:(ASIHTTPRequest *)request;
+- (void)hideUserProfileModal;
 @end

media/ios/Classes/FriendsListViewController.m

@@ -390,13 +390,28 @@ viewForHeaderInSection:(NSInteger)section {
     NSInteger currentRow = indexPath.row;
     int row = currentRow;
     appDelegate.activeUserProfileId = [[self.userProfiles objectAtIndex:row] objectForKey:@"user_id"];
+    appDelegate.activeUserProfileName = [[self.userProfiles objectAtIndex:row] objectForKey:@"username"];
     [self.friendSearchBar resignFirstResponder];
     
+    // adding Done button
+    UIBarButtonItem *donebutton = [[UIBarButtonItem alloc]
+                                   initWithTitle:@"Close" 
+                                   style:UIBarButtonItemStyleDone 
+                                   target:self 
+                                   action:@selector(hideUserProfileModal)];
+    
     // instantiate a new userProfileController
     UserProfileViewController *newUserProfile = [[UserProfileViewController alloc] init];
+    newUserProfile.navigationItem.rightBarButtonItem = donebutton;
+    newUserProfile.navigationItem.title = appDelegate.activeUserProfileName;
     appDelegate.userProfileViewController = newUserProfile; 
     [appDelegate.modalNavigationController pushViewController:newUserProfile animated:YES];
     [appDelegate.userProfileViewController getUserProfile];
 }
 
+- (void)hideUserProfileModal {
+    [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES];
+
+}
+
 @end

media/ios/Classes/NBContainerViewController.m

@@ -19,7 +19,7 @@
 #import "FontSettingsViewController.h"
 
 #define NB_DEFAULT_MASTER_WIDTH 270
-#define NB_DEFAULT_STORY_TITLE_HEIGHT 640
+#define NB_DEFAULT_STORY_TITLE_HEIGHT 760
 #define NB_DEFAULT_SLIDER_INTERVAL 0.35
 #define NB_DEFAULT_SLIDER_INTERVAL_OUT 0.35
 #define NB_DEFAULT_SHARE_HEIGHT 144

media/ios/Classes/NewsBlurAppDelegate.m

@@ -214,7 +214,12 @@
     userProfileView.navigationItem.title = self.activeUserProfileName;
     userProfileView.navigationItem.backBarButtonItem.title = self.activeUserProfileName;
     [userProfileView getUserProfile];   
-    [self.userProfileNavigationController pushViewController:userProfileView animated:YES];
+    if (self.modalNavigationController.view.window == nil) {
+        [self.userProfileNavigationController pushViewController:userProfileView animated:YES];
+    } else {
+        [self.modalNavigationController pushViewController:userProfileView animated:YES];
+    };
+
 }
 
 - (void)hideUserProfileModal {
@@ -580,7 +585,7 @@
 }
 
 - (void)hideStoryDetailView {
-    [self.storyDetailViewController clearStory];
+//    [self.storyDetailViewController clearStory];
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
         [self.masterContainerViewController transitionFromFeedDetail];
     } else {

media/ios/Classes/ShareViewController~ipad.xib

@@ -42,7 +42,6 @@
 						<string key="NSFrame">{{86, 15}, {532, 75}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -92,11 +91,14 @@
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
-						<object class="NSCustomResource" key="IBUISelectedImage" id="394034049">
+						<object class="NSCustomResource" key="IBUISelectedImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">facebook_button_on.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">facebook_button.png</string>
 						</object>
-						<reference key="IBUINormalImage" ref="394034049"/>
 						<object class="IBUIFontDescription" key="IBUIFontDescription" id="562180707">
 							<int key="type">2</int>
 							<double key="pointSize">15</double>
@@ -266,7 +268,7 @@
 				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="20.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="2" key="21.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="21.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
@@ -1633,6 +1635,7 @@
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="facebook_button.png">{32, 32}</string>
+			<string key="facebook_button_on.png">{32, 32}</string>
 			<string key="twitter_button.png">{64, 64}</string>
 			<string key="twitter_button_on.png">{32, 32}</string>
 		</dictionary>

media/ios/Classes/UserProfileViewController.m

@@ -266,6 +266,7 @@
         return;
     }
     
+    
     if (indexPath.row < activitiesCount) {
         NSDictionary *activity = [self.activitiesArray objectAtIndex:indexPath.row];
         NSString *category = [activity objectForKey:@"category"];