diff --git a/clients/ios/Classes/FontSettingsViewController.m b/clients/ios/Classes/FontSettingsViewController.m index 8cc1f0cdd..3dd1818e3 100644 --- a/clients/ios/Classes/FontSettingsViewController.m +++ b/clients/ios/Classes/FontSettingsViewController.m @@ -207,7 +207,7 @@ [appDelegate.feedDetailViewController redrawUnreadStory]; } } else if (indexPath.row == 2) { - [appDelegate.storyPageControl openSendToDialog]; + [appDelegate.storyPageControl openSendToDialog:nil]; } else if (indexPath.row == 3) { [appDelegate openTrainStory:appDelegate.storyPageControl.fontSettingsButton]; } else if (indexPath.row == 4) { diff --git a/clients/ios/Classes/StoryPageControl.h b/clients/ios/Classes/StoryPageControl.h index 2688b0ab4..653e0bda0 100644 --- a/clients/ios/Classes/StoryPageControl.h +++ b/clients/ios/Classes/StoryPageControl.h @@ -98,7 +98,6 @@ - (void)setTextButton; - (void)markStoryAsRead; - (void)finishMarkAsRead:(ASIFormDataRequest *)request; -- (void)openSendToDialog; - (void)markStoryAsUnread; - (void)finishMarkAsUnread:(ASIFormDataRequest *)request; - (void)markStoryAsSaved; @@ -116,6 +115,7 @@ - (void)flashCheckmarkHud:(NSString *)messageType; +- (IBAction)openSendToDialog:(id)sender; - (IBAction)doNextUnreadStory; - (IBAction)doPreviousStory; - (IBAction)tapProgressBar:(id)sender; diff --git a/clients/ios/Classes/StoryPageControl.m b/clients/ios/Classes/StoryPageControl.m index c7681a7b7..314c6e548 100644 --- a/clients/ios/Classes/StoryPageControl.m +++ b/clients/ios/Classes/StoryPageControl.m @@ -671,12 +671,14 @@ if (readStoryCount == 0 || (readStoryCount == 1 && [appDelegate.readStories lastObject] == [appDelegate.activeStory objectForKey:@"id"])) { - [buttonPrevious setEnabled:NO]; - [buttonPrevious setAlpha:.4]; - } else { - [buttonPrevious setEnabled:YES]; - [buttonPrevious setAlpha:1]; - } + [buttonPrevious setEnabled:NO]; +// buttonPrevious.alpha = 1.0f; +// [buttonAction setImage:[UIImage imageNamed:@"traverse_previous_off"]]; + } else { + [buttonPrevious setEnabled:YES]; +// buttonPrevious.alpha = 1.0f; +// [buttonAction setImage:[UIImage imageNamed:@"traverse_previous"]]; + } // setting up the NEXT UNREAD STORY BUTTON buttonNext.enabled = YES; @@ -804,7 +806,7 @@ // NSLog(@"results in mark as read is %@", results); } -- (void)openSendToDialog { +- (IBAction)openSendToDialog:(id)sender { NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults]; NSURL *url = [NSURL URLWithString:[appDelegate.activeStory objectForKey:@"story_permalink"]]; @@ -848,13 +850,13 @@ [shareSheet setValue:[appDelegate.activeStory objectForKey:@"story_title"] forKey:@"subject"]; [shareSheet setCompletionHandler:^(NSString *activityType, BOOL completed) { - NSString *_completedString; if (completed) { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidHide:) name:UIKeyboardDidHideNotification object:nil]; + NSString *_completedString; if ([activityType isEqualToString:UIActivityTypePostToTwitter]) { _completedString = @"Posted"; } else if ([activityType isEqualToString:UIActivityTypePostToFacebook]) { @@ -872,17 +874,14 @@ } else if ([activityType isEqualToString:@"pinboard"]) { _completedString = @"Saved"; } - } else { - _completedString = nil; + [MBProgressHUD hideHUDForView:appDelegate.storyPageControl.view animated:NO]; + self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; + self.storyHUD.customView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"37x-Checkmark.png"]]; + self.storyHUD.mode = MBProgressHUDModeCustomView; + self.storyHUD.removeFromSuperViewOnHide = YES; + self.storyHUD.labelText = _completedString; + [self.storyHUD hide:YES afterDelay:1]; } - - [MBProgressHUD hideHUDForView:appDelegate.storyPageControl.view animated:NO]; - self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; - self.storyHUD.customView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"37x-Checkmark.png"]]; - self.storyHUD.mode = MBProgressHUDModeCustomView; - self.storyHUD.removeFromSuperViewOnHide = YES; - self.storyHUD.labelText = _completedString; - [self.storyHUD hide:YES afterDelay:1]; }]; shareSheet.excludedActivityTypes = @[UIActivityTypePostToWeibo,UIActivityTypeAssignToContact]; diff --git a/clients/ios/Classes/StoryPageControl.xib b/clients/ios/Classes/StoryPageControl.xib index fff81f865..28cc770d3 100644 --- a/clients/ios/Classes/StoryPageControl.xib +++ b/clients/ios/Classes/StoryPageControl.xib @@ -2,9 +2,9 @@ 1552 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -45,6 +45,7 @@ {320, 460} + 3 @@ -63,13 +64,14 @@ 1289 - {{151, 4}, {158, 44}} + {{150, 4}, {160, 44}} + _NS:9 NO IBCocoaTouchFramework - + NSImage traverse_background.png @@ -77,22 +79,21 @@ 1292 - {{4, 4}, {105, 44}} + {{4, 4}, {139, 44}} + _NS:9 NO IBCocoaTouchFramework - - NSImage - traverse_background_left.png - + 1289 {{155.5, 9}, {43, 34}} + _NS:9 NO @@ -114,6 +115,10 @@ 2 + + NSImage + traverse_previous_off.png + NSImage traverse_previous.png @@ -133,6 +138,7 @@ 1289 {{199.5, 9}, {104, 34}} + _NS:9 NO @@ -175,9 +181,10 @@ 1292 - {{9, 9.5}, {94, 34}} + {{9, 9.5}, {83, 34}} - + + _NS:9 NO IBCocoaTouchFramework @@ -186,8 +193,8 @@ 0.0 0.0 0.0 - 20 - TEXT + 14 + TEXT 3 @@ -205,11 +212,45 @@ + + + 1292 + {{93, 9}, {44, 34}} + + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 0.0 + 0.0 + 0.0 + 20 + + + 3 + MC4xOTY5OTQ3NTM2AA + + + 2 + MC41ODgyMzUzMTg3IDAuNTk2MDc4NDU1NCAwLjU3MjU0OTA0NTEAA + + + + NSImage + traverse_send.png + + + + 1289 {{205.5, 16}, {20, 20}} + _NS:9 NO @@ -224,6 +265,7 @@ {{4.5, 409}, {315.5, 51}} + _NS:9 @@ -233,6 +275,7 @@ {320, 460} + 10 @@ -4721,6 +4764,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 83 + + + openSendToDialog: + + + 7 + + 87 + @@ -4766,6 +4818,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE + @@ -4799,6 +4852,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE + + 85 + + + @@ -4815,30 +4873,1653 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + - 84 + 87 + + + + + ActivityModule + UIView + + IBProjectSource + ./Classes/ActivityModule.h + + + + AddSiteViewController + UIViewController + + id + id + id + id + id + + + + addSite + id + + + checkSiteAddress + id + + + doAddButton + id + + + doCancelButton + id + + + toggleAddFolder: + id + + + + UIActivityIndicatorView + UIBarButtonItem + UIButton + UITextField + UILabel + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UINavigationBar + UIActivityIndicatorView + UITextField + UIScrollView + UITableView + + + + activityIndicator + UIActivityIndicatorView + + + addButton + UIBarButtonItem + + + addFolderButton + UIButton + + + addFolderInput + UITextField + + + 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 + + + + doOpenMarkReadActionSheet: + id + + + doOpenSettingsActionSheet: + id + + + + NewsBlurAppDelegate + UIBarButtonItem + TransparentToolbar + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UITableView + UIBarButtonItem + + + + appDelegate + NewsBlurAppDelegate + + + feedMarkReadButton + UIBarButtonItem + + + rightToolbar + TransparentToolbar + + + separatorBarButton + UIBarButtonItem + + + settingsBarButton + UIBarButtonItem + + + spacer2BarButton + UIBarButtonItem + + + spacer3BarButton + UIBarButtonItem + + + spacerBarButton + UIBarButtonItem + + + storyTitlesTable + UITableView + + + titleImageBarButton + UIBarButtonItem + + + + IBProjectSource + ./Classes/FeedDetailViewController.h + + + + FeedsMenuViewController + UIViewController + + NewsBlurAppDelegate + UIAlertView + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + loginAsAlert + UIAlertView + + + menuTableView + UITableView + + + + IBProjectSource + ./Classes/FeedsMenuViewController.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 + + + + IASKAppSettingsViewController + UITableViewController + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ./Classes/IASKAppSettingsViewController.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 + + + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + + + NewsBlurAppDelegate + BaseViewController + + AddSiteViewController + DashboardViewController + FeedDashboardViewController + FeedDetailMenuViewController + FeedDetailViewController + FeedsMenuViewController + NewsBlurViewController + FirstTimeUserAddFriendsViewController + FirstTimeUserAddNewsBlurViewController + FirstTimeUserAddSitesViewController + FirstTimeUserViewController + FontSettingsViewController + FriendsListViewController + UINavigationController + LoginViewController + NBContainerViewController + MoveSiteViewController + UINavigationController + OriginalStoryViewController + IASKAppSettingsViewController + ShareViewController + StoryDetailViewController + StoryPageControl + TrainerViewController + UserProfileViewController + UIWindow + + + + addSiteViewController + AddSiteViewController + + + dashboardViewController + DashboardViewController + + + feedDashboardViewController + FeedDashboardViewController + + + feedDetailMenuViewController + FeedDetailMenuViewController + + + feedDetailViewController + FeedDetailViewController + + + feedsMenuViewController + FeedsMenuViewController + + + feedsViewController + NewsBlurViewController + + + firstTimeUserAddFriendsViewController + FirstTimeUserAddFriendsViewController + + + firstTimeUserAddNewsBlurViewController + FirstTimeUserAddNewsBlurViewController + + + firstTimeUserAddSitesViewController + FirstTimeUserAddSitesViewController + + + firstTimeUserViewController + FirstTimeUserViewController + + + fontSettingsViewController + FontSettingsViewController + + + friendsListViewController + FriendsListViewController + + + ftuxNavigationController + UINavigationController + + + loginViewController + LoginViewController + + + masterContainerViewController + NBContainerViewController + + + moveSiteViewController + MoveSiteViewController + + + navigationController + UINavigationController + + + originalStoryViewController + OriginalStoryViewController + + + preferencesViewController + IASKAppSettingsViewController + + + 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 + UIBarButtonItem + NewsBlurAppDelegate + UISlider + UITableView + UIToolbar + UIBarButtonItem + UIView + UISegmentedControl + UIView + UIBarButtonItem + UIBarButtonItem + + + + activitiesButton + 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 + id + id + id + + + + doCloseOriginalStoryViewController + id + + + doOpenActionSheet + id + + + loadAddress: + id + + + webViewGoBack: + id + + + webViewGoForward: + id + + + webViewRefresh: + 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 + UIButton + UITextView + UIButton + NSLayoutConstraint + UILabel + UIBarButtonItem + UIButton + + + + appDelegate + NewsBlurAppDelegate + + + appdotnetButton + UIButton + + + commentField + UITextView + + + facebookButton + UIButton + + + keyboardHeight + NSLayoutConstraint + + + storyTitle + UILabel + + + 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 + id + id + + + + doNextUnreadStory + id + + + doPreviousStory + id + + + openSendToDialog: + id + + + showOriginalSubview: + id + + + tapProgressBar: + id + + + toggleFontSize: + id + + + toggleView: + id + + + + NewsBlurAppDelegate + UIToolbar + UIBarButtonItem + UIButton + UIButton + UIButton + THCircularProgressView + UIBarButtonItem + UIActivityIndicatorView + UIBarButtonItem + UIPageControl + UIView + UIView + TransparentToolbar + UIScrollView + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIView + + + + appDelegate + NewsBlurAppDelegate + + + bottomPlaceholderToolbar + UIToolbar + + + buttonAction + UIBarButtonItem + + + buttonNext + UIButton + + + buttonPrevious + UIButton + + + buttonText + UIButton + + + circularProgressView + THCircularProgressView + + + fontSettingsButton + UIBarButtonItem + + + loadingIndicator + UIActivityIndicatorView + + + originalStoryButton + UIBarButtonItem + + + pageControl + UIPageControl + + + progressView + UIView + + + progressViewContainer + UIView + + + rightToolbar + TransparentToolbar + + + scrollView + UIScrollView + + + separatorBarButton + UIBarButtonItem + + + spacer2BarButton + UIBarButtonItem + + + spacer3BarButton + UIBarButtonItem + + + spacerBarButton + UIBarButtonItem + + + subscribeButton + UIBarButtonItem + + + traverseView + UIView + + + + IBProjectSource + ./Classes/StoryPageControl.h + + + + THCircularProgressView + UIView + + IBProjectSource + ./Classes/THCircularProgressView.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 + + + + TransparentToolbar + UIToolbar + + IBProjectSource + ./Classes/TransparentToolbar.h + + + + UserProfileViewController + UIViewController + + IBProjectSource + ./Classes/UserProfileViewController.h + + + - 0 IBCocoaTouchFramework YES 3 {113, 46} - {105, 44} - {104, 34} + {208, 68} {43, 34} + {43, 34} + {44, 34} {94, 34} 2083 diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj index 1d83c7ce7..28d8e8042 100755 --- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj @@ -264,6 +264,10 @@ FF5D40121799F70200349659 /* ARChromeActivity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400D1799F70200349659 /* ARChromeActivity@2x.png */; }; FF5D40131799F70200349659 /* ARChromeActivity@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400E1799F70200349659 /* ARChromeActivity@2x~ipad.png */; }; FF5D40141799F70200349659 /* ARChromeActivity~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400F1799F70200349659 /* ARChromeActivity~ipad.png */; }; + FF5D4017179A00B900349659 /* traverse_send.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D4015179A00B900349659 /* traverse_send.png */; }; + FF5D4018179A00B900349659 /* traverse_send@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D4016179A00B900349659 /* traverse_send@2x.png */; }; + FF5D401B179A03E700349659 /* traverse_previous_off.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D4019179A03E700349659 /* traverse_previous_off.png */; }; + FF5D401C179A03E700349659 /* traverse_previous_off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D401A179A03E700349659 /* traverse_previous_off@2x.png */; }; FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF5EA47D143B691000B7563D /* AddSiteViewController.m */; }; FF5F3A82162B82B5008DBE3E /* rainbow.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5F3A81162B82B5008DBE3E /* rainbow.png */; }; FF5F3A85162B831A008DBE3E /* user_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5F3A84162B831A008DBE3E /* user_orange.png */; }; @@ -803,6 +807,10 @@ FF5D400D1799F70200349659 /* ARChromeActivity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity@2x.png"; sourceTree = ""; }; FF5D400E1799F70200349659 /* ARChromeActivity@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity@2x~ipad.png"; sourceTree = ""; }; FF5D400F1799F70200349659 /* ARChromeActivity~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity~ipad.png"; sourceTree = ""; }; + FF5D4015179A00B900349659 /* traverse_send.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_send.png; sourceTree = ""; }; + FF5D4016179A00B900349659 /* traverse_send@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_send@2x.png"; sourceTree = ""; }; + FF5D4019179A03E700349659 /* traverse_previous_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_previous_off.png; sourceTree = ""; }; + FF5D401A179A03E700349659 /* traverse_previous_off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_previous_off@2x.png"; sourceTree = ""; }; FF5EA47C143B691000B7563D /* AddSiteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteViewController.h; sourceTree = ""; }; FF5EA47D143B691000B7563D /* AddSiteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddSiteViewController.m; sourceTree = ""; }; FF5F3A81162B82B5008DBE3E /* rainbow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rainbow.png; sourceTree = ""; }; @@ -1335,6 +1343,8 @@ FFC518B81768E59F00542719 /* g_icn_offline.png */, FF8364C41757EC0B008F5C58 /* traverse_background_left.png */, FF8364C51757EC0B008F5C58 /* traverse_background_left@2x.png */, + FF5D4015179A00B900349659 /* traverse_send.png */, + FF5D4016179A00B900349659 /* traverse_send@2x.png */, FF8364BD1756949E008F5C58 /* traverse_text_on.png */, FF8364BE1756949E008F5C58 /* traverse_text_on@2x.png */, FF8364B91755759A008F5C58 /* traverse_text.png */, @@ -1368,6 +1378,8 @@ FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */, FF688E4C16E6B3E1003B7B42 /* traverse_done.png */, FF688E4D16E6B3E1003B7B42 /* traverse_done@2x.png */, + FF5D4019179A03E700349659 /* traverse_previous_off.png */, + FF5D401A179A03E700349659 /* traverse_previous_off@2x.png */, FF688E4816E6AFD3003B7B42 /* traverse_previous.png */, FF688E4916E6AFD3003B7B42 /* traverse_previous@2x.png */, FF688E4416E6ADB1003B7B42 /* traverse_next.png */, @@ -2439,6 +2451,10 @@ FF5D40121799F70200349659 /* ARChromeActivity@2x.png in Resources */, FF5D40131799F70200349659 /* ARChromeActivity@2x~ipad.png in Resources */, FF5D40141799F70200349659 /* ARChromeActivity~ipad.png in Resources */, + FF5D4017179A00B900349659 /* traverse_send.png in Resources */, + FF5D4018179A00B900349659 /* traverse_send@2x.png in Resources */, + FF5D401B179A03E700349659 /* traverse_previous_off.png in Resources */, + FF5D401C179A03E700349659 /* traverse_previous_off@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/clients/ios/Other Sources/ARChromeActivity/ARChromeActivity.m b/clients/ios/Other Sources/ARChromeActivity/ARChromeActivity.m index 15f5b010e..4ce3ae5ee 100755 --- a/clients/ios/Other Sources/ARChromeActivity/ARChromeActivity.m +++ b/clients/ios/Other Sources/ARChromeActivity/ARChromeActivity.m @@ -23,7 +23,7 @@ - (void)commonInit { _callbackSource = [[NSBundle mainBundle]objectForInfoDictionaryKey:@"CFBundleName"]; - _activityTitle = @"Chrome"; + _activityTitle = @"Open in Chrome"; } - (id)init { diff --git a/clients/ios/Resources/traverse_previous_off.png b/clients/ios/Resources/traverse_previous_off.png new file mode 100644 index 000000000..2b543f1e7 Binary files /dev/null and b/clients/ios/Resources/traverse_previous_off.png differ diff --git a/clients/ios/Resources/traverse_previous_off@2x.png b/clients/ios/Resources/traverse_previous_off@2x.png new file mode 100644 index 000000000..2edf5422a Binary files /dev/null and b/clients/ios/Resources/traverse_previous_off@2x.png differ diff --git a/clients/ios/Resources/traverse_send.png b/clients/ios/Resources/traverse_send.png new file mode 100644 index 000000000..0c0f02ca4 Binary files /dev/null and b/clients/ios/Resources/traverse_send.png differ diff --git a/clients/ios/Resources/traverse_send@2x.png b/clients/ios/Resources/traverse_send@2x.png new file mode 100644 index 000000000..9f2fda419 Binary files /dev/null and b/clients/ios/Resources/traverse_send@2x.png differ diff --git a/clients/ios/Resources/traverse_text.png b/clients/ios/Resources/traverse_text.png index 3bb6b4d45..50a4e6c31 100644 Binary files a/clients/ios/Resources/traverse_text.png and b/clients/ios/Resources/traverse_text.png differ diff --git a/clients/ios/Resources/traverse_text@2x.png b/clients/ios/Resources/traverse_text@2x.png index 98012ec1f..e1c6002ca 100644 Binary files a/clients/ios/Resources/traverse_text@2x.png and b/clients/ios/Resources/traverse_text@2x.png differ diff --git a/clients/ios/Resources/traverse_text_on.png b/clients/ios/Resources/traverse_text_on.png index 63834546c..0b3353612 100644 Binary files a/clients/ios/Resources/traverse_text_on.png and b/clients/ios/Resources/traverse_text_on.png differ diff --git a/clients/ios/Resources/traverse_text_on@2x.png b/clients/ios/Resources/traverse_text_on@2x.png index 3cb2321a4..05fa68225 100644 Binary files a/clients/ios/Resources/traverse_text_on@2x.png and b/clients/ios/Resources/traverse_text_on@2x.png differ