Revert parts of "Simplify options in settings"

This reverts back to using the "Smart" rehide strategy name
jordanbaird · Jul 20, 2024 · 4acaff4 · 4acaff4
1 parent 39b1267
commit 4acaff4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Ice/Events/EventManager.swift b/Ice/Events/EventManager.swift
@@ -25,7 +25,7 @@ final class EventManager {
         switch event.type {
         case .leftMouseDown:
             handleShowOnClick()
-            handleDefaultRehide(with: event)
+            handleSmartRehide(with: event)
         case .rightMouseDown:
             handleShowRightClickMenu()
         default:
@@ -161,13 +161,13 @@ extension EventManager {
         }
     }
 
-    // MARK: Handle Default Rehide
+    // MARK: Handle Smart Rehide
 
-    private func handleDefaultRehide(with event: NSEvent) {
+    private func handleSmartRehide(with event: NSEvent) {
         guard
             let appState,
             appState.settingsManager.generalSettingsManager.autoRehide,
-            case .default = appState.settingsManager.generalSettingsManager.rehideStrategy
+            case .smart = appState.settingsManager.generalSettingsManager.rehideStrategy
         else {
             return
         }

diff --git a/Ice/MenuBar/RehideStrategy.swift b/Ice/MenuBar/RehideStrategy.swift
@@ -7,8 +7,8 @@ import SwiftUI
 
 /// A type that determines how the auto-rehide feature works.
 enum RehideStrategy: Int, CaseIterable, Identifiable {
-    /// Menu bar items are rehidden using the default algorithm.
-    case `default` = 0
+    /// Menu bar items are rehidden using a smart algorithm.
+    case smart = 0
     /// Menu bar items are rehidden after a given time interval.
     case timed = 1
     /// Menu bar items are rehidden when the focused app changes.
@@ -19,7 +19,7 @@ enum RehideStrategy: Int, CaseIterable, Identifiable {
     /// Localized string key representation.
     var localized: LocalizedStringKey {
         switch self {
-        case .default: "Default"
+        case .smart: "Smart"
         case .timed: "Timed"
         case .focusedApp: "Focused app"
         }

diff --git a/Ice/Settings/SettingsManagers/GeneralSettingsManager.swift b/Ice/Settings/SettingsManagers/GeneralSettingsManager.swift
@@ -50,7 +50,7 @@ final class GeneralSettingsManager: ObservableObject {
     @Published var autoRehide = true
 
     /// A strategy that determines how the auto-rehide feature works.
-    @Published var rehideStrategy: RehideStrategy = .default
+    @Published var rehideStrategy: RehideStrategy = .smart
 
     /// A time interval for the auto-rehide feature when its rule
     /// is ``RehideStrategy/timed``.

diff --git a/Ice/Settings/SettingsPanes/GeneralSettingsPane.swift b/Ice/Settings/SettingsPanes/GeneralSettingsPane.swift
@@ -207,8 +207,8 @@ struct GeneralSettingsPane: View {
         } label: {
             Text("Strategy")
             switch manager.rehideStrategy {
-            case .default:
-                Text("Menu bar items are rehidden using the default algorithm")
+            case .smart:
+                Text("Menu bar items are rehidden using a smart algorithm")
             case .timed:
                 Text("Menu bar items are rehidden after a fixed amount of time")
             case .focusedApp: