Skip to content

Add search filter to the Add Alarm sheet #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjorkert wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add search filter to the Add Alarm sheet #681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions LoopFollow/Alarm/AddAlarm/AddAlarmSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,33 @@ struct AddAlarmSheet: View {
let onSelect: (AlarmType) -> Void
@Environment(\.dismiss) private var dismiss

@State private var searchText = ""

private let columns = [
GridItem(.adaptive(minimum: 110), spacing: 16),
]

private func matches(_ type: AlarmType) -> Bool {
let query = searchText.trimmingCharacters(in: .whitespacesAndNewlines)
guard !query.isEmpty else { return true }
return type.rawValue.localizedCaseInsensitiveContains(query)
|| type.blurb.localizedCaseInsensitiveContains(query)
|| type.group.rawValue.localizedCaseInsensitiveContains(query)
}

var body: some View {
NavigationStack {
ScrollView {
LazyVGrid(columns: columns, spacing: 16) {
ForEach(AlarmType.Group.allCases, id: \.self) { group in
if AlarmType.allCases.contains(where: { $0.group == group }) {
let types = AlarmType.allCases.filter { $0.group == group && matches($0) }
if !types.isEmpty {
Section(header: Text(group.rawValue)
.font(.headline)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, 4)
) {
ForEach(AlarmType.allCases.filter { $0.group == group }, id: \.self) { type in
ForEach(types, id: \.self) { type in
AlarmTile(type: type) {
onSelect(type)
}
Expand All @@ -32,8 +43,25 @@ struct AddAlarmSheet: View {
}
}
.padding()

if !AlarmType.allCases.contains(where: matches) {
VStack(spacing: 8) {
Image(systemName: "magnifyingglass")
.font(.largeTitle)
.foregroundColor(.secondary)
Text("No Results")
.font(.headline)
Text("No alarms match “\(searchText)”.")
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
}
.padding(.top, 40)
.padding(.horizontal)
}
}
.navigationTitle("Add Alarm")
.searchable(text: $searchText, prompt: "Search alarms")
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Cancel") { dismiss() }
Expand Down
Loading