fixes to dates on ios app, among other updates

Author: foxfriends

ios/ConArtist.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -10,7 +10,7 @@
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES"
+            buildForArchiving = "NO"
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
@@ -29,17 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "326B7E0021FEA52B00E8DF34"
-            BuildableName = "ConArtist DEV.app"
-            BlueprintName = "ConArtist DEV"
-            ReferencedContainer = "container:ConArtist.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -55,14 +44,12 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "326B7E0021FEA52B00E8DF34"
-            BuildableName = "ConArtist DEV.app"
-            BlueprintName = "ConArtist DEV"
+            BlueprintIdentifier = "321B75D51F9BAD320055EBC4"
+            BuildableName = "ConArtist.app"
+            BlueprintName = "ConArtist"
             ReferencedContainer = "container:ConArtist.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ios/ConArtist.xcodeproj/xcshareddata/xcschemes/ConArtist DEV.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/ConArtist.xcodeproj/xcshareddata/xcschemes/ConArtist.xcscheme

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

ios/ConArtist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -369,24 +369,24 @@ extension Convention {
     }
 
     var isStarted: Bool {
-        return start.changeTimeZone(from: TimeZone.UTC, to: .current) <= Date().roundToDay()
+        return Date().changeTimeZone(from: .UTC, to: .autoupdatingCurrent) > start
     }
 
     var isEnded: Bool {
-        return end.changeTimeZone(from: TimeZone.UTC, to: .current) < Date().roundToDay()
+        return Date().changeTimeZone(from: .UTC, to: .autoupdatingCurrent) > end
     }
 }
 
 // MARK: - Date formatting
 extension Convention {
-    static var DateFormat: String { return "MMM. d, yyyy"¡ }
-
     var dateString: String {
         get { return Convention.formatDateRange(start: self.start, end: self.end) }
     }
 
     static func formatDateRange(start: Date, end: Date) -> String {
-        return "{} - {}"¡ % start.toString(Convention.DateFormat, timeZone: .UTC) % end.toString(Convention.DateFormat, timeZone: .UTC)
+        var format = Date.FormatStyle.dateTime.month(.abbreviated).day(.defaultDigits).year(.defaultDigits)
+        format.timeZone = .UTC
+        return "{} - {}"¡ % start.formatted(format) % end.formatted(format)
     }
 }
 

ios/ConArtist/Model/Convention.swift

@@ -28,9 +28,9 @@ enum ConventionExtraInfo: Codable {
         case city
     }
 
-    static var HourFormat: String { return "h:mma"¡ }
-    static var ShortHourFormat: String { return "h:mm"¡ }
-    static var ShortDayFormat: String { return "EEE"¡ }
+    static var HourFormat: Date.FormatStyle { return Date.FormatStyle().hour(.defaultDigits(amPM: .abbreviated)).minute(.twoDigits) }
+    static var ShortHourFormat: Date.FormatStyle { return Date.FormatStyle().hour(.defaultDigits(amPM: .omitted)).minute(.twoDigits) }
+    static var ShortDayFormat: Date.FormatStyle { return Date.FormatStyle().weekday(.abbreviated) }
 
     case Hours([(Date, Date)])
     case Dates(Date, Date)
@@ -76,9 +76,9 @@ enum ConventionExtraInfo: Codable {
             return hours
                 .map { open, close in
                     "{} {} - {}"¡
-                        % open.toString(ConventionExtraInfo.ShortDayFormat)
-                        % open.toString(ConventionExtraInfo.HourFormat)
-                        % close.toString(ConventionExtraInfo.HourFormat)
+                    % open.formatted(ConventionExtraInfo.ShortDayFormat)
+                    % open.formatted(ConventionExtraInfo.HourFormat)
+                    % close.formatted(ConventionExtraInfo.HourFormat)
                 }
                 .joined(separator: "\n")
         case .Dates(let start, let end):

ios/ConArtist/Model/ConventionExtraInfo.swift

@@ -129,12 +129,12 @@ extension ConventionListViewController {
             .asObservable()
             .share(replay: 1)
         let past = conventions
-            .map { cons in cons.filter { $0.end < Date.today() } }
+            .map { cons in cons.filter { $0.isEnded } }
             .map { cons in cons.sorted { $0.start > $1.start } }
         let present = conventions
-            .map { cons in cons.filter { $0.start <= Date.today() && $0.end >= Date.today() } }
+            .map { cons in cons.filter { con in con.isStarted && !con.isEnded } }
         let future = conventions
-            .map { cons in cons.filter { $0.start > Date.today() } }
+            .map { cons in cons.filter { con in !con.isStarted && !con.isEnded } }
             .map { cons in cons.sorted { $0.start < $1.start } }
 
         past.subscribe(onNext: { [weak self] in self?.past = $0 }).disposed(by: disposeBag)

ios/ConArtist/Scenes/Convention List/ConventionListViewController.swift

@@ -45,8 +45,8 @@ class ConventionTableViewCell: ConArtistTableViewCell {
         if case .Hours(let hours)? = hours,
             let (open, close) = hours.first(where: { start, end in start.roundToDay() == Date().roundToDay()}) {
             timeLabel?.text = "{} - {}"¡
-                % open.toString(ConventionExtraInfo.ShortHourFormat)
-                % close.toString(ConventionExtraInfo.ShortHourFormat)
+                % open.formatted(ConventionExtraInfo.ShortHourFormat)
+                % close.formatted(ConventionExtraInfo.ShortHourFormat)
         } else {
             timeLabel?.text = ""
         }

ios/ConArtist/Scenes/Convention List/ConventionTableViewCell.swift

@@ -102,7 +102,7 @@ extension ExpenseDetailsOverlayViewController {
         categoryLabel.text = expense.category
         amountLabel.font = amountLabel.font.usingFeatures([.tabularFigures])
         amountLabel.text = expense.price.toString()
-        timeLabel.text = expense.time.toString("EEEE MMMM d, yyyy. h:mm a"¡)
+        timeLabel.text = expense.time.formatted(date: .complete, time: .shortened)
         noteLabel.text = expense.description.isEmpty ? "Nothing to say..."¡ : expense.description
         noteLabel.textColor = expense.description.isEmpty ? .textPlaceholder : .text
         backgroundButton.alpha = 0

ios/ConArtist/Scenes/Record List/Overlays/ExpenseDetailsOverlayViewController.swift

@@ -141,7 +141,7 @@ extension RecordDetailsOverlayViewController {
         }
         amountLabel.font = amountLabel.font.usingFeatures([.tabularFigures])
         amountLabel.text = record.price.toString()
-        timeLabel.text = record.time.toString("EEEE MMMM d, yyyy. h:mm a"¡)
+        timeLabel.text = record.time.formatted(date: .complete, time: .shortened)
         noteLabel.text = record.info.isEmpty ? "Nothing to say..."¡ : record.info
         noteLabel.textColor = record.info.isEmpty ? .textPlaceholder : .text
         backgroundButton.alpha = 0
@@ -151,7 +151,7 @@ extension RecordDetailsOverlayViewController {
             .reduce(0, +)
         itemsTableViewHeightConstraint.constant = height
         navBar.title = convention?.name ?? "Sale"¡
-        navBar.subtitle = after?.toString("MMM. d, yyyy"¡)
+        navBar.subtitle = after?.formatted(date: .abbreviated, time: .omitted)
         navBar.layer.shadowOpacity = 0
         itemsTableView.reloadData()
     }