Merge pull request #78 from aonez/master

Hide on launch + only call isUserInteractingWithStatusBar if needed
Mortennn · Oct 24, 2019 · 651c4b5 · 651c4b5
2 parents 67dabd3 + b23bc74
commit 651c4b5
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 8 deletions.
diff --git a/Dozer/AppDelegate.swift b/Dozer/AppDelegate.swift
@@ -24,6 +24,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         // Initalize Dozer Icons
         _ = DozerIcons.shared
+        if DozerIcons.shared.hideStatusBarIconsAtLaunch {
+            DozerIcons.shared.hide()
+        }
     }
 
     // Show all Dozer icons when opening Dozer from Finder etc.

diff --git a/Dozer/Constants.swift b/Dozer/Constants.swift
@@ -8,6 +8,7 @@ import Defaults
 
 extension Defaults.Keys {
     static let hideOnLogin: Defaults.Key<Bool> = Key<Bool>("hideOnLogin", default: false)
+    static let hideAtLaunchEnabled: Defaults.Key<Bool> = Key<Bool>("hideAtLaunchEnabled", default: false)
     static let hideAfterDelayEnabled: Defaults.Key<Bool> = Key<Bool>("hideAfterDelayEnabled", default: false)
     static let hideAfterDelay: Defaults.Key<TimeInterval> = Key<TimeInterval>("hideAfterDelay", default: 10)
     static let noIconMode: Defaults.Key<Bool> = Key<Bool>("noIconMode", default: false)

diff --git a/Dozer/DozerIcons.swift b/Dozer/DozerIcons.swift
@@ -8,6 +8,7 @@ import Defaults
 public final class DozerIcons {
     static var shared = DozerIcons()
     private var dozerIcons: [HelperstatusIcon] = []
+    private var timerToCheckUserInteraction = Timer()
     private var timerToHideDozerIcons = Timer()
 
     private init() {
@@ -24,15 +25,31 @@ public final class DozerIcons {
         if hideStatusBarIconsAfterDelay {
             startTimer()
         }
-
-        Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { _ in
+    }
+
+    private func startUserInteractionTimer() {
+        guard defaults[.hideAfterDelayEnabled] else {
+            stopUserInteractionTimer()
+            return
+        }
+        timerToCheckUserInteraction = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { _ in
             if self.isUserInteractingWithStatusBar() {
                 self.resetTimer()
             }
         }
     }
+
+    private func stopUserInteractionTimer() {
+        timerToCheckUserInteraction.invalidate()
+    }
 
     // MARK: Observe changes to settings
+    public var hideStatusBarIconsAtLaunch: Bool = defaults[.hideAtLaunchEnabled] {
+        didSet {
+            defaults[.hideAtLaunchEnabled] = self.hideStatusBarIconsAtLaunch
+        }
+    }
+
     public var hideStatusBarIconsAfterDelay: Bool = defaults[.hideAfterDelayEnabled] {
         didSet {
             defaults[.hideAfterDelayEnabled] = self.hideStatusBarIconsAfterDelay
@@ -133,10 +150,12 @@ public final class DozerIcons {
     // MARK: Show/hide lifecycle
     private func didShowStatusBarIcons() {
         startTimer()
+        startUserInteractionTimer()
     }
 
     private func didHideStatusBarIcons() {
         stopTimer()
+        stopUserInteractionTimer()
     }
 
     private func willHideStatusBarIcons() {

diff --git a/Dozer/ViewControllers/GeneralVC.swift b/Dozer/ViewControllers/GeneralVC.swift
@@ -22,6 +22,7 @@ final class General: NSViewController, PreferencePane {
 
     @IBOutlet private var LaunchAtLoginCheckbox: NSButton!
     @IBOutlet private var CheckForUpdatesCheckbox: NSButton!
+    @IBOutlet private var HideStatusBarIconsAtLaunchCheckbox: NSButton!
     @IBOutlet private var HideStatusBarIconsAfterDelayCheckbox: NSButton!
     @IBOutlet private var HideBothDozerIconsCheckbox: NSButton!
     @IBOutlet private var EnableRemoveDozerIconCheckbox: NSButton!
@@ -39,6 +40,7 @@ final class General: NSViewController, PreferencePane {
             CheckForUpdatesCheckbox.isChecked = false
         }
 
+        HideStatusBarIconsAtLaunchCheckbox.isChecked = defaults[.hideAtLaunchEnabled]
         HideStatusBarIconsAfterDelayCheckbox.isChecked = defaults[.hideAfterDelayEnabled]
         HideBothDozerIconsCheckbox.isChecked = defaults[.noIconMode]
         EnableRemoveDozerIconCheckbox.isChecked = defaults[.removeDozerIconEnabled]
@@ -62,6 +64,10 @@ final class General: NSViewController, PreferencePane {
         }
         SUUpdater.shared()!.automaticallyChecksForUpdates = CheckForUpdatesCheckbox.isChecked
     }
+
+    @IBAction private func hideStatusBarIconsAtLaunchClicked(_ sender: NSButton) {
+        DozerIcons.shared.hideStatusBarIconsAtLaunch = HideStatusBarIconsAtLaunchCheckbox.isChecked
+    }
 
     @IBAction private func hideStatusBarIconsAfterDelayClicked(_ sender: NSButton) {
         DozerIcons.shared.hideStatusBarIconsAfterDelay = HideStatusBarIconsAfterDelayCheckbox.isChecked

diff --git a/Dozer/XIB/General.xib b/Dozer/XIB/General.xib
@@ -11,6 +11,7 @@
                 <outlet property="EnableRemoveDozerIconCheckbox" destination="pDX-1f-4hl" id="uHk-1U-HG9"/>
                 <outlet property="HideBothDozerIconsCheckbox" destination="w7z-Qa-kqw" id="L5J-6S-jtb"/>
                 <outlet property="HideStatusBarIconsAfterDelayCheckbox" destination="hOy-nu-Sy0" id="aNv-vt-dQL"/>
+                <outlet property="HideStatusBarIconsAtLaunchCheckbox" destination="phN-BY-WEC" id="zff-cm-aik"/>
                 <outlet property="LaunchAtLoginCheckbox" destination="29f-2D-VsY" id="X2Z-FE-7IA"/>
                 <outlet property="ToggleMenuItemsView" destination="4Dt-wS-aZ8" id="PAm-fa-zGy"/>
                 <outlet property="view" destination="c22-O7-iKe" id="buC-Sz-vlD"/>
@@ -19,10 +20,10 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="397" height="281"/>
+            <rect key="frame" x="0.0" y="0.0" width="397" height="303"/>
             <subviews>
                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="29f-2D-VsY">
-                    <rect key="frame" x="18" y="245" width="361" height="18"/>
+                    <rect key="frame" x="18" y="267" width="361" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Launch at login" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="qB0-b5-ye2">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -61,6 +62,17 @@
                         <action selector="hideStatusBarIconsAfterDelayClicked:" target="-2" id="XYy-w6-La0"/>
                     </connections>
                 </button>
+                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="phN-BY-WEC">
+                    <rect key="frame" x="18" y="206" width="357" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="check" title="Hide status bar icons at launch" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="24v-K4-mhc">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="hideStatusBarIconsAtLaunchClicked:" target="-2" id="9pu-qd-GaG"/>
+                    </connections>
+                </button>
                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w7z-Qa-kqw">
                     <rect key="frame" x="18" y="141" width="361" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -102,7 +114,7 @@
                     </textFieldCell>
                 </textField>
                 <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ayr-kp-VXW">
-                    <rect key="frame" x="20" y="211" width="361" height="5"/>
+                    <rect key="frame" x="20" y="233" width="361" height="5"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </box>
                 <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="6Mb-v7-wV4">
@@ -114,7 +126,7 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </customView>
                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="htn-2c-54s">
-                    <rect key="frame" x="18" y="225" width="361" height="18"/>
+                    <rect key="frame" x="18" y="247" width="361" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="3Mj-bx-k9f">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -127,9 +139,9 @@
             </subviews>
             <constraints>
                 <constraint firstAttribute="width" constant="397" id="WEJ-WZ-mea"/>
-                <constraint firstAttribute="height" constant="281" id="ieY-Q5-nHf"/>
+                <constraint firstAttribute="height" constant="303" id="ieY-Q5-nHf"/>
             </constraints>
-            <point key="canvasLocation" x="138.5" y="108.5"/>
+            <point key="canvasLocation" x="138.5" y="119.5"/>
         </customView>
     </objects>
 </document>