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

fixing the DONE button in iPad

Browse source
This commit is contained in:
Roy Yang 2012-06-16 19:25:28 -07:00
parent b5778fe892
commit 1eee4bbee5
7 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
media/iphone/Classes/NewsBlurAppDelegate.h
View file

@ -107,6 +107,7 @@
- (void)addedGoogleReader;
- (void)showLogin;
- (void)showAdd;
- (void)showPopover;
- (void)showMoveSite;
- (void)loadFeedDetailView;
- (void)loadRiverFeedDetailView;

6
media/iphone/Classes/NewsBlurAppDelegate.m
View file

@ -174,6 +174,12 @@
[firstTimeUserViewController selectGoogleReaderButton];
}
- (void)showPopover {
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[splitStoryDetailViewController showPopover];
}
}
- (void)showAdd {
UINavigationController *navController = self.navigationController;
[addSiteViewController initWithNibName:nil bundle:nil];

4
media/iphone/NewsBlur.xcodeproj/project.pbxproj
View file

@ -59,6 +59,7 @@
4307BEE41565EDF8007A932A /* warning.png in Resources */ = {isa = PBXBuildFile; fileRef = 4307BE7F1565EDF8007A932A /* warning.png */; };
4307BEE61565EDF8007A932A /* world.png in Resources */ = {isa = PBXBuildFile; fileRef = 4307BE801565EDF8007A932A /* world.png */; };
4307BEFE1565EEBC007A932A /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4307BEFD1565EEBC007A932A /* Base64.m */; };
430AD52D158D62A40092E1CF /* storyDetailView.js in Sources */ = {isa = PBXBuildFile; fileRef = 430AD52C158D62A40092E1CF /* storyDetailView.js */; };
433323B015886FA80025064D /* logo_newsblur.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323AF15886FA80025064D /* logo_newsblur.png */; };
433323B8158901A40025064D /* fountain_pen.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323B6158901A40025064D /* fountain_pen.png */; };
433323B9158901A40025064D /* fountain_pen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323B7158901A40025064D /* fountain_pen@2x.png */; };
@ -268,6 +269,7 @@
4307BE801565EDF8007A932A /* world.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = world.png; sourceTree = "<group>"; };
4307BEFC1565EEBC007A932A /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
4307BEFD1565EEBC007A932A /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
430AD52C158D62A40092E1CF /* storyDetailView.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = storyDetailView.js; sourceTree = "<group>"; };
433323AF15886FA80025064D /* logo_newsblur.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_newsblur.png; sourceTree = "<group>"; };
433323B6158901A40025064D /* fountain_pen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fountain_pen.png; sourceTree = "<group>"; };
433323B7158901A40025064D /* fountain_pen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fountain_pen@2x.png"; sourceTree = "<group>"; };
@ -599,6 +601,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
430AD52C158D62A40092E1CF /* storyDetailView.js */,
43801386158A4E21006C7E37 /* style.css */,
1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */,
1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */,
@ -1433,6 +1436,7 @@
43C1E6401583DA3F006874F1 /* SplitStoryDetailViewController.m in Sources */,
433323CD158968ED0025064D /* FirstTimeUserViewController.m in Sources */,
43C95C48158BEC450086C69B /* GoogleReaderViewController.m in Sources */,
430AD52D158D62A40092E1CF /* storyDetailView.js in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
media/iphone/SplitStoryDetailViewController.h
View file

@ -18,4 +18,6 @@
@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate;
@property (strong, nonatomic) UIPopoverController *masterPopoverController;
- (void)showPopover;
@end

12
media/iphone/SplitStoryDetailViewController.m
View file

@ -38,10 +38,11 @@
- (void)viewDidAppear:(BOOL)animated {
if (self.masterPopoverController) {
[self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:NO];
[self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
}
}
- (void)viewDidUnload
{
[super viewDidUnload];
@ -57,13 +58,20 @@
[appDelegate adjustStoryDetailWebView];
}
- (void)showPopover {
if (self.masterPopoverController) {
[self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1) inView:self.view
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
}
}
#pragma mark - Split view
- (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController
{
barButtonItem.title = NSLocalizedString(@"NewsBlur", @"NewsBlur");
[self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES];
self.masterPopoverController = popoverController;
self.masterPopoverController = popoverController;
}
- (void)splitViewController:(UISplitViewController *)splitController willShowViewController:(UIViewController *)viewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem

0
media/iphone/storyDetailView.js Normal file
View file

2
media/iphone/style.css
View file

@ -31,7 +31,7 @@ img.NB-image {
}
.NB-no-style img {
margin: 1em;
margin: 0 1em 0 0;
display: inline-block;
border: 0;
background: none;