Reflect current selected attendance status in selector

Author: RafaelKayumov

Modules/Sources/Networking/Model/Bookings/Booking.swift

@@ -29,7 +29,6 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         return BookingStatus(rawValue: statusKey) ?? .unknown
     }
 
-    /// periphery: ignore - will be used in UI in upcoming PRs
     public var attendanceStatus: BookingAttendanceStatus {
         return BookingAttendanceStatus(rawValue: attendanceStatusKey) ?? .unknown
     }
@@ -208,7 +207,6 @@ public enum BookingStatus: String, CaseIterable {
     case unknown
 }
 
-/// periphery: ignore - will be used in UI in upcoming PRs
 public enum BookingAttendanceStatus: String, CaseIterable {
     case booked
     case checkedIn = "checked-in"

Modules/Sources/Yosemite/Model/Model.swift

@@ -31,6 +31,7 @@ public typealias BookingCustomerInfo = Networking.BookingCustomerInfo
 public typealias BookingPaymentInfo = Networking.BookingPaymentInfo
 public typealias BookingProductInfo = Networking.BookingProductInfo
 public typealias BookingResource = Networking.BookingResource
+public typealias BookingAttendanceStatus = Networking.BookingAttendanceStatus
 public typealias CreateBlazeCampaign = Networking.CreateBlazeCampaign
 public typealias FallibleCancelable = Hardware.FallibleCancelable
 public typealias CommentStatus = Networking.CommentStatus

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

@@ -28,6 +28,10 @@ final class BookingDetailsViewModel: ObservableObject {
     @Published private(set) var navigationTitle = ""
     @Published private(set) var sections: [Section] = []
 
+    var bookingAttendanceStatus: BookingAttendanceStatus {
+        booking.attendanceStatus
+    }
+
     init(booking: Booking,
          stores: StoresManager = ServiceLocator.stores,
          storage: StorageManagerType = ServiceLocator.storageManager) {

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

@@ -84,7 +84,7 @@ struct BookingDetailsView: View {
             $0.toolbarRole(.editor)
         }
         .sheet(isPresented: $showingStatusSheet) {
-            UpdateAttendanceStatusView { selectedStatus in
+            UpdateAttendanceStatusView(selectedStatus: viewModel.bookingAttendanceStatus) { selectedStatus in
                 print("Selected status: \(selectedStatus)")
             }
             .padding(.top)

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

@@ -1,12 +1,14 @@
 import SwiftUI
+import Networking
 
 struct UpdateAttendanceStatusView: View {
     @Environment(\.dismiss) private var dismiss
-    private let statuses = AttendanceStatus.allCases
-    private let onStatusSelected: (AttendanceStatus) -> Void
+    private let onStatusSelected: (BookingAttendanceStatus) -> Void
+    @State private var selectedStatus: BookingAttendanceStatus
 
-    init(onStatusSelected: @escaping (AttendanceStatus) -> Void) {
+    init(selectedStatus: BookingAttendanceStatus, onStatusSelected: @escaping (BookingAttendanceStatus) -> Void) {
         self.onStatusSelected = onStatusSelected
+        self._selectedStatus = .init(initialValue: selectedStatus)
     }
 
     var body: some View {
@@ -17,7 +19,7 @@ struct UpdateAttendanceStatusView: View {
                     .foregroundColor(.secondary)
                     .padding(.horizontal)
 
-                ForEach(statuses) { status in
+                ForEach(Constants.statuses, id: \.self) { status in
                     HStack(alignment: .top, spacing: 16) {
                         Image(systemName: status.iconName)
                             .font(.title3.weight(.medium))
@@ -31,6 +33,13 @@ struct UpdateAttendanceStatusView: View {
                                 .foregroundColor(.secondary)
                                 .fixedSize(horizontal: false, vertical: true)
                         }
+
+                        if status == selectedStatus {
+                            Spacer()
+                            Image(systemName: "checkmark")
+                                .font(.title3.weight(.medium))
+                                .foregroundStyle(Color.accentColor)
+                        }
                     }
                     .padding(.horizontal)
                     .contentShape(Rectangle())
@@ -45,17 +54,7 @@ struct UpdateAttendanceStatusView: View {
     }
 }
 
-extension UpdateAttendanceStatusView {
-    enum AttendanceStatus: CaseIterable, Identifiable {
-        case booked
-        case checkedIn
-        case noShow
-
-        var id: Self { self }
-    }
-}
-
-private extension UpdateAttendanceStatusView.AttendanceStatus {
+private extension BookingAttendanceStatus {
     var title: String {
         switch self {
         case .booked:
@@ -64,6 +63,8 @@ private extension UpdateAttendanceStatusView.AttendanceStatus {
             return UpdateAttendanceStatusView.Localization.checkedInTitle
         case .noShow:
             return UpdateAttendanceStatusView.Localization.noShowTitle
+        case .cancelled, .unknown:
+            return ""
         }
     }
 
@@ -75,6 +76,8 @@ private extension UpdateAttendanceStatusView.AttendanceStatus {
             return UpdateAttendanceStatusView.Localization.checkedInDescription
         case .noShow:
             return UpdateAttendanceStatusView.Localization.noShowDescription
+        case .cancelled, .unknown:
+            return ""
         }
     }
 
@@ -83,14 +86,20 @@ private extension UpdateAttendanceStatusView.AttendanceStatus {
         case .booked:
             return "calendar.badge.checkmark"
         case .checkedIn:
-            return "calendar.and.person"
+            return "person.fill.checkmark"
         case .noShow:
             return "calendar.badge.exclamationmark"
+        case .cancelled, .unknown:
+            return ""
         }
     }
 }
 
 private extension UpdateAttendanceStatusView {
+    enum Constants {
+        static let statuses: [BookingAttendanceStatus] = [.booked, .checkedIn, .noShow]
+    }
+
     enum Localization {
         static let title = NSLocalizedString(
             "UpdateAttendanceStatusView.title",
@@ -136,7 +145,7 @@ private extension UpdateAttendanceStatusView {
 #if DEBUG
 struct UpdateAttendanceStatusView_Previews: PreviewProvider {
     static var previews: some View {
-        UpdateAttendanceStatusView { selectedStatus in
+        UpdateAttendanceStatusView(selectedStatus: .booked) { selectedStatus in
             print("Selected status: \(selectedStatus)")
         }
     }