set ridetime in list item view

criticalmaps · Sep 30, 2024 · af5443e · af5443e
1 parent 097ec12
commit af5443e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 44 deletions.
diff --git a/CriticalMapsKit/Sources/AppFeature/AppView.swift b/CriticalMapsKit/Sources/AppFeature/AppView.swift
@@ -175,45 +175,14 @@ public struct AppView: View {
   func bottomSheetContentView() -> some View {
     VStack {
       List(viewStore.nextRideState.rideEvents, id: \.id) { ride in
-        HStack(alignment: .center, spacing: .grid(2)) {
-          Image(uiImage: Asset.cm.image)
-            .accessibilityHidden(true)
-
-          VStack(alignment: .leading, spacing: .grid(1)) {
-            Text(ride.title)
-              .multilineTextAlignment(.leading)
-              .font(Font.body.weight(.semibold))
-              .foregroundColor(Color(.textPrimary))
-              .padding(.bottom, .grid(1))
-
-            VStack(alignment: .leading, spacing: 2) {
-              Label(ride.dateTime.humanReadableDate, systemImage: "calendar")
-                .multilineTextAlignment(.leading)
-                .font(.bodyTwo)
-                .foregroundColor(Color(.textSecondary))
-
-              Label(ride.dateTime.humanReadableTime, systemImage: "clock")
-                .multilineTextAlignment(.leading)
-                .font(.bodyTwo)
-                .foregroundColor(Color(.textSecondary))
-
-              if let location = ride.location {
-                Label(location, systemImage: "location.fill")
-                  .multilineTextAlignment(.leading)
-                  .font(.bodyTwo)
-                  .foregroundColor(Color(.textSecondary))
-              }
-            }
+        RideEventView(ride: ride)
+          .contentShape(Rectangle())
+          .padding(.vertical, .grid(1))
+          .accessibilityElement(children: .combine)
+          .onTapGesture {
+            viewStore.send(.onRideSelectedFromBottomSheet(ride))
           }
-          Spacer()
-        }
-        .contentShape(Rectangle())
-        .padding(.vertical, .grid(1))
-        .accessibilityElement(children: .combine)
-        .onTapGesture {
-          viewStore.send(.onRideSelectedFromBottomSheet(ride))
-        }
-        .listRowBackground(Color.clear)
+          .listRowBackground(Color.clear)
       }
       .listStyle(.plain)
     }
@@ -297,3 +266,42 @@ struct NumericContentTransition: ViewModifier {
     }
   }
 }
+
+struct RideEventView: View {
+  let ride: Ride
+
+  var body: some View {
+    HStack(alignment: .center, spacing: .grid(2)) {
+      Image(uiImage: Asset.cm.image)
+        .accessibilityHidden(true)
+
+      VStack(alignment: .leading, spacing: .grid(1)) {
+        Text(ride.title)
+          .multilineTextAlignment(.leading)
+          .font(Font.body.weight(.semibold))
+          .foregroundColor(Color(.textPrimary))
+          .padding(.bottom, .grid(1))
+
+        VStack(alignment: .leading, spacing: 2) {
+          Label(ride.dateTime.humanReadableDate, systemImage: "calendar")
+            .multilineTextAlignment(.leading)
+            .font(.bodyTwo)
+            .foregroundColor(Color(.textSecondary))
+
+          Label(ride.rideTime, systemImage: "clock")
+            .multilineTextAlignment(.leading)
+            .font(.bodyTwo)
+            .foregroundColor(Color(.textSecondary))
+
+          if let location = ride.location {
+            Label(location, systemImage: "location.fill")
+              .multilineTextAlignment(.leading)
+              .font(.bodyTwo)
+              .foregroundColor(Color(.textSecondary))
+          }
+        }
+      }
+      Spacer()
+    }
+  }
+}
diff --git a/CriticalMapsKit/Sources/Helpers/Date+Additions.swift b/CriticalMapsKit/Sources/Helpers/Date+Additions.swift
@@ -14,11 +14,6 @@ public extension Date {
     return component
   }
 
-  /// - Returns: Formatted time without date components.
-  var humanReadableTime: String {
-    self.formatted(Date.FormatStyle.localeAwareShortTime)
-  }
-
   /// - Returns: Formatted date without time components.
   var humanReadableDate: String {
     self.formatted(Date.FormatStyle.localeAwareShortDate)

diff --git a/CriticalMapsKit/Sources/SharedModels/NextRideFeature/Ride.swift b/CriticalMapsKit/Sources/SharedModels/NextRideFeature/Ride.swift
@@ -105,7 +105,7 @@ public extension Ride {
     {
       return dateTime.formatted(Date.FormatStyle.shortTimeWithEventTimeZone(timeZone))
     } else {
-      return dateTime.humanReadableTime
+      return dateTime.formatted(Date.FormatStyle.localeAwareShortTime)
     }
   }