Integrated preferences views with new title bar layout

Author: insidegui

WWDC.xcodeproj/project.pbxproj

@@ -217,7 +217,7 @@
 		F4FB069F2A2148EA00799F84 /* ExploreTabRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FB069E2A2148EA00799F84 /* ExploreTabRootView.swift */; };
 		F4FB06A12A21493B00799F84 /* PreviewSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FB06A02A21493B00799F84 /* PreviewSupport.swift */; };
 		F4FB06BF2A216C1F00799F84 /* RemoteGlyph.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FB06BE2A216C1F00799F84 /* RemoteGlyph.swift */; };
-		F4FB06C12A2178C000799F84 /* WWDCMainWindowContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FB06C02A2178C000799F84 /* WWDCMainWindowContentViewController.swift */; };
+		F4FB06C12A2178C000799F84 /* WWDCWindowContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FB06C02A2178C000799F84 /* WWDCWindowContentViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -528,7 +528,7 @@
 		F4FB069E2A2148EA00799F84 /* ExploreTabRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExploreTabRootView.swift; sourceTree = "<group>"; };
 		F4FB06A02A21493B00799F84 /* PreviewSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewSupport.swift; sourceTree = "<group>"; };
 		F4FB06BE2A216C1F00799F84 /* RemoteGlyph.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteGlyph.swift; sourceTree = "<group>"; };
-		F4FB06C02A2178C000799F84 /* WWDCMainWindowContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCMainWindowContentViewController.swift; sourceTree = "<group>"; };
+		F4FB06C02A2178C000799F84 /* WWDCWindowContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCWindowContentViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -993,7 +993,7 @@
 				DD7F385E1EABD631002D8C00 /* WWDCTabViewController.swift */,
 				4DA25DCB21064B4800762BBD /* WWDCTabViewControllerTabBar.swift */,
 				4DA25DC721063CD500762BBD /* TitleBarViewController.swift */,
-				F4FB06C02A2178C000799F84 /* WWDCMainWindowContentViewController.swift */,
+				F4FB06C02A2178C000799F84 /* WWDCWindowContentViewController.swift */,
 			);
 			name = Base;
 			sourceTree = "<group>";
@@ -1634,7 +1634,7 @@
 				4DA25DC821063CD500762BBD /* TitleBarViewController.swift in Sources */,
 				4D5EB0F820598E6000D4BC52 /* SessionRowProvider.swift in Sources */,
 				DD7E28FF247FE69400A58370 /* ScheduleContainerViewController.swift in Sources */,
-				F4FB06C12A2178C000799F84 /* WWDCMainWindowContentViewController.swift in Sources */,
+				F4FB06C12A2178C000799F84 /* WWDCWindowContentViewController.swift in Sources */,
 				DDEDFCF11ED927A4002477C8 /* ToggleFilter.swift in Sources */,
 				DD7F38801EAC15B4002D8C00 /* RxNil.swift in Sources */,
 				DDFA10BF1EBEAAAD001DCF66 /* DownloadManager.swift in Sources */,

WWDC/GeneralPreferencesViewController.swift

@@ -19,7 +19,7 @@ extension NSStoryboard.SceneIdentifier {
     static let generalPreferencesViewController = NSStoryboard.SceneIdentifier("GeneralPreferencesViewController")
 }
 
