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

initial commit for portrait UI, needs refactoring

Browse source
This commit is contained in:
Roy Yang 2012-06-19 15:47:51 -07:00
parent 7ce1648d69
commit 7c6ce0d8a7
4 changed files with 93 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/iphone/Classes/FeedDetailViewController.m
View file

@ -185,7 +185,7 @@
return;
}
NSString *responseString = [request responseString];
NSDictionary *results = [[NSDictionary alloc]
initWithDictionary:[responseString JSONValue]];

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

@ -44,8 +44,10 @@
SplitStoryDetailViewController *splitStoryDetailViewController;
NSString * activeUsername;
BOOL isRiverView;
BOOL popoverHasFeedView;
NSDictionary * activeFeed;
NSString * activeFolder;
NSArray * activeFolderFeeds;
@ -87,6 +89,7 @@
@property (readwrite, retain) NSString * activeUsername;
@property (nonatomic, readwrite) BOOL isRiverView;
@property (nonatomic, readwrite) BOOL popoverHasFeedView;
@property (readwrite, retain) NSDictionary * activeFeed;
@property (readwrite, retain) NSString * activeFolder;
@property (readwrite, retain) NSArray * activeFolderFeeds;
@ -115,6 +118,7 @@
- (void)showLogin;
- (void)showFeedsMenu;
- (void)hideFeedsMenu;
- (void)pushFeedDetailToMasterPopover;
- (void)showAdd;
- (void)showMasterPopover;
- (void)showPopover;

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

@ -44,6 +44,7 @@
@synthesize activeUsername;
@synthesize isRiverView;
@synthesize popoverHasFeedView;
@synthesize activeFeed;
@synthesize activeFolder;
@synthesize activeFolderFeeds;
@ -216,6 +217,13 @@
- (void)showMasterPopover {
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[splitStoryDetailViewController showPopover];
NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
for (UIView *subview in subviews) {
if (subview.tag == 14) {
[subview removeFromSuperview];
}
}
[subviews release];
}
}
@ -231,8 +239,6 @@
} else {
[navController presentModalViewController:moveSiteViewController animated:YES];
}
}
- (void)reloadFeedsView:(BOOL)showLoader {
@ -242,17 +248,74 @@
}
- (void)loadFeedDetailView {
UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All" style: UIBarButtonItemStyleBordered target: nil action: nil];
[feedsViewController.navigationItem setBackBarButtonItem: newBackButton];
[newBackButton release];
UINavigationController *navController = self.navigationController;
[self setStories:nil];
[navController pushViewController:feedDetailViewController animated:YES];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad &&
UIInterfaceOrientationIsPortrait(splitStoryDetailViewController.interfaceOrientation)) {
// remove existing feedDetailViewController
NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
for (UIView *subview in subviews) {
if (subview.tag == 14) {
[subview removeFromSuperview];
}
}
[subviews release];
feedDetailViewController.view.tag = 14;
[splitStoryDetailViewController.view addSubview:feedDetailViewController.view];
[self adjustStoryDetailWebView];
[self.splitStoryDetailViewController.masterPopoverController dismissPopoverAnimated:YES];
} else {
UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All" style: UIBarButtonItemStyleBordered target: nil action: nil];
[feedsViewController.navigationItem setBackBarButtonItem: newBackButton];
[newBackButton release];
UINavigationController *navController = self.navigationController;
[self setStories:nil];
[navController pushViewController:feedDetailViewController animated:YES];
[self showNavigationBar:YES];
navController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
// navController.navigationBar.tintColor = UIColorFromRGB(0x59f6c1);
popoverHasFeedView = YES;
}
[feedDetailViewController resetFeedDetail];
[feedDetailViewController fetchFeedDetail:1 withCallback:nil];
[self showNavigationBar:YES];
navController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
// navController.navigationBar.tintColor = UIColorFromRGB(0x59f6c1);
}
- (void)adjustStoryDetailWebView {
UINavigationController *navController = self.navigationController;
if (UIInterfaceOrientationIsPortrait(splitStoryDetailViewController.interfaceOrientation)) {
storyDetailViewController.view.frame = CGRectMake(0,0,768,600);
feedDetailViewController.view.frame = CGRectMake(0,600,768,360);
if (popoverHasFeedView) {
[navController popViewControllerAnimated:NO];
popoverHasFeedView = NO;
}
[splitStoryDetailViewController.view addSubview:feedDetailViewController.view];
} else {
storyDetailViewController.view.frame = CGRectMake(0,0,704,704);
// remove existing feedDetailViewController
NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
for (UIView *subview in subviews) {
if (subview.tag == 14) {
[subview removeFromSuperview];
}
}
[subviews release];
if (!popoverHasFeedView) {
[navController pushViewController:feedDetailViewController animated:NO];
popoverHasFeedView = YES;
}
}
}
- (void)loadRiverFeedDetailView {
@ -306,17 +369,6 @@
navController.navigationItem.hidesBackButton = YES;
navController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
}
}
- (void)adjustStoryDetailWebView {
if (UIInterfaceOrientationIsPortrait(splitStoryDetailViewController.interfaceOrientation)) {
storyDetailViewController.view.frame = CGRectMake(0,0,768,960);
} else {
storyDetailViewController.view.frame = CGRectMake(0,0,704,704);
}
}
- (void)navigationController:(UINavigationController *)navController

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

@ -111,20 +111,20 @@
animated:YES scrollPosition:UITableViewScrollPositionMiddle];
// remove the right detail view in storySplitController
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad){
NSArray *subviews = [[appDelegate.splitStoryDetailViewController.view subviews] copy];
for (UIView *subview in subviews) {
if (subview.tag == 12) {
[subview removeFromSuperview];
}
}
[subviews release];
}
appDelegate.splitStoryDetailViewController.navigationItem.titleView = nil;
appDelegate.splitStoryDetailViewController.navigationItem.title = @"NewsBlur";
appDelegate.splitStoryDetailViewController.navigationItem.rightBarButtonItem = nil;
// // remove the right detail view in storySplitController
// if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad){
// NSArray *subviews = [[appDelegate.splitStoryDetailViewController.view subviews] copy];
// for (UIView *subview in subviews) {
// if (subview.tag == 12) {
// [subview removeFromSuperview];
// }
// }
// [subviews release];
// }
//
// appDelegate.splitStoryDetailViewController.navigationItem.titleView = nil;
// appDelegate.splitStoryDetailViewController.navigationItem.title = @"NewsBlur";
// appDelegate.splitStoryDetailViewController.navigationItem.rightBarButtonItem = nil;
}
- (void)viewDidAppear:(BOOL)animated {