Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-07-19 22:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate log actions in macOS settings toolbar

Browse Source 
The Filter/Export/Clear buttons appeared twice on macOS: inline next
to the search bar and again inside the ellipsis toolbar menu. Show
them once as plain toolbar buttons on macOS; keep the menu on iOS/tvOS.
This commit is contained in:
Arkadiusz Fal
2026-07-03 19:18:25 +02:00
parent fdd6075a49
commit 944be5a722
1 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Yattee/Views/Settings/LogViewerView.swift
View File

@@ -20,38 +20,7 @@ struct LogViewerView: View {
var body: some View {
VStack(spacing: 0) {
#if os(macOS)
HStack(spacing: 8) {
searchBar
Button {
showingFilters = true
} label: {
Label(String(localized: "settings.advanced.logs.filter"), systemImage: "line.3.horizontal.decrease.circle")
.labelStyle(.iconOnly)
}
.help(String(localized: "settings.advanced.logs.filter"))
Button {
showMacOSSavePanel()
} label: {
Label(String(localized: "settings.advanced.logs.export"), systemImage: "square.and.arrow.up")
.labelStyle(.iconOnly)
}
.help(String(localized: "settings.advanced.logs.export"))
Button(role: .destructive) {
loggingService.clearLogs()
} label: {
Label(String(localized: "settings.advanced.logs.clear"), systemImage: "trash")
.labelStyle(.iconOnly)
}
.help(String(localized: "settings.advanced.logs.clear"))
}
.padding(.trailing)
#else
searchBar
#endif
// Log list
logList
@@ -61,6 +30,34 @@ struct LogViewerView: View {
.navigationBarTitleDisplayMode(.inline)
#endif
.toolbar {
#if os(macOS)
ToolbarItem(placement: .primaryAction) {
Button {
showingFilters = true
} label: {
Label(String(localized: "settings.advanced.logs.filter"), systemImage: "line.3.horizontal.decrease.circle")
}
.help(String(localized: "settings.advanced.logs.filter"))
}
ToolbarItem(placement: .primaryAction) {
Button {
showMacOSSavePanel()
} label: {
Label(String(localized: "settings.advanced.logs.export"), systemImage: "square.and.arrow.up")
}
.help(String(localized: "settings.advanced.logs.export"))
}
ToolbarItem(placement: .primaryAction) {
Button(role: .destructive) {
loggingService.clearLogs()
} label: {
Label(String(localized: "settings.advanced.logs.clear"), systemImage: "trash")
}
.help(String(localized: "settings.advanced.logs.clear"))
}
#else
ToolbarItem(placement: .primaryAction) {
Menu {
Button {
@@ -70,11 +67,7 @@ struct LogViewerView: View {
}
Button {
#if os(macOS)
showMacOSSavePanel()
#else
showingExportSheet = true
#endif
} label: {
Label(String(localized: "settings.advanced.logs.export"), systemImage: "square.and.arrow.up")
}
@@ -90,6 +83,7 @@ struct LogViewerView: View {
Image(systemName: "ellipsis.circle")
}
}
#endif
}
.sheet(isPresented: $showingFilters) {
LogFiltersSheet(loggingService: loggingService)