#817 (three column layout)

- Fixing warnings. - Adding Swift subclasses of ObjC ones.
samuelclay · Aug 28, 2020 · 5fe73d4 · 5fe73d4
1 parent 35cc288
commit 5fe73d4
Show file tree

Hide file tree

Showing 78 changed files with 592 additions and 384 deletions.
diff --git 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
@@ -13,6 +13,7 @@
 #import <QuartzCore/QuartzCore.h>
 #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
@@ -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
@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "NewsBlurAppDelegate.h"
+#import "NewsBlur-Swift.h"
 
 @class NewsBlurAppDelegate;
 

diff --git 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
@@ -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
@@ -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<UIViewControllerTransitionCoordinator>)coordinator {
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "NewsBlurAppDelegate.h"
+#import "NewsBlur-Swift.h"
 
 typedef NS_ENUM(NSUInteger, FeedChooserOperation)
 {

diff --git a/...ts/ios/Classes/FeedDetailViewController.h → ...os/Classes/FeedDetailObjCViewController.h b/...ts/ios/Classes/FeedDetailViewController.h → ...os/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
 <UITableViewDelegate, UITableViewDataSource,
  UIPopoverControllerDelegate,
  MCSwipeTableViewCellDelegate,

diff --git a/...ts/ios/Classes/FeedDetailViewController.m → ...os/Classes/FeedDetailObjCViewController.m b/...ts/ios/Classes/FeedDetailViewController.m → ...os/Classes/FeedDetailObjCViewController.m
@@ -1,20 +1,17 @@
 //
-//  FeedDetailViewController.m
+//  FeedDetailObjCViewController.m
 //  NewsBlur
 //
 //  Created by Samuel Clay on 6/20/10.
 //  Copyright 2010 NewsBlur. All rights reserved.
 //
 
 #import <QuartzCore/QuartzCore.h>
-#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
@@ -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
@@ -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
@@ -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 <MCSwipeTableViewCellDelegate> *)appDelegate.feedsViewController];
+    [self setDelegate:(FeedsViewController <MCSwipeTableViewCellDelegate> *)appDelegate.feedsViewController];
     [self setFirstStateIconName:(iconName)
                      firstColor:UIColorFromRGB(0xA4D97B)
             secondStateIconName:nil

diff --git 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 → ...nts/ios/Classes/FeedsObjCViewController.h b/clients/ios/Classes/NewsBlurViewController.h → ...nts/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
 <UITableViewDelegate, UITableViewDataSource,
 NSCacheDelegate,
 UIPopoverControllerDelegate,