Tusker.xcodeproj/project.pbxproj

@@ -169,7 +169,6 @@
 		D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB0232C61BC002CA326 /* NotificationsPageViewController.swift */; };
 		D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */; };
 		D6BC9DB5232D4CE3002CA326 /* NotificationsMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB4232D4CE3002CA326 /* NotificationsMode.swift */; };
-		D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */; };
 		D6BED170212663DA00F02DA0 /* SwiftSoup.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D6BED174212667E900F02DA0 /* StatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BED173212667E900F02DA0 /* StatusTableViewCell.swift */; };
 		D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */; };
@@ -419,7 +418,6 @@
 		D6BC9DB0232C61BC002CA326 /* NotificationsPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsPageViewController.swift; sourceTree = "<group>"; };
 		D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellnessPrefsView.swift; sourceTree = "<group>"; };
 		D6BC9DB4232D4CE3002CA326 /* NotificationsMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsMode.swift; sourceTree = "<group>"; };
-		D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelinesPageViewController.swift; sourceTree = "<group>"; };
 		D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwiftSoup.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6BED173212667E900F02DA0 /* StatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusTableViewCell.swift; sourceTree = "<group>"; };
 		D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerNavigationDelegate.swift; sourceTree = "<group>"; };
@@ -704,7 +702,6 @@
 		D641C781213DD7DD004B4513 /* Timeline */ = {
 			isa = PBXGroup;
 			children = (
-				D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */,
 				D6F953EB212519E700CF0F2B /* TimelineTableViewController.swift */,
 			);
 			path = Timeline;
@@ -1520,7 +1517,6 @@
 				0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */,
 				D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */,
 				D66362712136338600C9CBA2 /* ComposeViewController.swift in Sources */,
-				D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */,
 				D6028B9B2150811100F223B9 /* MastodonCache.swift in Sources */,
 				D6A3BC802321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift in Sources */,
 				D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */,

Tusker/Screens/Main/MainTabBarViewController.swift

@@ -16,9 +16,10 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
         self.delegate = self
         
         viewControllers = [
-            embedInNavigationController(TimelinesPageViewController()),
+            embedInNavigationController(TimelineTableViewController(for: .home)),
             embedInNavigationController(NotificationsPageViewController()),
             ComposeViewController(),
+            embedInNavigationController(TimelineTableViewController(for: .public(local: false))),
             embedInNavigationController(MyProfileTableViewController()),
         ]
     }

Tusker/Screens/Timeline/TimelinesPageViewController.swift

@@ -1,45 +0,0 @@
-//
-//  TimelinesPageViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 9/14/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class TimelinesPageViewController: SegmentedPageViewController {
-
-    private let homeTitle = NSLocalizedString("Home", comment: "home timeline tab title")
-    private let federatedTitle = NSLocalizedString("Federated", comment: "federated timeline tab title")
-    private let localTitle = NSLocalizedString("Local", comment: "local timeline tab title")
-    
-    init() {
-        let home = TimelineTableViewController(for: .home)
-        home.title = homeTitle
-        
-        let federated = TimelineTableViewController(for: .public(local: false))
-        federated.title = federatedTitle
-        
-        let local = TimelineTableViewController(for: .public(local: true))
-        local.title = localTitle
-        
-        super.init(titles: [
-            homeTitle,
-            federatedTitle,
-            localTitle
-        ], pageControllers: [
-            home,
-            federated,
-            local
-        ])
-        
-        title = homeTitle
-        tabBarItem.image = UIImage(systemName: "house.fill")
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-}

Tusker/Screens/Utilities/SegmentedPageViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDelegate {
+class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate {
 
     let titles: [String]
     let pageControllers: [UIViewController]
@@ -23,6 +23,7 @@ class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDel
         
         super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, options: nil)
 
+        self.dataSource = self
         self.delegate = self
     }
     
@@ -53,7 +54,20 @@ class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDel
     @objc func segmentedControlChanged() {
         selectPage(at: segmentedControl.selectedSegmentIndex, animated: true)
     }
-
+    
+    // MARK: - Page View Controller Data Source
+    func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
+        guard let index = pageControllers.firstIndex(of: viewController),
+            index > 0 else { return nil }
+        return pageControllers[index - 1]
+    }
+    
+    func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
+        guard let index = pageControllers.firstIndex(of: viewController),
+            index < pageControllers.count - 1 else { return nil }
+        return pageControllers[index + 1]
+    }
+    
     // MARK: - Page View Controller Delegate
     func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
         currentIndex = pageControllers.firstIndex(of: viewControllers!.first!)!