diff --git a/media/ios/Classes/FeedDetailViewController.h b/media/ios/Classes/FeedDetailViewController.h index eba5fb5d0..4839013fa 100644 --- a/media/ios/Classes/FeedDetailViewController.h +++ b/media/ios/Classes/FeedDetailViewController.h @@ -41,6 +41,8 @@ @property (nonatomic) IBOutlet UIBarButtonItem * feedMarkReadButton; @property (nonatomic) IBOutlet UIBarButtonItem * settingsBarButton; @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, retain) WEPopoverController *popoverController; diff --git a/media/ios/Classes/FeedDetailViewController.m b/media/ios/Classes/FeedDetailViewController.m index 6920416c3..6434c11f8 100644 --- a/media/ios/Classes/FeedDetailViewController.m +++ b/media/ios/Classes/FeedDetailViewController.m @@ -44,7 +44,8 @@ @synthesize popoverController; @synthesize storyTitlesTable, feedMarkReadButton; @synthesize settingsBarButton; -@synthesize spacerBarButton, separatorBarButton; +@synthesize separatorBarButton; +@synthesize spacerBarButton, spacer2BarButton, spacer3BarButton; @synthesize stories; @synthesize rightToolbar; @synthesize appDelegate; @@ -68,12 +69,18 @@ self.storyTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4); rightToolbar = [[TransparentToolbar alloc] - initWithFrame:CGRectMake(0, 0, 80, + initWithFrame:CGRectMake(0, 0, 76, self.navigationController.view.frame.size.height)]; spacerBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; - spacerBarButton.width = -16; + 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; UIImage *separatorImage = [UIImage imageNamed:@"bar-separator.png"]; separatorBarButton = [UIBarButtonItem barItemWithImage:separatorImage target:nil action:nil]; @@ -125,14 +132,18 @@ [rightToolbar setItems: [NSArray arrayWithObjects: spacerBarButton, feedMarkReadButton, + spacer2BarButton, separatorBarButton, + spacer3BarButton, titleImageBarButton, nil]]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar]; } else { [rightToolbar setItems: [NSArray arrayWithObjects: spacerBarButton, feedMarkReadButton, + spacer2BarButton, separatorBarButton, + spacer3BarButton, settingsBarButton, nil]]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar]; } diff --git a/media/ios/Resources/bar-separator.png b/media/ios/Resources/bar-separator.png index 5d93a1f3f..956a268a9 100644 Binary files a/media/ios/Resources/bar-separator.png and b/media/ios/Resources/bar-separator.png differ diff --git a/media/ios/Resources/bar-separator@2x.png b/media/ios/Resources/bar-separator@2x.png index f9b7b9983..98ce709d2 100644 Binary files a/media/ios/Resources/bar-separator@2x.png and b/media/ios/Resources/bar-separator@2x.png differ