-class GeneralPreferencesViewController: NSViewController {
+final class GeneralPreferencesViewController: WWDCWindowContentViewController {
 
     #if ICLOUD
     weak var userDataSyncEngine: UserDataSyncEngine? {
@@ -40,6 +40,8 @@ class GeneralPreferencesViewController: NSViewController {
         return vc
     }
 
+    @IBOutlet weak var downloadsStackView: NSStackView?
+
     @IBOutlet weak var searchInTranscriptsSwitch: NSSwitch!
     @IBOutlet weak var searchInBookmarksSwitch: NSSwitch!
     @IBOutlet weak var refreshPeriodicallySwitch: NSSwitch!
@@ -66,6 +68,8 @@ class GeneralPreferencesViewController: NSViewController {
     @IBOutlet weak var dividerC: NSBox!
     @IBOutlet weak var dividerE: NSBox!
     @IBOutlet weak var dividerF: NSBox!
+
+    override var viewForWindowTopSafeAreaConstraint: NSView? { downloadsStackView }
 
     override func viewDidLoad() {
         super.viewDidLoad()

WWDC/PlaybackPreferencesViewController.swift

@@ -12,17 +12,20 @@ extension NSStoryboard.SceneIdentifier {
     static let playbackPreferencesViewController = NSStoryboard.SceneIdentifier("PlaybackPreferencesViewController")
 }
 
-final class PlaybackPreferencesViewController: NSViewController {
+final class PlaybackPreferencesViewController: WWDCWindowContentViewController {
 
     static func loadFromStoryboard() -> PlaybackPreferencesViewController {
         // swiftlint:disable:next force_cast
         return NSStoryboard(name: .preferences, bundle: nil).instantiateController(withIdentifier: .playbackPreferencesViewController) as! PlaybackPreferencesViewController
     }
 
+    @IBOutlet weak var skipIntroStackView: NSStackView?
     @IBOutlet private var skipIntroSwitch: NSSwitch!
     @IBOutlet private var skipBackAndForwardBy30SecondsSwitch: NSSwitch!
     @IBOutlet weak var includeAppBannerInClipsSwitch: NSSwitch!
 
+    override var viewForWindowTopSafeAreaConstraint: NSView? { skipIntroSwitch }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 

WWDC/Preferences.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -255,7 +255,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ORc-5v-yfb">
-                                        <rect key="frame" x="344" y="1" width="18" height="19"/>
+                                        <rect key="frame" x="344" y="0.0" width="18" height="19"/>
                                         <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="WPm-F8-kUH">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="smallSystem"/>
@@ -377,7 +377,7 @@
                             <constraint firstAttribute="trailing" secondItem="OZk-0e-tyQ" secondAttribute="trailing" id="XjQ-NC-K2O"/>
                             <constraint firstItem="Yew-yF-ZWD" firstAttribute="trailing" secondItem="YmL-o7-wzA" secondAttribute="trailing" id="Y8B-RI-3h4"/>
                             <constraint firstItem="gSp-wk-rap" firstAttribute="top" secondItem="GJT-d9-qvO" secondAttribute="bottom" constant="19" id="YEj-fP-BPe"/>
-                            <constraint firstItem="jme-OU-7GG" firstAttribute="top" secondItem="scn-7e-mlv" secondAttribute="top" constant="29" id="YsL-oL-7FX"/>
+                            <constraint firstItem="jme-OU-7GG" firstAttribute="top" secondItem="scn-7e-mlv" secondAttribute="top" constant="29" placeholder="YES" id="YsL-oL-7FX"/>
                             <constraint firstItem="YmL-o7-wzA" firstAttribute="top" secondItem="jme-OU-7GG" secondAttribute="top" constant="-2" id="cfW-zf-bJk"/>
                             <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Gny-ev-Via" secondAttribute="bottom" constant="20" symbolic="YES" id="ekP-Wn-wjY"/>
                             <constraint firstItem="Yew-yF-ZWD" firstAttribute="top" secondItem="N9Z-iX-jvK" secondAttribute="top" constant="-2" id="fxi-jB-18m"/>
@@ -398,6 +398,7 @@
                         <outlet property="dividerF" destination="Ljr-be-BXp" id="rRz-AP-0Dd"/>
                         <outlet property="downloadsFolderIntroLabel" destination="YmL-o7-wzA" id="qdP-fS-wMy"/>
                         <outlet property="downloadsFolderLabel" destination="eKi-p7-aRV" id="9xi-lk-ZjI"/>
+                        <outlet property="downloadsStackView" destination="jme-OU-7GG" id="sIY-CY-bkM"/>
                         <outlet property="enableUserDataSyncLabel" destination="goO-DA-n9P" id="juP-k6-qjZ"/>
                         <outlet property="enableUserDataSyncSwitch" destination="SF8-ZN-I8k" id="e7r-tv-jPV"/>
                         <outlet property="enableWWDCAgentSwitch" destination="Vk1-ZC-mPn" id="u9F-PR-puc"/>
@@ -519,7 +520,7 @@
                         <constraints>
                             <constraint firstItem="MB9-co-AOw" firstAttribute="leading" secondItem="CYB-Js-nMq" secondAttribute="leading" id="96z-R2-U73"/>
                             <constraint firstAttribute="trailing" secondItem="4tF-Jf-uRi" secondAttribute="trailing" id="KpR-vb-ubQ"/>
-                            <constraint firstItem="EB1-cz-f3w" firstAttribute="top" secondItem="5hl-wi-FfU" secondAttribute="top" constant="22" id="L10-pu-XBx"/>
+                            <constraint firstItem="EB1-cz-f3w" firstAttribute="top" secondItem="5hl-wi-FfU" secondAttribute="top" constant="22" placeholder="YES" id="L10-pu-XBx"/>
                             <constraint firstItem="4tF-Jf-uRi" firstAttribute="leading" secondItem="5hl-wi-FfU" secondAttribute="leading" constant="39" id="R85-Mx-vUo"/>
                             <constraint firstItem="CYB-Js-nMq" firstAttribute="top" secondItem="jzw-u5-Zjs" secondAttribute="bottom" constant="19" id="Y9R-1o-KAR"/>
                             <constraint firstItem="MB9-co-AOw" firstAttribute="top" secondItem="4tF-Jf-uRi" secondAttribute="bottom" constant="19" id="gXK-Yz-Lbr"/>
@@ -534,6 +535,7 @@
                     <connections>
                         <outlet property="includeAppBannerInClipsSwitch" destination="Xtm-cF-96x" id="TMN-ja-MJe"/>
                         <outlet property="skipBackAndForwardBy30SecondsSwitch" destination="JEt-pq-hrP" id="CqT-YK-nZZ"/>
+                        <outlet property="skipIntroStackView" destination="EB1-cz-f3w" id="dKH-G5-mrm"/>
                         <outlet property="skipIntroSwitch" destination="yfb-Pt-KGS" id="ZvD-Nu-XWb"/>
                     </connections>
                 </viewController>
@@ -558,7 +560,7 @@
                                             <constraint firstAttribute="width" constant="231" id="D34-Ex-Ec6"/>
                                         </constraints>
                                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="jHp-TC-67d">
-                                            <font key="font" metaFont="system" size="12"/>
+                                            <font key="font" metaFont="cellTitle"/>
                                             <string key="title">This will run an agent in the background that gives other apps the opportunity to access your content from the WWDC app. Currently, this is supported by the Raycast app. If you'd like to integrate WWDC content into your app, open an issue on Github describing your app and what you'd like to do.</string>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -570,7 +572,7 @@
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I1j-2K-qhm" customClass="ActionLabel" customModule="WWDC" customModuleProvider="target">
                                         <rect key="frame" x="-2" y="23" width="49" height="15"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Raycast" id="x44-Wc-9ts">
-                                            <font key="font" metaFont="system" size="12"/>
+                                            <font key="font" metaFont="cellTitle"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -581,7 +583,7 @@
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6PJ-m2-K7t" customClass="ActionLabel" customModule="WWDC" customModuleProvider="target">
                                         <rect key="frame" x="-2" y="0.0" width="104" height="15"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="WWDC on Github" id="IBm-XP-HKb">
-                                            <font key="font" metaFont="system" size="12"/>
+                                            <font key="font" metaFont="cellTitle"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>

WWDC/ScheduleContainerViewController.swift

@@ -10,7 +10,7 @@ import Cocoa
 import RxSwift
 import RxCocoa
 
-final class ScheduleContainerViewController: WWDCMainWindowContentViewController {
+final class ScheduleContainerViewController: WWDCWindowContentViewController {
 
     let splitViewController: SessionsSplitViewController
 

WWDC/SessionDetailsViewController.swift

@@ -10,7 +10,7 @@ import Cocoa
 import RxSwift
 import RxCocoa
 
-final class SessionDetailsViewController: WWDCMainWindowContentViewController {
+final class SessionDetailsViewController: WWDCWindowContentViewController {
 
     private struct Metrics {
         static let padding: CGFloat = 46

WWDC/WWDCTabViewController.swift

@@ -51,14 +51,21 @@ class WWDCTabViewController<Tab: WWDCTab>: NSTabViewController where Tab.RawValu
                 }
             }
 
-            let tab = Tab(rawValue: selectedTabViewItemIndex)!
+            guard let tab = Tab(rawValue: selectedTabViewItemIndex) else {
+                assertionFailure("selectedTabViewItemIndex of \(selectedTabViewItemIndex) doesn't correspond to a valid tab item")
+                return
+            }
 
             activeTabVar.accept(tab)
 
-            (view.window as? WWDCWindow)?.setTitleBarHidden(tab.hidesWindowTitleBar, animated: true)
+            updateWindowTitleBarVisibility(for: tab)
         }
     }
 
+    private func updateWindowTitleBarVisibility(for tab: Tab, animated: Bool = true) {
+        (view.window as? WWDCWindow)?.setTitleBarHidden(tab.hidesWindowTitleBar, animated: animated)
+    }
+
     private(set) lazy var tabBar = WWDCTabViewControllerTabBar()
 
     init(windowController: WWDCWindowController) {
@@ -94,7 +101,9 @@ class WWDCTabViewController<Tab: WWDCTab>: NSTabViewController where Tab.RawValu
         itemView.target = self
         itemView.action = #selector(changeTab)
 
-        itemView.state = (tabViewItems.firstIndex(of: tabViewItem) == selectedTabViewItemIndex) ? .on : .off
+        let isActiveTab = (tabViewItems.firstIndex(of: tabViewItem) == selectedTabViewItemIndex)
+
+        itemView.state = isActiveTab ? .on : .off
 
         tabBar.addItem(itemView)
     }
@@ -133,4 +142,12 @@ class WWDCTabViewController<Tab: WWDCTab>: NSTabViewController where Tab.RawValu
         loadingView?.hide()
     }
 
+    override func viewDidAppear() {
+        super.viewDidAppear()
+
+        if let tab = Tab(rawValue: selectedTabViewItemIndex) {
+            updateWindowTitleBarVisibility(for: tab, animated: false)
+        }
+    }
+
 }

…WDCMainWindowContentViewController.swift …DC/WWDCWindowContentViewController.swiftWWDC/WWDCMainWindowContentViewController.swift renamed to WWDC/WWDCWindowContentViewController.swift WWDC/WWDCMainWindowContentViewController.swift renamed to WWDC/WWDCWindowContentViewController.swift

@@ -1,6 +1,6 @@
 import Cocoa
 
-class WWDCMainWindowContentViewController: NSViewController {
+class WWDCWindowContentViewController: NSViewController {
 
     var topSafeAreaPadding: CGFloat { 22 }