Added UserDefaultsUnit properrty wrapper

1Weather/Model/Settings.swift

@@ -9,7 +9,7 @@ import UIKit
 import Localize_Swift
 import Localize_Swift
 
 
 @propertyWrapper
 @propertyWrapper
-struct UserDefaultsValue<T> {
+struct UserDefaultsUnitValue<T> {
     var wrappedValue: T {
     var wrappedValue: T {
         get {
         get {
             guard
             guard
@@ -20,14 +20,16 @@ struct UserDefaultsValue<T> {
             }
             }
             
             
             return decoded
             return decoded
-            
-//            let value = UserDefaults.standard.value(forKey: key) as? T
-//            return value ?? defaultValue
         }
         }
         set {
         set {
-            let data = NSKeyedArchiver.archivedData(withRootObject: T.self)
+            if let data = try? NSKeyedArchiver.archivedData(withRootObject: newValue, requiringSecureCoding: true) {
                 UserDefaults.standard.set(data, forKey: key)
                 UserDefaults.standard.set(data, forKey: key)
                 UserDefaults.standard.synchronize()
                 UserDefaults.standard.synchronize()
+                
+                Settings.shared.delegate.invoke { (delegate) in
+                    delegate.settingsDidChange()
+                }
+            }
         }
         }
     }
     }
     
     
@@ -40,26 +42,54 @@ struct UserDefaultsValue<T> {
     }
     }
 }
 }
 
 
+@propertyWrapper
+struct UserDefaultsBasicValue<T> {
+    var wrappedValue: T {
+        get {
+            let value = UserDefaults.standard.value(forKey: key) as? T
+            return value ?? defaultValue
+        }
+        
+        set {
+            UserDefaults.standard.setValue(newValue, forKey: key)
+            UserDefaults.standard.synchronize()
+        }
+    }
+    
+    private let key: String
+    private let defaultValue: T
+
+    init(wrappedValue defaultValue:T, key:String) {
+        self.defaultValue = defaultValue
+        self.key = key
+    }
+}
+
+protocol SettingsDelegate:class {
+    func settingsDidChange()
+}
+
 class Settings {
 class Settings {
     static let shared = Settings()
     static let shared = Settings()
+    let delegate = MulticastDelegate<SettingsDelegate>()
     private init() {}
     private init() {}
     
     
-    @UserDefaultsValue(key: "app_theme")
+    @UserDefaultsBasicValue(key: "app_theme")
     var appTheme = AppTheme.system
     var appTheme = AppTheme.system
     
     
-    @UserDefaultsValue(key: "app_theme_auto")
+    @UserDefaultsBasicValue(key: "app_theme_auto")
     var automaticSwitchTheme = false
     var automaticSwitchTheme = false
     
     
-    @UserDefaultsValue(key: "temperature_type")
+    @UserDefaultsUnitValue(key: "temperature_type")
     var temperatureType = UnitTemperature.celsius
     var temperatureType = UnitTemperature.celsius
     
     
-    @UserDefaultsValue(key: "wind_speed_type")
+    @UserDefaultsUnitValue(key: "wind_speed_type")
     var windSpeedType = UnitSpeed.milesPerHour
     var windSpeedType = UnitSpeed.milesPerHour
     
     
-    @UserDefaultsValue(key: "pressure_type")
+    @UserDefaultsUnitValue(key: "pressure_type")
     var pressureType = UnitPressure.millibars
     var pressureType = UnitPressure.millibars
     
     
-    @UserDefaultsValue(key: "distance_type")
+    @UserDefaultsUnitValue(key: "distance_type")
     var distanceType = UnitLength.miles
     var distanceType = UnitLength.miles
     
     
     var locale:Locale {
     var locale:Locale {

1Weather/UI/View controllers/Settings/Cells/SettingsDetailsCellFactory.swift

@@ -55,6 +55,10 @@ class SettingsDetailsCellFactory: CellFactoryProtocol {
             break
             break
         }
         }
         
         
+        if numberOfRows(inSection: 1) == 1 {
+            mask = [.layerMinXMinYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner]
+        }
+        
         switch viewModel.rowType {
         switch viewModel.rowType {
         case .temperature:
         case .temperature:
             cell.configure(item: viewModel.temperatures[indexPath.row].name,
             cell.configure(item: viewModel.temperatures[indexPath.row].name,

1Weather/UI/View controllers/Settings/SettingsDetailsViewController.swift

@@ -31,6 +31,17 @@ class SettingsDetailsViewController: UIViewController {
         self.viewModel.delegate = self
         self.viewModel.delegate = self
         prepareController()
         prepareController()
         prepareTable()
         prepareTable()
+        updateUI()
+    }
+    
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        updateUI()
+    }
+    
+    private func updateUI() {
+        tableView.backgroundColor = ThemeManager.currentTheme.baseBackgroundColor
+        self.view.backgroundColor = ThemeManager.currentTheme.baseBackgroundColor
     }
     }
 }
 }
 
 

1Weather/UI/View controllers/Settings/SettingsViewController.swift

@@ -29,6 +29,7 @@ class SettingsViewController: UIViewController {
     override func viewDidLoad() {
     override func viewDidLoad() {
         super.viewDidLoad()
         super.viewDidLoad()
 
 
+        viewModel.delegate = self
         prepareController()
         prepareController()
         prepareTableView()
         prepareTableView()
         updateUI()
         updateUI()
@@ -81,6 +82,13 @@ private extension SettingsViewController {
     }
     }
 }
 }
 
 
+//MARK:- ViewModel Delegate
+extension SettingsViewController: ViewModelDelegate {
+    func viewModelDidChange<P>(model: P) where P : ViewModelProtocol {
+        tableView.reloadData()
+    }
+}
+
 //MARK:- UITableView Data Source
 //MARK:- UITableView Data Source
 extension SettingsViewController: UITableViewDataSource {
 extension SettingsViewController: UITableViewDataSource {
     func numberOfSections(in tableView: UITableView) -> Int {
     func numberOfSections(in tableView: UITableView) -> Int {

1Weather/ViewModels/SettingsViewModel.swift

@@ -11,4 +11,14 @@ import UIKit
 class SettingsViewModel: ViewModelProtocol {
 class SettingsViewModel: ViewModelProtocol {
     let settings = Settings.shared
     let settings = Settings.shared
     weak var delegate:ViewModelDelegate?
     weak var delegate:ViewModelDelegate?
+    
+    init() {
+        settings.delegate.add(delegate: self)
+    }
+}
+
+extension SettingsViewModel: SettingsDelegate {
+    func settingsDidChange() {
+        self.delegate?.viewModelDidChange(model: self)
+    }
 }
 }

PG.playground/Contents.swift

 import Foundation
 import Foundation
 import UIKit
 import UIKit
+
+let testData = try NSKeyedArchiver.archivedData(withRootObject: UnitTemperature.celsius, requiringSecureCoding: true)
+

Pods/Pods.xcodeproj/xcuserdata/dstepanets.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -21,7 +21,7 @@
 		<key>Cirque.xcscheme_^#shared#^_</key>
 		<key>Cirque.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>3</integer>
 		</dict>
 		</dict>
 		<key>Localize-Swift.xcscheme</key>
 		<key>Localize-Swift.xcscheme</key>
 		<dict>
 		<dict>
@@ -33,7 +33,7 @@
 		<key>Localize-Swift.xcscheme_^#shared#^_</key>
 		<key>Localize-Swift.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		</dict>
 		<key>Pods-1Weather.xcscheme</key>
 		<key>Pods-1Weather.xcscheme</key>
 		<dict>
 		<dict>