(FEAT): Added support for room multi-filtering

ios/.swiftlint.yml

@@ -27,28 +27,28 @@ custom_rules:
     name: "Writing log messages directly to standard out is disallowed"
     regex: "(\\bprint|\\bdebugPrint|\\bdump|Swift\\.print|Swift\\.debugPrint|Swift\\.dump|_printChanges)\\s*\\("
     match_kinds:
-    - identifier
+      - identifier
     message: "Don't commit `print(…)`, `debugPrint(…)`, `dump(…)`, or `_printChanges()` as they write to standard out in release. Either log to a dedicated logging system or silence this warning in debug-only scenarios explicitly using `// swiftlint:disable:next no_direct_standard_out_logs`"
     severity: error
   no_file_literal:
     name: "#file is disallowed"
     regex: "(\\b#file\\b)"
     match_kinds:
-    - identifier
+      - identifier
     message: "Instead of #file, use #fileID"
     severity: error
   no_filepath_literal:
     name: "#filePath is disallowed"
     regex: "(\\b#filePath\\b)"
     match_kinds:
-    - identifier
+      - identifier
     message: "Instead of #filePath, use #fileID."
     severity: error
   no_unchecked_sendable:
     name: "`@unchecked Sendable` is discouraged."
     regex: "@unchecked Sendable"
     match_kinds:
-    - attribute.builtin
-    - typeidentifier
+      - attribute.builtin
+      - typeidentifier
     message: "Instead of using `@unchecked Sendable`, consider a safe alternative like a standard `Sendable` conformance or using `@preconcurrency import`. If you really must use `@unchecked Sendable`, you can add a `// swiftlint:disable:next no_unchecked_sendable` annotation with an explanation for how we know the type is thread-safe, and why we have to use @unchecked Sendable instead of Sendable. More explanation and suggested safe alternatives are available at https://github.com/airbnb/swift#unchecked-sendable."
-    severity: error
+    severity: error

ios/Buildings/Package.swift

