feat(#8): add option to use IceBar only on notched displays

Signed-off-by: Toni Förster <toni.foerster@icloud.com>

Author: stonerl

Thaw/MenuBar/MenuBarSection.swift

@@ -66,7 +66,14 @@ final class MenuBarSection {
 
     /// A Boolean value that indicates whether the Ice Bar should be used.
     private var useIceBar: Bool {
-        appState?.settings.general.useIceBar ?? false
+        guard let settings = appState?.settings.general, settings.useIceBar else {
+            return false
+        }
+        if settings.useIceBarOnlyOnNotchedDisplay {
+            let screen = screenForIceBar
+            return screen?.hasNotch ?? false
+        }
+        return true
     }
 
     /// A weak reference to the menu bar manager.

Thaw/Resources/Localizable.xcstrings

@@ -6863,6 +6863,9 @@
         }
       }
     },
+    "Only on displays with notch" : {
+      "comment" : "A toggle that lets the user choose whether to show the Thaw Bar only on displays with a notch."
+    },
     "Open %@ Settings" : {
       "comment" : "A button that opens the settings app to grant screen recording permissions for the \\(Constants.displayName) Bar.",
       "isCommentAutoGenerated" : true,
@@ -10521,6 +10524,9 @@
         }
       }
     },
+    "Use %@ Bar only on displays with a notch. On other displays, show icons in the menu bar." : {
+      "comment" : "A toggle that allows the user to choose whether to only show the Thaw Bar on displays with a notch."
+    },
     "Use dynamic appearance" : {
       "comment" : "A toggle that lets the user choose whether to use different appearance settings based on the current system appearance.",
       "isCommentAutoGenerated" : true,

Thaw/Settings/Models/GeneralSettings.swift

@@ -34,6 +34,10 @@ final class GeneralSettings: ObservableObject {
     /// in a separate bar below the menu bar.
     @Published var useIceBar = false
 
+    /// A Boolean value that indicates whether to use the Ice Bar
+    /// only on displays with a notch.
+    @Published var useIceBarOnlyOnNotchedDisplay = false
+
     /// The location where the Ice Bar appears.
     @Published var iceBarLocation: IceBarLocation = .dynamic
 
@@ -90,6 +94,7 @@ final class GeneralSettings: ObservableObject {
         Defaults.ifPresent(key: .showIceIcon, assign: &showIceIcon)
         Defaults.ifPresent(key: .customIceIconIsTemplate, assign: &customIceIconIsTemplate)
         Defaults.ifPresent(key: .useIceBar, assign: &useIceBar)
+        Defaults.ifPresent(key: .useIceBarOnlyOnNotchedDisplay, assign: &useIceBarOnlyOnNotchedDisplay)
         Defaults.ifPresent(key: .showOnClick, assign: &showOnClick)
         Defaults.ifPresent(key: .showOnHover, assign: &showOnHover)
         Defaults.ifPresent(key: .showOnScroll, assign: &showOnScroll)
@@ -163,6 +168,13 @@ final class GeneralSettings: ObservableObject {
             }
             .store(in: &c)
 
+        $useIceBarOnlyOnNotchedDisplay
+            .receive(on: DispatchQueue.main)
+            .sink { useIceBarOnlyOnNotchedDisplay in
+                Defaults.set(useIceBarOnlyOnNotchedDisplay, forKey: .useIceBarOnlyOnNotchedDisplay)
+            }
+            .store(in: &c)
+
         $iceBarLocation
             .receive(on: DispatchQueue.main)
             .sink { location in

Thaw/Settings/SettingsPanes/GeneralSettingsPane.swift

@@ -178,15 +178,27 @@ struct GeneralSettingsPane: View {
     private var iceBarOptions: some View {
         useIceBar
         if settings.useIceBar {
+            if hasNotchedDisplay {
+                useIceBarOnlyOnNotchedDisplay
+            }
             iceBarLocationPicker
         }
     }
 
+    private var hasNotchedDisplay: Bool {
+        NSScreen.screens.contains { $0.hasNotch }
+    }
+
     private var useIceBar: some View {
         Toggle("Use \(Constants.displayName) Bar", isOn: $settings.useIceBar)
             .annotation("Show hidden menu bar items in a separate bar below the menu bar.")
     }
 
+    private var useIceBarOnlyOnNotchedDisplay: some View {
+        Toggle("Only on displays with notch", isOn: $settings.useIceBarOnlyOnNotchedDisplay)
+            .annotation("Use \(Constants.displayName) Bar only on displays with a notch. On other displays, show icons in the menu bar.")
+    }
+
     private var iceBarLocationPicker: some View {
         IcePicker("Location", selection: $settings.iceBarLocation) {
             ForEach(IceBarLocation.allCases) { location in

Thaw/Utilities/Defaults.swift

@@ -146,6 +146,7 @@ extension Defaults {
         case iceIcon = "IceIcon"
         case customIceIconIsTemplate = "CustomIceIconIsTemplate"
         case useIceBar = "UseIceBar"
+        case useIceBarOnlyOnNotchedDisplay = "UseIceBarOnlyOnNotchedDisplay"
         case iceBarLocation = "IceBarLocation"
         case showOnClick = "ShowOnClick"
         case showOnHover = "ShowOnHover"