Minor tweaks

Color Picker.xcodeproj/project.pbxproj

@@ -473,7 +473,7 @@
 			repositoryURL = "https://github.com/sindresorhus/Defaults";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.1.0;
+				minimumVersion = 5.0.0;
 			};
 		};
 		E3E9F9AB2642B75100AE6450 /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */ = {

Color Picker/AppState.swift

@@ -86,6 +86,10 @@ final class AppState: ObservableObject {
 			]
 		)
 
+		// TODO: Remove in 2022.
+		Defaults.migrate(.shownColorFormats, to: .v5)
+		Defaults.migrate(.colorFormatToCopyAfterPicking, to: .v5)
+
 		DispatchQueue.main.async { [self] in
 			didLaunch()
 		}

Color Picker/Constants.swift

@@ -17,7 +17,7 @@ extension KeyboardShortcuts.Name {
 	static let toggleWindow = Self("toggleWindow")
 }
 
-enum CopyColorFormat: String, Codable, CaseIterable {
+enum CopyColorFormat: String, CaseIterable, Defaults.Serializable {
 	case none
 	case hex
 	case hsl
@@ -40,7 +40,24 @@ enum CopyColorFormat: String, Codable, CaseIterable {
 	}
 }
 
-enum ColorFormat: String, Codable, CaseIterable {
+// TODO: Remove in 2022.
+enum CodableCopyColorFormat: String {
+	case none
+	case hex
+	case hsl
+	case rgb
+	case lch
+}
+
+extension CodableCopyColorFormat: Defaults.CodableType {
+	typealias NativeForm = CopyColorFormat
+}
+
+extension CopyColorFormat: Defaults.NativeType {
+	typealias CodableForm = CodableCopyColorFormat
+}
+
+enum ColorFormat: String, CaseIterable, Defaults.Serializable {
 	case hex
 	case hsl
 	case rgb
@@ -63,3 +80,19 @@ enum ColorFormat: String, Codable, CaseIterable {
 extension ColorFormat: Identifiable {
 	var id: Self { self }
 }
+
+// TODO: Remove in 2022.
+enum CodableColorFormat: String {
+	case hex
+	case hsl
+	case rgb
+	case lch
+}
+
+extension CodableColorFormat: Defaults.CodableType {
+	typealias NativeForm = ColorFormat
+}
+
+extension ColorFormat: Defaults.NativeType {
+	typealias CodableForm = CodableColorFormat
+}

Color Picker/Events.swift

@@ -40,7 +40,7 @@ extension AppState {
 		NotificationCenter.default.publisher(for: NSWindow.willCloseNotification)
 			.sink { [self] _ in
 				DispatchQueue.main.async {
-					if colorPanel.isVisible {
+					if colorPanel.isVisible, SSApp.settingsWindow?.isVisible != true {
 						colorPanel.makeKeyAndOrderFront(nil)
 					}
 				}

Color Picker/SettingsView.swift

@@ -28,12 +28,17 @@ private struct CopyColorFormatSetting: View {
 	@Default(.colorFormatToCopyAfterPicking) private var colorFormat
 
 	var body: some View {
-		EnumPicker("Copy color after picking:", enumBinding: $colorFormat) { element, _ in
+		EnumPicker(
+			enumBinding: $colorFormat,
+			label: Text("Copy color after picking:")
+				.fixedSize()
+		) { element, _ in
 			Text(element.title)
 			if element == .none {
 				Divider()
 			}
 		}
+			.fixedSize()
 	}
 }
 

Color Picker/Utilities.swift

@@ -74,6 +74,11 @@ extension SSApp {
 			NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
 		}
 	}
+
+	/// The SwiftUI settings window.
+	static var settingsWindow: NSWindow? {
+		NSApp.windows.first { $0.frameAutosaveName == "com_apple_SwiftUI_Settings_window" }
+	}
 }
 
 
@@ -782,9 +787,9 @@ extension DispatchQueue {
 
 
 extension Defaults {
-	final class Observable<Value: Codable>: ObservableObject {
+	final class Observable<Value: Serializable>: ObservableObject {
 		let objectWillChange = ObservableObjectPublisher()
-		private var observation: DefaultsObservation?
+		private var cancellable: AnyCancellable?
 		private let key: Defaults.Key<Value>
 
 		var value: Value {
@@ -798,15 +803,16 @@ extension Defaults {
 		init(_ key: Key<Value>) {
 			self.key = key
 
-			self.observation = Defaults.observe(key, options: [.prior]) { [weak self] change in
-				guard change.isPrior else {
-					return
-				}
+			self.cancellable = Defaults.publisher(key, options: [.prior])
+				.sink { [weak self] change in
+					guard change.isPrior else {
+						return
+					}
 
-				DispatchQueue.mainSafeAsync {
-					self?.objectWillChange.send()
+					DispatchQueue.mainSafeAsync {
+						self?.objectWillChange.send()
+					}
 				}
-			}
 		}
 
 		/// Reset the key back to its default value.
@@ -817,58 +823,6 @@ extension Defaults {
 }
 
 
-extension Defaults {
-	/**
-	Creates a SwiftUI `Toggle` view that is connected to a Bool `Defaults` key.
-
-	```
-	struct ShowAllDayEventsSetting: View {
-		var body: some View {
-			Defaults.Toggle("Show All-Day Events", key: .showAllDayEvents)
-		}
-	}
-	```
-	*/
-	struct Toggle<Label, Key>: View where Label: View, Key: Defaults.Key<Bool> {
-		// TODO: Find a way to store the handler without using an embedded class.
-		private final class OnChangeHolder {
-			var onChange: ((Bool) -> Void)?
-		}
-
-		private let label: () -> Label
-		@ObservedObject private var observable: Defaults.Observable<Bool>
-		private let onChangeHolder = OnChangeHolder()
-
-		init(key: Key, @ViewBuilder label: @escaping () -> Label) {
-			self.label = label
-			self.observable = Defaults.Observable(key)
-		}
-
-		var body: some View {
-			SwiftUI.Toggle(isOn: $observable.value, label: label)
-				.onChange(of: observable.value) {
-					onChangeHolder.onChange?($0)
-				}
-		}
-	}
-}
-
-extension Defaults.Toggle where Label == Text {
-	init<S>(_ title: S, key: Defaults.Key<Bool>) where S: StringProtocol {
-		self.label = { Text(title) }
-		self.observable = Defaults.Observable(key)
-	}
-}
-
-extension Defaults.Toggle {
-	/// Do something when the value changes to a different value.
-	func onChange(_ action: @escaping (Bool) -> Void) -> Self {
-		onChangeHolder.onChange = action
-		return self
-	}
-}
-
-
 struct NativeTextField: NSViewRepresentable {
 	typealias NSViewType = InternalTextField
 
@@ -1568,7 +1522,7 @@ extension NSPasteboard {
 					}
 					.store(in: &cancellables)
 
-				if NSApp.isActive {
+				if NSApp?.isActive == true {
 					start()
 				}
 			} else {