Add instrument region filtering

2026-09-14 01:08:30 +02:00
parent 9ddac746e5
commit 6c6aeae5bb
4 changed files with 47 additions and 9 deletions
@@ -6,6 +6,7 @@ struct InstrumentBrowserView: View {

    @State private var searchText = ""
    @State private var selectedFamilyCategory: String?
+    @State private var selectedRegionOrigin: String?
    @Environment(\.dismiss) private var dismiss

    init(catalog: LocalInstrumentCatalog = LocalInstrumentCatalog()) {
@@ -15,14 +16,27 @@ struct InstrumentBrowserView: View {
    var body: some View {
        NavigationStack {
            VStack(spacing: 0) {
-                Picker("Family", selection: $selectedFamilyCategory) {
-                    Text("All families").tag(String?.none)
+                HStack {
+                    Picker("Family", selection: $selectedFamilyCategory) {
+                        Text("All families").tag(String?.none)

-                    ForEach(catalog.familyCategories, id: \.self) { familyCategory in
-                        Text(familyCategory).tag(Optional(familyCategory))
+                        ForEach(catalog.familyCategories, id: \.self) { familyCategory in
+                            Text(familyCategory).tag(Optional(familyCategory))
+                        }
                    }
+                    .pickerStyle(.menu)
+
+                    Spacer()
+
+                    Picker("Region", selection: $selectedRegionOrigin) {
+                        Text("All regions").tag(String?.none)
+
+                        ForEach(catalog.regionsOfOrigin, id: \.self) { regionOrigin in
+                            Text(regionOrigin).tag(Optional(regionOrigin))
+                        }
+                    }
+                    .pickerStyle(.menu)
                }
-                .pickerStyle(.menu)
                .padding(.horizontal)
                .padding(.vertical, 8)

@@ -31,7 +45,8 @@ struct InstrumentBrowserView: View {
                List(
                    catalog.instruments(
                        matching: searchText,
-                        familyCategory: selectedFamilyCategory
+                        familyCategory: selectedFamilyCategory,
+                        regionOrigin: selectedRegionOrigin
                    ),
                    id: \.id
                ) { instrument in
@@ -12,12 +12,19 @@ public struct LocalInstrumentCatalog: Sendable {
            .sorted { $0.localizedCaseInsensitiveCompare($1) == .orderedAscending }
    }

+    public var regionsOfOrigin: [String] {
+        Array(Set(items.compactMap(\.regionOrigin)))
+            .sorted { $0.localizedCaseInsensitiveCompare($1) == .orderedAscending }
+    }
+
    public func instruments(
        matching query: String,
-        familyCategory: String? = nil
+        familyCategory: String? = nil,
+        regionOrigin: String? = nil
    ) -> [InstrumentCatalogItem] {
        let searchTokens = Self.searchTokens(for: query)
        let selectedFamilyCategory = familyCategory?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let selectedRegionOrigin = regionOrigin?.trimmingCharacters(in: .whitespacesAndNewlines)

        return items
            .filter { item in
@@ -25,7 +32,8 @@ public struct LocalInstrumentCatalog: Sendable {
                    Self.searchableTerms(for: item).contains { $0.contains(token) }
                }
                let matchesFamily = selectedFamilyCategory?.isEmpty != false || item.familyCategory == selectedFamilyCategory
-                return matchesSearch && matchesFamily
+                let matchesRegion = selectedRegionOrigin?.isEmpty != false || item.regionOrigin == selectedRegionOrigin
+                return matchesSearch && matchesFamily && matchesRegion
            }
            .sorted { $0.name.localizedCaseInsensitiveCompare($1.name) == .orderedAscending }
    }