michaelvillar · karbassi · Jul 9, 2020
diff --git a/Timer.xcodeproj/project.pbxproj b/Timer.xcodeproj/project.pbxproj
@@ -3,10 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		41413B3424B6BAC600BD8270 /* GeneralPreferenceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41413B3224B6BAC600BD8270 /* GeneralPreferenceViewController.swift */; };
+		41413B3524B6BAC600BD8270 /* GeneralPreferenceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41413B3324B6BAC600BD8270 /* GeneralPreferenceViewController.xib */; };
+		416A9C8824B6BC0D00AB3CBC /* Preferences in Frameworks */ = {isa = PBXBuildFile; productRef = 416A9C8724B6BC0D00AB3CBC /* Preferences */; };
 		41A37D0724426E360078EA40 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 41A37D0624426E360078EA40 /* Credits.rtf */; };
 		41B080C62114CE2700EEE7E8 /* Keycodes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41B080C52114CE2700EEE7E8 /* Keycodes.swift */; };
 		4C30BBFC1CA7C56500C45EBF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30BBFB1CA7C56500C45EBF /* AppDelegate.swift */; };
@@ -23,6 +26,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		41413B3224B6BAC600BD8270 /* GeneralPreferenceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPreferenceViewController.swift; sourceTree = "<group>"; };
+		41413B3324B6BAC600BD8270 /* GeneralPreferenceViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralPreferenceViewController.xib; sourceTree = "<group>"; };
 		41A37D0624426E360078EA40 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
 		41B080C52114CE2700EEE7E8 /* Keycodes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keycodes.swift; sourceTree = "<group>"; };
 		4C30BBF81CA7C56500C45EBF /* Timer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Timer.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -45,6 +50,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				416A9C8824B6BC0D00AB3CBC /* Preferences in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -70,6 +76,8 @@
 		4C30BBFA1CA7C56500C45EBF /* Timer */ = {
 			isa = PBXGroup;
 			children = (
+				41413B3224B6BAC600BD8270 /* GeneralPreferenceViewController.swift */,
+				41413B3324B6BAC600BD8270 /* GeneralPreferenceViewController.xib */,
 				4C30BBFB1CA7C56500C45EBF /* AppDelegate.swift */,
 				4C6F0F2B1CACF4B500E9A6F7 /* MVTimerController.swift */,
 				4C30BC081CA7C81C00C45EBF /* MVWindow.swift */,
@@ -104,6 +112,9 @@
 			dependencies = (
 			);
 			name = Timer;
+			packageProductDependencies = (
+				416A9C8724B6BC0D00AB3CBC /* Preferences */,
+			);
 			productName = Timer;
 			productReference = 4C30BBF81CA7C56500C45EBF /* Timer.app */;
 			productType = "com.apple.product-type.application";
@@ -134,6 +145,9 @@
 				Base,
 			);
 			mainGroup = 4C30BBEF1CA7C56500C45EBF;
+			packageReferences = (
+				416A9C8624B6BC0D00AB3CBC /* XCRemoteSwiftPackageReference "Preferences" */,
+			);
 			productRefGroup = 4C30BBF91CA7C56500C45EBF /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -150,6 +164,7 @@
 			files = (
 				4C30BBFE1CA7C56500C45EBF /* Assets.xcassets in Resources */,
 				4C6F0F2A1CAA79EB00E9A6F7 /* alert-sound.caf in Resources */,
+				41413B3524B6BAC600BD8270 /* GeneralPreferenceViewController.xib in Resources */,
 				4C30BC141CA7D73C00C45EBF /* MainMenu.xib in Resources */,
 				41A37D0724426E360078EA40 /* Credits.rtf in Resources */,
 			);
@@ -162,6 +177,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				41413B3424B6BAC600BD8270 /* GeneralPreferenceViewController.swift in Sources */,
 				4C30BC0B1CA7C96700C45EBF /* MVMainView.swift in Sources */,
 				723C0C581E12211000E7AE1E /* MVUserDefaultsKeys.swift in Sources */,
 				4C6F0F211CAA3D8600E9A6F7 /* MVLabel.swift in Sources */,
@@ -235,7 +251,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -284,7 +300,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -299,8 +315,11 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Timer/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.michaelvillar.Timer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -317,8 +336,11 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Timer/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.michaelvillar.Timer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -349,6 +371,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		416A9C8624B6BC0D00AB3CBC /* XCRemoteSwiftPackageReference "Preferences" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/sindresorhus/Preferences";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.0.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		416A9C8724B6BC0D00AB3CBC /* Preferences */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 416A9C8624B6BC0D00AB3CBC /* XCRemoteSwiftPackageReference "Preferences" */;
+			productName = Preferences;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 4C30BBF01CA7C56500C45EBF /* Project object */;
 }
diff --git a/Timer/AppDelegate.swift b/Timer/AppDelegate.swift
@@ -1,19 +1,37 @@
 import Cocoa
