diff --git a/media/css/reader.css b/media/css/reader.css index 12c20925e..7380a84b1 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -652,36 +652,44 @@ body { top: -1px; width: 20px; height: 22px; - background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 3px 4px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 4px 6px; background-size: 8px; } .NB-feedlist .folder_title .NB-feedlist-manage-icon { - background-position: 3px 5px; + background-position: 4px 6px; } .NB-feedlist .feed .NB-feedlist-manage-icon:hover, .NB-feedlist .folder_title .NB-feedlist-manage-icon:hover { - background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 3px 4px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 4px 6px; background-size: 8px; } .NB-feedlist .folder_title .NB-feedlist-manage-icon:hover { - background-position: 3px 5px; + background-position: 4px 5px; } .NB-feedlist .feed.NB-hover-inverse .NB-feedlist-manage-icon:hover, .NB-feedlist .folder.NB-hover-inverse .NB-feedlist-manage-icon:hover { - background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 3px 2px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 4px 8px; background-size: 8px; } - +.NB-feedlist .folder.NB-hover-inverse .NB-feedlist-manage-icon:hover { + background-position: 6px 8px; +} +.NB-feedlist .feed.NB-hover-inverse .NB-feedlist-manage-icon:hover { + background-position: 4px 8px; +} +.NB-feedlist .feed.NB-toplevel.NB-hover-inverse .NB-feedlist-manage-icon:hover { + background-position: 5px 7px; +} .NB-feedlist .feed.NB-toplevel .NB-feedlist-manage-icon, .NB-feedlist .folder_title.NB-toplevel .NB-feedlist-manage-icon { left: 0; opacity: 1; display: none; - background-position: 5px 4px; + background-position: 6px 7px; } .NB-feedlist .folder_title.NB-toplevel .NB-feedlist-manage-icon { - background-position: 5px 5px; + background-position: 6px 8px; } .NB-feedlist .feed:hover .NB-feedlist-manage-icon, .NB-feedlist .folder_title:hover .NB-feedlist-manage-icon { @@ -1127,7 +1135,7 @@ background: transparent; float: right; width: 16px; height: 12px; - background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 0 -1px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 4px 2px; background-size: 8px; margin: 0 0 0 4px; } @@ -1605,7 +1613,7 @@ background: transparent; top: 2px; width: 28px; height: 22px; - background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 10px 2px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 13px 6px; background-size: 8px; } @@ -1614,12 +1622,12 @@ background: transparent; } #story_titles .NB-story-title:hover .NB-story-manage-icon:hover { - background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 10px 1px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 13px 6px; background-size: 8px; cursor: pointer; } #story_titles .NB-story-title.NB-hover-inverse:hover .NB-story-manage-icon:hover { - background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 10px 1px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 13px 6px; background-size: 8px; cursor: pointer; } @@ -2042,7 +2050,7 @@ background: transparent; .NB-feed-story .NB-feed-story-sentiment { position: absolute; top: 1px; - left: -22px; + left: -19px; width: 16px; height: 16px; } @@ -2080,7 +2088,7 @@ background: transparent; } .NB-feed-story .NB-feed-story-manage-icon { - background: url("/media/embed/icons/circular/g_icn_arrow_right.png") no-repeat scroll 7px 2px transparent; + background: url("/media/embed/icons/circular/g_icn_arrow_right.png") no-repeat scroll 13px 6px transparent; background-size: 8px; display: none; height: 22px; @@ -2094,12 +2102,12 @@ background: transparent; } .NB-feed-story .NB-feed-story-header:hover .NB-feed-story-manage-icon:hover { - background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 7px 1px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 13px 6px; background-size: 8px; cursor: pointer; } .NB-feed-story.NB-hover-inverse .NB-feed-story-header:hover .NB-feed-story-manage-icon:hover { - background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 7px 1px; + background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 13px 6px; background-size: 8px; } @@ -5469,7 +5477,7 @@ form.opml_import_form input { .NB-menu-manage-container .NB-menu-manage-arrow { width: 19px; height: 20px; - background: #F0FFF0 url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 2px 2px; + background: #F0FFF0 url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 5px 6px; background-size: 8px; border-top: 1px solid #8ABCBE; border-left: 1px solid #8ABCBE; diff --git a/media/ios/Classes/ActivityModule.m b/media/ios/Classes/ActivityModule.m index 9ea0e88fe..efed64bd6 100644 --- a/media/ios/Classes/ActivityModule.m +++ b/media/ios/Classes/ActivityModule.m @@ -13,6 +13,7 @@ #import #import "ASIHTTPRequest.h" #import "ActivityCell.h" +#import "SmallActivityCell.h" @implementation ActivityModule @@ -174,7 +175,12 @@ return MINIMUM_ACTIVITY_HEIGHT; } - ActivityCell *activityCell = [[ActivityCell alloc] init]; + id activityCell; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + activityCell = [[ActivityCell alloc] init]; + } else { + activityCell = [[SmallActivityCell alloc] init]; + } NSMutableDictionary *userProfile = [appDelegate.dictUserProfile mutableCopy]; [userProfile setValue:@"You" forKey:@"username"]; @@ -189,13 +195,19 @@ } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - ActivityCell *cell = [tableView - dequeueReusableCellWithIdentifier:@"ActivityCell"]; + ActivityCell *cell = [tableView + dequeueReusableCellWithIdentifier:@"ActivityCell"]; if (cell == nil) { - cell = [[ActivityCell alloc] - initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:@"ActivityCell"]; - } + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + cell = [[ActivityCell alloc] + initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:@"ActivityCell"]; + } else { + cell = [[SmallActivityCell alloc] + initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:@"ActivityCell"]; + } + } if (indexPath.row >= [appDelegate.userActivitiesArray count]) { // add in loading cell diff --git a/media/ios/Classes/InteractionsModule.m b/media/ios/Classes/InteractionsModule.m index 515641bb4..65a823e7a 100644 --- a/media/ios/Classes/InteractionsModule.m +++ b/media/ios/Classes/InteractionsModule.m @@ -150,7 +150,7 @@ appDelegate.userInteractionsArray = [appDelegate.userInteractionsArray arrayByAddingObjectsFromArray:newInteractions]; } - + [self refreshWithInteractions:appDelegate.userInteractionsArray]; } diff --git a/media/ios/Classes/NewsBlurViewController.h b/media/ios/Classes/NewsBlurViewController.h index e0ffad97e..7b898385c 100644 --- a/media/ios/Classes/NewsBlurViewController.h +++ b/media/ios/Classes/NewsBlurViewController.h @@ -92,6 +92,7 @@ UIPopoverControllerDelegate> { - (void)pullToRefreshViewShouldRefresh:(PullToRefreshView *)view; - (void)showUserProfile; - (IBAction)showSettingsPopover:(id)sender; +- (IBAction)showInteractionsPopover:(id)sender; - (NSDate *)pullToRefreshViewLastUpdated:(PullToRefreshView *)view; - (void)fadeSelectedCell; - (IBAction)tapAddSite:(id)sender; diff --git a/media/ios/Classes/NewsBlurViewController.m b/media/ios/Classes/NewsBlurViewController.m index fc9076c75..cb087d44f 100644 --- a/media/ios/Classes/NewsBlurViewController.m +++ b/media/ios/Classes/NewsBlurViewController.m @@ -10,6 +10,8 @@ #import "NewsBlurAppDelegate.h" #import "NBContainerViewController.h" #import "DashboardViewController.h" +#import "InteractionsModule.h" +#import "ActivityModule.h" #import "FeedTableCell.h" #import "FeedsMenuViewController.h" #import "FeedDetailMenuViewController.h" @@ -365,9 +367,10 @@ static const CGFloat kFolderTitleHeight = 28; // UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc] // initWithCustomView:settings]; - UIBarButtonItem *activityButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"nav_icn_activity_hover.png"] style:UIBarButtonItemStylePlain target:self action:@selector(showSettingsPopover:)]; - - + UIBarButtonItem *activityButton = [[UIBarButtonItem alloc] + initWithImage:[UIImage imageNamed:@"nav_icn_activity_hover.png"] + style:UIBarButtonItemStylePlain + target:self action:@selector(showInteractionsPopover:)]; self.navigationItem.rightBarButtonItem = activityButton; NSMutableDictionary *sortedFolders = [[NSMutableDictionary alloc] init]; @@ -592,6 +595,30 @@ static const CGFloat kFolderTitleHeight = 28; } } +- (IBAction)showInteractionsPopover:(id)sender { + if (self.popoverController == nil) { + self.popoverController = [[WEPopoverController alloc] + initWithContentViewController:appDelegate.dashboardViewController]; + + self.popoverController.delegate = self; + } else { + [self.popoverController dismissPopoverAnimated:YES]; + self.popoverController = nil; + } + + if ([self.popoverController respondsToSelector:@selector(setContainerViewProperties:)]) { + [self.popoverController setContainerViewProperties:[self improvedContainerViewProperties]]; + } + [self.popoverController setPopoverContentSize:CGSizeMake(self.view.frame.size.width - 20, self.view.frame.size.height - 60)]; + [self.popoverController presentPopoverFromBarButtonItem:self.navigationItem.rightBarButtonItem + permittedArrowDirections:UIPopoverArrowDirectionUp + animated:YES]; + + [appDelegate.dashboardViewController refreshInteractions]; + [appDelegate.dashboardViewController refreshActivity]; +} + + - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { if (alertView.tag == 2) { if (buttonIndex == 0) { diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index 3cc8eccff..1c2d6a4aa 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -54,7 +54,6 @@ 437AA8CA159394E2005463F5 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8C8159394E2005463F5 /* ShareViewController.m */; }; 437AA8CB159394E2005463F5 /* ShareViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8C9159394E2005463F5 /* ShareViewController~ipad.xib */; }; 437F974C15ACA0ED0007136B /* DashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F974A15ACA0ED0007136B /* DashboardViewController.m */; }; - 437F974D15ACA0ED0007136B /* DashboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437F974B15ACA0ED0007136B /* DashboardViewController.xib */; }; 437F976F15AE21290007136B /* ActivityModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F976E15AE21280007136B /* ActivityModule.m */; }; 437F977215AE70E30007136B /* InteractionsModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F977115AE70E30007136B /* InteractionsModule.m */; }; 43821AD315D8703F0034A4EF /* 258-checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = 43821AD115D8703F0034A4EF /* 258-checkmark.png */; }; @@ -288,6 +287,8 @@ 78FC34FA11CA94900055C312 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F211CA94900055C312 /* SBJsonBase.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 78FC34FB11CA94900055C312 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F411CA94900055C312 /* SBJsonParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 78FC34FC11CA94900055C312 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F611CA94900055C312 /* SBJsonWriter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + FF1660C816D6E9A700AF8541 /* DashboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */; }; + FF1660CA16D6E9B400AF8541 /* DashboardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */; }; FF2D8B331487250200057B80 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2D8B321487250200057B80 /* Security.framework */; }; FF2D8B351487250C00057B80 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2D8B341487250C00057B80 /* MessageUI.framework */; }; FF2D8C191487EFF000057B80 /* DefaultSHKConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = FF2D8B4B1487EFF000057B80 /* DefaultSHKConfigurator.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -464,7 +465,6 @@ 437AA8C9159394E2005463F5 /* ShareViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "ShareViewController~ipad.xib"; path = "Classes/ShareViewController~ipad.xib"; sourceTree = ""; }; 437F974915ACA0ED0007136B /* DashboardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DashboardViewController.h; sourceTree = ""; }; 437F974A15ACA0ED0007136B /* DashboardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DashboardViewController.m; sourceTree = ""; }; - 437F974B15ACA0ED0007136B /* DashboardViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DashboardViewController.xib; path = Classes/DashboardViewController.xib; sourceTree = ""; }; 437F976D15AE21280007136B /* ActivityModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityModule.h; sourceTree = ""; }; 437F976E15AE21280007136B /* ActivityModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ActivityModule.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 437F977015AE70E30007136B /* InteractionsModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractionsModule.h; sourceTree = ""; }; @@ -771,6 +771,8 @@ 78FC34F511CA94900055C312 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = ""; }; 78FC34F611CA94900055C312 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* NewsBlur-iPhone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NewsBlur-iPhone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; + FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DashboardViewController.xib; sourceTree = ""; }; + FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "DashboardViewController~ipad.xib"; path = "Resources-iPad/Classes/DashboardViewController~ipad.xib"; sourceTree = ""; }; FF2D8B321487250200057B80 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; FF2D8B341487250C00057B80 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; FF2D8B4A1487EFF000057B80 /* DefaultSHKConfigurator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultSHKConfigurator.h; sourceTree = ""; }; @@ -1525,6 +1527,7 @@ 43B8F017156603170008733D /* Resources-iPhone */ = { isa = PBXGroup; children = ( + FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */, 43B8F018156603170008733D /* AddSiteAutocompleteCell.xib */, 43B8F019156603170008733D /* AddSiteViewController.xib */, 43B8F01B156603170008733D /* FeedDetailViewController.xib */, @@ -1549,9 +1552,9 @@ isa = PBXGroup; children = ( 433323B5158901A40025064D /* Images */, - 437F974B15ACA0ED0007136B /* DashboardViewController.xib */, 43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */, 43D045241565BC150085F811 /* LoginViewController~ipad.xib */, + FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */, 43D0451F1565BC150085F811 /* MainWindow~ipad.xib */, 43D045281565BC150085F811 /* MoveSiteViewController~ipad.xib */, FF67D3B816897AD80057A7DA /* TrainerViewController~ipad.xib */, @@ -2062,7 +2065,6 @@ 43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */, 439DAB211590DA350019B0EB /* FeedsMenuViewController.xib in Resources */, 437AA8CB159394E2005463F5 /* ShareViewController~ipad.xib in Resources */, - 437F974D15ACA0ED0007136B /* DashboardViewController.xib in Resources */, 43081E2215AFE84200B24D7A /* ShareViewController.xib in Resources */, 43A4C44215B00A26008787B5 /* 06-arrow-south.png in Resources */, 43A4C44315B00A26008787B5 /* 06-arrow-south@2x.png in Resources */, @@ -2272,6 +2274,8 @@ FF85BF8216D6AF43002D334D /* g_icn_hidden.png in Resources */, FF85BF8316D6AF43002D334D /* g_icn_unread.png in Resources */, FF85BF8516D6C2B7002D334D /* clock2.png in Resources */, + FF1660C816D6E9A700AF8541 /* DashboardViewController.xib in Resources */, + FF1660CA16D6E9B400AF8541 /* DashboardViewController~ipad.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/media/ios/Classes/DashboardViewController.xib b/media/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib similarity index 100% rename from media/ios/Classes/DashboardViewController.xib rename to media/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib diff --git a/media/ios/Resources-iPhone/DashboardViewController.xib b/media/ios/Resources-iPhone/DashboardViewController.xib new file mode 100644 index 000000000..e61242f8d --- /dev/null +++ b/media/ios/Resources-iPhone/DashboardViewController.xib @@ -0,0 +1,1862 @@ + + + + 1552 + 12C3006 + 3084 + 1187.34 + 625.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 2083 + + + IBProxyObject + IBUIBarButtonItem + IBUISegmentedControl + IBUIToolbar + IBUIView + IBUIWebView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 274 + + + + 274 + {478, 916} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBIPadFramework + + + + 274 + + {478, 916} + + + + _NS:9 + + 3 + MQA + + + IBIPadFramework + + + + 274 + {478, 916} + + + + _NS:9 + + 1 + MSAxIDEAA + + IBIPadFramework + 1 + YES + + + + 266 + + + + 292 + {{119, 8}, {240, 30}} + + + _NS:9 + NO + IBIPadFramework + 2 + 2 + 0 + + Interactions + Your Activities + + + + + + + + + + + {0, 0} + {0, 0} + + + + + + + + {{0, 916}, {478, 44}} + + + + _NS:9 + NO + NO + IBIPadFramework + + + IBIPadFramework + + 5 + + + IBIPadFramework + 240 + + + + + IBIPadFramework + + 5 + + + + + {478, 960} + + + + + 3 + MQA + + NO + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + + IBIPadFramework + + + + + + + view + + + + 3 + + + + activitiesModule + + + + 39 + + + + segmentedButton + + + + 44 + + + + interactionsModule + + + + 29 + + + + toolbar + + + + 55 + + + + feedbackWebView + + + + 50 + + + + tapSegmentedButton: + + + 13 + + 46 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + + + 22 + + + + + + + + + + 25 + + + + + + + + 26 + + + + + 27 + + + + + 24 + + + + + 38 + + + + + + 28 + + + + + 49 + + + + + + + DashboardViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + InteractionsModule + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + ActivityModule + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 60 + + + + + ActivityModule + UIView + + IBProjectSource + ./Classes/ActivityModule.h + + + + AddSiteViewController + UIViewController + + id + id + id + id + id + id + + + + addFolder + id + + + addSite + id + + + checkSiteAddress + id + + + doAddButton + id + + + doCancelButton + id + + + selectAddTypeSignup + id + + + + UIActivityIndicatorView + UIBarButtonItem + UITextField + UISegmentedControl + UILabel + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UINavigationBar + UIActivityIndicatorView + UITextField + UIScrollView + UITableView + + + + activityIndicator + UIActivityIndicatorView + + + addButton + UIBarButtonItem + + + addFolderInput + UITextField + + + addTypeControl + UISegmentedControl + + + addingLabel + UILabel + + + appDelegate + NewsBlurAppDelegate + + + cancelButton + UIBarButtonItem + + + errorLabel + UILabel + + + folderPicker + UIPickerView + + + inFolderInput + UITextField + + + navBar + UINavigationBar + + + siteActivityIndicator + UIActivityIndicatorView + + + siteAddressInput + UITextField + + + siteScrollView + UIScrollView + + + siteTable + UITableView + + + + IBProjectSource + ./Classes/AddSiteViewController.h + + + + BaseViewController + UIViewController + + IBProjectSource + ./Classes/BaseViewController.h + + + + DashboardViewController + UIViewController + + id + id + + + + doLogout: + id + + + tapSegmentedButton: + id + + + + ActivityModule + NewsBlurAppDelegate + UIWebView + InteractionsModule + UISegmentedControl + UIToolbar + UIToolbar + + + + activitiesModule + ActivityModule + + + appDelegate + NewsBlurAppDelegate + + + feedbackWebView + UIWebView + + + interactionsModule + InteractionsModule + + + segmentedButton + UISegmentedControl + + + toolbar + UIToolbar + + + topToolbar + UIToolbar + + + + IBProjectSource + ./Classes/DashboardViewController.h + + + + FeedDetailMenuViewController + UIViewController + + id + id + + + + changeOrder: + id + + + changeReadFilter: + id + + + + NewsBlurAppDelegate + UITableView + UISegmentedControl + UISegmentedControl + + + + appDelegate + NewsBlurAppDelegate + + + menuTableView + UITableView + + + orderSegmentedControl + UISegmentedControl + + + readFilterSegmentedControl + UISegmentedControl + + + + IBProjectSource + ./Classes/FeedDetailMenuViewController.h + + + + FeedDetailViewController + BaseViewController + + id + id + id + + + + doOpenMarkReadActionSheet: + id + + + doOpenSettingsActionSheet: + id + + + selectIntelligence + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UISlider + UIToolbar + UISegmentedControl + UIBarButtonItem + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + feedMarkReadButton + UIBarButtonItem + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + intelligenceControl + UISegmentedControl + + + settingsButton + UIBarButtonItem + + + storyTitlesTable + UITableView + + + + IBProjectSource + ./Classes/FeedDetailViewController.h + + + + FeedsMenuViewController + UIViewController + + NewsBlurAppDelegate + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + menuTableView + UITableView + + + + IBProjectSource + ./Classes/FeedsMenuViewController.h + + + + FindSitesViewController + UIViewController + + NewsBlurAppDelegate + UISearchBar + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + sitesSearchBar + UISearchBar + + + sitesTable + UITableView + + + + IBProjectSource + ./Classes/FindSitesViewController.h + + + + FirstTimeUserAddFriendsViewController + UIViewController + + id + id + id + id + + + + tapFacebookButton + id + + + tapNextButton + id + + + tapTwitterButton + id + + + toggleAutoFollowFriends: + id + + + + NewsBlurAppDelegate + UIActivityIndicatorView + UIButton + UILabel + UIBarButtonItem + UIActivityIndicatorView + UIButton + + + + appDelegate + NewsBlurAppDelegate + + + facebookActivityIndicator + UIActivityIndicatorView + + + facebookButton + UIButton + + + friendsLabel + UILabel + + + nextButton + UIBarButtonItem + + + twitterActivityIndicator + UIActivityIndicatorView + + + twitterButton + UIButton + + + + IBProjectSource + ./Classes/FirstTimeUserAddFriendsViewController.h + + + + FirstTimeUserAddNewsBlurViewController + UIViewController + + id + id + id + + + + tapNewsBlurButton: + id + + + tapNextButton + id + + + tapPopularButton: + id + + + + NewsBlurAppDelegate + UILabel + UIBarButtonItem + + + + appDelegate + NewsBlurAppDelegate + + + instructionsLabel + UILabel + + + nextButton + UIBarButtonItem + + + + IBProjectSource + ./Classes/FirstTimeUserAddNewsBlurViewController.h + + + + FirstTimeUserAddSitesViewController + UIViewController + + tapNextButton + id + + + tapNextButton + + tapNextButton + id + + + + UIActivityIndicatorView + NewsBlurAppDelegate + UITableView + UIButton + UIView + UILabel + UIBarButtonItem + UIScrollView + + + + activityIndicator + UIActivityIndicatorView + + + appDelegate + NewsBlurAppDelegate + + + categoriesTable + UITableView + + + googleReaderButton + UIButton + + + googleReaderButtonWrapper + UIView + + + instructionLabel + UILabel + + + nextButton + UIBarButtonItem + + + scrollView + UIScrollView + + + + IBProjectSource + ./Classes/FirstTimeUserAddSitesViewController.h + + + + FirstTimeUserViewController + UIViewController + + tapNextButton + id + + + tapNextButton + + tapNextButton + id + + + + NewsBlurAppDelegate + UILabel + UILabel + UIImageView + UIBarButtonItem + + + + appDelegate + NewsBlurAppDelegate + + + footer + UILabel + + + header + UILabel + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + + IBProjectSource + ./Classes/FirstTimeUserViewController.h + + + + FontSettingsViewController + UIViewController + + id + id + + + + changeFontSize: + id + + + changeFontStyle: + id + + + + NewsBlurAppDelegate + UISegmentedControl + UISegmentedControl + UILabel + UITableView + UILabel + + + + appDelegate + NewsBlurAppDelegate + + + fontSizeSegment + UISegmentedControl + + + fontStyleSegment + UISegmentedControl + + + largeFontSizeLabel + UILabel + + + menuTableView + UITableView + + + smallFontSizeLabel + UILabel + + + + IBProjectSource + ./Classes/FontSettingsViewController.h + + + + FriendsListViewController + UIViewController + + NewsBlurAppDelegate + UISearchBar + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + friendSearchBar + UISearchBar + + + friendsTable + UITableView + + + + IBProjectSource + ./Classes/FriendsListViewController.h + + + + InteractionsModule + UIView + + IBProjectSource + ./Classes/InteractionsModule.h + + + + LoginViewController + UIViewController + + id + id + id + id + id + + + + selectLogin + id + + + selectLoginSignup + id + + + selectSignUp + id + + + tapLoginButton + id + + + tapSignUpButton + id + + + + NewsBlurAppDelegate + UITextField + UILabel + UILabel + UIView + UISegmentedControl + UITextField + UILabel + UILabel + UIButton + UIButton + UITextField + UITextField + UIView + UITextField + UILabel + UILabel + + + + appDelegate + NewsBlurAppDelegate + + + emailInput + UITextField + + + emailLabel + UILabel + + + errorLabel + UILabel + + + logInView + UIView + + + loginControl + UISegmentedControl + + + passwordInput + UITextField + + + passwordLabel + UILabel + + + passwordOptionalLabel + UILabel + + + selectLoginButton + UIButton + + + selectSignUpButton + UIButton + + + signUpPasswordInput + UITextField + + + signUpUsernameInput + UITextField + + + signUpView + UIView + + + usernameInput + UITextField + + + usernameLabel + UILabel + + + usernameOrEmailLabel + UILabel + + + + IBProjectSource + ./Classes/LoginViewController.h + + + + MoveSiteViewController + UIViewController + + id + id + id + id + + + + doCancelButton + id + + + doMoveButton + id + + + moveFolder + id + + + moveSite + id + + + + UIActivityIndicatorView + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UIBarButtonItem + UILabel + UINavigationBar + UILabel + UITextField + + + + activityIndicator + UIActivityIndicatorView + + + appDelegate + NewsBlurAppDelegate + + + cancelButton + UIBarButtonItem + + + errorLabel + UILabel + + + folderPicker + UIPickerView + + + fromFolderInput + UITextField + + + moveButton + UIBarButtonItem + + + movingLabel + UILabel + + + navBar + UINavigationBar + + + titleLabel + UILabel + + + toFolderInput + UITextField + + + + IBProjectSource + ./Classes/MoveSiteViewController.h + + + + NBContainerViewController + UIViewController + + appDelegate + NewsBlurAppDelegate + + + appDelegate + + appDelegate + NewsBlurAppDelegate + + + + IBProjectSource + ./Classes/NBContainerViewController.h + + + + NewsBlurAppDelegate + BaseViewController + + AddSiteViewController + DashboardViewController + FeedDashboardViewController + FeedDetailMenuViewController + FeedDetailViewController + FeedsMenuViewController + NewsBlurViewController + FindSitesViewController + FirstTimeUserAddFriendsViewController + FirstTimeUserAddNewsBlurViewController + FirstTimeUserAddSitesViewController + FirstTimeUserViewController + FontSettingsViewController + FriendsListViewController + UINavigationController + LoginViewController + NBContainerViewController + MoveSiteViewController + UINavigationController + OriginalStoryViewController + ShareViewController + StoryDetailViewController + StoryPageControl + TrainerViewController + UserProfileViewController + UIWindow + + + + addSiteViewController + AddSiteViewController + + + dashboardViewController + DashboardViewController + + + feedDashboardViewController + FeedDashboardViewController + + + feedDetailMenuViewController + FeedDetailMenuViewController + + + feedDetailViewController + FeedDetailViewController + + + feedsMenuViewController + FeedsMenuViewController + + + feedsViewController + NewsBlurViewController + + + findSitesViewController + FindSitesViewController + + + firstTimeUserAddFriendsViewController + FirstTimeUserAddFriendsViewController + + + firstTimeUserAddNewsBlurViewController + FirstTimeUserAddNewsBlurViewController + + + firstTimeUserAddSitesViewController + FirstTimeUserAddSitesViewController + + + firstTimeUserViewController + FirstTimeUserViewController + + + fontSettingsViewController + FontSettingsViewController + + + friendsListViewController + FriendsListViewController + + + ftuxNavigationController + UINavigationController + + + loginViewController + LoginViewController + + + masterContainerViewController + NBContainerViewController + + + moveSiteViewController + MoveSiteViewController + + + navigationController + UINavigationController + + + originalStoryViewController + OriginalStoryViewController + + + shareViewController + ShareViewController + + + storyDetailViewController + StoryDetailViewController + + + storyPageControl + StoryPageControl + + + trainerViewController + TrainerViewController + + + userProfileViewController + UserProfileViewController + + + window + UIWindow + + + + IBProjectSource + ./Classes/NewsBlurAppDelegate.h + + + + NewsBlurViewController + BaseViewController + + UIButton + UIButton + UIButton + id + id + id + id + + + + sectionTapped: + UIButton + + + sectionUntapped: + UIButton + + + sectionUntappedOutside: + UIButton + + + selectIntelligence + id + + + showInteractionsPopover: + id + + + showSettingsPopover: + id + + + tapAddSite: + id + + + + UIBarButtonItem + NewsBlurAppDelegate + UISlider + UITableView + UIToolbar + UIBarButtonItem + UIView + UISegmentedControl + UIView + UIBarButtonItem + UIBarButtonItem + + + + addBarButton + UIBarButtonItem + + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedTitlesTable + UITableView + + + feedViewToolbar + UIToolbar + + + homeButton + UIBarButtonItem + + + innerView + UIView + + + intelligenceControl + UISegmentedControl + + + noFocusMessage + UIView + + + settingsBarButton + UIBarButtonItem + + + toolbarLeftMargin + UIBarButtonItem + + + + IBProjectSource + ./Classes/NewsBlurViewController.h + + + + OriginalStoryViewController + BaseViewController + + id + id + id + + + + doCloseOriginalStoryViewController + id + + + doOpenActionSheet + id + + + loadAddress: + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UILabel + UITextField + UIBarButtonItem + UIToolbar + UIWebView + + + + appDelegate + NewsBlurAppDelegate + + + back + UIBarButtonItem + + + closeButton + UIBarButtonItem + + + forward + UIBarButtonItem + + + pageAction + UIBarButtonItem + + + pageTitle + UILabel + + + pageUrl + UITextField + + + refresh + UIBarButtonItem + + + toolbar + UIToolbar + + + webView + UIWebView + + + + IBProjectSource + ./Classes/OriginalStoryViewController.h + + + + ShareViewController + UIViewController + + id + id + id + id + + + + doCancelButton: + id + + + doReplyToComment: + id + + + doShareThisStory: + id + + + doToggleButton: + id + + + + NewsBlurAppDelegate + UITextView + UIButton + UIBarButtonItem + UIButton + + + + appDelegate + NewsBlurAppDelegate + + + commentField + UITextView + + + facebookButton + UIButton + + + submitButton + UIBarButtonItem + + + twitterButton + UIButton + + + + IBProjectSource + ./Classes/ShareViewController.h + + + + StoryDetailViewController + BaseViewController + + NewsBlurAppDelegate + UIView + UIView + UILabel + UIWebView + + + + appDelegate + NewsBlurAppDelegate + + + feedTitleGradient + UIView + + + innerView + UIView + + + noStorySelectedLabel + UILabel + + + webView + UIWebView + + + + IBProjectSource + ./Classes/StoryDetailViewController.h + + + + StoryPageControl + BaseViewController + + id + id + id + id + id + + + + doNextUnreadStory + id + + + doPreviousStory + id + + + showOriginalSubview: + id + + + tapProgressBar: + id + + + toggleFontSize: + id + + + + UIBarButtonItem + NewsBlurAppDelegate + UIToolbar + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIPageControl + UIProgressView + UIView + UIScrollView + UIBarButtonItem + UIToolbar + + + + activity + UIBarButtonItem + + + appDelegate + NewsBlurAppDelegate + + + bottomPlaceholderToolbar + UIToolbar + + + buttonAction + UIBarButtonItem + + + buttonNext + UIBarButtonItem + + + buttonPrevious + UIBarButtonItem + + + fontSettingsButton + UIBarButtonItem + + + originalStoryButton + UIBarButtonItem + + + pageControl + UIPageControl + + + progressView + UIProgressView + + + progressViewContainer + UIView + + + scrollView + UIScrollView + + + subscribeButton + UIBarButtonItem + + + toolbar + UIToolbar + + + + IBProjectSource + ./Classes/StoryPageControl.h + + + + TrainerViewController + BaseViewController + + doCloseDialog: + id + + + doCloseDialog: + + doCloseDialog: + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UINavigationBar + TrainerWebView + + + + appDelegate + NewsBlurAppDelegate + + + closeButton + UIBarButtonItem + + + navBar + UINavigationBar + + + webView + TrainerWebView + + + + IBProjectSource + ./Classes/TrainerViewController.h + + + + TrainerWebView + UIWebView + + IBProjectSource + ./Classes/TrainerWebView.h + + + + UserProfileViewController + UIViewController + + IBProjectSource + ./Classes/UserProfileViewController.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 2083 + + diff --git a/media/ios/Resources-iPhone/MainWindow.xib b/media/ios/Resources-iPhone/MainWindow.xib index f7422d5dd..c01d0b0f6 100644 --- a/media/ios/Resources-iPhone/MainWindow.xib +++ b/media/ios/Resources-iPhone/MainWindow.xib @@ -1,14 +1,14 @@ - 1536 - 12C2037 - 2840 + 1552 + 12C3006 + 3084 1187.34 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 YES @@ -99,7 +99,7 @@ 1 1 - + IBUIScreenMetrics YES @@ -255,12 +255,23 @@ IBCocoaTouchFramework NO + + + + 1 + 1 + + + IBCocoaTouchFramework + NO + 256 {320, 480} + 1 MSAxIDEAA @@ -498,6 +509,14 @@ 176 + + + dashboardViewController + + + + 179 + appDelegate @@ -650,6 +669,14 @@ 175 + + + appDelegate + + + + 178 + @@ -819,6 +846,11 @@ + + 177 + + + @@ -866,6 +898,8 @@ 170.IBPluginDependency 174.CustomClassName 174.IBPluginDependency + 177.CustomClassName + 177.IBPluginDependency 3.CustomClassName 3.IBPluginDependency 39.IBPluginDependency @@ -921,6 +955,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin TrainerViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin + DashboardViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin NewsBlurAppDelegate com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -946,7 +982,7 @@ - 176 + 179 @@ -2664,6 +2700,8 @@ sectionUntapped: sectionUntappedOutside: selectIntelligence + showInteractionsPopover: + showSettingsPopover: tapAddSite: @@ -2673,6 +2711,8 @@ UIButton id id + id + id @@ -2683,6 +2723,8 @@ sectionUntapped: sectionUntappedOutside: selectIntelligence + showInteractionsPopover: + showSettingsPopover: tapAddSite: @@ -2703,6 +2745,14 @@ selectIntelligence id + + showInteractionsPopover: + id + + + showSettingsPopover: + id + tapAddSite: id @@ -2713,6 +2763,7 @@ YES YES + addBarButton appDelegate feedScoreSlider feedTitlesTable @@ -2721,10 +2772,12 @@ innerView intelligenceControl noFocusMessage + settingsBarButton toolbarLeftMargin YES + UIBarButtonItem NewsBlurAppDelegate UISlider UITableView @@ -2734,12 +2787,14 @@ UISegmentedControl UIView UIBarButtonItem + UIBarButtonItem YES YES + addBarButton appDelegate feedScoreSlider feedTitlesTable @@ -2748,10 +2803,15 @@ innerView intelligenceControl noFocusMessage + settingsBarButton toolbarLeftMargin YES + + addBarButton + UIBarButtonItem + appDelegate NewsBlurAppDelegate @@ -2784,6 +2844,10 @@ noFocusMessage UIView + + settingsBarButton + UIBarButtonItem + toolbarLeftMargin UIBarButtonItem @@ -3295,13 +3359,15 @@ YES appDelegate closeButton + navBar webView YES NewsBlurAppDelegate UIBarButtonItem - UIWebView + UINavigationBar + TrainerWebView @@ -3310,6 +3376,7 @@ YES appDelegate closeButton + navBar webView @@ -3322,9 +3389,13 @@ closeButton UIBarButtonItem + + navBar + UINavigationBar + webView - UIWebView + TrainerWebView @@ -3333,6 +3404,14 @@ ./Classes/TrainerViewController.h + + TrainerWebView + UIWebView + + IBProjectSource + ./Classes/TrainerWebView.h + + UserProfileViewController UIViewController @@ -3347,7 +3426,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -3355,6 +3434,6 @@ YES 3 - 1926 + 2083 diff --git a/media/ios/ShareKit/Core/SHK.m b/media/ios/ShareKit/Core/SHK.m index fac4747df..499317e18 100755 --- a/media/ios/ShareKit/Core/SHK.m +++ b/media/ios/ShareKit/Core/SHK.m @@ -582,7 +582,7 @@ static NSDictionary *sharersDictionary = nil; + (id)allocWithZone:(NSZone *)zone { - return [[self currentHelper] retain]; + return [[self currentHelper] retain]; } - (id)copyWithZone:(NSZone *)zone diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 1bc92c124..c90ed3d89 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -3132,17 +3132,17 @@ if (inverse) { var $align = $item; if (type == 'feed') { - left = toplevel ? 2 : -20; - top = toplevel ? 1 : 1; + left = toplevel ? 2 : -22; + top = toplevel ? 1 : 3; } else if (type == 'socialfeed') { left = 1; top = 1; } else if (type == 'folder') { - left = toplevel ? 0 : -20; - top = toplevel ? 1 : 1; + left = toplevel ? 0 : -21; + top = toplevel ? 3 : 3; } else if (type == 'story') { - left = 4; - top = 2; + left = 7; + top = 1; $align = $('.NB-story-manage-icon,.NB-feed-story-manage-icon', $item); if (!$align.is(':visible')) { $align = $('.NB-storytitles-sentiment', $item); @@ -3161,19 +3161,19 @@ } else { var $align = $item; if (type == 'feed') { - left = toplevel ? 2 : 0; - top = toplevel ? 21 : 21; + left = toplevel ? 0 : -2; + top = toplevel ? 20 : 19; $align = $('.NB-feedlist-manage-icon', $item); } else if (type == 'socialfeed') { left = toplevel ? 2 : -18; top = toplevel ? 21 : 21; $align = $('.NB-feedlist-manage-icon', $item); } else if (type == 'folder') { - left = toplevel ? 2 : -20; - top = toplevel ? 22 : 22; + left = toplevel ? 0 : -22; + top = toplevel ? 21 : 18; } else if (type == 'story') { - left = 4; - top = 18; + left = 7; + top = 19; $align = $('.NB-story-manage-icon,.NB-feed-story-manage-icon', $item); if (!$align.is(':visible')) { $align = $('.NB-storytitles-sentiment', $item);