BookingBadgeable

Author: adborbas

WooCommerce/Classes/Bookings/BookingBadgeView.swift

@@ -15,17 +15,18 @@ struct BookingBadgeView: View {
     }
 }
 
-extension BookingBadgeView {
-    init(_ status: BookingAttendanceStatus) {
-        self.init(text: status.localizedTitle, color: status.badgeColor)
-    }
+protocol BookingBadgeable {
+    var text: String { get }
+    var badgeColor: Color { get }
+}
 
-    init(_ status: BookingStatus) {
-        self.init(text: status.localizedTitle, color: status.badgeColor)
+extension BookingBadgeView {
+    init(_ badgeable: BookingBadgeable) {
+        self.init(text: badgeable.text, color: badgeable.badgeColor)
     }
 }
 
-extension BookingAttendanceStatus {
+extension BookingAttendanceStatus: BookingBadgeable {
     var badgeColor: Color {
         switch self {
         case .noShow:
@@ -34,9 +35,13 @@ extension BookingAttendanceStatus {
             return BadgeColor.default
         }
     }
+
+    var text: String {
+        self.localizedTitle
+    }
 }
 
-extension BookingStatus {
+extension BookingStatus: BookingBadgeable {
     var badgeColor: Color {
         switch self {
         case .unpaid:
@@ -45,6 +50,10 @@ extension BookingStatus {
             return BadgeColor.default
         }
     }
+
+    var text: String {
+        self.localizedTitle
+    }
 }
 
 fileprivate enum BadgeColor {

WooCommerce/Classes/ViewModels/Booking Details/HeaderContent.swift

@@ -3,11 +3,14 @@ import struct Yosemite.Booking
 import struct Yosemite.BookingProductInfo
 import struct Yosemite.Customer
 import struct Yosemite.Address
+import enum Yosemite.BookingAttendanceStatus
+import enum Yosemite.BookingStatus
 
 extension BookingDetailsViewModel {
     final class HeaderContent: ObservableObject {
         @Published private(set) var bookingDate: String = ""
-        @Published private(set) var status: [String] = []
+        @Published private(set) var attendanceStatus: BookingAttendanceStatus = .unknown
+        @Published private(set) var bookingStatus: BookingStatus = .unknown
         @Published private(set) var serviceAndCustomerLine: String = ""
 
         func update(with booking: Booking) {
@@ -17,11 +20,8 @@ extension BookingDetailsViewModel {
                 timeZone: BookingListTab.utcTimeZone
             )
             serviceAndCustomerLine = booking.summaryText
-
-            status = [
-                booking.attendanceStatus.localizedTitle,
-                booking.bookingStatus.localizedTitle
-            ]
+            attendanceStatus = booking.attendanceStatus
+            bookingStatus = booking.bookingStatus
         }
     }
 }

WooCommerce/Classes/ViewRelated/Bookings/Booking Details/HeaderView.swift

@@ -17,16 +17,8 @@ extension BookingDetailsView {
                         .foregroundColor(.secondary)
                 }
                 HStack {
-                    ForEach(content.status, id: \.self) { statusString in
-                        Text(statusString)
-                            .font(.caption2)
-                            .padding(.vertical, 4.5)
-                            .padding(.horizontal, 8)
-                            .background(
-                                BookingDetailsView.Layout.defaultBadgeColor
-                            )
-                            .cornerRadius(4)
-                    }
+                    BookingBadgeView(content.attendanceStatus)
+                    BookingBadgeView(content.bookingStatus)
                 }
                 .padding(.top, Layout.headerBadgesAdditionalTopPadding)
             }