+import Preferences
+
+extension Preferences.PaneIdentifier {
+    static let general = Self("general")
+}
 
 @NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate {
-
+final class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate {
+
+  @IBOutlet private var window: NSWindow!
+
+  lazy var preferencesWindowController = PreferencesWindowController(
+      preferencePanes: [
+          GeneralPreferenceViewController()
+      ]
+  )
+
+  @IBAction
+  func preferencesMenuItemActionHandler(_ sender: NSMenuItem) {
+      preferencesWindowController.show()
+  }
+
   private var controllers: [MVTimerController] = []
   private var currentlyInDock : MVTimerController?
-  
+
   private var staysOnTop = false {
     didSet {
       for window in NSApplication.shared.windows {
         window.level = self.windowLevel()
       }
     }
   }
-  
+
   override init() {
     super.init()
     self.registerDefaults()
@@ -23,17 +41,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
     let controller = MVTimerController()
     controllers.append(controller)
     self.addBadgeToDock(controller: controller)
-    
+
     NSUserNotificationCenter.default.delegate = self
-    
+
     let nc = NotificationCenter.default
     nc.addObserver(self, selector: #selector(handleClose), name: NSWindow.willCloseNotification, object: nil)
     nc.addObserver(self, selector: #selector(handleUserDefaultsChange), name: UserDefaults.didChangeNotification, object: nil)
     nc.addObserver(self, selector: #selector(handleOcclusionChange), name: NSWindow.didChangeOcclusionStateNotification, object: nil)
-    
+
     staysOnTop = UserDefaults.standard.bool(forKey: MVUserDefaultsKeys.staysOnTop)
   }
-  
+
   func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
     for window in NSApplication.shared.windows {
       window.makeKeyAndOrderFront(self)
@@ -44,27 +62,27 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
   func userNotificationCenter(_ center: NSUserNotificationCenter, shouldPresent notification: NSUserNotification) -> Bool {
     return true
   }
-  
+
   func addBadgeToDock(controller: MVTimerController){
     if currentlyInDock != controller {
       self.removeBadgeFromDock()
     }
     currentlyInDock = controller
     controller.showInDock(true)
   }
-  
+
   func removeBadgeFromDock() {
     if currentlyInDock != nil {
       currentlyInDock!.showInDock(false)
     }
   }
-  
+
   @objc func newDocument(_ sender: AnyObject?) {
     let controller = MVTimerController(closeToWindow: NSApplication.shared.keyWindow)
     controller.window?.level = self.windowLevel()
     controllers.append(controller)
   }
-  
+
   @objc func handleClose(_ notification: Notification) {
     if let window = notification.object as? NSWindow,
       let controller = window.windowController as? MVTimerController,
@@ -73,23 +91,23 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
           controllers.remove(at: index)
     }
   }
-  
+
   @objc func handleOcclusionChange(_ notification: Notification) {
     if let window = notification.object as? NSWindow,
       let controller = window.windowController as? MVTimerController
     {
       controller.windowVisibilityChanged(window.isVisible)
     }
   }
-  
+
   @objc func handleUserDefaultsChange(_ notification: Notification) {
     staysOnTop = UserDefaults.standard.bool(forKey: MVUserDefaultsKeys.staysOnTop)
   }
-  
+
   func windowLevel() -> NSWindow.Level {
     return staysOnTop ? .floating : .normal
   }
-  
+
   private func registerDefaults() {
     UserDefaults.standard.register(defaults: [MVUserDefaultsKeys.staysOnTop: false])
   }

diff --git a/Timer/Base.lproj/MainMenu.xib b/Timer/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -27,7 +27,11 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" hidden="YES" id="VOq-y0-SEH"/>
-                            <menuItem title="Preferences…" hidden="YES" enabled="NO" keyEquivalent="," id="BOF-NM-1cW"/>
+                            <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
+                                <connections>
+                                    <action selector="preferencesMenuItemActionHandler:" target="Voe-Tx-rLC" id="hJp-KP-VVu"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
                             <menuItem title="Services" id="NMo-om-nkz">
                                 <modifierMask key="keyEquivalentModifierMask"/>
@@ -621,6 +625,7 @@
                     </menu>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="141" y="260"/>
         </menu>
         <userDefaultsController representsSharedInstance="YES" id="lVF-Ft-Uh4"/>
     </objects>

diff --git a/Timer/GeneralPreferenceViewController.swift b/Timer/GeneralPreferenceViewController.swift
@@ -0,0 +1,16 @@
+import Cocoa
+import Preferences
+
+final class GeneralPreferenceViewController: NSViewController, PreferencePane {
+	let preferencePaneIdentifier = Preferences.PaneIdentifier.general
+	let preferencePaneTitle = "General"
+	let toolbarItemIcon = NSImage(named: NSImage.preferencesGeneralName)!
+
+	override var nibName: NSNib.Name? { "GeneralPreferenceViewController" }
+
+	override func viewDidLoad() {
+		super.viewDidLoad()
+
+		// Setup stuff here
+	}
+}