Use 24-hour meeting times and numeric dates

Author: acv-w

WireCalling/Sources/WireCallingUI/Views/WireMeetings/MeetingForm/MeetingFormView.swift

@@ -211,7 +211,7 @@ struct MeetingFormView: View {
             Text(label)
             Spacer()
             pill(
-                text: date.wrappedValue.formatted(.dateTime.day().month(.abbreviated).year()),
+                text: DateFormatter.meetingDate.string(from: date.wrappedValue),
                 isSelected: expandedField == dateField
             ) {
                 toggleExpansion(dateField)
@@ -220,7 +220,7 @@ struct MeetingFormView: View {
             .disabled(!isDateFieldEnabled)
             .accessibilityHidden(!isDateFieldEnabled)
             pill(
-                text: date.wrappedValue.formatted(date: .omitted, time: .shortened),
+                text: DateFormatter.meetingTime.string(from: date.wrappedValue),
                 isSelected: expandedField == timeField
             ) {
                 toggleExpansion(timeField)
@@ -291,6 +291,8 @@ private struct MinuteIntervalTimePicker: UIViewRepresentable {
         let datePicker = UIDatePicker()
         datePicker.datePickerMode = .time
         datePicker.preferredDatePickerStyle = .wheels
+        // Keep 24-hour wheels even when the device uses a 12-hour clock.
+        datePicker.locale = Locale(identifier: "en_US_POSIX@hours=h23")
         datePicker.minuteInterval = minuteInterval
         datePicker.minimumDate = range.lowerBound
         datePicker.maximumDate = maximumDate

WireCalling/Sources/WireCallingUI/Views/WireMeetings/MeetingsView/MeetingsFormatter.swift

@@ -33,19 +33,14 @@ package struct MeetingsFormatter: MeetingsFormatterProtocol {
         let calendar = Calendar.current
 
         if calendar.isDate(date, inSameDayAs: now) {
-            return Strings.Header.today + " (\(DateFormatter.dayHeader.string(from: date)))"
+            return Strings.Header.today + " (\(DateFormatter.meetingDate.string(from: date)))"
         } else {
-            return DateFormatter.dayHeader.string(from: date)
+            return DateFormatter.meetingDate.string(from: date)
         }
     }
 
     package func timeRange(from start: Date, to end: Date) -> String {
-        let calendar = Calendar.current
-        let startPeriod = calendar.component(.hour, from: start) / 12
-        let endPeriod = calendar.component(.hour, from: end) / 12
-        let isSamePeriod = startPeriod == endPeriod
-        let startFormatter = isSamePeriod ? DateFormatter.meetingTimeWithoutPeriod : DateFormatter.meetingTime
-        let startString = startFormatter.string(from: start)
+        let startString = DateFormatter.meetingTime.string(from: start)
         let endString = DateFormatter.meetingTime.string(from: end)
         return "\(startString) - \(endString)"
     }
@@ -54,30 +49,20 @@ package struct MeetingsFormatter: MeetingsFormatterProtocol {
 
 // MARK: - Helpers
 
-private extension DateFormatter {
-
-    static let dayHeader: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.locale = .current
-        formatter.dateFormat = "EEEE, MMMM d"
-        return formatter
-    }()
-
-}
-
-private extension DateFormatter {
+extension DateFormatter {
 
-    static let meetingTimeWithoutPeriod: DateFormatter = {
+    static let meetingDate: DateFormatter = {
         let formatter = DateFormatter()
-        formatter.locale = .current
-        formatter.dateFormat = "hh:mm"
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.calendar = Calendar(identifier: .gregorian)
+        formatter.dateFormat = "dd.MM.yyyy"
         return formatter
     }()
 
     static let meetingTime: DateFormatter = {
         let formatter = DateFormatter()
-        formatter.locale = .current
-        formatter.dateFormat = "hh:mm a"
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "HH:mm"
         return formatter
     }()