hugo/Gotcha
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

Show and clear active filters

Browse Source
This commit is contained in:
Georg Bauer
2026-07-31 17:54:15 +02:00
parent eadbadd3cb
commit de49db0910
6 changed files with 156 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ios/Sources/ContentScreens.swift
View File

@@ -129,7 +129,7 @@ final class IssuesViewController: RefreshingTableViewController {
let current = context.core.settings().issueStatus
let status = UIMenu(
title: "Status",
image: context.symbol("circle.lefthalf.filled"),
image: filterMenuImage("circle.lefthalf.filled", active: current != "open"),
options: .singleSelection,
children: ["open", "closed"].map { status in
UIAction(
@@ -154,6 +154,7 @@ final class IssuesViewController: RefreshingTableViewController {
} else {
children.append(UIAction(title: "Loading filters…", attributes: .disabled) { _ in })
}
children.append(clearFiltersMenu())
filterButton.menu = UIMenu(children: children)
filterButton.accessibilityLabel = "Filter issues"
updateFilterTint()
@@ -172,7 +173,7 @@ final class IssuesViewController: RefreshingTableViewController {
}
return UIMenu(
title: "Milestone",
image: context.symbol("flag"),
image: filterMenuImage("flag", active: !selected.isEmpty),
options: .singleSelection,
children: [all] + actions
)
@@ -203,7 +204,7 @@ final class IssuesViewController: RefreshingTableViewController {
}
return UIMenu(
title: "Labels",
image: context.symbol("tag"),
image: filterMenuImage("tag", active: !selected.isEmpty),
children: actions.isEmpty
? [UIAction(title: "No labels", attributes: .disabled) { _ in }]
: actions
@@ -232,6 +233,32 @@ final class IssuesViewController: RefreshingTableViewController {
)
}
private func clearFiltersMenu() -> UIMenu {
UIMenu(
options: .displayInline,
children: [
UIAction(
title: "Clear Filters",
image: context.symbol("xmark.circle"),
attributes: filtersActive ? [] : .disabled
) { [weak self] _ in self?.clearFilters() },
]
)
}
private func clearFilters() {
filterTask?.cancel()
do {
try context.core.clearIssueFilters(owner: owner, repository: repository)
filterOptions?.selectedMilestone = ""
filterOptions?.selectedLabels = []
updateFilterMenu()
loadIssues(refreshing: false)
} catch {
show(error: error)
}
}
private var filtersActive: Bool {
(try? context.core.issueFiltersActive(owner: owner, repository: repository)) ?? false
}
@@ -835,7 +862,7 @@ final class PullsViewController: RefreshingTableViewController {
let current = context.core.settings().pullStatus
let status = UIMenu(
title: "Status",
image: context.symbol("circle.lefthalf.filled"),
image: filterMenuImage("circle.lefthalf.filled", active: current != "open"),
options: .singleSelection,
children: ["open", "closed"].map { status in
UIAction(title: status.capitalized, state: current == status ? .on : .off) {
@@ -856,7 +883,7 @@ final class PullsViewController: RefreshingTableViewController {
let item = navigationItem.rightBarButtonItem ?? UIBarButtonItem(
image: context.symbol("line.3.horizontal.decrease.circle")
)
item.menu = UIMenu(children: [status, milestone])
item.menu = UIMenu(children: [status, milestone, clearFiltersMenu()])
item.accessibilityLabel = "Filter pull requests"
navigationItem.rightBarButtonItem = item
updateFilterTint()
@@ -874,7 +901,7 @@ final class PullsViewController: RefreshingTableViewController {
}
return UIMenu(
title: "Milestone",
image: context.symbol("flag"),
image: filterMenuImage("flag", active: !selected.isEmpty),
options: .singleSelection,
children: [all] + milestones
)
@@ -892,6 +919,31 @@ final class PullsViewController: RefreshingTableViewController {
}
}
private func clearFiltersMenu() -> UIMenu {
UIMenu(
options: .displayInline,
children: [
UIAction(
title: "Clear Filters",
image: context.symbol("xmark.circle"),
attributes: filtersActive ? [] : .disabled
) { [weak self] _ in self?.clearFilters() },
]
)
}
private func clearFilters() {
filterTask?.cancel()
do {
try context.core.clearPullFilters()
filterOptions?.selectedMilestone = ""
updateFilterMenu()
loadPulls(refreshing: false)
} catch {
show(error: error)
}
}
private var filtersActive: Bool {
(try? context.core.pullFiltersActive()) ?? false
}