diff --git a/media/iphone/Classes/FeedDetailViewController.h b/media/iphone/Classes/FeedDetailViewController.h index 3ad60e108..e443e889b 100644 --- a/media/iphone/Classes/FeedDetailViewController.h +++ b/media/iphone/Classes/FeedDetailViewController.h @@ -41,6 +41,7 @@ - (IBAction)selectIntelligence; - (NSDictionary *)getStoryAtRow:(NSInteger)indexPathRow; - (void)checkScroll; +- (UIView *)makeFeedTitleBar:(NSDictionary *)feed makeRect:(CGRect)rect; - (IBAction)doOpenMarkReadActionSheet:(id)sender; - (IBAction)doOpenSettingsActionSheet; diff --git a/media/iphone/Classes/FeedDetailViewController.m b/media/iphone/Classes/FeedDetailViewController.m index 04ea88ec9..ad455240f 100644 --- a/media/iphone/Classes/FeedDetailViewController.m +++ b/media/iphone/Classes/FeedDetailViewController.m @@ -499,9 +499,8 @@ // River view gradient if ((appDelegate.isRiverView || appDelegate.isSocialView) && cell) { - UIView *gradientView = [appDelegate makeFeedTitleGradient:feed - withRect:CGRectMake(0, 0, cell.frame.size.width, 21)]; - [cell.feedGradient addSubview:gradientView]; + UIView *feedTitleBar = [self makeFeedTitleBar:feed makeRect:CGRectMake(0, 2, 12, cell.frame.size.height)]; + [cell.feedGradient addSubview:feedTitleBar]; } if (!isStoryRead) { @@ -558,6 +557,68 @@ } } +- (UIView *)makeFeedTitleBar:(NSDictionary *)feed makeRect:(CGRect)rect { + UIView *gradientView = [[[UIView alloc] init] autorelease]; + UILabel *titleLabel = [[[UILabel alloc] init] autorelease]; + titleLabel.text = [feed objectForKey:@"feed_title"]; + titleLabel.backgroundColor = [UIColor clearColor]; + titleLabel.textAlignment = UITextAlignmentLeft; + titleLabel.lineBreakMode = UILineBreakModeTailTruncation; + titleLabel.numberOfLines = 1; + titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:11.0]; + titleLabel.shadowOffset = CGSizeMake(0, 1); + titleLabel.textColor = UIColorFromRGB(0x606060); + titleLabel.frame = CGRectMake(40, 4, 300, 20); + titleLabel.highlightedTextColor = UIColorFromRGB(0xE0E0E0); + + NSString *feedIdStr = [NSString stringWithFormat:@"%@", [feed objectForKey:@"id"]]; + UIImage *titleImage = [Utilities getImage:feedIdStr]; + UIImageView *titleImageView = [[UIImageView alloc] initWithImage:titleImage]; + titleImageView.alpha = 0.6; + titleImageView.frame = CGRectMake(18, 6, 16.0, 16.0); + [titleLabel addSubview:titleImageView]; + [titleImageView release]; + + [gradientView addSubview:titleLabel]; + [gradientView addSubview:titleImageView]; + + CALayer *topBorder = [CALayer layer]; + topBorder.frame = CGRectMake(12, 1, 320, 1); + topBorder.backgroundColor = UIColorFromRGB(0xE6E6E6).CGColor; + topBorder.opacity = 1; + [gradientView.layer addSublayer:topBorder]; + gradientView.opaque = YES; + + unsigned int color = 0; + NSString *faviconColor = [feed valueForKey:@"favicon_color"]; + if ([faviconColor class] == [NSNull class]) { + faviconColor = @"505050"; + } + NSScanner *scanner = [NSScanner scannerWithString:faviconColor]; + [scanner scanHexInt:&color]; + CALayer *feedColorBar = [CALayer layer]; + feedColorBar.frame = rect; + feedColorBar.backgroundColor = UIColorFromRGB(color).CGColor; + feedColorBar.opacity = 1; + [gradientView.layer addSublayer:feedColorBar]; + + unsigned int colorBorder = 0; + NSString *faviconFade = [feed valueForKey:@"favicon_fade"]; + if ([faviconFade class] == [NSNull class]) { + faviconFade = @"505050"; + } + NSScanner *scannerBorder = [NSScanner scannerWithString:faviconFade]; + [scannerBorder scanHexInt:&colorBorder]; + CALayer *feedColorBarBorder = [CALayer layer]; + feedColorBarBorder.frame = CGRectMake(0, 1, rect.size.width, 1); + feedColorBarBorder.backgroundColor = UIColorFromRGB(colorBorder).CGColor; + feedColorBarBorder.opacity = 1; + [gradientView.layer addSublayer:feedColorBarBorder]; + + + return gradientView; +} + - (void)scrollViewDidScroll: (UIScrollView *)scroll { [self checkScroll]; } diff --git a/media/iphone/Classes/FirstTimeUserViewController.xib b/media/iphone/Classes/FirstTimeUserViewController.xib index e002cf798..c435a2d23 100644 --- a/media/iphone/Classes/FirstTimeUserViewController.xib +++ b/media/iphone/Classes/FirstTimeUserViewController.xib @@ -2,7 +2,7 @@ 1296 - 11E53 + 11E2620 2182 1138.47 569.00 @@ -144,7 +144,7 @@ {{0, 34}, {768, 112}} - + _NS:9 NO YES @@ -178,7 +178,7 @@ {{87, 577}, {594, 196}} - + _NS:9 NO YES @@ -216,7 +216,7 @@ {{182, 174}, {405, 405}} - + _NS:9 NO IBIPadFramework @@ -258,10 +258,6 @@ YES - - 1 - MCAwLjUwMTk2MDgxNCAwAA - @@ -328,7 +324,7 @@ IBIPadFramework - + 292 @@ -336,7 +332,6 @@ 292 {{244, 96}, {280, 80}} - _NS:9 NO @@ -369,7 +364,6 @@ 292 {{20, 725}, {230, 215}} - _NS:9 NO @@ -404,7 +398,6 @@ 292 {{20, 493}, {230, 215}} - _NS:9 NO @@ -436,7 +429,6 @@ 292 {{20, 261}, {230, 215}} - _NS:9 NO @@ -468,7 +460,6 @@ 292 {{269, 261}, {230, 215}} - _NS:9 NO @@ -500,7 +491,6 @@ 292 {{269, 493}, {230, 215}} - _NS:9 NO @@ -532,7 +522,6 @@ 292 {{518, 261}, {230, 215}} - _NS:9 NO @@ -564,7 +553,6 @@ 292 {{518, 493}, {230, 215}} - _NS:9 NO @@ -596,8 +584,6 @@ 292 {{269, 725}, {230, 215}} - - _NS:9 NO @@ -628,7 +614,6 @@ 292 {{305, 42}, {158, 21}} - _NS:9 NO @@ -660,7 +645,6 @@ 292 {{293, 222}, {183, 21}} - _NS:9 NO @@ -682,14 +666,12 @@ {768, 960} - - _NS:9 IBIPadFramework - + 292 @@ -697,7 +679,6 @@ 292 {{302, 220}, {133, 21}} - _NS:9 NO @@ -722,7 +703,6 @@ 292 {{106, 372}, {230, 215}} - _NS:9 NO @@ -745,8 +725,6 @@ 292 {{402, 372}, {230, 215}} - - _NS:9 NO IBIPadFramework @@ -765,15 +743,13 @@ {768, 960} - - _NS:9 NO IBIPadFramework - + 292 @@ -781,7 +757,6 @@ 292 {{260, 270}, {248, 21}} - _NS:9 NO @@ -806,8 +781,6 @@ 292 {{269, 372}, {230, 215}} - - _NS:9 NO IBIPadFramework @@ -833,8 +806,6 @@ {768, 960} - - _NS:9 NO @@ -1449,6 +1420,28 @@ ./Classes/BaseViewController.h + + FeedDashboardViewController + UIViewController + + NewsBlurAppDelegate + UIToolbar + + + + appDelegate + NewsBlurAppDelegate + + + toolbar + UIToolbar + + + + IBProjectSource + ./Classes/FeedDashboardViewController.h + + FeedDetailViewController BaseViewController @@ -1658,6 +1651,8 @@ NewsBlurAppDelegate + UISegmentedControl + UISegmentedControl UILabel UILabel @@ -1666,6 +1661,14 @@ appDelegate NewsBlurAppDelegate + + fontSizeSegment + UISegmentedControl + + + fontStyleSegment + UISegmentedControl + largeFontSizeLabel UILabel @@ -1839,6 +1842,57 @@ ./Classes/LoginViewController.h + + MGSplitViewController + UIViewController + + id + id + id + id + + + + showMasterPopover: + id + + + toggleMasterBeforeDetail: + id + + + toggleMasterView: + id + + + toggleSplitOrientation: + id + + + + id + UIViewController + UIViewController + + + + delegate + id + + + detailViewController + UIViewController + + + masterViewController + UIViewController + + + + IBProjectSource + ./Classes/MGSplitViewController.h + + MoveSiteViewController UIViewController @@ -1935,6 +1989,7 @@ BaseViewController AddSiteViewController + FeedDashboardViewController FeedDetailViewController FeedsMenuViewController NewsBlurViewController @@ -1945,7 +2000,8 @@ MoveSiteViewController UINavigationController OriginalStoryViewController - UISplitViewController + ShareViewController + MGSplitViewController UINavigationController SplitStoryDetailViewController StoryDetailViewController @@ -1956,6 +2012,10 @@ addSiteViewController AddSiteViewController + + feedDashboardViewController + FeedDashboardViewController + feedDetailViewController FeedDetailViewController @@ -1996,9 +2056,13 @@ originalStoryViewController OriginalStoryViewController + + shareViewController + ShareViewController + splitStoryController - UISplitViewController + MGSplitViewController splitStoryDetailNavigationController @@ -2029,8 +2093,9 @@ id UIButton UIButton + UIButton id - id + id @@ -2045,12 +2110,16 @@ sectionUntapped: UIButton + + sectionUntappedOutside: + UIButton + selectIntelligence id - - showMenuButton + + showMenuButton: id @@ -2185,19 +2254,88 @@ - SplitStoryDetailViewController + ShareViewController UIViewController - - appDelegate - NewsBlurAppDelegate - - - appDelegate - + + id + id + id + id + + + + doCancelButton: + id + + + doReplyToComment: + id + + + doShareThisStory: + id + + + doToggleButton: + id + + + + NewsBlurAppDelegate + UITextView + UIButton + UIBarButtonItem + UIBarButtonItem + UIButton + + + appDelegate NewsBlurAppDelegate + + commentField + UITextView + + + facebookButton + UIButton + + + submitButton + UIBarButtonItem + + + toolbarTitle + UIBarButtonItem + + + twitterButton + UIButton + + + + IBProjectSource + ./Classes/ShareViewController.h + + + SplitStoryDetailViewController + UIViewController + + NewsBlurAppDelegate + MGSplitViewController + + + + appDelegate + NewsBlurAppDelegate + + + splitController + MGSplitViewController + + IBProjectSource ./Classes/SplitStoryDetailViewController.h @@ -2207,11 +2345,16 @@ StoryDetailViewController UIViewController + id id id id + + doNextStory + id + doNextUnreadStory id @@ -2230,10 +2373,12 @@ NewsBlurAppDelegate UIBarButtonItem UIBarButtonItem + UIBarButtonItem UIBarButtonItem UIView UIPopoverController UIProgressView + UIBarButtonItem UIToolbar UIWebView @@ -2254,6 +2399,10 @@ buttonNext UIBarButtonItem + + buttonNextStory + UIBarButtonItem + buttonPrevious UIBarButtonItem @@ -2270,6 +2419,10 @@ progressView UIProgressView + + toggleViewButton + UIBarButtonItem + toolbar UIToolbar diff --git a/media/iphone/Classes/NewsBlurAppDelegate.m b/media/iphone/Classes/NewsBlurAppDelegate.m index f2cbed7dc..d3896920c 100644 --- a/media/iphone/Classes/NewsBlurAppDelegate.m +++ b/media/iphone/Classes/NewsBlurAppDelegate.m @@ -976,8 +976,8 @@ if (self.isRiverView || self.isSocialView) { gradientView = [NewsBlurAppDelegate makeGradientView:rect - startColor:[feed objectForKey:@"favicon_color"] - endColor:[feed objectForKey:@"favicon_fade"]]; + startColor:[feed objectForKey:@"favicon_fade"] + endColor:[feed objectForKey:@"favicon_color"]]; UILabel *titleLabel = [[[UILabel alloc] init] autorelease]; titleLabel.text = [feed objectForKey:@"feed_title"]; @@ -990,12 +990,12 @@ if ([[feed objectForKey:@"favicon_text_color"] class] != [NSNull class]) { titleLabel.textColor = [[feed objectForKey:@"favicon_text_color"] isEqualToString:@"white"] ? - [UIColor whiteColor] : - [UIColor blackColor]; + [UIColor whiteColor] : + [UIColor blackColor]; titleLabel.shadowColor = [[feed objectForKey:@"favicon_text_color"] isEqualToString:@"white"] ? - UIColorFromRGB(0x202020) : - UIColorFromRGB(0xd0d0d0); + UIColorFromRGB(0x202020) : + UIColorFromRGB(0xd0d0d0); } else { titleLabel.textColor = [UIColor whiteColor]; titleLabel.shadowColor = [UIColor blackColor]; @@ -1015,8 +1015,8 @@ gradientView = [NewsBlurAppDelegate makeGradientView:CGRectMake(0, -1, 1024, 10) // hard coding the 1024 as a hack for window.frame.size.width - startColor:[feed objectForKey:@"favicon_color"] - endColor:[feed objectForKey:@"favicon_fade"]]; + startColor:[feed objectForKey:@"favicon_fade"] + endColor:[feed objectForKey:@"favicon_color"]]; } gradientView.opaque = YES; diff --git a/media/iphone/Resources-iPad/Classes/FeedDetailTableCell~ipad.xib b/media/iphone/Resources-iPad/Classes/FeedDetailTableCell~ipad.xib index 90ddbd4f1..ef3507bd1 100644 --- a/media/iphone/Resources-iPad/Classes/FeedDetailTableCell~ipad.xib +++ b/media/iphone/Resources-iPad/Classes/FeedDetailTableCell~ipad.xib @@ -2,7 +2,7 @@ 1296 - 11E53 + 11E2620 2182 1138.47 569.00 @@ -52,7 +52,6 @@ {{620, 40}, {128, 15}} - 1 MSAxIDEAA @@ -222,7 +221,6 @@ {{607, 60}, {141, 15}} - YES 7 @@ -249,7 +247,7 @@ 290 - {{34, 28}, {728, 34}} + {{40, 24}, {728, 34}} @@ -278,7 +276,7 @@ 268 - {{34, 60}, {122, 15}} + {{40, 60}, {122, 15}} @@ -305,7 +303,7 @@ 292 - {{8, 42}, {16, 16}} + {{18, 34}, {16, 16}}