[IMP] Mode naming coherence

Fluor/Controllers/BehaviorController.swift

@@ -42,8 +42,8 @@ class BehaviorController: NSObject, BehaviorDidChangeObserver, DefaultModeViewCo
     private var fnDownTimestamp: TimeInterval? = nil
     private var shouldHandleFNKey: Bool = false
 
-    private var currentMode: FKeyMode = .apple
-    private var onLaunchKeyboardMode: FKeyMode = .apple
+    private var currentMode: FKeyMode = .media
+    private var onLaunchKeyboardMode: FKeyMode = .media
     private var currentAppID: String = ""
     private var currentAppURL: URL?
     private var currentAppName: String?
@@ -212,10 +212,10 @@ class BehaviorController: NSObject, BehaviorDidChangeObserver, DefaultModeViewCo
         catch { AppErrorManager.terminateApp(withReason: error.localizedDescription) }
 
         switch mode {
-        case .apple:
+        case .media:
             os_log("Switch to Apple Mode for %@", self.currentAppID)
             self.statusMenuController.statusItem.image = AppManager.default.useLightIcon ? #imageLiteral(resourceName: "AppleMode") : #imageLiteral(resourceName: "IconAppleMode") 
-        case .other:
+        case .function:
             NSLog("Switch to Other Mode for %@", self.currentAppID)
             self.statusMenuController.statusItem.image = AppManager.default.useLightIcon ? #imageLiteral(resourceName: "OtherMode") : #imageLiteral(resourceName: "IconOtherMode")
         }

Fluor/Controllers/ViewControllers/RulesEditorViewController.swift

@@ -105,8 +105,8 @@ class RulesEditorViewController: NSViewController, BehaviorDidChangeObserver {
             let bundle = Bundle(url: url)!
             let id = bundle.bundleIdentifier!
 
-            AppManager.default.propagate(behavior: .apple, forApp: id, at: url, from: .rule)
-            return Rule(id: id, url: url, behavior: .apple)
+            AppManager.default.propagate(behavior: .media, forApp: id, at: url, from: .rule)
+            return Rule(id: id, url: url, behavior: .media)
         }
         rulesSet.formUnion(items)
     }

Fluor/Models/AppManager.swift

@@ -57,7 +57,7 @@ class AppManager: BehaviorDidChangePoster {
     /// The defaut behavior manager.
     static let `default`: AppManager = AppManager()
 
-    @Defaults(key: .keyboardMode, defaultValue: .apple)
+    @Defaults(key: .keyboardMode, defaultValue: .media)
     var defaultFKeyMode: FKeyMode
 
     @Defaults(key: .switchMethod, defaultValue: .window)
@@ -75,7 +75,7 @@ class AppManager: BehaviorDidChangePoster {
     @Defaults(key: .restoreStateAsBeforeStartup, defaultValue: false)
     var shouldRestorePreviousState: Bool 
 
-    @Defaults(key: .onQuitState, defaultValue: .apple)
+    @Defaults(key: .onQuitState, defaultValue: .media)
     var onQuitState: FKeyMode
 
     @Defaults(key: .disabledOnLunch, defaultValue: false)
@@ -176,10 +176,10 @@ class AppManager: BehaviorDidChangePoster {
         switch behavior {
         case .inferred:
             return self.defaultFKeyMode
-        case .apple:
-            return .apple
-        case .other:
-            return .other
+        case .media:
+            return .media
+        case .function:
+            return .function
         }
     }
 

Fluor/Models/Enums.swift

@@ -29,46 +29,46 @@
 import DefaultsWrapper
 
 @objc enum FKeyMode: Int {
-    case apple = 0
-    case other
+    case media = 0
+    case function
 
     var behavior: AppBehavior {
         switch self {
-        case .apple:
-            return .apple
-        case .other:
-            return .other
+        case .media:
+            return .media
+        case .function:
+            return .function
         }
     }
 
     var counterPart: FKeyMode {
         switch self {
-        case .apple: return .other
-        case .other: return .apple
+        case .media: return .function
+        case .function: return .media
         }
     }
 
     var label: String {
         switch self {
-        case .apple:
-            return NSLocalizedString("Media keys", comment: "")
-        case .other:
-            return NSLocalizedString("Function keys", comment: "")
+        case .media:
+            return NSLocalizedString("Media key", comment: "")
+        case .function:
+            return NSLocalizedString("Function key", comment: "")
         }
     }
 }
 
 @objc enum AppBehavior: Int {
     case inferred = 0
-    case apple
-    case other
+    case media
+    case function
 
     var counterPart: AppBehavior {
         switch self {
-        case .apple:
-            return .other
-        case .other:
-            return .apple
+        case .media:
+            return .function
+        case .function:
+            return .media
         default:
             return .inferred
         }
@@ -78,10 +78,10 @@ import DefaultsWrapper
         switch self {
         case .inferred:
             return NSLocalizedString("Same as default", comment: "")
-        case .apple:
-            return NSLocalizedString("Media keys", comment: "")
-        case .other:
-            return NSLocalizedString("Function keys", comment: "")
+        case .media:
+            return NSLocalizedString("Media key", comment: "")
+        case .function:
+            return NSLocalizedString("Function key", comment: "")
         }
     }
 }