From 5fe73d431ba042ec5a0a9512b661caac238f7756 Mon Sep 17 00:00:00 2001 From: David Sinclair Date: Thu, 27 Aug 2020 21:26:12 -0700 Subject: [PATCH] #817 (three column layout) - Fixing warnings. - Adding Swift subclasses of ObjC ones. --- clients/ios/Classes/ActivityCell.m | 1 + clients/ios/Classes/ActivityModule.m | 1 + clients/ios/Classes/AddSiteTableCell.m | 1 + clients/ios/Classes/AddSiteViewController.h | 1 + clients/ios/Classes/AddSiteViewController.m | 22 +-- .../Classes/AuthorizeServicesViewController.m | 13 +- clients/ios/Classes/BaseViewController.m | 5 +- clients/ios/Classes/DashboardViewController.m | 8 +- clients/ios/Classes/DataUtilities.m | 1 + .../ios/Classes/DetailViewController.swift | 14 ++ clients/ios/Classes/FeedChooserItem.m | 1 + clients/ios/Classes/FeedChooserTitleView.m | 1 + .../ios/Classes/FeedChooserViewController.h | 1 + ...oller.h => FeedDetailObjCViewController.h} | 4 +- ...oller.m => FeedDetailObjCViewController.m} | 14 +- clients/ios/Classes/FeedDetailTableCell.m | 2 +- .../Classes/FeedDetailViewController.swift | 14 ++ clients/ios/Classes/FeedTableCell.m | 3 +- clients/ios/Classes/FeedsMenuViewController.m | 17 +- ...Controller.h => FeedsObjCViewController.h} | 4 +- ...Controller.m => FeedsObjCViewController.m} | 11 +- clients/ios/Classes/FeedsViewController.swift | 14 ++ .../FirstTimeUserAddFriendsViewController.h | 1 + .../FirstTimeUserAddFriendsViewController.m | 31 ++-- .../FirstTimeUserAddNewsBlurViewController.m | 31 ++-- .../FirstTimeUserAddSitesViewController.m | 29 ++- .../ios/Classes/FirstTimeUserViewController.m | 31 ++-- clients/ios/Classes/FolderTitleView.m | 2 +- clients/ios/Classes/FontListViewController.m | 2 +- .../ios/Classes/FontSettingsViewController.m | 10 +- .../ios/Classes/FriendsListViewController.h | 1 + .../ios/Classes/FriendsListViewController.m | 23 +-- clients/ios/Classes/InteractionsModule.h | 1 + clients/ios/Classes/LoginViewController.h | 2 +- clients/ios/Classes/LoginViewController.m | 30 ++-- .../ios/Classes/MarkReadMenuViewController.m | 3 +- clients/ios/Classes/MoveSiteViewController.m | 20 +-- .../ios/Classes/NBContainerViewController.h | 1 + .../ios/Classes/NBContainerViewController.m | 14 +- clients/ios/Classes/NewsBlurAppDelegate.h | 15 +- clients/ios/Classes/NewsBlurAppDelegate.m | 15 +- .../ios/Classes/NotificationsViewController.h | 1 + clients/ios/Classes/PremiumViewController.h | 1 + clients/ios/Classes/ProfileBadge.m | 1 + clients/ios/Classes/ShareViewController.h | 1 + clients/ios/Classes/ShareViewController.m | 28 +-- clients/ios/Classes/SiteCell.h | 3 +- clients/ios/Classes/SiteCell.m | 1 + clients/ios/Classes/SplitViewController.swift | 14 ++ clients/ios/Classes/SplitViewDelegate.swift | 15 ++ clients/ios/Classes/StoriesCollection.h | 1 + ...ller.h => StoryDetailObjCViewController.h} | 4 +- ...ller.m => StoryDetailObjCViewController.m} | 30 ++-- .../Classes/StoryDetailViewController.swift | 14 ++ clients/ios/Classes/StoryPageControl.xib | 22 ++- clients/ios/Classes/StoryPageDelegate.swift | 26 +++ ...yPageControl.h => StoryPageObjCDelegate.h} | 8 +- ...yPageControl.m => StoryPageObjCDelegate.m} | 13 +- .../ios/Classes/StoryPageViewController.swift | 14 ++ clients/ios/Classes/ThemeManager.m | 5 +- clients/ios/Classes/TrainerViewController.h | 2 + .../ios/Classes/UserProfileViewController.h | 1 + .../ios/Classes/UserProfileViewController.m | 25 +-- clients/ios/Classes/UserTagsViewController.h | 1 + .../ios/Classes/offline/OfflineFetchImages.m | 2 +- .../ios/Classes/offline/OfflineFetchStories.m | 2 +- .../ios/Classes/offline/OfflineFetchText.m | 2 +- .../ios/Classes/offline/OfflineSyncUnreads.h | 1 + .../ios/Classes/offline/OfflineSyncUnreads.m | 2 +- clients/ios/NewsBlur-iPhone-Info.plist | 4 +- .../ios/NewsBlur.xcodeproj/project.pbxproj | 88 +++++++--- clients/ios/Other Sources/BridgingHeader.h | 5 +- clients/ios/Other Sources/fmdb/FMDatabase.m | 10 -- clients/ios/Other Sources/fmdb/FMResultSet.m | 5 - .../ios/Resources-iPad/MainWindow~ipad.xib | 14 +- clients/ios/Resources-iPhone/MainWindow.xib | 12 +- .../NewsBlurViewController.xib | 17 +- .../ios/Resources/MainInterface.storyboard | 166 ++++++++++++++++++ 78 files changed, 592 insertions(+), 384 deletions(-) create mode 100644 clients/ios/Classes/DetailViewController.swift rename clients/ios/Classes/{FeedDetailViewController.h => FeedDetailObjCViewController.h} (97%) rename clients/ios/Classes/{FeedDetailViewController.m => FeedDetailObjCViewController.m} (99%) create mode 100644 clients/ios/Classes/FeedDetailViewController.swift rename clients/ios/Classes/{NewsBlurViewController.h => FeedsObjCViewController.h} (98%) rename clients/ios/Classes/{NewsBlurViewController.m => FeedsObjCViewController.m} (99%) create mode 100644 clients/ios/Classes/FeedsViewController.swift create mode 100644 clients/ios/Classes/SplitViewController.swift create mode 100644 clients/ios/Classes/SplitViewDelegate.swift rename clients/ios/Classes/{StoryDetailViewController.h => StoryDetailObjCViewController.h} (96%) rename clients/ios/Classes/{StoryDetailViewController.m => StoryDetailObjCViewController.m} (99%) create mode 100644 clients/ios/Classes/StoryDetailViewController.swift create mode 100644 clients/ios/Classes/StoryPageDelegate.swift rename clients/ios/Classes/{StoryPageControl.h => StoryPageObjCDelegate.h} (97%) rename clients/ios/Classes/{StoryPageControl.m => StoryPageObjCDelegate.m} (99%) create mode 100644 clients/ios/Classes/StoryPageViewController.swift create mode 100644 clients/ios/Resources/MainInterface.storyboard diff --git a/clients/ios/Classes/ActivityCell.m b/clients/ios/Classes/ActivityCell.m index b73aab4255..9af77a08b9 100644 --- a/clients/ios/Classes/ActivityCell.m +++ b/clients/ios/Classes/ActivityCell.m @@ -9,6 +9,7 @@ #import "ActivityCell.h" #import "UIImageView+AFNetworking.h" #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @implementation ActivityCell diff --git a/clients/ios/Classes/ActivityModule.m b/clients/ios/Classes/ActivityModule.m index 000207ae49..95ffbd9124 100644 --- a/clients/ios/Classes/ActivityModule.m +++ b/clients/ios/Classes/ActivityModule.m @@ -13,6 +13,7 @@ #import #import "ActivityCell.h" #import "SmallActivityCell.h" +#import "NewsBlur-Swift.h" @implementation ActivityModule diff --git a/clients/ios/Classes/AddSiteTableCell.m b/clients/ios/Classes/AddSiteTableCell.m index d607a76b2f..7cb15ea1e8 100644 --- a/clients/ios/Classes/AddSiteTableCell.m +++ b/clients/ios/Classes/AddSiteTableCell.m @@ -11,6 +11,7 @@ #import "ABTableViewCell.h" #import "UIView+TKCategory.h" #import "Utilities.h" +#import "NewsBlur-Swift.h" static UIFont *textFont = nil; static UIFont *indicatorFont = nil; diff --git a/clients/ios/Classes/AddSiteViewController.h b/clients/ios/Classes/AddSiteViewController.h index d74d203b57..5023bf4b98 100644 --- a/clients/ios/Classes/AddSiteViewController.h +++ b/clients/ios/Classes/AddSiteViewController.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @class NewsBlurAppDelegate; diff --git a/clients/ios/Classes/AddSiteViewController.m b/clients/ios/Classes/AddSiteViewController.m index 351530b5f3..34f62e4ece 100644 --- a/clients/ios/Classes/AddSiteViewController.m +++ b/clients/ios/Classes/AddSiteViewController.m @@ -9,10 +9,10 @@ #import "AddSiteViewController.h" #import "AddSiteAutocompleteCell.h" #import "NewsBlurAppDelegate.h" -#import "NewsBlurViewController.h" #import "NBContainerViewController.h" #import "MenuViewController.h" #import "SBJson4.h" +#import "NewsBlur-Swift.h" @interface AddSiteViewController() @@ -86,16 +86,16 @@ - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { - return YES; - } - - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { +// return YES; +// } +// +// return NO; +//} - (void)viewDidAppear:(BOOL)animated { [self.activityIndicator stopAnimating]; diff --git a/clients/ios/Classes/AuthorizeServicesViewController.m b/clients/ios/Classes/AuthorizeServicesViewController.m index 91daa710ce..2d3e2b9db4 100644 --- a/clients/ios/Classes/AuthorizeServicesViewController.m +++ b/clients/ios/Classes/AuthorizeServicesViewController.m @@ -35,13 +35,6 @@ - (void)viewDidLoad { self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate]; } -- (void)viewDidUnload { - [self setWebView:nil]; - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -72,9 +65,9 @@ - (void)viewWillAppear:(BOOL)animated { } } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return YES; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// return YES; +//} - (void)doCancelButton { [appDelegate.shareViewController adjustShareButtons]; diff --git a/clients/ios/Classes/BaseViewController.m b/clients/ios/Classes/BaseViewController.m index f0e37369a0..1207a5a5b6 100644 --- a/clients/ios/Classes/BaseViewController.m +++ b/clients/ios/Classes/BaseViewController.m @@ -1,5 +1,6 @@ #import "BaseViewController.h" #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @implementation BaseViewController @@ -127,10 +128,6 @@ - (void) viewDidLoad { } } -- (void) viewDidUnload { - [super viewDidUnload]; -} - - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; diff --git a/clients/ios/Classes/DashboardViewController.m b/clients/ios/Classes/DashboardViewController.m index df44a73384..bd9ce2fab1 100644 --- a/clients/ios/Classes/DashboardViewController.m +++ b/clients/ios/Classes/DashboardViewController.m @@ -10,11 +10,11 @@ #import "NewsBlurAppDelegate.h" #import "ActivityModule.h" #import "InteractionsModule.h" -#import "FeedDetailViewController.h" #import "UserProfileViewController.h" #import "PINCache.h" #import "StoriesCollection.h" #import "UISearchBar+Field.h" +#import "NewsBlur-Swift.h" @implementation DashboardViewController @@ -87,9 +87,9 @@ - (void)viewWillAppear:(BOOL)animated { } } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return YES; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// return YES; +//} // allow keyboard comands - (BOOL)canBecomeFirstResponder { diff --git a/clients/ios/Classes/DataUtilities.m b/clients/ios/Classes/DataUtilities.m index 3a930e8815..c98685aef2 100644 --- a/clients/ios/Classes/DataUtilities.m +++ b/clients/ios/Classes/DataUtilities.m @@ -9,6 +9,7 @@ #import "DataUtilities.h" #import "NewsBlurAppDelegate.h" #import "StoriesCollection.h" +#import "NewsBlur-Swift.h" @implementation DataUtilities diff --git a/clients/ios/Classes/DetailViewController.swift b/clients/ios/Classes/DetailViewController.swift new file mode 100644 index 0000000000..a43997699f --- /dev/null +++ b/clients/ios/Classes/DetailViewController.swift @@ -0,0 +1,14 @@ +// +// DetailViewController.swift +// NewsBlur +// +// Created by David Sinclair on 2020-08-27. +// Copyright © 2020 NewsBlur. All rights reserved. +// + +import UIKit + +/// Manages the detail column of the split view, with the feed detail and/or the story pages. +class DetailViewController: BaseViewController { + +} diff --git a/clients/ios/Classes/FeedChooserItem.m b/clients/ios/Classes/FeedChooserItem.m index 23f87b9be8..1aae7fd635 100644 --- a/clients/ios/Classes/FeedChooserItem.m +++ b/clients/ios/Classes/FeedChooserItem.m @@ -8,6 +8,7 @@ #import "FeedChooserItem.h" #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @interface FeedChooserItem () diff --git a/clients/ios/Classes/FeedChooserTitleView.m b/clients/ios/Classes/FeedChooserTitleView.m index 7ac0d924e5..f9ed4ccfd7 100644 --- a/clients/ios/Classes/FeedChooserTitleView.m +++ b/clients/ios/Classes/FeedChooserTitleView.m @@ -8,6 +8,7 @@ #import "FeedChooserTitleView.h" #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @interface FeedChooserTitleView () diff --git a/clients/ios/Classes/FeedChooserViewController.h b/clients/ios/Classes/FeedChooserViewController.h index 7742e74ea2..6c94bf1a42 100644 --- a/clients/ios/Classes/FeedChooserViewController.h +++ b/clients/ios/Classes/FeedChooserViewController.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" typedef NS_ENUM(NSUInteger, FeedChooserOperation) { diff --git a/clients/ios/Classes/FeedDetailViewController.h b/clients/ios/Classes/FeedDetailObjCViewController.h similarity index 97% rename from clients/ios/Classes/FeedDetailViewController.h rename to clients/ios/Classes/FeedDetailObjCViewController.h index 2029983070..1568893e47 100644 --- a/clients/ios/Classes/FeedDetailViewController.h +++ b/clients/ios/Classes/FeedDetailObjCViewController.h @@ -1,5 +1,5 @@ // -// FeedDetailViewController.h +// FeedDetailObjCViewController.h // NewsBlur // // Created by Samuel Clay on 6/20/10. @@ -17,7 +17,7 @@ @class NewsBlurAppDelegate; @class MCSwipeTableViewCell; -@interface FeedDetailViewController : BaseViewController +@interface FeedDetailObjCViewController : BaseViewController -#import "FeedDetailViewController.h" +#import "FeedDetailObjCViewController.h" #import "NewsBlurAppDelegate.h" #import "NBContainerViewController.h" -#import "NewsBlurViewController.h" #import "FeedDetailTableCell.h" #import "UserProfileViewController.h" -#import "StoryDetailViewController.h" -#import "StoryPageControl.h" #import "NSString+HTML.h" #import "MBProgressHUD.h" #import "SBJson4.h" @@ -35,12 +32,13 @@ #import "UISearchBar+Field.h" #import "MenuViewController.h" #import "StoryTitleAttributedString.h" +#import "NewsBlur-Swift.h" #define kTableViewRowHeight 46; #define kTableViewRiverRowHeight 68; #define kTableViewShortRowDifference 17; -@interface FeedDetailViewController () +@interface FeedDetailObjCViewController () @property (nonatomic) NSUInteger scrollingMarkReadRow; @property (nonatomic, readonly) BOOL isMarkReadOnScroll; @@ -51,7 +49,7 @@ @interface FeedDetailViewController () @end -@implementation FeedDetailViewController +@implementation FeedDetailObjCViewController @synthesize storyTitlesTable, feedMarkReadButton; @synthesize settingsBarButton; @@ -607,7 +605,7 @@ - (void)finishedLoadingFeedsNotification:(NSNotification *)notification { folder = [NSString stringWithFormat:@"%@", @(index)]; } - [appDelegate loadRiverFeedDetailView:self withFolder:folder]; + [appDelegate loadRiverFeedDetailView:(FeedDetailViewController *)self withFolder:folder]; [self viewWillAppear:NO]; } diff --git a/clients/ios/Classes/FeedDetailTableCell.m b/clients/ios/Classes/FeedDetailTableCell.m index aceafe4ff8..209ad0923e 100644 --- a/clients/ios/Classes/FeedDetailTableCell.m +++ b/clients/ios/Classes/FeedDetailTableCell.m @@ -7,7 +7,6 @@ // #import "NewsBlurAppDelegate.h" -#import "FeedDetailViewController.h" #import "FeedDetailTableCell.h" #import "DashboardViewController.h" #import "ABTableViewCell.h" @@ -16,6 +15,7 @@ #import "Utilities.h" #import "MCSwipeTableViewCell.h" #import "PINCache.h" +#import "NewsBlur-Swift.h" static UIFont *textFont = nil; static UIFont *indicatorFont = nil; diff --git a/clients/ios/Classes/FeedDetailViewController.swift b/clients/ios/Classes/FeedDetailViewController.swift new file mode 100644 index 0000000000..21ddc6a254 --- /dev/null +++ b/clients/ios/Classes/FeedDetailViewController.swift @@ -0,0 +1,14 @@ +// +// FeedDetailViewController.swift +// NewsBlur +// +// Created by David Sinclair on 2020-08-27. +// Copyright © 2020 NewsBlur. All rights reserved. +// + +import UIKit + +/// List of stories for a feed. +class FeedDetailViewController: FeedDetailObjCViewController { + +} diff --git a/clients/ios/Classes/FeedTableCell.m b/clients/ios/Classes/FeedTableCell.m index 81db317301..7dc8e5437d 100644 --- a/clients/ios/Classes/FeedTableCell.m +++ b/clients/ios/Classes/FeedTableCell.m @@ -11,6 +11,7 @@ #import "UnreadCountView.h" #import "ABTableViewCell.h" #import "MCSwipeTableViewCell.h" +#import "NewsBlur-Swift.h" static UIFont *textFont = nil; @@ -103,7 +104,7 @@ - (void)setupGestures { iconName = @"train.png"; } - [self setDelegate:(NewsBlurViewController *)appDelegate.feedsViewController]; + [self setDelegate:(FeedsViewController *)appDelegate.feedsViewController]; [self setFirstStateIconName:(iconName) firstColor:UIColorFromRGB(0xA4D97B) secondStateIconName:nil diff --git a/clients/ios/Classes/FeedsMenuViewController.m b/clients/ios/Classes/FeedsMenuViewController.m index a267189a31..37a6e3785a 100644 --- a/clients/ios/Classes/FeedsMenuViewController.m +++ b/clients/ios/Classes/FeedsMenuViewController.m @@ -10,8 +10,8 @@ #import "NewsBlurAppDelegate.h" #import "MBProgressHUD.h" #import "NBContainerViewController.h" -#import "NewsBlurViewController.h" #import "MenuTableViewCell.h" +#import "NewsBlur-Swift.h" @implementation FeedsMenuViewController @@ -70,15 +70,6 @@ - (void)rebuildOptions { [self.menuTableView reloadData]; } -- (void)viewDidUnload -{ - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; - self.menuOptions = nil; - self.menuTableView = nil; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -118,9 +109,9 @@ - (void)viewWillAppear:(BOOL)animated { } } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return YES; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// return YES; +//} // allow keyboard comands - (BOOL)canBecomeFirstResponder { diff --git a/clients/ios/Classes/NewsBlurViewController.h b/clients/ios/Classes/FeedsObjCViewController.h similarity index 98% rename from clients/ios/Classes/NewsBlurViewController.h rename to clients/ios/Classes/FeedsObjCViewController.h index a077d8c314..ee2c1cf8ec 100644 --- a/clients/ios/Classes/NewsBlurViewController.h +++ b/clients/ios/Classes/FeedsObjCViewController.h @@ -1,5 +1,5 @@ // -// NewsBlurViewController.h +// FeedsObjCViewController.h // NewsBlur // // Created by Samuel Clay on 6/16/10. @@ -25,7 +25,7 @@ static enum { @class NewsBlurAppDelegate; -@interface NewsBlurViewController : BaseViewController +@interface FeedsObjCViewController : BaseViewController *NewsBlurTopSectionNames; -@interface NewsBlurViewController () +@interface FeedsObjCViewController () @property (nonatomic, strong) NSMutableDictionary *updatedDictSocialFeeds_; @property (nonatomic, strong) NSMutableDictionary *updatedDictFeeds_; @@ -55,7 +52,7 @@ @interface NewsBlurViewController () @end -@implementation NewsBlurViewController +@implementation FeedsObjCViewController @synthesize appDelegate; @synthesize feedTitlesTable; diff --git a/clients/ios/Classes/FeedsViewController.swift b/clients/ios/Classes/FeedsViewController.swift new file mode 100644 index 0000000000..8755a576fc --- /dev/null +++ b/clients/ios/Classes/FeedsViewController.swift @@ -0,0 +1,14 @@ +// +// FeedsViewController.swift +// NewsBlur +// +// Created by David Sinclair on 2020-08-27. +// Copyright © 2020 NewsBlur. All rights reserved. +// + +import UIKit + +///Sidebar listing all of the feeds. +class FeedsViewController: FeedsObjCViewController { + +} diff --git a/clients/ios/Classes/FirstTimeUserAddFriendsViewController.h b/clients/ios/Classes/FirstTimeUserAddFriendsViewController.h index b85ba796fa..af9a037262 100644 --- a/clients/ios/Classes/FirstTimeUserAddFriendsViewController.h +++ b/clients/ios/Classes/FirstTimeUserAddFriendsViewController.h @@ -9,6 +9,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @interface FirstTimeUserAddFriendsViewController : BaseViewController { NewsBlurAppDelegate *appDelegate; diff --git a/clients/ios/Classes/FirstTimeUserAddFriendsViewController.m b/clients/ios/Classes/FirstTimeUserAddFriendsViewController.m index eed9fca81a..89f1ced252 100644 --- a/clients/ios/Classes/FirstTimeUserAddFriendsViewController.m +++ b/clients/ios/Classes/FirstTimeUserAddFriendsViewController.m @@ -45,33 +45,22 @@ - (void)viewDidLoad { self.navigationItem.title = @"Friends"; } -- (void)viewDidUnload { - [self setNextButton:nil]; - [self setFacebookButton:nil]; - [self setTwitterButton:nil]; - [self setFacebookActivityIndicator:nil]; - [self setTwitterActivityIndicator:nil]; - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; // [self selectTwitterButton]; [self.navigationItem.rightBarButtonItem setStyle:UIBarButtonItemStyleDone]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { - return YES; - } - - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { +// return YES; +// } +// +// return NO; +//} - (IBAction)tapNextButton { [appDelegate.ftuxNavigationController pushViewController:appDelegate.firstTimeUserAddNewsBlurViewController animated:YES]; diff --git a/clients/ios/Classes/FirstTimeUserAddNewsBlurViewController.m b/clients/ios/Classes/FirstTimeUserAddNewsBlurViewController.m index d3fd8b1a51..6ce1ef45e8 100644 --- a/clients/ios/Classes/FirstTimeUserAddNewsBlurViewController.m +++ b/clients/ios/Classes/FirstTimeUserAddNewsBlurViewController.m @@ -7,7 +7,7 @@ // #import "FirstTimeUserAddNewsBlurViewController.h" -#import "NewsBlurViewController.h" +#import "NewsBlur-Swift.h" @implementation FirstTimeUserAddNewsBlurViewController @@ -36,15 +36,6 @@ - (void)viewDidLoad { self.navigationItem.title = @"All Done"; } -- (void)viewDidUnload -{ - [self setNextButton:nil]; - [self setInstructionsLabel:nil]; - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -58,16 +49,16 @@ - (void)viewDidAppear:(BOOL)animated { [self addPopular]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { - return YES; - } - - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { +// return YES; +// } +// +// return NO; +//} - (IBAction)tapNextButton { diff --git a/clients/ios/Classes/FirstTimeUserAddSitesViewController.m b/clients/ios/Classes/FirstTimeUserAddSitesViewController.m index 4b75f29602..e8a7ba59e1 100644 --- a/clients/ios/Classes/FirstTimeUserAddSitesViewController.m +++ b/clients/ios/Classes/FirstTimeUserAddSitesViewController.m @@ -10,8 +10,8 @@ #import "FirstTimeUserAddSitesViewController.h" #import "FirstTimeUserAddFriendsViewController.h" #import "AuthorizeServicesViewController.h" -#import "NewsBlurViewController.h" #import "SiteCell.h" +#import "NewsBlur-Swift.h" @interface FirstTimeUserAddSitesViewController() @@ -87,24 +87,15 @@ - (void)viewWillAppear:(BOOL)animated { NSLog(@"%f height", self.tableViewHeight); } -- (void)viewDidUnload { - [super viewDidUnload]; - [self setActivityIndicator:nil]; - [self setInstructionLabel:nil]; - [self setCategoriesTable:nil]; - [self setGoogleReaderButton:nil]; - [self setNextButton:nil]; -} - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { - return YES; - } - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { +// return YES; +// } +// return NO; +//} - (IBAction)tapNextButton { diff --git a/clients/ios/Classes/FirstTimeUserViewController.m b/clients/ios/Classes/FirstTimeUserViewController.m index fed67a69a6..0eba2d3936 100644 --- a/clients/ios/Classes/FirstTimeUserViewController.m +++ b/clients/ios/Classes/FirstTimeUserViewController.m @@ -66,17 +66,6 @@ - (void)viewDidLoad } -- (void)viewDidUnload -{ - [self setNextButton:nil]; - [self setLogo:nil]; - [self setHeader:nil]; - [self setFooter:nil]; - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -107,16 +96,16 @@ - (void)viewDidDisappear:(BOOL)animated { self.logo = nil; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { - return YES; - } - - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { +// return YES; +// } +// +// return NO; +//} - (IBAction)tapNextButton { diff --git a/clients/ios/Classes/FolderTitleView.m b/clients/ios/Classes/FolderTitleView.m index fcc5dc6170..ce4d026a06 100644 --- a/clients/ios/Classes/FolderTitleView.m +++ b/clients/ios/Classes/FolderTitleView.m @@ -8,9 +8,9 @@ #import #import "NewsBlurAppDelegate.h" -#import "NewsBlurViewController.h" #import "FolderTitleView.h" #import "UnreadCountView.h" +#import "NewsBlur-Swift.h" @implementation FolderTitleView diff --git a/clients/ios/Classes/FontListViewController.m b/clients/ios/Classes/FontListViewController.m index 67046c4bfa..035a071f55 100644 --- a/clients/ios/Classes/FontListViewController.m +++ b/clients/ios/Classes/FontListViewController.m @@ -9,7 +9,7 @@ #import "FontListViewController.h" #import "MenuTableViewCell.h" #import "NewsBlurAppDelegate.h" -#import "StoryPageControl.h" +#import "NewsBlur-Swift.h" @interface FontListViewController () diff --git a/clients/ios/Classes/FontSettingsViewController.m b/clients/ios/Classes/FontSettingsViewController.m index 9eff986b69..6c808243fd 100644 --- a/clients/ios/Classes/FontSettingsViewController.m +++ b/clients/ios/Classes/FontSettingsViewController.m @@ -8,14 +8,12 @@ #import "FontSettingsViewController.h" #import "NewsBlurAppDelegate.h" -#import "StoryDetailViewController.h" -#import "StoryPageControl.h" -#import "FeedDetailViewController.h" #import "MenuTableViewCell.h" #import "NBContainerViewController.h" #import "StoriesCollection.h" #import "FontListViewController.h" #import "MenuViewController.h" +#import "NewsBlur-Swift.h" @interface FontSettingsViewController () @@ -139,9 +137,9 @@ - (void)viewWillAppear:(BOOL)animated { } } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return YES; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// return YES; +//} // allow keyboard comands - (BOOL)canBecomeFirstResponder { diff --git a/clients/ios/Classes/FriendsListViewController.h b/clients/ios/Classes/FriendsListViewController.h index 00654d71de..1c335e7100 100644 --- a/clients/ios/Classes/FriendsListViewController.h +++ b/clients/ios/Classes/FriendsListViewController.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @class NewsBlurAppDelegate; diff --git a/clients/ios/Classes/FriendsListViewController.m b/clients/ios/Classes/FriendsListViewController.m index efcb447222..f620b9dbaf 100644 --- a/clients/ios/Classes/FriendsListViewController.m +++ b/clients/ios/Classes/FriendsListViewController.m @@ -59,15 +59,6 @@ - (void)viewDidLoad self.preferredContentSize = self.view.frame.size; } -- (void)viewDidUnload -{ - [self setFriendSearchBar:nil]; - [self setSuggestedUserProfiles:nil]; - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -77,13 +68,13 @@ - (void)viewWillAppear:(BOOL)animated { [self.friendSearchBar becomeFirstResponder]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return YES; -} - -- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { - [self.friendsTable reloadData]; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// return YES; +//} +// +//- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { +// [self.friendsTable reloadData]; +//} - (void)doCancelButton { [appDelegate.modalNavigationController dismissViewControllerAnimated:YES completion:nil]; diff --git a/clients/ios/Classes/InteractionsModule.h b/clients/ios/Classes/InteractionsModule.h index ec1c09b9aa..41c52c0011 100644 --- a/clients/ios/Classes/InteractionsModule.h +++ b/clients/ios/Classes/InteractionsModule.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @class NewsBlurAppDelegate; diff --git a/clients/ios/Classes/LoginViewController.h b/clients/ios/Classes/LoginViewController.h index c6aa3150a9..3094f7563d 100644 --- a/clients/ios/Classes/LoginViewController.h +++ b/clients/ios/Classes/LoginViewController.h @@ -7,7 +7,7 @@ // #import -#import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" #define LANDSCAPE_MARGIN 128 diff --git a/clients/ios/Classes/LoginViewController.m b/clients/ios/Classes/LoginViewController.m index fbb2bad65d..3d4650c065 100644 --- a/clients/ios/Classes/LoginViewController.m +++ b/clients/ios/Classes/LoginViewController.m @@ -95,29 +95,19 @@ - (void)rearrangeViews { } } -- (void)viewDidUnload { - [self setSignUpView:nil]; - [self setLogInView:nil]; - [self setSignUpUsernameInput:nil]; - [self setSignUpPasswordInput:nil]; - [self setSelectSignUpButton:nil]; - [self setSelectLoginButton:nil]; - [super viewDidUnload]; -} - - (void)viewWillAppear:(BOOL)animated { [self showError:nil]; [super viewWillAppear:animated]; [usernameInput becomeFirstResponder]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } +// return NO; +//} - (void)viewDidAppear:(BOOL)animated { [MBProgressHUD hideHUDForView:self.view animated:YES]; @@ -131,9 +121,9 @@ - (void)didReceiveMemoryWarning { // Release any cached data, images, etc that aren't in use. } -- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { - [self rearrangeViews]; -} +//- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { +// [self rearrangeViews]; +//} - (void)showError:(NSString *)error { BOOL hasError = error.length > 0; diff --git a/clients/ios/Classes/MarkReadMenuViewController.m b/clients/ios/Classes/MarkReadMenuViewController.m index edad712090..6d594f139c 100644 --- a/clients/ios/Classes/MarkReadMenuViewController.m +++ b/clients/ios/Classes/MarkReadMenuViewController.m @@ -8,10 +8,9 @@ #import "MarkReadMenuViewController.h" #import "NewsBlurAppDelegate.h" -#import "NewsBlurViewController.h" -#import "FeedDetailViewController.h" #import "StoriesCollection.h" #import "MenuTableViewCell.h" +#import "NewsBlur-Swift.h" NSString * const MarkReadMenuTitle = @"title"; NSString * const MarkReadMenuIcon = @"icon"; diff --git a/clients/ios/Classes/MoveSiteViewController.m b/clients/ios/Classes/MoveSiteViewController.m index c7d8d26bed..d58eae6f56 100644 --- a/clients/ios/Classes/MoveSiteViewController.m +++ b/clients/ios/Classes/MoveSiteViewController.m @@ -57,16 +57,16 @@ - (void)viewDidLoad { [super viewDidLoad]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - return YES; - } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { - return YES; - } - - return NO; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// // Return YES for supported orientations +// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { +// return YES; +// } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) { +// return YES; +// } +// +// return NO; +//} - (void)viewWillAppear:(BOOL)animated { [self.errorLabel setHidden:YES]; diff --git a/clients/ios/Classes/NBContainerViewController.h b/clients/ios/Classes/NBContainerViewController.h index aa8b93748f..e611df5ea3 100644 --- a/clients/ios/Classes/NBContainerViewController.h +++ b/clients/ios/Classes/NBContainerViewController.h @@ -9,6 +9,7 @@ #import #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @class NewsBlurAppDelegate; diff --git a/clients/ios/Classes/NBContainerViewController.m b/clients/ios/Classes/NBContainerViewController.m index d7415fceac..a0a807fb60 100644 --- a/clients/ios/Classes/NBContainerViewController.m +++ b/clients/ios/Classes/NBContainerViewController.m @@ -7,11 +7,7 @@ // #import "NBContainerViewController.h" -#import "NewsBlurViewController.h" -#import "FeedDetailViewController.h" #import "DashboardViewController.h" -#import "StoryDetailViewController.h" -#import "StoryPageControl.h" #import "OriginalStoryViewController.h" #import "ShareViewController.h" #import "UserProfileViewController.h" @@ -26,6 +22,7 @@ #import "NotificationsViewController.h" #import "StoriesCollection.h" #import "UserTagsViewController.h" +#import "NewsBlur-Swift.h" #define NB_DEFAULT_MASTER_WIDTH 270 #define NB_DEFAULT_MASTER_WIDTH_LANDSCAPE 370 @@ -40,12 +37,12 @@ @interface NBContainerViewController () @property (nonatomic, strong) UINavigationController *storyNavigationController; @property (nonatomic, strong) UINavigationController *shareNavigationController; @property (nonatomic, strong) UINavigationController *originalNavigationController; -@property (nonatomic, strong) NewsBlurViewController *feedsViewController; +@property (nonatomic, strong) FeedsViewController *feedsViewController; @property (nonatomic, strong) FeedDetailViewController *feedDetailViewController; @property (nonatomic, strong) DashboardViewController *dashboardViewController; @property (nonatomic, strong) StoryDetailViewController *storyDetailViewController; @property (nonatomic, strong) OriginalStoryViewController *originalViewController; -@property (nonatomic, strong) StoryPageControl *storyPageControl; +@property (nonatomic, strong) StoryPageDelegate *storyPageControl; @property (nonatomic, strong) ShareViewController *shareViewController; @property (nonatomic, strong) UIView *storyTitlesStub; @property (readwrite) BOOL storyTitlesOnLeft; @@ -179,11 +176,6 @@ - (void)viewWillAppear:(BOOL)animated { [self layoutDashboardScreen]; } -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. -} - - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; } diff --git a/clients/ios/Classes/NewsBlurAppDelegate.h b/clients/ios/Classes/NewsBlurAppDelegate.h index a3062a2692..c69c24a70c 100644 --- a/clients/ios/Classes/NewsBlurAppDelegate.h +++ b/clients/ios/Classes/NewsBlurAppDelegate.h @@ -21,7 +21,7 @@ #define STORY_TITLES_HEIGHT 240 #define DASHBOARD_TITLE @"NewsBlur" -@class NewsBlurViewController; +@class FeedsViewController; @class DashboardViewController; @class FeedsMenuViewController; @class FeedDetailViewController; @@ -33,7 +33,7 @@ @class FriendsListViewController; @class FontSettingsViewController; @class StoryDetailViewController; -@class StoryPageControl; +@class StoryPageDelegate; @class ShareViewController; @class LoginViewController; @class AddSiteViewController; @@ -74,14 +74,14 @@ SFSafariViewControllerDelegate> { FirstTimeUserAddNewsBlurViewController *firstTimeUserAddNewsBlurViewController; DashboardViewController *dashboardViewController; - NewsBlurViewController *feedsViewController; + FeedsViewController *feedsViewController; FeedsMenuViewController *feedsMenuViewController; FeedDetailViewController *feedDetailViewController; FriendsListViewController *friendsListViewController; FontSettingsViewController *fontSettingsViewController; StoryDetailViewController *storyDetailViewController; - StoryPageControl *storyPageControl; + StoryPageDelegate *storyPageControl; ShareViewController *shareViewController; LoginViewController *loginViewController; AddSiteViewController *addSiteViewController; @@ -171,13 +171,13 @@ SFSafariViewControllerDelegate> { @property (nonatomic) UINavigationController *originalStoryViewNavController; @property (nonatomic) IBOutlet NBContainerViewController *masterContainerViewController; @property (nonatomic) IBOutlet DashboardViewController *dashboardViewController; -@property (nonatomic) IBOutlet NewsBlurViewController *feedsViewController; +@property (nonatomic) IBOutlet FeedsViewController *feedsViewController; @property (nonatomic) IBOutlet FeedsMenuViewController *feedsMenuViewController; @property (nonatomic) IBOutlet FeedDetailViewController *feedDetailViewController; @property (nonatomic, strong) UINavigationController *feedDetailMenuNavigationController; @property (nonatomic) IBOutlet FriendsListViewController *friendsListViewController; @property (nonatomic) IBOutlet StoryDetailViewController *storyDetailViewController; -@property (nonatomic) IBOutlet StoryPageControl *storyPageControl; +@property (nonatomic) IBOutlet StoryPageDelegate *storyPageControl; @property (nonatomic) IBOutlet LoginViewController *loginViewController; @property (nonatomic, strong) UINavigationController *addSiteNavigationController; @property (nonatomic) IBOutlet AddSiteViewController *addSiteViewController; @@ -285,7 +285,8 @@ SFSafariViewControllerDelegate> { @property (nonatomic, strong) void (^backgroundCompletionHandler)(UIBackgroundFetchResult); -+ (NewsBlurAppDelegate*) sharedAppDelegate; ++ (instancetype)sharedAppDelegate; + - (void)registerDefaultsFromSettingsBundle; - (void)finishBackground; diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m index 9c4322c15f..014746d38a 100644 --- a/clients/ios/Classes/NewsBlurAppDelegate.m +++ b/clients/ios/Classes/NewsBlurAppDelegate.m @@ -6,14 +6,10 @@ // #import "NewsBlurAppDelegate.h" -#import "NewsBlurViewController.h" #import "NBContainerViewController.h" -#import "FeedDetailViewController.h" #import "DashboardViewController.h" #import "MarkReadMenuViewController.h" #import "FeedsMenuViewController.h" -#import "StoryDetailViewController.h" -#import "StoryPageControl.h" #import "FirstTimeUserViewController.h" #import "FriendsListViewController.h" #import "LoginViewController.h" @@ -64,6 +60,7 @@ #import "UISearchBar+Field.h" #import "UIViewController+HidePopover.h" #import "PINCache.h" +#import "NewsBlur-Swift.h" #import #import #import @@ -194,11 +191,15 @@ @implementation NewsBlurAppDelegate @synthesize totalUncachedImagesCount; @synthesize remainingUncachedImagesCount; -+ (NewsBlurAppDelegate*) sharedAppDelegate { - return (NewsBlurAppDelegate*) [UIApplication sharedApplication].delegate; ++ (instancetype)sharedAppDelegate { + return (NewsBlurAppDelegate *)[UIApplication sharedApplication].delegate; } - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + #warning CATALYST hack + return YES; + + [self registerDefaultsFromSettingsBundle]; self.navigationController.delegate = self; @@ -338,7 +339,7 @@ - (UIViewController *)application:(UIApplication *)application viewControllerWit return self.feedsViewController; } else if ([identifier isEqualToString:@"FeedDetailView"]) { return self.feedDetailViewController; - } else if ([identifier isEqualToString:@"StoryPageControl"]) { + } else if ([identifier isEqualToString:@"StoryPageDelegate"]) { return self.storyPageControl; } else if ([identifier isEqualToString:@"ContainerView"]) { return self.masterContainerViewController; diff --git a/clients/ios/Classes/NotificationsViewController.h b/clients/ios/Classes/NotificationsViewController.h index 569ff2d291..4a33d991cf 100644 --- a/clients/ios/Classes/NotificationsViewController.h +++ b/clients/ios/Classes/NotificationsViewController.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @class NewsBlurAppDelegate; diff --git a/clients/ios/Classes/PremiumViewController.h b/clients/ios/Classes/PremiumViewController.h index 94f3be48fc..c68c17885a 100644 --- a/clients/ios/Classes/PremiumViewController.h +++ b/clients/ios/Classes/PremiumViewController.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @class SAConfettiView; diff --git a/clients/ios/Classes/ProfileBadge.m b/clients/ios/Classes/ProfileBadge.m index 37c4cf3504..e5550ba606 100644 --- a/clients/ios/Classes/ProfileBadge.m +++ b/clients/ios/Classes/ProfileBadge.m @@ -11,6 +11,7 @@ #import "Utilities.h" #import "UIImageView+AFNetworking.h" #import +#import "NewsBlur-Swift.h" #define kTopBadgeHeight 125 #define kTopBadgeTextXCoordinate 100 diff --git a/clients/ios/Classes/ShareViewController.h b/clients/ios/Classes/ShareViewController.h index b8ca018cfd..38df0a61a0 100644 --- a/clients/ios/Classes/ShareViewController.h +++ b/clients/ios/Classes/ShareViewController.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @interface ShareViewController : BaseViewController { NSString *activeReplyId; diff --git a/clients/ios/Classes/ShareViewController.m b/clients/ios/Classes/ShareViewController.m index 2274bb419d..295b6c69e1 100644 --- a/clients/ios/Classes/ShareViewController.m +++ b/clients/ios/Classes/ShareViewController.m @@ -8,14 +8,12 @@ #import "ShareViewController.h" #import "NewsBlurAppDelegate.h" -#import "StoryDetailViewController.h" -#import "FeedDetailViewController.h" -#import "StoryPageControl.h" #import #import "Utilities.h" #import "DataUtilities.h" #import "StoriesCollection.h" #import "NSString+HTML.h" +#import "NewsBlur-Swift.h" @implementation ShareViewController @@ -83,16 +81,6 @@ - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (void)viewDidUnload { - [self setCommentField:nil]; - [self setFacebookButton:nil]; - [self setTwitterButton:nil]; - [self setSubmitButton:nil]; - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - (bool)isHardwareKeyboardUsed:(NSNotification*)keyboardNotification { NSDictionary* info = [keyboardNotification userInfo]; CGRect keyboardEndFrame; @@ -139,13 +127,13 @@ - (void)keyboardWillBeHidden:(NSNotification*)aNotification }]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return YES; -} - -- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { - [self adjustCommentField:CGSizeZero]; -} +//- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +// return YES; +//} +// +//- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { +// [self adjustCommentField:CGSizeZero]; +//} - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; diff --git a/clients/ios/Classes/SiteCell.h b/clients/ios/Classes/SiteCell.h index eefbe98ff8..88508b45e3 100644 --- a/clients/ios/Classes/SiteCell.h +++ b/clients/ios/Classes/SiteCell.h @@ -8,6 +8,7 @@ #import #import "NewsBlurAppDelegate.h" #import "ABTableViewCell.h" +#import "NewsBlur-Swift.h" @interface SiteCell : ABTableViewCell { NewsBlurAppDelegate *appDelegate; @@ -31,4 +32,4 @@ - (UIImage *)imageByApplyingAlpha:(UIImage *)image withAlpha:(CGFloat) alpha; -@end \ No newline at end of file +@end diff --git a/clients/ios/Classes/SiteCell.m b/clients/ios/Classes/SiteCell.m index 1d837d4a74..f3714d0abb 100644 --- a/clients/ios/Classes/SiteCell.m +++ b/clients/ios/Classes/SiteCell.m @@ -11,6 +11,7 @@ #import "ABTableViewCell.h" #import "UIView+TKCategory.h" #import "Utilities.h" +#import "NewsBlur-Swift.h" static UIFont *textFont = nil; static UIFont *indicatorFont = nil; diff --git a/clients/ios/Classes/SplitViewController.swift b/clients/ios/Classes/SplitViewController.swift new file mode 100644 index 0000000000..3819c15f17 --- /dev/null +++ b/clients/ios/Classes/SplitViewController.swift @@ -0,0 +1,14 @@ +// +// SplitViewController.swift +// NewsBlur +// +// Created by David Sinclair on 2020-08-27. +// Copyright © 2020 NewsBlur. All rights reserved. +// + +import UIKit + +/// Subclass of `UISplitViewController` to enable customizations. +class SplitViewController: UISplitViewController { + +} diff --git a/clients/ios/Classes/SplitViewDelegate.swift b/clients/ios/Classes/SplitViewDelegate.swift new file mode 100644 index 0000000000..f27d02fbfc --- /dev/null +++ b/clients/ios/Classes/SplitViewDelegate.swift @@ -0,0 +1,15 @@ +// +// SplitViewDelegate.swift +// NewsBlur +// +// Created by David Sinclair on 2020-08-27. +// Copyright © 2020 NewsBlur. All rights reserved. +// + +import UIKit + +/// Split view delegate. +class SplitViewDelegate: NSObject, UISplitViewControllerDelegate { + + +} diff --git a/clients/ios/Classes/StoriesCollection.h b/clients/ios/Classes/StoriesCollection.h index cebce3620e..034311a2ba 100644 --- a/clients/ios/Classes/StoriesCollection.h +++ b/clients/ios/Classes/StoriesCollection.h @@ -7,6 +7,7 @@ // #import "NewsBlurAppDelegate.h" +#import "NewsBlur-Swift.h" @interface StoriesCollection : NSObject { NSDictionary * activeFeed; diff --git a/clients/ios/Classes/StoryDetailViewController.h b/clients/ios/Classes/StoryDetailObjCViewController.h similarity index 96% rename from clients/ios/Classes/StoryDetailViewController.h rename to clients/ios/Classes/StoryDetailObjCViewController.h index e59ecafbcc..5a8eac791c 100644 --- a/clients/ios/Classes/StoryDetailViewController.h +++ b/clients/ios/Classes/StoryDetailObjCViewController.h @@ -1,5 +1,5 @@ // -// StoryDetailViewController.h +// StoryDetailObjCViewController.h // NewsBlur // // Created by Samuel Clay on 6/24/10. @@ -13,7 +13,7 @@ @class NewsBlurAppDelegate; -@interface StoryDetailViewController : BaseViewController +@interface StoryDetailObjCViewController : BaseViewController { NewsBlurAppDelegate *appDelegate; diff --git a/clients/ios/Classes/StoryDetailViewController.m b/clients/ios/Classes/StoryDetailObjCViewController.m similarity index 99% rename from clients/ios/Classes/StoryDetailViewController.m rename to clients/ios/Classes/StoryDetailObjCViewController.m index 2a62bda138..7e0e22e457 100644 --- a/clients/ios/Classes/StoryDetailViewController.m +++ b/clients/ios/Classes/StoryDetailObjCViewController.m @@ -1,5 +1,5 @@ // -// StoryDetailViewController.m +// StoryDetailObjCViewController.m // NewsBlur // // Created by Samuel Clay on 6/24/10. @@ -8,14 +8,11 @@ #import #import -#import "StoryDetailViewController.h" +#import "StoryDetailObjCViewController.h" #import "NewsBlurAppDelegate.h" -#import "NewsBlurViewController.h" -#import "FeedDetailViewController.h" #import "FontSettingsViewController.h" #import "UserProfileViewController.h" #import "ShareViewController.h" -#import "StoryPageControl.h" #import "Utilities.h" #import "NSString+HTML.h" #import "NBContainerViewController.h" @@ -26,17 +23,18 @@ #import "StoriesCollection.h" #import "UIView+ViewController.h" #import "JNWThrottledBlock.h" +#import "NewsBlur-Swift.h" #define iPadPro12 ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad && ([UIScreen mainScreen].bounds.size.height == 1366 || [UIScreen mainScreen].bounds.size.width == 1366)) #define iPadPro10 ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad && ([UIScreen mainScreen].bounds.size.height == 1112 || [UIScreen mainScreen].bounds.size.width == 1112)) -@interface StoryDetailViewController () +@interface StoryDetailObjCViewController () @property (nonatomic, strong) NSString *fullStoryHTML; @end -@implementation StoryDetailViewController +@implementation StoryDetailObjCViewController @synthesize appDelegate; @synthesize activeStoryId; @@ -287,12 +285,6 @@ - (void)deferredEnableScrolling { self.webView.scrollView.scrollEnabled = YES; } -- (void)viewDidUnload { - [self setInnerView:nil]; - - [super viewDidUnload]; -} - - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; @@ -617,7 +609,7 @@ - (void)drawStory:(BOOL)force withOrientation:(UIInterfaceOrientation)orientatio dispatch_async(dispatch_get_main_queue(), ^{ // NSLog(@"Drawing Story: %@", [self.activeStory objectForKey:@"story_title"]); [self loadHTMLString:htmlTopAndBottom]; - [self.appDelegate.storyPageControl setTextButton:self]; + [self.appDelegate.storyPageControl setTextButton:(StoryDetailViewController *)self]; }); dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ @@ -2500,7 +2492,7 @@ - (void)toggleTextView:(id)sender { - (void)showStoryView { self.inTextView = NO; [MBProgressHUD hideHUDForView:self.webView animated:YES]; - [appDelegate.storyPageControl setTextButton:self]; + [appDelegate.storyPageControl setTextButton:(StoryDetailViewController *)self]; [self drawStory]; } @@ -2529,7 +2521,7 @@ - (void)failedFetchText { [self informError:@"Could not fetch text"]; } self.inTextView = NO; - [appDelegate.storyPageControl setTextButton:self]; + [appDelegate.storyPageControl setTextButton:(StoryDetailViewController *)self]; } - (void)finishFetchText:(NSString *)text storyId:(NSString *)storyId { @@ -2537,7 +2529,7 @@ - (void)finishFetchText:(NSString *)text storyId:(NSString *)storyId { [self.appDelegate.storyPageControl hideNotifier]; [MBProgressHUD hideHUDForView:self.webView animated:YES]; self.inTextView = NO; - [appDelegate.storyPageControl setTextButton:self]; + [appDelegate.storyPageControl setTextButton:(StoryDetailViewController *)self]; return; } @@ -2588,7 +2580,7 @@ - (void)failedFetchStoryChanges:(NSError *)error { [self informError:@"Could not fetch changes"]; } self.inTextView = NO; - [appDelegate.storyPageControl setTextButton:self]; + [appDelegate.storyPageControl setTextButton:(StoryDetailViewController *)self]; } - (void)finishFetchStoryChanges:(NSDictionary *)results storyId:(NSString *)storyId { @@ -2601,7 +2593,7 @@ - (void)finishFetchStoryChanges:(NSDictionary *)results storyId:(NSString *)stor [self.appDelegate.storyPageControl hideNotifier]; [MBProgressHUD hideHUDForView:self.webView animated:YES]; self.inTextView = NO; - [appDelegate.storyPageControl setTextButton:self]; + [appDelegate.storyPageControl setTextButton:(StoryDetailViewController *)self]; return; } diff --git a/clients/ios/Classes/StoryDetailViewController.swift b/clients/ios/Classes/StoryDetailViewController.swift new file mode 100644 index 0000000000..e2fc6aade9 --- /dev/null +++ b/clients/ios/Classes/StoryDetailViewController.swift @@ -0,0 +1,14 @@ +// +// StoryDetailViewController.swift +// NewsBlur +// +// Created by David Sinclair on 2020-08-27. +// Copyright © 2020 NewsBlur. All rights reserved. +// + +import UIKit + +/// An individual story. +class StoryDetailViewController: StoryDetailObjCViewController { + +} diff --git a/clients/ios/Classes/StoryPageControl.xib b/clients/ios/Classes/StoryPageControl.xib index c1c0bed2a9..2b94a40a19 100644 --- a/clients/ios/Classes/StoryPageControl.xib +++ b/clients/ios/Classes/StoryPageControl.xib @@ -1,14 +1,12 @@ - - + - - + - + @@ -48,7 +46,7 @@ - + @@ -191,7 +189,7 @@ - + @@ -220,7 +218,7 @@