From 44c91a68ec4879c74a598a492ce59a510ca18ae2 Mon Sep 17 00:00:00 2001
From: Valeriy Van <github@w7software.com>
Date: Mon, 11 Jan 2021 01:35:41 +0100
Subject: [PATCH] Improve how time of birth is handled

---
 Motivation/AgeView.swift                  | 12 ++++-
 Motivation/Configuration.xib              |  5 ++-
 Motivation/ConfigureSheetController.swift | 55 +++++++++++++++++++----
 Motivation/Preferences.swift              | 45 +++++++++++--------
 4 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/Motivation/AgeView.swift b/Motivation/AgeView.swift
index 414329c..00a92d2 100644
--- a/Motivation/AgeView.swift
+++ b/Motivation/AgeView.swift
@@ -115,7 +115,7 @@ class AgeView: ScreenSaverView {
 		animationTimeInterval = 1 / 30
 
 		// Recall preferences
-		birthday = Preferences().birthday
+        updateBirthday()
 
 		// Setup the label
 		addSubview(textLabel)
@@ -165,9 +165,17 @@ class AgeView: ScreenSaverView {
 
 	/// Birthday changed
 	@objc private func birthdayDidChange(_ notification: Notification?) {
-		birthday = Preferences().birthday
+        updateBirthday()
 	}
 
+    private func updateBirthday() {
+        if let dateComponents = Preferences().birthdayComponents {
+            birthday = Calendar.current.date(from: dateComponents)
+        } else {
+            birthday = Date()
+        }
+    }
+
 	/// Update the font for the current size
 	private func updateFont() {
 		if birthday != nil {
diff --git a/Motivation/Configuration.xib b/Motivation/Configuration.xib
index 676e59a..55aca8f 100644
--- a/Motivation/Configuration.xib
+++ b/Motivation/Configuration.xib
@@ -9,6 +9,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="ConfigureSheetController" customModule="Motivation" customModuleProvider="target">
             <connections>
                 <outlet property="birthdatePicker" destination="24i-HD-fhj" id="bHR-UT-Eba"/>
+                <outlet property="birthdayIncludesTimeToggle" destination="HSJ-VB-Zwi" id="Pjd-It-nKx"/>
                 <outlet property="lightRadio" destination="SYp-OG-PUb" id="QAx-UK-2Qi"/>
                 <outlet property="moderateRadio" destination="pTh-rE-L1F" id="Okf-GD-efx"/>
                 <outlet property="terrifyingRadio" destination="daF-cg-qud" id="Qzr-li-xhu"/>
@@ -105,8 +106,8 @@ DQ
                         </textFieldCell>
                     </textField>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="HSJ-VB-Zwi">
-                        <rect key="frame" x="18" y="149" width="52" height="18"/>
-                        <buttonCell key="cell" type="check" title="Time" bezelStyle="regularSquare" imagePosition="left" inset="2" id="3dd-s4-7Zs">
+                        <rect key="frame" x="18" y="149" width="97" height="18"/>
+                        <buttonCell key="cell" type="check" title="Include time" bezelStyle="regularSquare" imagePosition="left" inset="2" id="3dd-s4-7Zs">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
diff --git a/Motivation/ConfigureSheetController.swift b/Motivation/ConfigureSheetController.swift
index ac9ab59..0511a73 100644
--- a/Motivation/ConfigureSheetController.swift
+++ b/Motivation/ConfigureSheetController.swift
@@ -14,10 +14,29 @@ class ConfigureSheetController: NSObject {
 
     @IBOutlet var window: NSWindow?
     @IBOutlet weak var birthdatePicker: NSDatePicker!
+    @IBOutlet weak var birthdayIncludesTimeToggle: NSButton!
 	@IBOutlet weak var lightRadio: NSButton!
 	@IBOutlet weak var moderateRadio: NSButton!
 	@IBOutlet weak var terrifyingRadio: NSButton!
 
+    private var pickerElements: NSDatePicker.ElementFlags {
+        if birthdayIncludesTime {
+            return [.yearMonthDay, .hourMinute]
+        } else {
+            return [.yearMonthDay]
+        }
+    }
+
+    private var birthdayIncludesTime: Bool { birthdayIncludesTimeToggle.state.rawValue != 0 }
+
+    private var calendarComponents: Set<Calendar.Component> {
+        if birthdayIncludesTime {
+            return [.year, .month, .day, .hour, .minute]
+        } else {
+            return [.year, .month, .day]
+        }
+    }
+
     override init() {
         super.init()
         let myBundle = Bundle(for: ConfigureSheetController.self)
@@ -26,26 +45,46 @@ class ConfigureSheetController: NSObject {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+
         switch Preferences().motivationLevel {
         case .light: lightRadio.state = .on
         case .moderate: moderateRadio.state = .on
         case .terrifying: terrifyingRadio.state = .on
         }
-        if let birthday = Preferences().birthday {
-            birthdatePicker.dateValue = birthday
+        
+        let birthDate: Date
+        let timeIsIncluded: Bool
+        if let dateComponents = Preferences().birthdayComponents,
+           let date = Calendar.current.date(from: dateComponents)
+        {
+            birthDate = date
+            timeIsIncluded = dateComponents.hour != nil
+        } else {
+            // Probably, first launch
+            birthDate = Date()
+            timeIsIncluded = false
         }
+        birthdatePicker.dateValue = birthDate
+        birthdayIncludesTimeToggle.state = timeIsIncluded ? .on : .off
+        birthdatePicker.datePickerElements = pickerElements
     }
 
     @IBAction func dateDidChange(_ sender: NSDatePicker) {
-        Preferences().birthday = sender.dateValue
+        updateDate()
+    }
+
+    private func updateDate() {
+        Preferences().birthdayComponents =
+            Calendar
+                .current
+                .dateComponents(calendarComponents,
+                                from: birthdatePicker.dateValue)
+
     }
 
     @IBAction func time(_ sender: NSButton) {
-        if birthdatePicker.datePickerElements.contains(.hourMinute) {
-            birthdatePicker.datePickerElements = [.yearMonthDay]
-        } else {
-            birthdatePicker.datePickerElements = [.hourMinute, .yearMonthDay]
-        }
+        birthdatePicker.datePickerElements = pickerElements
+        updateDate()
     }
 
     @IBAction func close(_ sender: NSButton) {
diff --git a/Motivation/Preferences.swift b/Motivation/Preferences.swift
index c2ecb3a..82c1c6d 100644
--- a/Motivation/Preferences.swift
+++ b/Motivation/Preferences.swift
@@ -28,23 +28,31 @@ class Preferences: NSObject {
 	static var birthdayDidChangeNotificationName = "Preferences.birthdayDidChangeNotification"
 	static var motivationLevelDidChangeNotificationName = "Preferences.motivationLevelDidChangeNotification"
 
-	var birthday: Date? {
-		get {
-			let timestamp = defaults?.object(forKey: "Birthday") as? TimeInterval
-			return timestamp.map { Date(timeIntervalSince1970: $0) }
-		}
-
-		set {
-			if let date = newValue {
-				defaults?.set(date.timeIntervalSince1970, forKey: "Birthday")
-			} else {
-				defaults?.removeObject(forKey: "Birthday")
-			}
-			defaults?.synchronize()
-
-			NotificationCenter.default.post(name: Notification.Name(rawValue: type(of: self).birthdayDidChangeNotificationName), object: newValue)
-		}
-	}
+    var birthdayComponents: DateComponents? {
+        get {
+            if let data = defaults?.object(forKey: "BirthdayComponents") as? Data,
+               let dateComponents = try? JSONDecoder().decode(DateComponents.self, from: data) {
+                return dateComponents
+            } else if let timestamp = defaults?.object(forKey: "Birthday") as? TimeInterval {
+                // Trying read Date stored by earlier version
+                defaults?.removeObject(forKey: "Birthday")
+                let date = Date(timeIntervalSince1970: timestamp)
+                // Here we suppose time of birth is not included
+                return Calendar.current.dateComponents([.year, .month, .day], from: date)
+            } else {
+                // Not available. Probably, first launch.
+                return nil
+            }
+        }
+        set {
+            if let jsonData = try? JSONEncoder().encode(newValue) {
+                defaults?.setValue(jsonData, forKey: "BirthdayComponents")
+                defaults?.synchronize()
+            }
+            let notificationName = Notification.Name(rawValue: type(of: self).birthdayDidChangeNotificationName)
+            NotificationCenter.default.post(name: notificationName, object: newValue)
+        }
+    }
 
 	var motivationLevel: MotivationLevel {
 		get {
@@ -56,7 +64,8 @@ class Preferences: NSObject {
 			defaults?.set(newValue.rawValue, forKey: "MotivationLevel")
 			defaults?.synchronize()
 
-			NotificationCenter.default.post(name: Notification.Name(rawValue: type(of: self).motivationLevelDidChangeNotificationName), object: newValue.rawValue)
+            let notificationName = Notification.Name(rawValue: type(of: self).motivationLevelDidChangeNotificationName)
+			NotificationCenter.default.post(name: notificationName, object: newValue.rawValue)
 		}
 	}