diff --git a/clients/ios/Classes/NBDashboardNavigationBar.h b/clients/ios/Classes/ActivitiesNavigationBar.h similarity index 63% rename from clients/ios/Classes/NBDashboardNavigationBar.h rename to clients/ios/Classes/ActivitiesNavigationBar.h index c4876f046a..d5fc1d2cad 100644 --- a/clients/ios/Classes/NBDashboardNavigationBar.h +++ b/clients/ios/Classes/ActivitiesNavigationBar.h @@ -1,5 +1,5 @@ // -// NBDashboardNavigationBar.h +// ActivitiesNavigationBar.h // NewsBlur // // Created by Samuel Clay on 10/3/17. @@ -8,6 +8,6 @@ #import -@interface NBDashboardNavigationBar : UINavigationBar +@interface ActivitiesNavigationBar : UINavigationBar @end diff --git a/clients/ios/Classes/NBDashboardNavigationBar.m b/clients/ios/Classes/ActivitiesNavigationBar.m similarity index 88% rename from clients/ios/Classes/NBDashboardNavigationBar.m rename to clients/ios/Classes/ActivitiesNavigationBar.m index d4c2833dd8..4713203bbe 100644 --- a/clients/ios/Classes/NBDashboardNavigationBar.m +++ b/clients/ios/Classes/ActivitiesNavigationBar.m @@ -1,14 +1,14 @@ // -// NBDashboardNavigationBar.m +// ActivitiesNavigationBar.m // NewsBlur // // Created by Samuel Clay on 10/3/17. // Copyright © 2017 NewsBlur. All rights reserved. // -#import "NBDashboardNavigationBar.h" +#import "ActivitiesNavigationBar.h" -@implementation NBDashboardNavigationBar +@implementation ActivitiesNavigationBar - (void)layoutSubviews { diff --git a/clients/ios/Classes/DashboardViewController.h b/clients/ios/Classes/ActivitiesViewController.h similarity index 79% rename from clients/ios/Classes/DashboardViewController.h rename to clients/ios/Classes/ActivitiesViewController.h index 3ecd346bac..ccc48acb2e 100644 --- a/clients/ios/Classes/DashboardViewController.h +++ b/clients/ios/Classes/ActivitiesViewController.h @@ -1,5 +1,5 @@ // -// DashboardViewController.h +// ActivitiesViewController.h // NewsBlur // // Created by Roy Yang on 7/10/12. @@ -7,7 +7,7 @@ // #import -#import "NBDashboardNavigationBar.h" +#import "ActivitiesNavigationBar.h" @class NewsBlurAppDelegate; @class InteractionsModule; @@ -15,12 +15,12 @@ @class FeedbackModule; @class FeedDetailViewController; -@interface DashboardViewController : UIViewController { +@interface ActivitiesViewController : UIViewController { NewsBlurAppDelegate *appDelegate; InteractionsModule *interactionsModule; ActivityModule *activitiesModule; UIToolbar *toolbar; - NBDashboardNavigationBar *topToolbar; + ActivitiesNavigationBar *topToolbar; UISegmentedControl *segmentedButton; } @@ -28,7 +28,7 @@ @property (nonatomic) IBOutlet InteractionsModule *interactionsModule; @property (nonatomic) IBOutlet ActivityModule *activitiesModule; -@property (nonatomic) IBOutlet NBDashboardNavigationBar *topToolbar; +@property (nonatomic) IBOutlet ActivitiesNavigationBar *topToolbar; @property (nonatomic) IBOutlet UIToolbar *toolbar; @property (nonatomic) IBOutlet UISegmentedControl *segmentedButton; @property (nonatomic) IBOutlet UIImageView *logoImageView; diff --git a/clients/ios/Classes/DashboardViewController.m b/clients/ios/Classes/ActivitiesViewController.m similarity index 97% rename from clients/ios/Classes/DashboardViewController.m rename to clients/ios/Classes/ActivitiesViewController.m index ff02c88f4b..5be4019c5e 100644 --- a/clients/ios/Classes/DashboardViewController.m +++ b/clients/ios/Classes/ActivitiesViewController.m @@ -1,12 +1,12 @@ // -// DashboardViewController.m +// ActivitiesViewController.m // NewsBlur // // Created by Roy Yang on 7/10/12. // Copyright (c) 2012 NewsBlur. All rights reserved. // -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #import "NewsBlurAppDelegate.h" #import "ActivityModule.h" #import "InteractionsModule.h" @@ -16,7 +16,7 @@ #import "UISearchBar+Field.h" #import "NewsBlur-Swift.h" -@implementation DashboardViewController +@implementation ActivitiesViewController @synthesize appDelegate; @synthesize interactionsModule; diff --git a/clients/ios/Classes/FeedDetailTableCell.m b/clients/ios/Classes/FeedDetailTableCell.m index 7a8256eef5..cd844206ab 100644 --- a/clients/ios/Classes/FeedDetailTableCell.m +++ b/clients/ios/Classes/FeedDetailTableCell.m @@ -8,7 +8,7 @@ #import "NewsBlurAppDelegate.h" #import "FeedDetailTableCell.h" -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #import "ABTableViewCell.h" #import "UIView+TKCategory.h" #import "UIImageView+AFNetworking.h" diff --git a/clients/ios/Classes/FeedsObjCViewController.m b/clients/ios/Classes/FeedsObjCViewController.m index ca1bf3d2b2..079735c1d1 100644 --- a/clients/ios/Classes/FeedsObjCViewController.m +++ b/clients/ios/Classes/FeedsObjCViewController.m @@ -8,11 +8,11 @@ #import "FeedsObjCViewController.h" #import "NewsBlurAppDelegate.h" -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #import "InteractionsModule.h" #import "ActivityModule.h" #import "FeedTableCell.h" -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #import "UserProfileViewController.h" #import "MBProgressHUD.h" #import "SBJson4.h" @@ -344,37 +344,6 @@ - (void)viewDidAppear:(BOOL)animated { [self becomeFirstResponder]; } -//- (void)handleGesture:(UIScreenEdgePanGestureRecognizer *)gesture { -// if ([[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPad) return; -// -// self.interactiveFeedDetailTransition = YES; -// -// CGPoint point = [gesture locationInView:self.view]; -// CGFloat viewWidth = CGRectGetWidth(self.view.frame); -// CGFloat percentage = MIN(point.x, viewWidth) / viewWidth; -//// NSLog(@"back gesture: %d, %f - %f/%f", (int)gesture.state, percentage, point.x, viewWidth); -// -// if (gesture.state == UIGestureRecognizerStateBegan) { -//// if (appDelegate.storiesCollection.transferredFromDashboard) { -//// [appDelegate.dashboardViewController.storiesModule.storiesCollection -//// transferStoriesFromCollection:appDelegate.storiesCollection]; -//// [appDelegate.dashboardViewController.storiesModule fadeSelectedCell:NO]; -//// } -// } else if (gesture.state == UIGestureRecognizerStateChanged) { -// [appDelegate.masterContainerViewController interactiveTransitionFromFeedDetail:percentage]; -// } else if (gesture.state == UIGestureRecognizerStateEnded) { -// CGPoint velocity = [gesture velocityInView:self.view]; -// if (velocity.x > 0) { -// [appDelegate.masterContainerViewController transitionFromFeedDetail]; -// } else { -//// // Returning back to view, cancelling pop animation. -//// [appDelegate.masterContainerViewController transitionToFeedDetail:NO]; -// } -// -// self.interactiveFeedDetailTransition = NO; -// } -//} - - (void)fadeSelectedCell { [self fadeCellWithIndexPath:[self.feedTitlesTable indexPathForSelectedRow]]; } @@ -751,6 +720,8 @@ - (void)finishLoadingFeedListWithDict:(NSDictionary *)results finished:(BOOL)fin appDelegate.dictSocialServices = [results objectForKey:@"social_services"]; appDelegate.userActivitiesArray = [results objectForKey:@"activities"]; + appDelegate.dashboardArray = [results objectForKey:@"dashboard_rivers"]; + appDelegate.isPremium = [[appDelegate.dictUserProfile objectForKey:@"is_premium"] integerValue] == 1; appDelegate.isPremiumArchive = [[appDelegate.dictUserProfile objectForKey:@"is_archive"] integerValue] == 1; id premiumExpire = [appDelegate.dictUserProfile objectForKey:@"premium_expire"]; @@ -1221,10 +1192,10 @@ - (IBAction)showInteractionsPopover:(id)sender { CGSize size = CGSizeMake(self.view.frame.size.width - 36, self.view.frame.size.height - 60); - [self.appDelegate showPopoverWithViewController:self.appDelegate.dashboardViewController contentSize:size barButtonItem:self.activitiesButton]; + [self.appDelegate showPopoverWithViewController:self.appDelegate.activitiesViewController contentSize:size barButtonItem:self.activitiesButton]; - [appDelegate.dashboardViewController refreshInteractions]; - [appDelegate.dashboardViewController refreshActivity]; + [appDelegate.activitiesViewController refreshInteractions]; + [appDelegate.activitiesViewController refreshActivity]; } - (void)handleLongPress:(UILongPressGestureRecognizer *)gestureRecognizer { @@ -2532,7 +2503,7 @@ - (IBAction)selectIntelligence { [self showExplainerOnEmptyFeedlist]; // if (!self.isPhone) { -// FeedDetailViewController *storiesModule = self.appDelegate.dashboardViewController.storiesModule; +// FeedDetailViewController *storiesModule = self.appDelegate.activitiesViewController.storiesModule; // // storiesModule.storiesCollection.feedPage = 0; // storiesModule.storiesCollection.storyCount = 0; diff --git a/clients/ios/Classes/InteractionsModule.m b/clients/ios/Classes/InteractionsModule.m index 4f1ba0dca3..9508164e29 100644 --- a/clients/ios/Classes/InteractionsModule.m +++ b/clients/ios/Classes/InteractionsModule.m @@ -12,7 +12,7 @@ #import "SmallInteractionCell.h" #import #import "UserProfileViewController.h" -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #define MINIMUM_INTERACTION_HEIGHT_IPAD 78 #define MINIMUM_INTERACTION_HEIGHT_IPHONE 54 diff --git a/clients/ios/Classes/NewsBlurAppDelegate.h b/clients/ios/Classes/NewsBlurAppDelegate.h index 44a53b2430..fd164e2199 100644 --- a/clients/ios/Classes/NewsBlurAppDelegate.h +++ b/clients/ios/Classes/NewsBlurAppDelegate.h @@ -15,15 +15,13 @@ #define FEED_DETAIL_VIEW_TAG 1000001 #define STORY_DETAIL_VIEW_TAG 1000002 #define FEED_TITLE_GRADIENT_TAG 100003 -#define FEED_DASHBOARD_VIEW_TAG 100004 #define SHARE_MODAL_HEIGHT 120 #define STORY_TITLES_HEIGHT 240 -#define DASHBOARD_TITLE @"NewsBlur" @class AppDelegateHelper; @class SplitViewController; @class FeedsViewController; -@class DashboardViewController; +@class ActivitiesViewController; @class FeedDetailViewController; @class MarkReadMenuViewController; @class FirstTimeUserViewController; @@ -73,7 +71,7 @@ SFSafariViewControllerDelegate> { FirstTimeUserAddFriendsViewController *firstTimeUserAddFriendsViewController; FirstTimeUserAddNewsBlurViewController *firstTimeUserAddNewsBlurViewController; - DashboardViewController *dashboardViewController; + ActivitiesViewController *activitiesViewController; FeedsViewController *feedsViewController; FeedDetailViewController *feedDetailViewController; FriendsListViewController *friendsListViewController; @@ -175,7 +173,7 @@ SFSafariViewControllerDelegate> { @property (nonatomic) UINavigationController *userProfileNavigationController; @property (nonatomic) UINavigationController *originalStoryViewNavController; @property (nonatomic) IBOutlet DetailViewController *detailViewController; -@property (nonatomic) IBOutlet DashboardViewController *dashboardViewController; +@property (nonatomic) IBOutlet ActivitiesViewController *activitiesViewController; @property (nonatomic) IBOutlet FeedsViewController *feedsViewController; @property (nonatomic) IBOutlet FeedDetailViewController *feedDetailViewController; @property (nonatomic, strong) UINavigationController *feedDetailMenuNavigationController; @@ -255,7 +253,6 @@ SFSafariViewControllerDelegate> { @property (nonatomic) NSMutableDictionary *collapsedFolders; @property (nonatomic) UIFontDescriptor *fontDescriptorTitleSize; - @property (nonatomic) NSDictionary *dictFolders; @property (nonatomic, strong) NSMutableDictionary *dictFeeds; @property (nonatomic, strong) NSMutableDictionary *dictInactiveFeeds; @@ -276,6 +273,7 @@ SFSafariViewControllerDelegate> { @property (nonatomic) NSArray *userActivitiesArray; @property (nonatomic) NSMutableArray *dictFoldersArray; @property (nonatomic) NSArray *notificationFeedIds; +@property (nonatomic) NSArray *dashboardArray; @property (nonatomic, readonly) NSString *widgetFolder; @property (nonatomic, strong) NSString *pendingFolder; @@ -352,8 +350,6 @@ SFSafariViewControllerDelegate> { - (void)backgroundLoadNotificationStory; - (void)loadStarredDetailViewWithStory:(NSString *)contentId showFindingStory:(BOOL)showHUD; - (void)loadRiverFeedDetailView:(FeedDetailViewController *)feedDetailView withFolder:(NSString *)folder; -- (void)openDashboardRiverForStory:(NSString *)contentId - showFindingStory:(BOOL)showHUD; - (void)loadStoryDetailView; - (void)adjustStoryDetailWebView; diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m index 2d35afb687..4b4b44128c 100644 --- a/clients/ios/Classes/NewsBlurAppDelegate.m +++ b/clients/ios/Classes/NewsBlurAppDelegate.m @@ -6,7 +6,7 @@ // #import "NewsBlurAppDelegate.h" -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #import "MarkReadMenuViewController.h" #import "FirstTimeUserViewController.h" #import "FriendsListViewController.h" @@ -93,7 +93,7 @@ @implementation NewsBlurAppDelegate @synthesize userProfileNavigationController; //@synthesize masterContainerViewController; @synthesize detailViewController; -@synthesize dashboardViewController; +@synthesize activitiesViewController; @synthesize feedsViewController; @synthesize feedDetailViewController; @synthesize friendsListViewController; @@ -1226,7 +1226,7 @@ - (void)prepareViewControllers { self.detailNavigationController = (UINavigationController *)splitChildren[2]; self.detailViewController = self.detailNavigationController.viewControllers.firstObject; - self.dashboardViewController = [DashboardViewController new]; + self.activitiesViewController = [ActivitiesViewController new]; self.friendsListViewController = [FriendsListViewController new]; self.storyDetailViewController = [StoryDetailViewController new]; self.loginViewController = [LoginViewController new]; @@ -1279,8 +1279,8 @@ - (void)showLogin { [self.feedsViewController.feedTitlesTable reloadData]; [self.feedsViewController resetToolbar]; - [self.dashboardViewController.interactionsModule.interactionsTable reloadData]; - [self.dashboardViewController.activitiesModule.activitiesTable reloadData]; + [self.activitiesViewController.interactionsModule.interactionsTable reloadData]; + [self.activitiesViewController.activitiesModule.activitiesTable reloadData]; NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults]; [userPreferences setInteger:-1 forKey:@"selectedIntelligence"]; @@ -2147,35 +2147,6 @@ - (void)loadRiverFeedDetailView:(FeedDetailViewController *)feedDetailView withF }]; } -- (void)openDashboardRiverForStory:(NSString *)contentId - showFindingStory:(BOOL)showHUD { - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { - // [self.feedsNavigationController popToRootViewControllerAnimated:NO]; - // [self.splitViewController showColumn:UISplitViewControllerColumnPrimary]; - [self showFeedsListAnimated:NO]; - [self.feedsNavigationController dismissViewControllerAnimated:YES completion:nil]; - [self hidePopoverAnimated:NO]; - } - - self.inFindingStoryMode = YES; - [storiesCollection reset]; - storiesCollection.isRiverView = YES; - - self.tryFeedStoryId = contentId; - storiesCollection.activeFolder = @"everything"; - - [self loadRiverFeedDetailView:feedDetailViewController withFolder:@"river_dashboard"]; - - if (showHUD) { - if (!self.isPhone) { - [self.storyPagesViewController showShareHUD:@"Finding story..."]; - } else { - MBProgressHUD *HUD = [MBProgressHUD showHUDAddedTo:self.feedDetailViewController.view animated:YES]; - HUD.labelText = @"Finding story..."; - } - } -} - - (void)adjustStoryDetailWebView { // change the web view [self.storyPagesViewController.currentPage changeWebViewWidth]; diff --git a/clients/ios/Classes/StoriesCollection.h b/clients/ios/Classes/StoriesCollection.h index 2fc14c2f4d..842b4ed005 100644 --- a/clients/ios/Classes/StoriesCollection.h +++ b/clients/ios/Classes/StoriesCollection.h @@ -27,7 +27,6 @@ BOOL isRiverView; BOOL isSocialView; BOOL isSocialRiverView; - BOOL transferredFromDashboard; BOOL inSearch; NSString *searchQuery; } @@ -56,7 +55,6 @@ @property (nonatomic, readwrite) BOOL isSavedView; @property (nonatomic, readwrite) BOOL isReadView; @property (nonatomic, readwrite) BOOL isWidgetView; -@property (nonatomic, readwrite) BOOL transferredFromDashboard; @property (nonatomic, readwrite) BOOL showHiddenStories; @property (nonatomic, readwrite) BOOL inSearch; @property (nonatomic, readonly) BOOL isEverything; @@ -78,7 +76,6 @@ @property (nonatomic, readonly) NSString *storyTitlesPositionKey; @property (nonatomic, readonly) NSString *storyViewKey; -- (id)initForDashboard; - (void)reset; - (void)transferStoriesFromCollection:(StoriesCollection *)fromCollection; diff --git a/clients/ios/Classes/StoriesCollection.m b/clients/ios/Classes/StoriesCollection.m index 7fa275b62d..35d6118af2 100644 --- a/clients/ios/Classes/StoriesCollection.m +++ b/clients/ios/Classes/StoriesCollection.m @@ -43,7 +43,6 @@ @implementation StoriesCollection @synthesize isSocialRiverView; @synthesize isSavedView; @synthesize isReadView; -@synthesize transferredFromDashboard; @synthesize inSearch; @synthesize searchQuery; @@ -58,14 +57,6 @@ - (id)init { return self; } -- (id)initForDashboard { - if (self = [self init]) { - - } - - return self; -} - - (void)reset { [self setStories:nil]; [self setFeedUserProfiles:nil]; @@ -77,7 +68,6 @@ - (void)reset { self.activeFolderFeeds = nil; self.activeClassifiers = [NSMutableDictionary dictionary]; - self.transferredFromDashboard = NO; self.isRiverView = NO; self.isSocialView = NO; self.isSocialRiverView = NO; diff --git a/clients/ios/Classes/ThemeManager.m b/clients/ios/Classes/ThemeManager.m index 0e969e505c..7baeb616a9 100644 --- a/clients/ios/Classes/ThemeManager.m +++ b/clients/ios/Classes/ThemeManager.m @@ -8,7 +8,7 @@ #import "ThemeManager.h" #import "NewsBlurAppDelegate.h" -#import "DashboardViewController.h" +#import "ActivitiesViewController.h" #import "OriginalStoryViewController.h" #import #import "NewsBlur-Swift.h" @@ -382,7 +382,7 @@ - (void)updateTheme { [appDelegate.splitViewController updateTheme]; [appDelegate.feedsViewController updateTheme]; - [appDelegate.dashboardViewController updateTheme]; + [appDelegate.activitiesViewController updateTheme]; [appDelegate.feedDetailViewController updateTheme]; [appDelegate.detailViewController updateTheme]; [appDelegate.storyPagesViewController updateTheme]; diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj index 2c2b107967..d1126d36cb 100755 --- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj @@ -593,7 +593,7 @@ 1757925E2930605500490924 /* JNWThrottledBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = FF8D1EDA1BAA3CCD00725D8A /* JNWThrottledBlock.m */; }; 1757925F2930605500490924 /* FeedDetailObjCViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4D9073265BE13500792DB3 /* FeedDetailObjCViewController.m */; }; 175792602930605500490924 /* ProfileBadge.m in Sources */ = {isa = PBXBuildFile; fileRef = 431B858015A23C6B00DCE497 /* ProfileBadge.m */; }; - 175792612930605500490924 /* DashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F974A15ACA0ED0007136B /* DashboardViewController.m */; }; + 175792612930605500490924 /* ActivitiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F974A15ACA0ED0007136B /* ActivitiesViewController.m */; }; 175792622930605500490924 /* FeedsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 170E3CCC24F8A3A2009CE819 /* FeedsViewController.swift */; }; 175792632930605500490924 /* ActivityModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F976E15AE21280007136B /* ActivityModule.m */; }; 175792642930605500490924 /* InteractionsModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F977115AE70E30007136B /* InteractionsModule.m */; }; @@ -648,7 +648,7 @@ 175792952930605500490924 /* MenuTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4130A2162E10CF00DDB6A7 /* MenuTableViewCell.m */; }; 175792962930605500490924 /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 176A5C7924F8BD1B009E8DF9 /* DetailViewController.swift */; }; 175792972930605500490924 /* MenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17432C7E1C533FBC003F8FD6 /* MenuViewController.m */; }; - 175792982930605500490924 /* NBDashboardNavigationBar.m in Sources */ = {isa = PBXBuildFile; fileRef = FFF8B3AE1F847505001AB95E /* NBDashboardNavigationBar.m */; }; + 175792982930605500490924 /* ActivitiesNavigationBar.m in Sources */ = {isa = PBXBuildFile; fileRef = FFF8B3AE1F847505001AB95E /* ActivitiesNavigationBar.m */; }; 175792992930605500490924 /* FeedChooserItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E635AE1C548C580075338E /* FeedChooserItem.m */; }; 1757929A2930605500490924 /* StoryPagesObjCViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF6A233116448E0700E15989 /* StoryPagesObjCViewController.m */; }; 1757929C2930605500490924 /* SmallInteractionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF1660CC16D6FD8A00AF8541 /* SmallInteractionCell.m */; }; @@ -932,7 +932,7 @@ 43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43763AD0158F90B100B3DBE2 /* FontSettingsViewController.xib */; }; 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 */; }; + 437F974C15ACA0ED0007136B /* ActivitiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F974A15ACA0ED0007136B /* ActivitiesViewController.m */; }; 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 */; }; @@ -1369,7 +1369,7 @@ FFF1E4C817750BDD00BF59D3 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = FFF1E4C717750BDD00BF59D3 /* Settings.bundle */; platformFilter = ios; }; FFF1E4CB17750D2C00BF59D3 /* menu_icn_preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = FFF1E4C917750D2C00BF59D3 /* menu_icn_preferences.png */; }; FFF1E4CC17750D2C00BF59D3 /* menu_icn_preferences@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFF1E4CA17750D2C00BF59D3 /* menu_icn_preferences@2x.png */; }; - FFF8B3AF1F847505001AB95E /* NBDashboardNavigationBar.m in Sources */ = {isa = PBXBuildFile; fileRef = FFF8B3AE1F847505001AB95E /* NBDashboardNavigationBar.m */; }; + FFF8B3AF1F847505001AB95E /* ActivitiesNavigationBar.m in Sources */ = {isa = PBXBuildFile; fileRef = FFF8B3AE1F847505001AB95E /* ActivitiesNavigationBar.m */; }; FFFF683D19D628000081904A /* NBURLCache.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFF683C19D628000081904A /* NBURLCache.m */; }; /* End PBXBuildFile section */ @@ -1732,8 +1732,8 @@ 437AA8C7159394E2005463F5 /* ShareViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = ""; }; 437AA8C8159394E2005463F5 /* ShareViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = ""; }; 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 = ""; }; + 437F974915ACA0ED0007136B /* ActivitiesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivitiesViewController.h; sourceTree = ""; }; + 437F974A15ACA0ED0007136B /* ActivitiesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ActivitiesViewController.m; 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 = ""; }; @@ -2338,8 +2338,8 @@ FFF1E4C717750BDD00BF59D3 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; FFF1E4C917750D2C00BF59D3 /* menu_icn_preferences.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_icn_preferences.png; sourceTree = ""; }; FFF1E4CA17750D2C00BF59D3 /* menu_icn_preferences@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu_icn_preferences@2x.png"; sourceTree = ""; }; - FFF8B3AD1F847505001AB95E /* NBDashboardNavigationBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NBDashboardNavigationBar.h; sourceTree = ""; }; - FFF8B3AE1F847505001AB95E /* NBDashboardNavigationBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NBDashboardNavigationBar.m; sourceTree = ""; }; + FFF8B3AD1F847505001AB95E /* ActivitiesNavigationBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ActivitiesNavigationBar.h; sourceTree = ""; }; + FFF8B3AE1F847505001AB95E /* ActivitiesNavigationBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ActivitiesNavigationBar.m; sourceTree = ""; }; FFFF683B19D628000081904A /* NBURLCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NBURLCache.h; path = "Other Sources/NBURLCache.h"; sourceTree = ""; }; FFFF683C19D628000081904A /* NBURLCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NBURLCache.m; path = "Other Sources/NBURLCache.m"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -2468,7 +2468,7 @@ FF22FE5216E52BAD0046165A /* Foundation */, FF855B581794B03A0098D48A /* Offline */, 43D8189F15B9404D00733444 /* Models */, - 437F974715ACA0C50007136B /* Dashboard */, + 437F974715ACA0C50007136B /* Activities */, 17432C801C53425C003F8FD6 /* FeedChooser */, 431B857315A131C300DCE497 /* Feeds */, 431B857215A131B200DCE497 /* Feed-Detail */, @@ -3268,13 +3268,13 @@ path = "Resources-iPad/Images"; sourceTree = ""; }; - 437F974715ACA0C50007136B /* Dashboard */ = { + 437F974715ACA0C50007136B /* Activities */ = { isa = PBXGroup; children = ( - 437F974915ACA0ED0007136B /* DashboardViewController.h */, - 437F974A15ACA0ED0007136B /* DashboardViewController.m */, - FFF8B3AD1F847505001AB95E /* NBDashboardNavigationBar.h */, - FFF8B3AE1F847505001AB95E /* NBDashboardNavigationBar.m */, + 437F974915ACA0ED0007136B /* ActivitiesViewController.h */, + 437F974A15ACA0ED0007136B /* ActivitiesViewController.m */, + FFF8B3AD1F847505001AB95E /* ActivitiesNavigationBar.h */, + FFF8B3AE1F847505001AB95E /* ActivitiesNavigationBar.m */, 437F977015AE70E30007136B /* InteractionsModule.h */, 437F977115AE70E30007136B /* InteractionsModule.m */, 437F976D15AE21280007136B /* ActivityModule.h */, @@ -3288,7 +3288,7 @@ 4383DCD415BB8B87007E6611 /* SmallActivityCell.h */, 4383DCD515BB8B88007E6611 /* SmallActivityCell.m */, ); - name = Dashboard; + name = Activities; sourceTree = ""; }; 43B8F017156603170008733D /* Resources-iPhone */ = { @@ -5070,7 +5070,7 @@ 1757925E2930605500490924 /* JNWThrottledBlock.m in Sources */, 1757925F2930605500490924 /* FeedDetailObjCViewController.m in Sources */, 175792602930605500490924 /* ProfileBadge.m in Sources */, - 175792612930605500490924 /* DashboardViewController.m in Sources */, + 175792612930605500490924 /* ActivitiesViewController.m in Sources */, 175792622930605500490924 /* FeedsViewController.swift in Sources */, 175792632930605500490924 /* ActivityModule.m in Sources */, 175792642930605500490924 /* InteractionsModule.m in Sources */, @@ -5133,7 +5133,7 @@ 175792952930605500490924 /* MenuTableViewCell.m in Sources */, 175792962930605500490924 /* DetailViewController.swift in Sources */, 175792972930605500490924 /* MenuViewController.m in Sources */, - 175792982930605500490924 /* NBDashboardNavigationBar.m in Sources */, + 175792982930605500490924 /* ActivitiesNavigationBar.m in Sources */, 172ECBFE298B14B1006371BC /* FeedDetailStoryView.swift in Sources */, 175792992930605500490924 /* FeedChooserItem.m in Sources */, 1757929A2930605500490924 /* StoryPagesObjCViewController.m in Sources */, @@ -5280,7 +5280,7 @@ FF8D1EDB1BAA3CCD00725D8A /* JNWThrottledBlock.m in Sources */, FF4D9075265BE13500792DB3 /* FeedDetailObjCViewController.m in Sources */, 431B858115A23C6B00DCE497 /* ProfileBadge.m in Sources */, - 437F974C15ACA0ED0007136B /* DashboardViewController.m in Sources */, + 437F974C15ACA0ED0007136B /* ActivitiesViewController.m in Sources */, 170E3CCD24F8A3A2009CE819 /* FeedsViewController.swift in Sources */, 437F976F15AE21290007136B /* ActivityModule.m in Sources */, 437F977215AE70E30007136B /* InteractionsModule.m in Sources */, @@ -5343,7 +5343,7 @@ FF4130A3162E10CF00DDB6A7 /* MenuTableViewCell.m in Sources */, 176A5C7A24F8BD1B009E8DF9 /* DetailViewController.swift in Sources */, 17432C7F1C533FBC003F8FD6 /* MenuViewController.m in Sources */, - FFF8B3AF1F847505001AB95E /* NBDashboardNavigationBar.m in Sources */, + FFF8B3AF1F847505001AB95E /* ActivitiesNavigationBar.m in Sources */, 172ECBFD298B14B1006371BC /* FeedDetailStoryView.swift in Sources */, 17E635AF1C548C580075338E /* FeedChooserItem.m in Sources */, FF6A233216448E0700E15989 /* StoryPagesObjCViewController.m in Sources */, diff --git a/clients/ios/Resources-iPhone/DashboardViewController.xib b/clients/ios/Resources-iPhone/DashboardViewController.xib index 26ea33587f..edc3fcf42b 100644 --- a/clients/ios/Resources-iPhone/DashboardViewController.xib +++ b/clients/ios/Resources-iPhone/DashboardViewController.xib @@ -1,13 +1,12 @@ - + - - + - +