Refactoring

Author: jordanbaird

Ice/MenuBar/Appearance/MenuBarAppearanceEditor/MenuBarAppearanceEditor.swift

@@ -63,30 +63,10 @@ struct MenuBarAppearanceEditor: View {
                 isDynamicToggle
             }
             if appearanceManager.configuration.isDynamic {
-                VStack(alignment: .leading) {
-                    HStack {
-                        Text("Light Appearance")
-                            .font(.headline)
-                        if case .dark = SystemAppearance.current {
-                            PreviewButton(configuration: appearanceManager.configuration.lightModeConfiguration)
-                        }
-                    }
-                    .frame(height: 16)
-                    MenuBarPartialAppearanceEditor(configuration: appearanceManager.bindings.configuration.lightModeConfiguration)
-                }
-                VStack(alignment: .leading) {
-                    HStack {
-                        Text("Dark Appearance")
-                            .font(.headline)
-                        if case .light = SystemAppearance.current {
-                            PreviewButton(configuration: appearanceManager.configuration.darkModeConfiguration)
-                        }
-                    }
-                    .frame(height: 16)
-                    MenuBarPartialAppearanceEditor(configuration: appearanceManager.bindings.configuration.darkModeConfiguration)
-                }
+                LabeledPartialEditor(appearance: .light)
+                LabeledPartialEditor(appearance: .dark)
             } else {
-                MenuBarPartialAppearanceEditor(configuration: appearanceManager.bindings.configuration.staticConfiguration)
+                StaticPartialEditor()
             }
             IceSection("Menu Bar Shape") {
                 shapePicker
@@ -149,7 +129,7 @@ struct MenuBarAppearanceEditor: View {
     }
 }
 
-private struct MenuBarPartialAppearanceEditor: View {
+private struct UnlabeledPartialEditor: View {
     @Binding var configuration: MenuBarAppearancePartialConfiguration
 
     var body: some View {
@@ -235,7 +215,85 @@ private struct MenuBarPartialAppearanceEditor: View {
     }
 }
 
+private struct LabeledPartialEditor: View {
+    @EnvironmentObject var appearanceManager: MenuBarAppearanceManager
+    @State private var currentAppearance = SystemAppearance.current
+    @State private var textFrame = CGRect.zero
+
+    let appearance: SystemAppearance
+
+    var body: some View {
+        IceSection {
+            labelStack
+        } content: {
+            partialEditor
+        }
+        .bordered(false)
+        .dividers(false)
+        .onReceive(NSApp.publisher(for: \.effectiveAppearance)) { _ in
+            currentAppearance = .current
+        }
+    }
+
+    @ViewBuilder
+    private var labelStack: some View {
+        HStack {
+            Text(appearance.titleKey)
+                .font(.headline)
+                .onFrameChange(update: $textFrame)
+
+            if currentAppearance != appearance {
+                previewButton
+            }
+        }
+        .frame(height: textFrame.height)
+    }
+
+    @ViewBuilder
+    private var previewButton: some View {
+        switch appearance {
+        case .light:
+            PreviewButton(configuration: appearanceManager.configuration.lightModeConfiguration)
+        case .dark:
+            PreviewButton(configuration: appearanceManager.configuration.darkModeConfiguration)
+        }
+    }
+
+    @ViewBuilder
+    private var partialEditor: some View {
+        switch appearance {
+        case .light:
+            UnlabeledPartialEditor(configuration: appearanceManager.bindings.configuration.lightModeConfiguration)
+        case .dark:
+            UnlabeledPartialEditor(configuration: appearanceManager.bindings.configuration.darkModeConfiguration)
+        }
+    }
+}
+
+private struct StaticPartialEditor: View {
+    @EnvironmentObject var appearanceManager: MenuBarAppearanceManager
+
+    var body: some View {
+        UnlabeledPartialEditor(configuration: appearanceManager.bindings.configuration.staticConfiguration)
+    }
+}
+
 private struct PreviewButton: View {
+    private struct DummyButton: NSViewRepresentable {
+        @Binding var isPressed: Bool
+
+        func makeNSView(context: Context) -> NSButton {
+            let button = NSButton()
+            button.title = ""
+            button.bezelStyle = .accessoryBarAction
+            return button
+        }
+
+        func updateNSView(_ nsView: NSButton, context: Context) {
+            nsView.isHighlighted = isPressed
+        }
+    }
+
     @EnvironmentObject var appearanceManager: MenuBarAppearanceManager
 
     @State private var frame = CGRect.zero
@@ -268,17 +326,3 @@ private struct PreviewButton: View {
         .onFrameChange(update: $frame)
     }
 }
-
-private struct DummyButton: NSViewRepresentable {
-    @Binding var isPressed: Bool
-
-    func makeNSView(context: Context) -> NSButton {
-        let button = NSButton()
-        button.title = ""
-        return button
-    }
-
-    func updateNSView(_ nsView: NSButton, context: Context) {
-        nsView.isHighlighted = isPressed
-    }
-}

Ice/UI/IceUI/IceSection.swift

@@ -10,6 +10,8 @@ struct IceSection<Header: View, Content: View, Footer: View>: View {
     private let content: Content
     private let footer: Footer
     private let spacing: CGFloat = 10
+    private var isBordered = true
+    private var hasDividers = true
 
     init(
         @ViewBuilder header: () -> Header,
@@ -72,15 +74,47 @@ struct IceSection<Header: View, Content: View, Footer: View>: View {
     }
 
     var body: some View {
-        IceGroupBox(padding: spacing) {
-            header
-        } content: {
+        if isBordered {
+            IceGroupBox(padding: spacing) {
+                header
+            } content: {
+                dividedContent
+            } footer: {
+                footer
+            }
+        } else {
+            VStack(alignment: .leading) {
+                header
+                dividedContent
+                footer
+            }
+        }
+    }
+
+    @ViewBuilder
+    private var dividedContent: some View {
+        if hasDividers {
             _VariadicView.Tree(IceSectionLayout(spacing: spacing)) {
                 content
                     .frame(maxWidth: .infinity)
             }
-        } footer: {
-            footer
+        } else {
+            content
+                .frame(maxWidth: .infinity)
+        }
+    }
+}
+
+extension IceSection {
+    func bordered(_ isBordered: Bool = true) -> IceSection {
+        with(self) { copy in
+            copy.isBordered = isBordered
+        }
+    }
+
+    func dividers(_ hasDividers: Bool = true) -> IceSection {
+        with(self) { copy in
+            copy.hasDividers = hasDividers
         }
     }
 }

Ice/Utilities/SystemAppearance.swift

@@ -3,7 +3,7 @@
 //  Ice
 //
 
-import Cocoa
+import SwiftUI
 
 /// A value corresponding to a light or dark appearance.
 enum SystemAppearance {
@@ -72,4 +72,12 @@ enum SystemAppearance {
     static var current: SystemAppearance {
         systemAppearance(for: NSApp.effectiveAppearance)
     }
+
+    /// The title key to display in the interface.
+    var titleKey: LocalizedStringKey {
+        switch self {
+        case .light: "Light Appearance"
+        case .dark: "Dark Appearance"
+        }
+    }
 }