Package.swift

@@ -9,7 +9,7 @@ let package = Package(
         .package(
             url: "https://github.com/moreSwift/swift-cross-ui",
             .upToNextMinor(from: "0.7.0"),
-    )
+        ),
     ],
     targets: [
         .executableTarget(
@@ -18,6 +18,6 @@ let package = Package(
                 .product(name: "SwiftCrossUI", package: "swift-cross-ui"),
                 .product(name: "DefaultBackend", package: "swift-cross-ui"),
             ],
-    )
+        ),
     ],
 )

Sources/AmtrakStatus/AmtrakClient.swift

@@ -7,6 +7,7 @@ enum AmtrakError: Error {
     case stationNotFound(String)
 }
 
+
 struct TrainStationLookUp: Sendable {
     var trainNumbers: [String]
     var timeZone: TimeZone?
@@ -51,6 +52,7 @@ struct AmtrakClient {
             .map(String.init) ?? trainId
     }
     
+
     func trainStationLookup(stationCode code: String) async throws -> TrainStationLookUp {
         let reponse = try await fetchStation(code: code)
 
@@ -76,7 +78,7 @@ struct AmtrakClient {
             throw AmtrakError.invalidResponse
         }
 
-    guard (200..<300).contains(http.statusCode) else {
+        guard (200 ..< 300).contains(http.statusCode) else {
             throw AmtrakError.httpStatus(http.statusCode)
         }
 

Sources/AmtrakStatus/AmtrakDateFormatting.swift

@@ -18,23 +18,17 @@ struct AmtrakDateFormatting {
     }()
     
     func parsedDate(from isoString: String?) -> Date? {
-    guard let isoString, !isoString.isEmpty,
+        guard let isoString, !isoString.isEmpty, let date = isoFormatter.date(
-      let date = isoFormatter.date(
+            from: isoString) else {
-        from: isoString)
-    else {
             return nil
         }
         
         return isoFormatter.date(from: isoString)
     }
     
-  func time(from isoString: String?, in zone: TimeZone?, comparedTo originZone: TimeZone? = nil)
+    func time(from isoString: String?, in zone: TimeZone?, comparedTo originZone: TimeZone? = nil) -> String? {
-    -> String?
+        guard let isoString, !isoString.isEmpty, let date = isoFormatter.date(
-  {
+            from: isoString) else {
-    guard let isoString, !isoString.isEmpty,
-      let date = isoFormatter.date(
-        from: isoString)
-    else {
             return nil
             }
         
@@ -54,6 +48,7 @@ struct AmtrakDateFormatting {
         return "\(formatted) \(abbreviation)"
     }
     
+    
     func isOnTime(actual: String?, scheduled: String?) -> LateTrain {
         
         guard
@@ -75,6 +70,7 @@ struct AmtrakDateFormatting {
         }
     }
     
+    
     func localTime(timeZone: TimeZone?) -> String {
         let now = Date()
         timeFormatter.timeZone = timeZone
@@ -87,10 +83,8 @@ struct AmtrakDateFormatting {
     }
     
     func date(from isoString: String?) -> String? {
-    guard let isoString, !isoString.isEmpty,
+        guard let isoString, !isoString.isEmpty, let date = isoFormatter.date(
-      let date = isoFormatter.date(
+            from: isoString) else {
-        from: isoString)
-    else {
             return nil
         }
         

Sources/AmtrakStatus/AmtrakStatusApp.swift

@@ -4,7 +4,7 @@ import SwiftCrossUI
 @main
 struct AmtrakStatusApp: App {
     var body: some Scene {
-    WindowGroup("AMTK Status") {
+        WindowGroup("Amtrak Status") {
             ContentView()
         }
     }

Sources/AmtrakStatus/ContentView.swift

@@ -1,5 +1,6 @@
-import Foundation
 import SwiftCrossUI
+import Foundation
+
 
 struct ContentView: View {
     @State var client = AmtrakClient()
@@ -147,8 +148,7 @@ struct ContentView: View {
                 let trains = try await client.fetchAllTrainStatus(num: number)
                 for train in trains {
                     let platform = train.stations?.first(
-            where: {
+                        where: { $0.code == code
-              $0.code == code
                         },
                     )?.platform
                     let row = await trainStatus(
@@ -201,13 +201,11 @@ struct ContentView: View {
             )
         }
         
-    let time =
+        let time = amtrakDate.time(
-      amtrakDate.time(
             from: leg?.arr,
             in: timeZone,
             comparedTo: originZone
-      )
+        ) ?? amtrakDate.time(
-      ?? amtrakDate.time(
             from: leg?.schArr,
             in: timeZone,
             comparedTo: originZone
@@ -247,8 +245,7 @@ struct ContentView: View {
         
         var calendar = Calendar.current
         calendar.timeZone = timeZone ?? .current
-    return
+        return calendar
-      calendar
             .compare(
                 deparatureDate,
                 to: Date(),
@@ -269,14 +266,12 @@ struct ContentView: View {
             return [:]
         }
         return Dictionary(
-      staleData.lastUpdatedArr.map { ($0.trainID, $0.timeSince) },
+            staleData.lastUpdatedArr.map { ( $0.trainID, $0.timeSince) },
             uniquingKeysWith: { first, _ in first }
         )
     }
     
-  func fetchTimeZone(forStationCode code: String, cache: inout [String: TimeZone?]) async
+    func fetchTimeZone(forStationCode code: String, cache: inout [String: TimeZone?]) async -> TimeZone? {
-    -> TimeZone?
-  {
         if let cached = cache[code] {
             return cached
         }

Sources/AmtrakStatus/LateTrain.swift

@@ -11,9 +11,9 @@ enum LateTrain {
         switch self {
         case .onTime:
             return "On Time"
-    case .early(let minutes):
+        case .early(minutes: let minutes):
             return "\(Self.formatted(minutes)) early"
-    case .late(let minutes):
+        case .late(minutes: let minutes):
             return "\(Self.formatted(minutes)) late"
         case .unknown:
             return ""

format.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-##===----------------------------------------------------------------------===##
-##
-## This source file is from the Swift Argument Parser open source project
-##
-## Copyright (c) 2025 Apple Inc. and the Swift project authors
-## Licensed under Apache License v2.0 with Runtime Library Exception
-##
-## See https://swift.org/LICENSE.txt for license information
-##
-##===----------------------------------------------------------------------===##
-
-echo "Formatting Swift sources in $(pwd)"
-
-# Run the format / lint commands
-git ls-files -z '*.swift' | xargs -0 swift format format --parallel --in-place
-git ls-files -z '*.swift' | xargs -0 swift format lint --strict --parallel