mirror of
https://github.com/maxgoedjen/secretive.git
synced 2025-09-20 03:10:57 +00:00
Toolbar cleanup
This commit is contained in:
parent
f5f115aadf
commit
5e6ea2bae1
@ -54,20 +54,12 @@ extension ContentView {
|
|||||||
ToolbarItem(id: id) { view }
|
ToolbarItem(id: id) { view }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var needsSetup: Bool {
|
|
||||||
runningSetup || !hasRunSetup
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Item either showing a "everything's good, here's more info" or "something's wrong, re-run setup" message
|
/// Item either showing a "everything's good, here's more info" or "something's wrong, re-run setup" message
|
||||||
/// These two are mutually exclusive
|
/// These two are mutually exclusive
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
var runningOrRunSetupView: some View {
|
var runningOrRunSetupView: some View {
|
||||||
if needsSetup {
|
agentStatusToolbarView
|
||||||
setupNoticeView
|
|
||||||
} else {
|
|
||||||
agentStatusToolbarView
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var updateNoticeContent: (LocalizedStringResource, Color)? {
|
var updateNoticeContent: (LocalizedStringResource, Color)? {
|
||||||
@ -134,19 +126,6 @@ extension ContentView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
|
||||||
var setupNoticeView: some View {
|
|
||||||
Button(action: {
|
|
||||||
runningSetup = true
|
|
||||||
}, label: {
|
|
||||||
if !hasRunSetup {
|
|
||||||
Text(.agentSetupNoticeTitle)
|
|
||||||
.font(.headline)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.buttonStyle(ToolbarButtonStyle(color: .orange))
|
|
||||||
}
|
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
var agentStatusToolbarView: some View {
|
var agentStatusToolbarView: some View {
|
||||||
Button(action: {
|
Button(action: {
|
||||||
|
Loading…
Reference in New Issue
Block a user