passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use gear icon for iOS About (#684) 

Resolve a discrepancy between iPhone and iPad. Leave the info icon on
macOS, where Settings are separate.
This commit is contained in:
Davide 2024-10-04 18:27:09 +02:00 committed by GitHub
parent a306d61a84
commit d14f22d4a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Passepartout/Library/Sources/AppUI/Views/App/AppToolbar.swift
View File

@ -58,7 +58,7 @@ struct AppToolbar: ToolbarContent {
} }
} else { } else {
ToolbarItem(placement: .navigation) { ToolbarItem(placement: .navigation) {
moreButton aboutButton
} }
ToolbarItemGroup(placement: .primaryAction) { ToolbarItemGroup(placement: .primaryAction) {
addProfileMenu addProfileMenu
@ -77,21 +77,19 @@ private extension AppToolbar {
) )
} }
var moreButton: some View {
Button(action: onAbout) {
ThemeImageLabel(Strings.Global.about, .moreDetails)
}
}
var settingsButton: some View { var settingsButton: some View {
Button(action: onSettings) { Button(action: onSettings) {
ThemeImageLabel(Strings.Global.settings, .settings) ThemeImage(.settings)
} }
} }
var aboutButton: some View { var aboutButton: some View {
Button(action: onAbout) { Button(action: onAbout) {
ThemeImageLabel(Strings.Global.about, .info) #if os(iOS)
ThemeImage(.settings)
#else
ThemeImage(.info)
#endif
} }
} }