sjs/samhuri.net-ios
1
0
Fork 0
mirror of https://github.com/samsonjs/samhuri.net-ios.git synced 2026-04-27 15:07:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bugs on the iPad

Browse source 
- wire up blogController properly
- don’t crash trying to save non-existent posts
This commit is contained in:
Sami Samhuri 2015-05-03 21:40:49 -07:00
parent 32829036ce
commit dc25824cd3
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Blog/AppDelegate.m
View file

@ -21,7 +21,8 @@
@property (nonatomic, readonly, strong) BlogController *blogController; @property (nonatomic, readonly, strong) BlogController *blogController;
@property (nonatomic, readonly, strong) PostsViewController *postsViewController; @property (nonatomic, readonly, strong) PostsViewController *postsViewController;
@property (nonatomic, readonly, strong) EditorViewController *editorViewController; @property (nonatomic, readonly, strong) EditorViewController *editorViewControllerForPhone;
@property (nonatomic, readonly, strong) EditorViewController *editorViewControllerForPad;
@end @end
@ -36,7 +37,8 @@
navigationController.topViewController.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem; navigationController.topViewController.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem;
splitViewController.delegate = self; splitViewController.delegate = self;
self.postsViewController.blogController = self.blogController; self.postsViewController.blogController = self.blogController;
self.editorViewController.blogController = self.blogController; self.editorViewControllerForPhone.blogController = self.blogController;
self.editorViewControllerForPad.blogController = self.blogController;
return YES; return YES;
} }
@ -69,15 +71,21 @@
return postsViewController; return postsViewController;
} }
- (EditorViewController *)editorViewController { - (EditorViewController *)editorViewControllerForPhone {
UISplitViewController *splitViewController = (UISplitViewController *)self.window.rootViewController; UISplitViewController *splitViewController = (UISplitViewController *)self.window.rootViewController;
UINavigationController *navigationController = splitViewController.viewControllers.firstObject; UINavigationController *navigationController = splitViewController.viewControllers.firstObject;
if (navigationController.viewControllers.count > 1) { if (navigationController.viewControllers.count > 1) {
navigationController = navigationController.viewControllers.lastObject; navigationController = navigationController.viewControllers.lastObject;
EditorViewController *editorViewController = (EditorViewController *)navigationController.viewControllers.firstObject;
return editorViewController;
} }
return nil; EditorViewController *editorViewController = (EditorViewController *)navigationController.viewControllers.firstObject;
return editorViewController;
}
- (EditorViewController *)editorViewControllerForPad {
UISplitViewController *splitViewController = (UISplitViewController *)self.window.rootViewController;
UINavigationController *navigationController = splitViewController.viewControllers.lastObject;
EditorViewController *editorViewController = (EditorViewController *)navigationController.viewControllers.firstObject;
return editorViewController;
} }
- (ModelStore *)newModelStoreWithPath:(NSString *)dbPath { - (ModelStore *)newModelStoreWithPath:(NSString *)dbPath {

10
Blog/EditorViewController.m
View file

@ -118,7 +118,7 @@
- (void)configureLinkView { - (void)configureLinkView {
NSURL *url = self.modifiedPost.url; NSURL *url = self.modifiedPost.url;
if (self.post && url || [self pasteboardHasLink]) { if (self.post && (url || [self pasteboardHasLink])) {
NSString *title = url ? url.absoluteString : @"Add Link from Pasteboard"; NSString *title = url ? url.absoluteString : @"Add Link from Pasteboard";
[self.linkButton setTitle:title forState:UIControlStateNormal]; [self.linkButton setTitle:title forState:UIControlStateNormal];
self.removeLinkButton.hidden = !url; self.removeLinkButton.hidden = !url;
@ -190,7 +190,9 @@
[notificationCenter removeObserver:self name:UIKeyboardWillHideNotification object:nil]; [notificationCenter removeObserver:self name:UIKeyboardWillHideNotification object:nil];
[notificationCenter removeObserver:self name:DraftRemovedNotification object:nil]; [notificationCenter removeObserver:self name:DraftRemovedNotification object:nil];
[notificationCenter removeObserver:self name:PublishedPostRemovedNotification object:nil]; [notificationCenter removeObserver:self name:PublishedPostRemovedNotification object:nil];
[self savePost]; if (self.post) {
[self savePost];
}
} }
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
@ -206,7 +208,9 @@
#pragma mark - Notification handlers #pragma mark - Notification handlers
- (void)applicationWillResignActive:(NSNotification *)note { - (void)applicationWillResignActive:(NSNotification *)note {
[self savePost]; if (self.post) {
[self savePost];
}
} }
- (void)keyboardWillShow:(NSNotification *)note { - (void)keyboardWillShow:(NSNotification *)note {