Refactor models

soffes · Mar 24, 2018 · d2c445e · d2c445e
1 parent 9028dfd
commit d2c445e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/Clock/Classes/BN0021.swift b/Clock/Classes/BN0021.swift
@@ -72,6 +72,10 @@ final class BN0021: ClockView {
 
 	// MARK: - ClockView
 
+	override class var modelName: String {
+		return "BN0021"
+	}
+
 	override var styleName: String {
 		set {
 			style = Style(rawValue: newValue) ?? Style.default

diff --git a/Clock/Classes/BN0032.swift b/Clock/Classes/BN0032.swift
@@ -67,6 +67,10 @@ final class BN0032: ClockView {
 
 	// MARK: - ClockView
 
+	override class var modelName: String {
+		return "BN0032"
+	}
+
 	override var styleName: String {
 		set {
 			style = Style(rawValue: newValue) ?? Style.default

diff --git a/Clock/Classes/BN0111.swift b/Clock/Classes/BN0111.swift
@@ -87,6 +87,10 @@ final class BN0111: ClockView {
 
 	// MARK: - ClockView
 
+	override class var modelName: String {
+		return "BN0111"
+	}
+
 	override var styleName: String {
 		set {
 			style = Style(rawValue: newValue) ?? Style.default

diff --git a/Clock/Classes/ClockView.swift b/Clock/Classes/ClockView.swift
@@ -5,6 +5,10 @@ class ClockView: NSView {
 
 	// MARK: - Properties
 
+	class var modelName: String {
+		fatalError("Unimplemented")
+	}
+
 	var drawsLogo = false
 	var logoImage: NSImage?
 	var clockFrame: CGRect {

diff --git a/Clock/Classes/MainView.swift b/Clock/Classes/MainView.swift
@@ -1,7 +1,7 @@
 import AppKit
 import ScreenSaver
 
-class MainView: ScreenSaverView {
+final class MainView: ScreenSaverView {
 
 	// MARK: - Properties
 

diff --git a/Clock/Classes/Preferences.swift b/Clock/Classes/Preferences.swift
@@ -6,14 +6,6 @@ extension Notification.Name {
 	static let ModelDidChange = Notification.Name(rawValue: "SAMClockModelDidChangeNotification")
 }
 
-let models: [String: ClockView.Type] = [
-	"BN0021": BN0021.self,
-	"BN0032": BN0032.self,
-	"BN0111": BN0111.self
-]
-
-let defaultModel = BN0032.self
-
 final class Preferences: NSObject {
 
 	// MARK: - Types
@@ -32,13 +24,21 @@ final class Preferences: NSObject {
 
 	private let defaults: UserDefaults = ScreenSaverDefaults(forModuleWithName: Bundle(for: Preferences.self).bundleIdentifier!)!
 
+	private let models = [
+		BN0021.self,
+		BN0032.self,
+		BN0111.self
+	]
+
+	private let defaultModel = BN0032.self
+
 	var model: ClockView.Type {
-		return models[modelName] ?? defaultModel
+		return models.first { $0.modelName == modelName } ?? defaultModel
 	}
 
 	@objc var modelName: String {
 		get {
-			return defaults.string(forKey: DefaultsKey.model.key) ?? "BN0032"
+			return defaults.string(forKey: DefaultsKey.model.key) ?? defaultModel.modelName
 		}
 
 		set {
@@ -81,8 +81,8 @@ final class Preferences: NSObject {
 
 	override init() {
 		defaults.register(defaults: [
-			DefaultsKey.model.key: "BN0032",
-			DefaultsKey.style.key: "BKBKG",
+			DefaultsKey.model.key: defaultModel.modelName,
+			DefaultsKey.style.key: defaultModel.Style.default.rawValue,
 			DefaultsKey.logo.key: false
 		])
 	}