Switch toolbar items to viewbuilders

Sources/Secretive/Views/ContentView.swift

@@ -9,6 +9,8 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
     @Binding var showingCreation: Bool
     @Binding var runningSetup: Bool
     @Binding var hasRunSetup: Bool
+    @State var showingAgentInfo = false
+    @Environment(\.colorScheme) var colorScheme
 
     @EnvironmentObject private var storeList: SecretStoreList
     @EnvironmentObject private var updater: UpdaterType
@@ -27,10 +29,10 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
         }
         .frame(minWidth: 640, minHeight: 320)
         .toolbar {
-            updateNotice
+            toolbarItem(updateNoticeView, id: "update")
-            setupNotice
+            toolbarItem(runningOrRunSetupView, id: "setup")
-            appPathNotice
+            toolbarItem(appPathNoticeView, id: "appPath")
-            newItem
+            toolbarItem(newItemView, id: "new")
         }
         .sheet(isPresented: $runningSetup) {
             SetupView(visible: $runningSetup, setupComplete: $hasRunSetup)
@@ -41,26 +43,42 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
 
 extension ContentView {
 
-    var updateNotice: ToolbarItem<Void, AnyView> {
+
-        guard let update = updater.update else {
+    func toolbarItem(_ view: some View, id: String) -> ToolbarItem<String, some View> {
-            return ToolbarItem { AnyView(EmptyView()) }
+        ToolbarItem(id: id) { view }
     }
-        let color: Color
+
-        let text: String
+    var needsSetup: Bool {
+        (runningSetup || !hasRunSetup || !agentStatusChecker.running) && !agentStatusChecker.developmentBuild
+    }
+
+    /// Item either showing a "everything's good, here's more info" or "something's wrong, re-run setup" message
+    /// These two are mutually exclusive
+    @ViewBuilder
+    var runningOrRunSetupView: some View {
+        if needsSetup {
+            setupNoticeView
+        } else {
+            runningNoticeView
+        }
+    }
+
+    var updateNoticeContent: (String, Color)? {
+        guard let update = updater.update else { return nil }
         if update.critical {
-            text = "Critical Security Update Required"
+            return ("Critical Security Update Required", .red)
-            color = .red
         } else {
             if updater.testBuild {
-                text = "Test Build"
+                return ("Test Build", .blue)
-                color = .blue
             } else {
-                text = "Update Available"
+                return ("Update Available", .orange)
-                color = .orange
             }
         }
-        return ToolbarItem {
+    }
-            AnyView(
+
+    @ViewBuilder
+    var updateNoticeView: some View {
+        if let update = updater.update, let (text, color) = updateNoticeContent {
             Button(action: {
                 selectedUpdate = update
             }, label: {
@@ -73,16 +91,12 @@ extension ContentView {
             .popover(item: $selectedUpdate, attachmentAnchor: .point(.bottom), arrowEdge: .bottom) { update in
                 UpdateDetailView(update: update)
             }
-            )
         }
     }
 
-    var newItem: ToolbarItem<Void, AnyView> {
+    @ViewBuilder
-        guard storeList.modifiableStore?.isAvailable ?? false else {
+    var newItemView: some View {
-            return ToolbarItem { AnyView(EmptyView()) }
+        if storeList.modifiableStore?.isAvailable ?? false {
-        }
-        return ToolbarItem {
-            AnyView(
             Button(action: {
                 showingCreation = true
             }, label: {
@@ -93,16 +107,11 @@ extension ContentView {
                     CreateSecretView(store: modifiable, showing: $showingCreation)
                 }
             }
-
-            )
         }
     }
 
-    var setupNotice: ToolbarItem<Void, AnyView> {
+    @ViewBuilder
-        return ToolbarItem {
+    var setupNoticeView: some View {
-            AnyView(
-                Group {
-                    if (runningSetup || !hasRunSetup || !agentStatusChecker.running) && !agentStatusChecker.developmentBuild  {
         Button(action: {
             runningSetup = true
         }, label: {
@@ -118,21 +127,38 @@ extension ContentView {
         })
         .background(Color.orange)
         .cornerRadius(5)
-                    } else {
-                        EmptyView()
     }
+
+    @ViewBuilder
+    var runningNoticeView: some View {
+        Button(action: {
+            showingAgentInfo = true
+        }, label: {
+            HStack {
+                Text("Agent is Running")
+                    .font(.headline)
+                Circle()
+                    .frame(width: 10, height: 10)
+                    .foregroundColor(Color.green)
             }
-            )
+        })
+        .background((colorScheme == .dark ? Color.white : Color.black).opacity(0.05))
+        .cornerRadius(5)
+        .popover(isPresented: $showingAgentInfo, attachmentAnchor: .point(.bottom), arrowEdge: .bottom) {
+            VStack {
+                Text("SecretAgent is Running")
+                    .font(.title)
+                    .padding(5)
+                Text("SecretAgent is a process that runs in the background to sign requests, so you don't need to keep Secretive open all the time.\n\n**You can close Secretive, and everything will still keep working.**")
+                    .frame(width: 300)
+            }
+            .padding()
         }
     }
 
-    var appPathNotice: ToolbarItem<Void, AnyView> {
+    @ViewBuilder
-        let controller = ApplicationDirectoryController()
+    var appPathNoticeView: some View {
-        guard !controller.isInApplicationsDirectory else {
+        if !ApplicationDirectoryController().isInApplicationsDirectory {
-            return ToolbarItem { AnyView(EmptyView()) }
-        }
-        return ToolbarItem {
-            AnyView(
             Button(action: {
                 showingAppPathNotice = true
             }, label: {
@@ -155,7 +181,6 @@ extension ContentView {
                 }
                 .padding()
             }
-            )
         }
     }
 
@@ -198,3 +223,28 @@ struct ContentView_Previews: PreviewProvider {
 }
 
 #endif
+
+struct ToolbarButton: ButtonStyle {
+
+    private let lightColor: Color
+    private let darkColor: Color
+    @Environment(\.colorScheme) var colorScheme
+
+    init(color: Color) {
+        self.lightColor = color
+        self.darkColor = color
+    }
+
+    init(lightColor: Color, darkColor: Color) {
+        self.lightColor = lightColor
+        self.darkColor = darkColor
+    }
+
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+//            .buttonStyle(.bordered)
+            .padding()
+            .background(colorScheme == .light ? lightColor : darkColor)
+            .foregroundColor(.white)
+    }
+}