Skip to content

Simplify toolbar icons and highlight active filters #146

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

Merged
austin-smith merged 5 commits into from
Sep 19, 2026
Merged

Simplify toolbar icons and highlight active filters #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e734a3
remove circled toolbar icons
austin-smith Sep 19, 2026
4a78efd
Merge branch 'main' into remove-circled-toolbar-icons
austin-smith Sep 19, 2026
8eb31cf
highlight active filters on ios and macos
austin-smith Sep 19, 2026
0e43068
merge remote branch updates
austin-smith Sep 19, 2026
36e7ac9
merge main into toolbar updates
austin-smith Sep 19, 2026
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
2 changes: 1 addition & 1 deletion BitDream/Views/Shared/TorrentDetail.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ struct TorrentDetailToolbar: ToolbarContent {
}
})
} label: {
Image(systemName: "ellipsis.circle")
Image(systemName: "ellipsis")
}
}
#endif
Expand Down
26 changes: 14 additions & 12 deletions BitDream/Views/iOS/iOSContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ private extension iOSContentView {
Label("Resume All", systemImage: "play")
})
} label: {
Image(systemName: "ellipsis.circle")
Image(systemName: "ellipsis")
.foregroundStyle(Color.primary.opacity(isSidebarOpen && colorScheme == .light ? 0.5 : 1))
}
.iOSHapticControlActivation()
Expand All @@ -372,18 +372,20 @@ private extension iOSContentView {
var bottomToolbarItems: some ToolbarContent {
Group {
ToolbarItem(placement: .bottomBar) {
Button {
hapticFeedback.play(.actionTriggered)
showPrefs.toggle()
} label: {
Label(
"Filter and Sort",
systemImage: hasActiveFilters
? "line.3.horizontal.decrease.circle.fill"
: "line.3.horizontal.decrease.circle"
)
// Keep the popover's navigation state stable when the button style changes.
ZStack {
Button {
hapticFeedback.play(.actionTriggered)
showPrefs.toggle()
} label: {
Label("Filter and Sort", systemImage: "line.3.horizontal.decrease")
}
.if(hasActiveFilters) { button in
button.buttonStyle(.borderedProminent)
}
.tint(hasActiveFilters ? Color.accentColor : Color.primary)
Comment thread
austin-smith marked this conversation as resolved.
.accessibilityValue(hasActiveFilters ? "Active" : "Inactive")
}
.accessibilityValue(hasActiveFilters ? "Active" : "Inactive")
.popover(isPresented: $showPrefs) {
iOSFilterAndSortView(
labelFilter: $labelFilter,
Expand Down
2 changes: 1 addition & 1 deletion BitDream/Views/iOS/iOSTorrentDetail.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ struct iOSTorrentDetail: View {
onError: presentError
)
} label: {
Image(systemName: "ellipsis.circle")
Image(systemName: "ellipsis")
}
.iOSHapticControlActivation()
}
Expand Down
25 changes: 15 additions & 10 deletions BitDream/Views/macOS/macOSContentToolbar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,25 @@ struct macOSContentToolbar: ToolbarContent {
Menu {
macOSContentSortMenu(sortProperty: $sortProperty, sortOrder: $sortOrder)
} label: {
Label("Sort", systemImage: "arrow.up.arrow.down.circle")
Label("Sort", systemImage: "arrow.up.arrow.down")
}
}

ToolbarItem(placement: .automatic) {
Button(action: {
showingFilterPopover.toggle()
}, label: {
Label("Filters", systemImage: "line.3.horizontal.decrease.circle")
.if(hasActiveFilters) { view in
view.foregroundColor(accentColor)
}
})
.help(hasActiveFilters ? "Active filters (\(activeFilterCount))" : "Filter torrents")
// Keep the popover attached while the button's active style changes.
ZStack {
Button(action: {
showingFilterPopover.toggle()
}, label: {
Label("Filters", systemImage: "line.3.horizontal.decrease")
})
.if(hasActiveFilters) { button in
button.buttonStyle(.borderedProminent)
}
.tint(hasActiveFilters ? accentColor : Color.primary)
.accessibilityValue(hasActiveFilters ? "Active" : "Inactive")
.help(hasActiveFilters ? "Active filters (\(activeFilterCount))" : "Filter torrents")
}
.popover(isPresented: $showingFilterPopover, arrowEdge: .bottom) {
macOSContentFilterMenu(
accentColor: accentColor,
Expand Down
2 changes: 1 addition & 1 deletion BitDream/Views/macOS/macOSTorrentActionsMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ struct TorrentActionsToolbarMenu: View {
)
}
} label: {
Label("Actions", systemImage: "ellipsis.circle")
Label("Actions", systemImage: "ellipsis")
}
.sheet(isPresented: $labelDialog) {
LabelEditSheetContent(
Expand Down
Loading