@@ -36,7 +36,12 @@ let package = Package(
       swiftSettings: .defaultSettings),
     .target(
       name: "BuildingViewModels",
-      dependencies: ["BuildingInteractors", "BuildingModels", "CommonUI", .product(name: "BottomSheet", package: "BottomSheet")],
+      dependencies: [
+        "BuildingInteractors",
+        "BuildingModels",
+        .product(name: "RoomModels", package: "Rooms"),
+        .product(name: "BottomSheet", package: "BottomSheet"),
+      ],
       swiftSettings: .defaultSettings),
     .target(
       name: "BuildingInteractors",

ios/Buildings/Sources/BuildingViewModels/BuildingViewModel.swift

@@ -8,10 +8,10 @@
 import BuildingInteractors
 import BuildingModels
 import BuildingServices
-import CommonUI
 import Foundation
 import Location
 import Observation
+import RoomModels
 
 // MARK: - BuildingViewModel
 

ios/Buildings/Sources/BuildingViews/BuildingsTabView.swift

@@ -19,14 +19,12 @@ public struct BuildingsTabView<BuildingDestination: View, RoomDestination: View>
 
   public init(
     path: Binding<NavigationPath>,
-    viewModel: BuildingViewModel,
     selectedView: Binding<ViewOrientation>,
     _ roomsDestinationBuilderView: @escaping (Building) -> BuildingDestination,
     _ roomDestinationBuilderView: @escaping (Room) -> RoomDestination)
   {
     _path = path
     _selectedView = selectedView
-    self.viewModel = viewModel
     self.roomsDestinationBuilderView = roomsDestinationBuilderView
     self.roomDestinationBuilderView = roomDestinationBuilderView
   }
@@ -35,58 +33,9 @@ public struct BuildingsTabView<BuildingDestination: View, RoomDestination: View>
 
   public var body: some View {
     NavigationStack(path: $path) {
-      buildingsView
-        .refreshable {
-          Task {
-            await viewModel.reloadBuildings()
-          }
-        }
-        .redacted(reason: viewModel.isLoading ? .placeholder : [])
-        .toolbar {
-          // Buttons on the right
-          ToolbarItemGroup(placement: .navigationBarTrailing) {
-            HStack {
-              Button {
-                viewModel.getBuildingsInOrder()
-              } label: {
-                Image(systemName: "arrow.up.arrow.down")
-                  .resizable()
-                  .frame(width: 25, height: 20)
-              }
-
-              Button {
-                if selectedView == ViewOrientation.Card {
-                  selectedView = ViewOrientation.List
-                } else {
-                  selectedView = ViewOrientation.Card
-                }
-              } label: {
-                Image(systemName: selectedView == ViewOrientation.List ? "square.grid.2x2" : "list.bullet")
-                  .resizable()
-                  .frame(width: 22, height: 20)
-              }
-            }
-            .padding(5)
-            .foregroundStyle(theme.label.tertiary)
-          }
-        }
-        .navigationDestination(for: Building.self) { building in
-          roomsDestinationBuilderView(building)
-            .navigationTitle(building.name)
-            .navigationBarTitleDisplayMode(.inline)
-        }
-        .navigationDestination(for: Room.self) { room in // Renders the view for displaying a room that has been clicked on
-          roomDestinationBuilderView(room)
-        }
-        .onAppear {
-          if !viewModel.hasLoaded {
-            viewModel.onAppear()
-          }
-        }
-        .navigationTitle("Buildings")
-        .searchable(text: $viewModel.searchText, placement: .navigationBarDrawer(displayMode: .always), prompt: "K17")
+      mainContent
     }
-    .alert(item: $viewModel.loadBuildingErrorMessage) { error in
+    .alert(item: loadBuildingErrorBinding) { error in
       Alert(
         title: Text(error.title),
         message: Text(error.message),
@@ -100,7 +49,6 @@ public struct BuildingsTabView<BuildingDestination: View, RoomDestination: View>
 
   // MARK: Internal
 
-  @State var viewModel: BuildingViewModel
   @Binding var path: NavigationPath
   @State var rowHeight: CGFloat?
   @Binding var selectedView: ViewOrientation
@@ -119,15 +67,13 @@ public struct BuildingsTabView<BuildingDestination: View, RoomDestination: View>
             cardWidth: $cardWidth,
             building: building,
             buildings: buildings,
-            isLoading: viewModel.isLoading,
+            isLoading: buildingViewModel.isLoading,
             imageProvider: { roomID in
               BuildingImage[roomID]
             })
         }
       }
       .padding(.horizontal, 16)
-      // .listRowSeparator(.hidden)
-      // .listRowBackground(Color.clear)
     } header: {
       HStack {
         Text(campus)
@@ -152,7 +98,7 @@ public struct BuildingsTabView<BuildingDestination: View, RoomDestination: View>
             rowHeight: $rowHeight,
             building: building,
             buildings: buildings,
-            isLoading: viewModel.isLoading,
+            isLoading: buildingViewModel.isLoading,
             imageProvider: { buildingID in
               BuildingImage[buildingID]
             })
@@ -168,36 +114,106 @@ public struct BuildingsTabView<BuildingDestination: View, RoomDestination: View>
 
   // MARK: Private
 
+  @Environment(LiveBuildingViewModel.self) private var buildingViewModel
+
   @Environment(Theme.self) private var theme
 
   private let columns = [
     GridItem(.flexible()),
     GridItem(.flexible()),
   ]
 
+  private var searchTextBinding: Binding<String> {
+    Binding(
+      get: { buildingViewModel.searchText },
+      set: { buildingViewModel.searchText = $0 })
+  }
+
+  private var loadBuildingErrorBinding: Binding<RoomModels.AlertError?> {
+    Binding(
+      get: { buildingViewModel.loadBuildingErrorMessage },
+      set: { buildingViewModel.loadBuildingErrorMessage = $0 })
+  }
+
+  @ViewBuilder
+  private var mainContent: some View {
+    buildingsView
+      .refreshable {
+        Task {
+          buildingViewModel.reloadBuildings()
+        }
+      }
+      .redacted(reason: buildingViewModel.isLoading ? .placeholder : [])
+      .toolbar {
+        ToolbarItemGroup(placement: .navigationBarTrailing) {
+          toolbarButtons
+        }
+      }
+      .navigationDestination(for: Building.self) { building in
+        roomsDestinationBuilderView(building)
+          .navigationTitle(building.name)
+          .navigationBarTitleDisplayMode(.inline)
+      }
+      .navigationDestination(for: Room.self) { room in
+        roomDestinationBuilderView(room)
+      }
+      .task {
+        if !buildingViewModel.hasLoaded {
+          buildingViewModel.onAppear()
+        }
+      }
+      .navigationTitle("Buildings")
+      .searchable(text: searchTextBinding, placement: .navigationBarDrawer(displayMode: .always), prompt: "K17")
+  }
+
   @ViewBuilder
   private var buildingsView: some View {
     if selectedView == ViewOrientation.List {
       List {
-        buildingsListSegment(for: "Upper campus", from: viewModel.displayedBuildings.upper)
-        buildingsListSegment(for: "Middle campus", from: viewModel.displayedBuildings.middle)
-        buildingsListSegment(for: "Lower campus", from: viewModel.displayedBuildings.lower)
+        buildingsListSegment(for: "Upper campus", from: buildingViewModel.displayedBuildings.upper)
+        buildingsListSegment(for: "Middle campus", from: buildingViewModel.displayedBuildings.middle)
+        buildingsListSegment(for: "Lower campus", from: buildingViewModel.displayedBuildings.lower)
       }
       .listRowInsets(EdgeInsets())
       .scrollContentBackground(.hidden)
       .background(Color.gray.opacity(0.1))
     } else {
       ScrollView {
-        buildingsCardSegment(for: "Upper campus", from: viewModel.displayedBuildings.upper)
-        buildingsCardSegment(for: "Middle campus", from: viewModel.displayedBuildings.middle)
-        buildingsCardSegment(for: "Lower campus", from: viewModel.displayedBuildings.lower)
+        buildingsCardSegment(for: "Upper campus", from: buildingViewModel.displayedBuildings.upper)
+        buildingsCardSegment(for: "Middle campus", from: buildingViewModel.displayedBuildings.middle)
+        buildingsCardSegment(for: "Lower campus", from: buildingViewModel.displayedBuildings.lower)
       }
-      // .padding(.horizontal)
       .background(Color.gray.opacity(0.1))
       .shadow(color: theme.label.primary.opacity(0.2), radius: 5)
     }
   }
 
+  private var toolbarButtons: some View {
+    HStack {
+      Button {
+        buildingViewModel.getBuildingsInOrder()
+      } label: {
+        Image(systemName: "arrow.up.arrow.down")
+          .resizable()
+          .frame(width: 25, height: 20)
+      }
+
+      Button {
+        if selectedView == ViewOrientation.Card {
+          selectedView = ViewOrientation.List
+        } else {
+          selectedView = ViewOrientation.Card
+        }
+      } label: {
+        Image(systemName: selectedView == ViewOrientation.List ? "square.grid.2x2" : "list.bullet")
+          .resizable()
+          .frame(width: 22, height: 20)
+      }
+    }
+    .padding(5)
+    .foregroundStyle(theme.label.tertiary)
+  }
+
 }
 
 // MARK: - PreviewWrapper
@@ -207,15 +223,16 @@ struct PreviewWrapper: View {
   @State var selectedView = ViewOrientation.List
 
   var body: some View {
+    let viewModel: LiveBuildingViewModel = PreviewBuildingViewModel()
     BuildingsTabView(
       path: $path,
-      viewModel: PreviewBuildingViewModel(),
       selectedView: $selectedView)
     { _ in
       EmptyView() // Buildings destination
     } _: { _ in
       EmptyView() // Rooms destination
     }
+    .environment(viewModel)
     .defaultTheme()
   }
 }

ios/CommonUI/Package.swift

@@ -22,8 +22,10 @@ let package = Package(
     .target(
       name: "CommonUI",
       dependencies: [
-        .product(name: "RoomModels", package: "Rooms"),
         .product(name: "BuildingModels", package: "Buildings"),
+//        .product(name: "BuildingViewModels", package: "Buildings"),
+        .product(name: "RoomModels", package: "Rooms"),
+        .product(name: "RoomViewModels", package: "Rooms"),
       ],
       resources: [.process("Resources")],
       swiftSettings: .defaultSettings),

ios/CommonUI/Sources/CommonUI/AvailabilityStatusColours.swift

@@ -37,4 +37,33 @@ extension Room {
       Theme.light.list.grayBackground.opacity(0.20)
     }
   }
+
+  /// Status text color derived from bookings when a custom filter is active.
+  /// Falls back to the live `statusTextColour` when inactive or bookings are unavailable.
+  public func contextualStatusTextColour(
+    referenceInstant: Date,
+    isCustomFilterActive: Bool,
+    bookings: [RoomBooking]?)
+    -> Color
+  {
+    if let isFree = isFreeFromBookings(at: referenceInstant, isCustomFilterActive: isCustomFilterActive, bookings: bookings) {
+      return isFree ? Theme.light.list.green : Theme.light.list.red
+    }
+    return statusTextColour
+  }
+
+  /// Status background color derived from bookings when a custom filter is active.
+  public func contextualStatusBackgroundColor(
+    referenceInstant: Date,
+    isCustomFilterActive: Bool,
+    bookings: [RoomBooking]?)
+    -> Color
+  {
+    if let isFree = isFreeFromBookings(at: referenceInstant, isCustomFilterActive: isCustomFilterActive, bookings: bookings) {
+      return isFree
+        ? Theme.light.list.greenBackground.opacity(0.15)
+        : Theme.light.list.redBackground.opacity(0.54)
+    }
+    return statusBackgroundColor
+  }
 }