From 5d61fbfd67c3f59bcffa997590d1bc7d41e61528 Mon Sep 17 00:00:00 2001
From: Dustin Mierau <dustin@mierau.me>
Date: Fri, 3 May 2024 13:04:56 -0700
Subject: Remember banner toolbar displayed state. Clean up use of preferences
 throughout project.

---
 Hotline/Application-macOS.swift | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Hotline/Application-macOS.swift')

diff --git a/Hotline/Application-macOS.swift b/Hotline/Application-macOS.swift
index 4cad224..ec42a89 100644
--- a/Hotline/Application-macOS.swift
+++ b/Hotline/Application-macOS.swift
@@ -35,7 +35,6 @@ struct Application: App {
   
   @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
   
-  @State private var preferences = Prefs()
   @State private var soundEffects = SoundEffectPlayer()
   @State private var bookmarks = Bookmarks()
   @State private var hotlinePanel: HotlinePanel? = nil
@@ -55,7 +54,9 @@ struct Application: App {
     .defaultPosition(.center)
     .onChange(of: AppLaunchState.shared.launchState) {
       if AppLaunchState.shared.launchState == .launched {
-        showBannerWindow()
+        if Prefs.shared.showBannerToolbar {
+          showBannerWindow()
+        }
       }
     }
     
@@ -63,7 +64,6 @@ struct Application: App {
     WindowGroup(id: "server", for: Server.self) { server in
       ServerView(server: server)
         .frame(minWidth: 430, minHeight: 300)
-        .environment(preferences)
         .environment(soundEffects)
         .environment(bookmarks)
     } defaultValue: {
@@ -163,7 +163,6 @@ struct Application: App {
     // MARK: Settings Window
     Settings {
       SettingsView()
-        .environment(preferences)
     }
     
     // MARK: News Editor Window
@@ -204,6 +203,7 @@ struct Application: App {
     
     if hotlinePanel?.isVisible == false {
       hotlinePanel?.orderFront(nil)
+      Prefs.shared.showBannerToolbar = true
     }
   }
   
@@ -214,9 +214,11 @@ struct Application: App {
     
     if hotlinePanel?.isVisible == true {
       hotlinePanel?.orderOut(nil)
+      Prefs.shared.showBannerToolbar = false
     }
     else {
       hotlinePanel?.orderFront(nil)
+      Prefs.shared.showBannerToolbar = true
     }
   }
 }
-- 
cgit