style: 💄 code formating for Swift/AnniversaryCalculatorDemo

empty array init , use guard instead of "!", remove self and ";"

Author: ChenYilong

Swift/AnniversaryCalculator/AnniversaryCalculatorDemo/Couple.swift

@@ -12,33 +12,33 @@ struct Couple {
     let anniversary: String
 
     func shouldAnniversaryToRemind() -> Bool {
-        if (self.anniversary.isEmpty || self.coupleId.isEmpty) {
-            return false;
+        if (anniversary.isEmpty || coupleId.isEmpty) {
+            return false
         }
 
-        let anniversaryAtStr = self.anniversary
-        var anniversaryAt: Date = Date.dateFromISOString(string: anniversaryAtStr) ?? Date();
-
+        let anniversaryAtStr = anniversary
+        var anniversaryAt: Date = Date.dateFromISOString(string: anniversaryAtStr) ?? Date()
+        
         if anniversaryAt >= Date() {
             return false
         }
 
-        let gapYears: Int =  Date.gapYears(date: anniversaryAt)
-
+        let gapYears: Int = Date.gapYears(date: anniversaryAt)
+        
         anniversaryAt = Date.thisYearDate(pastDate: anniversaryAt)
         if gapYears % 10 == 0 {
-            anniversaryAt = anniversaryAt.afterDays(days: 14)
+            anniversaryAt = anniversaryAt.after(days: 14)
         } else if gapYears % 5 == 0 {
-            anniversaryAt = anniversaryAt.afterDays(days: 7)
+            anniversaryAt = anniversaryAt.after(days: 7)
         }
-         
-        let beginReminderDate = Date().afterDays(days: 1)
-        let endReminderDate = Date().afterDays(days: 14)
 
-        if anniversaryAt <= endReminderDate  && anniversaryAt  >= beginReminderDate {
+        let beginReminderDate = Date().after(days: 1)
+        let endReminderDate = Date().after(days: 14)
+        
+        if anniversaryAt <= endReminderDate && anniversaryAt >= beginReminderDate {
             return true
         }
-        return false;
+        return false
     }
 
 }

Swift/AnniversaryCalculator/AnniversaryCalculatorDemo/DateExtension.swift

@@ -25,18 +25,15 @@ extension Date {
         return dateFormatter.date(from: string)
     }
 
-    func afterDays(days: Int) -> Date {
-        var dayComponent    = DateComponents()
-        dayComponent.day    = days // For removing one day (yesterday): -1
-        let theCalendar     = Calendar.current
-        let nextDate : Date = theCalendar.date(byAdding: dayComponent, to: Date())!
-        
+    func after(days: Int) -> Date {
+        var dayComponent = DateComponents()
+        dayComponent.day = days // For removing one day (yesterday): -1
+        let theCalendar = Calendar.current
+        guard let nextDate = theCalendar.date(byAdding: dayComponent, to: Date()) else { return Date() }
 
         let dateComponents: DateComponents? = theCalendar.dateComponents([.year, .month, .day], from: nextDate)
-
-        let date: Date? = theCalendar.date(from: dateComponents!)
-        
-        return date!;
+        guard let date = theCalendar.date(from: dateComponents ?? DateComponents()) else { return Date() }
+        return date;
     }
 
     static func gapYears(date: Date) -> Int {
@@ -53,12 +50,9 @@ extension Date {
         let calendar = Calendar.current
 
         var dateComponents: DateComponents? = calendar.dateComponents([.year, .month, .day], from: pastDate)
-        
-        //         dateComponents?.day = 17
-        //         dateComponents?.month = 5
         dateComponents?.year =  Calendar.current.component(.year, from: Date())
-        let date: Date? = calendar.date(from: dateComponents!)
-        return date!;
+        guard let date = calendar.date(from: dateComponents ?? DateComponents()) else { return Date() }
+        return date;
     }
 
 }

Swift/AnniversaryCalculator/AnniversaryCalculatorDemo/ViewController.swift

@@ -14,12 +14,12 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
 
-        for couple in self.viewModel.couples {
+        for couple in viewModel.couples {
             if couple.shouldAnniversaryToRemind() {
-                self.viewModel.couplesToRemind.append(couple)
+                viewModel.couplesToRemind.append(couple)
             }
         }
-        print("shouldAnniversaryToRemind: " , self.viewModel.couplesToRemind)
+        print(viewModel.couplesToRemind)
     }
 
 

Swift/AnniversaryCalculator/AnniversaryCalculatorDemo/ViewModel.swift

@@ -8,9 +8,8 @@
 import Foundation
 
 class ViewModel {
-
-    var couples : Array = Array<Couple>();
-    var couplesToRemind : Array = Array<Couple>();
+    var couples: [Couple] = []
+    var couplesToRemind: [Couple] = [];
 
     init() {
         let Couple_1 = Couple(

Swift/AnniversaryCalculator/AnniversaryCalculatorDemoTests/AnniversaryCalculatorDemoTests.swift

@@ -11,36 +11,36 @@ import XCTest
 
 class TestViewModel {
 
-    var couples : Array = Array<Couple>();
-    var couplesToRemind : Array = Array<Couple>();
+    var couples: [Couple] = []
+    var couplesToRemind: [Couple] = [];
 
     init() {
         let Couple_1 = Couple(
             coupleId: "1",
-            anniversary: Date.ISOStringFromDate(date: Date().afterDays(days: (-365+1)))
+            anniversary: Date.ISOStringFromDate(date: Date().after(days: (-365+1)))
         )
         let Couple_2 = Couple(
             coupleId: "2",
-            anniversary: Date.ISOStringFromDate(date: Date().afterDays(days: (-365+2)))
+            anniversary: Date.ISOStringFromDate(date: Date().after(days: (-365+2)))
 
         )
         let Couple_3 = Couple(
             coupleId: "3",
-            anniversary: Date.ISOStringFromDate(date: Date().afterDays(days: (-365*5-6)))//"2017-8-08T03:07:33.457Z"
+            anniversary: Date.ISOStringFromDate(date: Date().after(days: (-365*5-6)))//"2017-8-08T03:07:33.457Z"
 
         )
         let Couple_4 = Couple(
             coupleId: "4",
-            anniversary: Date.ISOStringFromDate(date: Date().afterDays(days: (-365*5-5)))//"2017-8-22T03:07:33.457Z"
+            anniversary: Date.ISOStringFromDate(date: Date().after(days: (-365*5-5)))//"2017-8-22T03:07:33.457Z"
 
         )
         let Couple_5 = Couple(
             coupleId: "5",
-            anniversary: Date.ISOStringFromDate(date: Date().afterDays(days:(-365*10-13)))//"2012-8-01T03:07:33.457Z"
+            anniversary: Date.ISOStringFromDate(date: Date().after(days:(-365*10-13)))//"2012-8-01T03:07:33.457Z"
         )
         let Couple_6 = Couple(
             coupleId: "6",
-            anniversary: Date.ISOStringFromDate(date: Date().afterDays(days: (-365*10-12)))//"2012-8-15T03:07:33.457Z"
+            anniversary: Date.ISOStringFromDate(date: Date().after(days: (-365*10-12)))//"2012-8-15T03:07:33.457Z"
         )
         couples = [
             Couple_1,