From 73828e51154e17048ed9da3cbd313a743d9d8155 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 5 Sep 2019 14:37:07 -0500 Subject: [PATCH] Remove the coordinator dependency from KeyboadManager as it wasn't needed --- iOS/Detail/DetailViewController.swift | 2 +- iOS/KeyboardManager.swift | 16 +++++----------- iOS/MasterFeed/MasterFeedViewController.swift | 2 +- .../MasterTimelineViewController.swift | 2 +- iOS/RootSplitViewController.swift | 2 +- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/iOS/Detail/DetailViewController.swift b/iOS/Detail/DetailViewController.swift index 1cd79b0fd..dde3bdd68 100644 --- a/iOS/Detail/DetailViewController.swift +++ b/iOS/Detail/DetailViewController.swift @@ -26,7 +26,7 @@ class DetailViewController: UIViewController { weak var coordinator: SceneCoordinator! - lazy var keyboardManager = KeyboardManager(type: .detail, coordinator: coordinator) + private let keyboardManager = KeyboardManager(type: .detail) override var keyCommands: [UIKeyCommand]? { return keyboardManager.keyCommands } diff --git a/iOS/KeyboardManager.swift b/iOS/KeyboardManager.swift index 4163c5a74..a1170bce0 100644 --- a/iOS/KeyboardManager.swift +++ b/iOS/KeyboardManager.swift @@ -17,19 +17,9 @@ enum KeyboardType: String { class KeyboardManager { - private let coordinator: SceneCoordinator private(set) var keyCommands: [UIKeyCommand]? - init(type: KeyboardType, coordinator: SceneCoordinator) { - self.coordinator = coordinator - load(type: type) - } - -} - -private extension KeyboardManager { - - func load(type: KeyboardType) { + init(type: KeyboardType) { let file = Bundle.main.path(forResource: type.rawValue, ofType: "plist")! let entries = NSArray(contentsOfFile: file)! as! [[String: Any]] keyCommands = entries.compactMap { createKeyCommand(keyEntry: $0) } @@ -44,6 +34,10 @@ private extension KeyboardManager { } } +} + +private extension KeyboardManager { + func createKeyCommand(keyEntry: [String: Any]) -> UIKeyCommand? { guard let input = createKeyCommandInput(keyEntry: keyEntry) else { return nil } let modifiers = createKeyModifierFlags(keyEntry: keyEntry) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 81c34af79..8a16f7ae5 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -22,7 +22,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { var undoableCommands = [UndoableCommand]() weak var coordinator: SceneCoordinator! - lazy var keyboardManager = KeyboardManager(type: .sidebar, coordinator: coordinator) + private let keyboardManager = KeyboardManager(type: .sidebar) override var keyCommands: [UIKeyCommand]? { return keyboardManager.keyCommands } diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index 0b6ab4efd..96d8f6e26 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -24,7 +24,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner weak var coordinator: SceneCoordinator! var undoableCommands = [UndoableCommand]() - lazy var keyboardManager = KeyboardManager(type: .timeline, coordinator: coordinator) + private let keyboardManager = KeyboardManager(type: .timeline) override var keyCommands: [UIKeyCommand]? { return keyboardManager.keyCommands } diff --git a/iOS/RootSplitViewController.swift b/iOS/RootSplitViewController.swift index 5653c267c..d5726eaa0 100644 --- a/iOS/RootSplitViewController.swift +++ b/iOS/RootSplitViewController.swift @@ -13,7 +13,7 @@ class RootSplitViewController: UISplitViewController { var coordinator: SceneCoordinator! - lazy var keyboardManager = KeyboardManager(type: .global, coordinator: coordinator) + private let keyboardManager = KeyboardManager(type: .global) override var keyCommands: [UIKeyCommand]? { return keyboardManager.keyCommands }