Scroll to the current session instead of just scrolling to the top

Author: zats

trySwift.xcodeproj/project.pbxproj

@@ -27,8 +27,8 @@
 		499CCFF21CC2E0F4007A5BBB /* UIViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 499CCFF11CC2E0F4007A5BBB /* UIViewControllerExtension.swift */; };
 		49F7B2811E8475F900F09768 /* SplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49F7B2801E8475F900F09768 /* SplitViewController.swift */; };
 		4D498DB1B98D4B496FDBB7AA /* Pods_try__Extension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2E9D5733A6E1B6E10AFEEF /* Pods_try__Extension.framework */; };
-		5CDB20792048952A00C3E0D3 /* TwitterFollowDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDB20782048952A00C3E0D3 /* TwitterFollowDelegate.swift */; };
 		5C7F82DB2048B01D009193B4 /* RootTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7F82DA2048B01D009193B4 /* RootTabBarController.swift */; };
+		5CDB20792048952A00C3E0D3 /* TwitterFollowDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDB20782048952A00C3E0D3 /* TwitterFollowDelegate.swift */; };
 		7AD1E19C80B78BB08E3DF079 /* Pods_trySwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 620220ABCCCDF47FDAF48B67 /* Pods_trySwift.framework */; };
 		EAFE1C26E49EFABF83487BDC /* Pods_try__Today.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24718BF11477753FCD47A7A8 /* Pods_try__Today.framework */; };
 		FA0E2B4F1E63B90400B40814 /* SessionDetailInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0E2B4E1E63B90400B40814 /* SessionDetailInterfaceController.swift */; };
@@ -195,8 +195,8 @@
 		499CCFF11CC2E0F4007A5BBB /* UIViewControllerExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewControllerExtension.swift; sourceTree = "<group>"; };
 		49F7B2801E8475F900F09768 /* SplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplitViewController.swift; sourceTree = "<group>"; };
 		58F81AD508535BD405F98215 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-		5CDB20782048952A00C3E0D3 /* TwitterFollowDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterFollowDelegate.swift; sourceTree = "<group>"; };
 		5C7F82DA2048B01D009193B4 /* RootTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootTabBarController.swift; sourceTree = "<group>"; };
+		5CDB20782048952A00C3E0D3 /* TwitterFollowDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterFollowDelegate.swift; sourceTree = "<group>"; };
 		5FA07FBC036240AEF8B7C739 /* Pods-trySwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-trySwift.release.xcconfig"; path = "Pods/Target Support Files/Pods-trySwift/Pods-trySwift.release.xcconfig"; sourceTree = "<group>"; };
 		620220ABCCCDF47FDAF48B67 /* Pods_trySwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_trySwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6C1F9C27BCD8099DCA758F7A /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
@@ -385,20 +385,20 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		5CDB20772048951F00C3E0D3 /* Twitter */ = {
+		5C7F82D92048B00B009193B4 /* RootTabBar */ = {
 			isa = PBXGroup;
 			children = (
-				5CDB20782048952A00C3E0D3 /* TwitterFollowDelegate.swift */,
+				5C7F82DA2048B01D009193B4 /* RootTabBarController.swift */,
 			);
-			path = Twitter;
+			path = RootTabBar;
 			sourceTree = "<group>";
 		};
-		5C7F82D92048B00B009193B4 /* RootTabBar */ = {
+		5CDB20772048951F00C3E0D3 /* Twitter */ = {
 			isa = PBXGroup;
 			children = (
-				5C7F82DA2048B01D009193B4 /* RootTabBarController.swift */,
+				5CDB20782048952A00C3E0D3 /* TwitterFollowDelegate.swift */,
 			);
-			path = RootTabBar;
+			path = Twitter;
 			sourceTree = "<group>";
 		};
 		F413680C9BA29129B4319377 /* Pods */ = {

trySwift/RootTabBar/RootTabBarController.swift

@@ -15,18 +15,25 @@ class RootTabBarController: UITabBarController, UITabBarControllerDelegate {
   }
 
   func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
-    if let splitViewController = viewController as? UISplitViewController {
-      if let navigationController = splitViewController.viewControllers.last as? UINavigationController {
-        if navigationController.viewControllers.count > 1 {
-          navigationController.popViewController(animated: true)
+    guard
+      let splitViewController = viewController as? UISplitViewController,
+      let navigationController = splitViewController.viewControllers.last as? UINavigationController
+      else {
+        return
+    }
+
+    // if several view controllers are in the stack, pop to the root
+    if navigationController.viewControllers.count > 1 {
+      navigationController.popToRootViewController(animated: true)
+    } else {
+      // if there's at least one view controller in the stack (which there always should be)
+      if let firstController = navigationController.viewControllers.first {
+        // we either delegate to the controller since it knows better how to scroll to the top
+        if let scrollableToTop = firstController as? ScrollableToTop {
+          scrollableToTop.scrollAfterTabTap()
+        // or we find the topmost scroll view and scroll it to the top
         } else {
-          if let firstController = navigationController.viewControllers.first {
-            if let scrollableToTop = firstController as? ScrollableToTop {
-              scrollableToTop.scrollAfterTabTap()
-            } else {
-              firstController.view.findScrollSubview()?.setContentOffset(.zero, animated: true)
-            }
-          }
+          firstController.view.findScrollSubview()?.setContentOffset(.zero, animated: true)
         }
       }
     }

trySwift/ScheduleViewController.swift

@@ -30,8 +30,6 @@ class ScheduleViewController: ButtonBarPagerTabStripViewController {
         buttonBarView.backgroundColor = .white
         settings.style.selectedBarBackgroundColor = .white
         buttonBarView.selectedBar.backgroundColor = .trySwiftAccentColor()
-        
-        tabBarController?.delegate = self
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -83,19 +81,3 @@ private extension ScheduleViewController {
     }
 }
 
-extension ScheduleViewController: UITabBarControllerDelegate {
-    func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
-        guard
-            tabBarController.selectedViewController === viewController,
-            navigationController?.viewControllers.last === self
-            else { return true }
-
-        guard
-            let index = moveToCorrectDate(animated: true),
-            let controller = viewControllers[index] as? SessionsTableViewController
-            else { return true }
-        controller.scrollToCurrentSession(animated: true)
-
-        return true
-    }
-}