feat: Dates Screen Stylistic Changes

Core/Core/Assets.xcassets/CourseDates/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Core/Core/Assets.xcassets/CourseDates/assignment_icon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "edit_square.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Assets.xcassets/CourseDates/calendar_icon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "calender_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Assets.xcassets/CourseDates/certificate_icon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "certificate_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Assets.xcassets/CourseDates/lock_icon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "lock_icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Assets.xcassets/CourseDates/lock_with_watch_icon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "locked.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Assets.xcassets/CourseDates/school_cap_icon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "school.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Extensions/DateExtension.swift

@@ -9,12 +9,18 @@ import Foundation
 
 public extension Date {
     init(iso8601: String) {
-        let date: Date
+        let formats = ["yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZ"]
+        var date: Date
         var dateFormatter: DateFormatter?
         dateFormatter = DateFormatter()
-        dateFormatter?.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
         dateFormatter?.locale = Locale(identifier: "en_US_POSIX")
-        date = dateFormatter?.date(from: iso8601) ?? Date()
+
+        date = formats.compactMap { format in
+            dateFormatter?.dateFormat = format
+            return dateFormatter?.date(from: iso8601)
+        }
+        .first ?? Date()
+
         defer {
             dateFormatter = nil
         }
@@ -26,7 +32,7 @@ public extension Date {
         formatter.locale = .current
         formatter.unitsStyle = .full
         formatter.locale = Locale(identifier: "en_US_POSIX")
-        if self.description == Date().description {
+        if description == Date().description {
             return CoreLocalization.Date.justNow
         } else {
             return formatter.localizedString(for: self, relativeTo: Date())
@@ -104,7 +110,7 @@ public extension Date {
         case .iso8601:
             dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
         case .shortWeekdayMonthDayYear:
-            dateFormatter.dateFormat = "EEE, MMM d, yyyy"
+            applyShortWeekdayMonthDayYear(dateFormatter: dateFormatter)
         }
 
         let date = dateFormatter.string(from: self)
@@ -124,7 +130,7 @@ public extension Date {
             let days = Calendar.current.dateComponents([.day], from: self, to: Date())
             if let day = days.day {
                 if day < 2 {
-                    return self.timeAgoDisplay()
+                    return timeAgoDisplay()
                 } else {
                     return date
                 }
@@ -134,7 +140,57 @@ public extension Date {
         case .iso8601:
             return date
         case .shortWeekdayMonthDayYear:
-            return date
+            return getShortWeekdayMonthDayYear(dateFormatterString: date)
+        }
+    }
+
+    private func applyShortWeekdayMonthDayYear(dateFormatter: DateFormatter) {
+        if isCurrentYear() {
+            let days = Calendar.current.dateComponents([.day], from: self, to: Date())
+            if let day = days.day, (-6 ... -2).contains(day) {
+                dateFormatter.dateFormat = "EEEE"
+            } else {
+                dateFormatter.dateFormat = "MMMM d"
+            }
+        } else {
+            dateFormatter.dateFormat = "MMMM d, yyyy"
         }
     }
+
+    private func getShortWeekdayMonthDayYear(dateFormatterString: String) -> String {
+        let days = Calendar.current.dateComponents([.day], from: self, to: Date())
+
+        if let day = days.day {
+            guard isCurrentYear() else {
+                // It's past year or future year
+                return dateFormatterString
+            }
+
+            switch day {
+            case -6...(-2):
+                return dateFormatterString
+            case 2...6:
+                return timeAgoDisplay()
+            case -1:
+                return CoreLocalization.CourseDates.tomorrow
+            case 1:
+                return CoreLocalization.CourseDates.yesterday
+            default:
+                if day > 6 || day < -6 {
+                    return dateFormatterString
+                } else {
+                    // It means, date is in hours past due or upcoming
+                    return timeAgoDisplay()
+                }
+            }
+        } else {
+            return dateFormatterString
+        }
+    }
+
+    func isCurrentYear() -> Bool {
+        let selfYear = Calendar.current.component(.year, from: self)
+        let runningYear = Calendar.current.component(.year, from: Date())
+        return selfYear == runningYear
+    }
 }

Core/Core/SwiftGen/Assets.swift

@@ -28,6 +28,12 @@ public enum CoreAssets {
   public static let facebookButtonColor = ColorAsset(name: "FacebookButtonColor")
   public static let googleButtonColor = ColorAsset(name: "GoogleButtonColor")
   public static let microsoftButtonColor = ColorAsset(name: "MicrosoftButtonColor")
+  public static let assignmentIcon = ImageAsset(name: "assignment_icon")
+  public static let calendarIcon = ImageAsset(name: "calendar_icon")
+  public static let certificateIcon = ImageAsset(name: "certificate_icon")
+  public static let lockIcon = ImageAsset(name: "lock_icon")
+  public static let lockWithWatchIcon = ImageAsset(name: "lock_with_watch_icon")
+  public static let schoolCapIcon = ImageAsset(name: "school_cap_icon")
   public static let bookCircle = ImageAsset(name: "book.circle")
   public static let bubbleLeftCircle = ImageAsset(name: "bubble.left.circle")
   public static let docCircle = ImageAsset(name: "doc.circle")

Core/Core/SwiftGen/Strings.swift

@@ -63,14 +63,20 @@ public enum CoreLocalization {
     public static let completed = CoreLocalization.tr("Localizable", "COURSE_DATES.COMPLETED", fallback: "Completed")
     /// Due next
     public static let dueNext = CoreLocalization.tr("Localizable", "COURSE_DATES.DUE_NEXT", fallback: "Due next")
+    /// Items Hidden
+    public static let itemsHidden = CoreLocalization.tr("Localizable", "COURSE_DATES.ITEMS_HIDDEN", fallback: "Items Hidden")
     /// Past due
     public static let pastDue = CoreLocalization.tr("Localizable", "COURSE_DATES.PAST_DUE", fallback: "Past due")
     /// Today
     public static let today = CoreLocalization.tr("Localizable", "COURSE_DATES.TODAY", fallback: "Today")
+    /// Tomorrow
+    public static let tomorrow = CoreLocalization.tr("Localizable", "COURSE_DATES.TOMORROW", fallback: "Tomorrow")
     /// Unreleased
     public static let unreleased = CoreLocalization.tr("Localizable", "COURSE_DATES.UNRELEASED", fallback: "Unreleased")
     /// Verified Only
     public static let verifiedOnly = CoreLocalization.tr("Localizable", "COURSE_DATES.VERIFIED_ONLY", fallback: "Verified Only")
+    /// Yesterday
+    public static let yesterday = CoreLocalization.tr("Localizable", "COURSE_DATES.YESTERDAY", fallback: "Yesterday")
   }
   public enum Date {
     /// Ended

Core/Core/en.lproj/Localizable.strings

@@ -94,6 +94,9 @@
 "COURSE_DATES.DUE_NEXT" = "Due next";
 "COURSE_DATES.UNRELEASED" = "Unreleased";
 "COURSE_DATES.VERIFIED_ONLY" = "Verified Only";
+"COURSE_DATES.TOMORROW" = "Tomorrow";
+"COURSE_DATES.YESTERDAY" = "Yesterday";
+"COURSE_DATES.ITEMS_HIDDEN" = "Items Hidden";
 
 "SOCIAL_SIGN_CANCELED" = "The user canceled the sign-in flow.";
 

Core/Core/uk.lproj/Localizable.strings

@@ -94,6 +94,9 @@
 "COURSE_DATES.DUE_NEXT" = "Due next";
 "COURSE_DATES.UNRELEASED" = "Unreleased";
 "COURSE_DATES.VERIFIED_ONLY" = "Verified Only";
+"COURSE_DATES.TOMORROW" = "Tomorrow";
+"COURSE_DATES.YESTERDAY" = "Yesterday";
+"COURSE_DATES.ITEMS_HIDDEN" = "Items Hidden";
 
 "SOCIAL_SIGN_CANCELED" = "The user canceled the sign-in flow.";
 "AUTHORIZATION_FAILED" = "Authorization failed.";