public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changing around story navigation

Browse source
This commit is contained in:
Roy Yang 2012-07-29 00:07:17 -07:00
parent e0e4804816
commit e5af26c6ec
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
media/ios/Classes/ActivityCell.m
View file

@ -109,7 +109,6 @@
self.faviconView.frame = CGRectMake(leftMargin+16, topMargin, 16, 16);
}
NSLog(@"category is %@", category);
if ([category isEqualToString:@"follow"]) {
withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"];
txt = [NSString stringWithFormat:@"%@ followed %@", username, withUserUsername];

1
media/ios/Classes/NewsBlurViewController.m
View file

@ -303,7 +303,6 @@
self.navigationItem.rightBarButtonItem = settingsButton;
NSMutableDictionary *sortedFolders = [[NSMutableDictionary alloc] init];
NSArray *sortedArray;

30
media/ios/Classes/StoryDetailViewController.m
View file

@ -77,25 +77,25 @@
[self.progressViewContainer addGestureRecognizer:tap];
self.progressViewContainer.hidden = YES;
// adding drag property for toolbars
// settings button to right
UIImage *settingsImage = [UIImage imageNamed:@"settings.png"];
UIButton *settings = [UIButton buttonWithType:UIButtonTypeCustom];
settings.bounds = CGRectMake(0, 0, 32, 32);
[settings addTarget:self action:@selector(toggleFontSize:) forControlEvents:UIControlEventTouchUpInside];
[settings setImage:settingsImage forState:UIControlStateNormal];
UIBarButtonItem *fontSettings = [[UIBarButtonItem alloc]
initWithTitle:@"Aa"
style:UIBarButtonItemStyleBordered
target:self
action:@selector(toggleFontSize:)
];
UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc]
initWithCustomView:settings];
self.fontSettingsButton = settingsButton;
// back button
UIBarButtonItem *backButton = [[UIBarButtonItem alloc]
initWithTitle:@"Back" style:UIBarButtonItemStyleBordered target:self action:@selector(transitionFromFeedDetail)];
self.buttonBack = backButton;
self.fontSettingsButton = fontSettings;
// loading indicator
self.loadingIndicator = [[UIActivityIndicatorView alloc]
initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
@ -462,7 +462,7 @@
self.webView.hidden = NO;
self.bottomPlaceholderToolbar.hidden = YES;
self.progressViewContainer.hidden = NO;
self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:self.originalStoryButton, self.fontSettingsButton, nil];
self.navigationItem.rightBarButtonItem = self.fontSettingsButton;
[appDelegate hideFindingStoryHUD];
[appDelegate hideShareView:YES];
@ -1179,8 +1179,10 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
}
[popoverController setPopoverContentSize:CGSizeMake(274.0, 130.0)];
UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc]
initWithCustomView:sender];
[popoverController presentPopoverFromBarButtonItem:sender
[popoverController presentPopoverFromBarButtonItem:settingsButton
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
} else {
FontSettingsViewController *fontSettings = [[FontSettingsViewController alloc] init];