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

adding in logic to dismiss popovers

Browse source
This commit is contained in:
Roy Yang 2012-07-12 11:43:49 -07:00
parent 11407f8536
commit a4af8d34d9
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
media/iphone/Classes/NewsBlurViewController.m
View file

@ -403,6 +403,7 @@
}
- (void)showUserProfilePopover:(id)sender {
appDelegate.activeUserProfileId = [NSString stringWithFormat:@"%@", [appDelegate.dictUserProfile objectForKey:@"user_id"]];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
@ -412,6 +413,10 @@
popoverController.delegate = self;
} else {
if (popoverController.isPopoverVisible) {
[popoverController dismissPopoverAnimated:YES];
return;
}
[popoverController setContentViewController:appDelegate.userProfileViewController];
}
@ -435,6 +440,10 @@
popoverController.delegate = self;
} else {
if (popoverController.isPopoverVisible) {
[popoverController dismissPopoverAnimated:YES];
return;
}
[popoverController setContentViewController:appDelegate.feedsMenuViewController];
}

13
media/iphone/Classes/StoryDetailViewController.m
View file

@ -586,6 +586,11 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
popoverController.delegate = self;
} else {
if (popoverController.isPopoverVisible) {
[popoverController dismissPopoverAnimated:YES];
return;
}
[popoverController setContentViewController:appDelegate.userProfileViewController];
}
@ -863,14 +868,18 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
popoverController.delegate = self;
} else {
if (popoverController.isPopoverVisible) {
[popoverController dismissPopoverAnimated:YES];
return;
}
[popoverController setContentViewController:appDelegate.fontSettingsViewController];
}
[popoverController setPopoverContentSize:CGSizeMake(274.0, 130.0)];
[popoverController presentPopoverFromBarButtonItem:sender
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
}
- (void)changeFontSize:(NSString *)fontSize {