Use Preference wrapper of UserDefaults

iina · Apr 5, 2019 · 00d18c2 · 00d18c2
1 parent 091d4e7
commit 00d18c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/iina/KeyMapping.swift b/iina/KeyMapping.swift
@@ -19,7 +19,7 @@ class KeyMapping: NSObject {
 
   @objc var keyForDisplay: String {
     get {
-      return UserDefaults.standard.bool(forKey: "displayKeyBindingRawValues") ? key : prettyKey
+      return Preference.bool(for: .displayKeyBindingRawValues) ? key : prettyKey
     }
     set {
       key = newValue
@@ -29,7 +29,7 @@ class KeyMapping: NSObject {
 
   @objc var actionForDisplay: String {
     get {
-      return UserDefaults.standard.bool(forKey: "displayKeyBindingRawValues") ? readableAction : prettyCommand
+      return Preference.bool(for: .displayKeyBindingRawValues) ? readableAction : prettyCommand
     }
     set {
       rawAction = newValue

diff --git a/iina/PrefKeyBindingViewController.swift b/iina/PrefKeyBindingViewController.swift
@@ -61,7 +61,7 @@ class PrefKeyBindingViewController: NSViewController, PreferenceWindowEmbeddable
     super.viewDidLoad()
 
     kbTableView.delegate = self
-    kbTableView.doubleAction = UserDefaults.standard.bool(forKey: "displayKeyBindingRawValues") ? nil : #selector(editRow)
+    kbTableView.doubleAction = Preference.bool(for: .displayKeyBindingRawValues) ? nil : #selector(editRow)
     confTableView.dataSource = self
     confTableView.delegate = self
 
@@ -302,7 +302,7 @@ class PrefKeyBindingViewController: NSViewController, PreferenceWindowEmbeddable
   }
 
   @IBAction func displayRawValueAction(_ sender: NSButton) {
-    kbTableView.doubleAction = UserDefaults.standard.bool(forKey: "displayKeyBindingRawValues") ? nil : #selector(editRow)
+    kbTableView.doubleAction = Preference.bool(for: .displayKeyBindingRawValues) ? nil : #selector(editRow)
     kbTableView.reloadData()
   }
 
@@ -403,7 +403,7 @@ extension PrefKeyBindingViewController: NSTableViewDelegate, NSTableViewDataSour
 
   func tableView(_ tableView: NSTableView, shouldEdit tableColumn: NSTableColumn?, row: Int) -> Bool {
     if tableView == kbTableView {
-      return UserDefaults.standard.bool(forKey: "displayKeyBindingRawValues")
+      return Preference.bool(for: .displayKeyBindingRawValues)
     } else {
       return false
     }