Adding support for MacOS 10.13

AlexPerathoner · Aug 17, 2020 · 5774955 · 5774955
1 parent ae2329b
commit 5774955
Show file tree

Hide file tree

Showing 10 changed files with 458 additions and 360 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,8 @@ Here's a full list of the features:
 <img src = "Screens/colors.png" width=250>
 </p>
 
+* Each icon (volume / brightness / keyboard's backlight) also has it's own color! <sup>[1](#note1)</sup>
+
 * If you think that the default bar is too small you can easily adjust its size.
 
 |<img src = "Screens/Size/small.png">|<img src = "Screens/Size/middle.png">|<img src = "Screens/Size/big.png">|
@@ -67,6 +69,8 @@ Here's a full list of the features:
 
 * Lastly don't forget to **enable the launch at login function!**
 
+<a name="note1"></a><sup>[1](#note1)</sup>:
+> Only available in MacOS 10.14 and later.
 
 ## Installation
 Download the [latest release](https://github.com/AlexPerathoner/SlimHUD/releases/latest).
@@ -78,7 +82,7 @@ Launching SlimHud is easy: copy the app into your Application's folder and then
 2. Launch the terminal by clicking on Utilities > Terminal.
 3. Disable SIP with ```csrutil disable```.
 4. Restart your mac and login into an admin account.
-5. Run ```sudo mount -uw /; killall Finder``` in your terminal. <sup>[1](#note1)</sup>
+5. Run ```sudo mount -uw /; killall Finder``` in your terminal. <sup>[2](#note2)</sup>
 6. Now run ```sudo nano /System/Library/LaunchAgents/com.apple.OSDUIHelper.plist```.
 6. Remove all of the text between \<plist version=”1.0″> and \</plist>. Save the file by hitting control + X, answering yes and hitting return.
 8. Re-enter Recovery mode.
@@ -89,7 +93,7 @@ You have now successfully replaced those ugly and old overlays! Congrats!
 For future updates it won't be necessary to go through all of these steps. Just copy the [latest release](https://github.com/AlexPerathoner/SlimHUD/releases/latest) into your application Folder.<br>After version `1.3.0` you can check for updates from inside the app.
 
 #### Explanation
-<a name="note1"></a><sup>[1](#note1)</sup>:
+<a name="note2"></a><sup>[2](#note2)</sup>:
 > sudo allows a permitted user to execute a command as the superuser or another user.
 Mount is used to mount disks. The -u flag indicates that the status of an already mounted file system should be changed. -w means to mount the file system read-write. The file system is "/" aka root.
 The killall utility kills processes selected by name. Since it's Finder, it will just restart and reflect the change you've just made.

diff --git a/SlimHUD.xcodeproj/project.pbxproj b/SlimHUD.xcodeproj/project.pbxproj
@@ -8,6 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		1219E06918EE24D5484AA823 /* Pods_SlimHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335F277FDB5CB464DEAB1AF9 /* Pods_SlimHUD.framework */; };
+		FA12C21124EA934800F92CA3 /* SettingsWindowControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA12C21024EA934800F92CA3 /* SettingsWindowControllerDelegate.swift */; };
+		FA12C21324EA937800F92CA3 /* SettingsViewController+General.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA12C21224EA937800F92CA3 /* SettingsViewController+General.swift */; };
+		FA12C21524EA93A500F92CA3 /* SettingsViewController+Position.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA12C21424EA93A500F92CA3 /* SettingsViewController+Position.swift */; };
+		FA12C21724EA93DF00F92CA3 /* SettingsViewController+Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA12C21624EA93DF00F92CA3 /* SettingsViewController+Style.swift */; };
 		FA131C2F24683CBD005908FF /* MainMenu.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FA131C2E24683CBD005908FF /* MainMenu.storyboard */; };
 		FA262AE0240E6A9900BFC2D1 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA262ADF240E6A9900BFC2D1 /* SettingsViewController.swift */; };
 		FA262AE2240E6AA000BFC2D1 /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA262AE1240E6AA000BFC2D1 /* SettingsController.swift */; };
@@ -37,6 +41,10 @@
 		335F277FDB5CB464DEAB1AF9 /* Pods_SlimHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SlimHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A76B91BA76461B0592D9CAA5 /* Pods-SlimHUD.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SlimHUD.debug.xcconfig"; path = "Target Support Files/Pods-SlimHUD/Pods-SlimHUD.debug.xcconfig"; sourceTree = "<group>"; };
 		B4665C4192BCA42C48DA9C4D /* Pods-SlimHUD.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SlimHUD.release.xcconfig"; path = "Target Support Files/Pods-SlimHUD/Pods-SlimHUD.release.xcconfig"; sourceTree = "<group>"; };
+		FA12C21024EA934800F92CA3 /* SettingsWindowControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsWindowControllerDelegate.swift; sourceTree = "<group>"; };
+		FA12C21224EA937800F92CA3 /* SettingsViewController+General.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SettingsViewController+General.swift"; sourceTree = "<group>"; };
+		FA12C21424EA93A500F92CA3 /* SettingsViewController+Position.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SettingsViewController+Position.swift"; sourceTree = "<group>"; };
+		FA12C21624EA93DF00F92CA3 /* SettingsViewController+Style.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SettingsViewController+Style.swift"; sourceTree = "<group>"; };
 		FA131C2E24683CBD005908FF /* MainMenu.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainMenu.storyboard; sourceTree = "<group>"; };
 		FA262ADF240E6A9900BFC2D1 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
 		FA262AE1240E6AA000BFC2D1 /* SettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsController.swift; sourceTree = "<group>"; };
@@ -86,11 +94,23 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
+		FA12C21824EA9D5F00F92CA3 /* SettingsViewController */ = {
+			isa = PBXGroup;
+			children = (
+				FA262ADF240E6A9900BFC2D1 /* SettingsViewController.swift */,
+				FA12C21624EA93DF00F92CA3 /* SettingsViewController+Style.swift */,
+				FA12C21424EA93A500F92CA3 /* SettingsViewController+Position.swift */,
+				FA12C21224EA937800F92CA3 /* SettingsViewController+General.swift */,
+			);
+			path = SettingsViewController;
+			sourceTree = "<group>";
+		};
 		FA262AE5240E9EEF00BFC2D1 /* Settings */ = {
 			isa = PBXGroup;
 			children = (
 				FAD58AAA24570B9F00E6E0D9 /* Settings.storyboard */,
-				FA262ADF240E6A9900BFC2D1 /* SettingsViewController.swift */,
+				FA12C21824EA9D5F00F92CA3 /* SettingsViewController */,
+				FA12C21024EA934800F92CA3 /* SettingsWindowControllerDelegate.swift */,
 				FAD58AAC2457139100E6E0D9 /* SettingsWindowController.swift */,
 				FA78F53E242FA73000785678 /* SettingsPreview.swift */,
 			);
@@ -325,7 +345,10 @@
 				FA69AC8723F9E2E600AA73FD /* AppDelegate.swift in Sources */,
 				FABE1FDA23FEF17B009AD01F /* AppleScript.swift in Sources */,
 				FA5C77EC240B077E004E0937 /* BaseView.swift in Sources */,
+				FA12C21524EA93A500F92CA3 /* SettingsViewController+Position.swift in Sources */,
 				FA55B98C2423FE180071E6D9 /* Extensions.swift in Sources */,
+				FA12C21324EA937800F92CA3 /* SettingsViewController+General.swift in Sources */,
+				FA12C21724EA93DF00F92CA3 /* SettingsViewController+Style.swift in Sources */,
 				FAF5F6532406D1480011B766 /* Hud.swift in Sources */,
 				FA5C77ED240B077E004E0937 /* ProgressBar.swift in Sources */,
 				FA262AE0240E6A9900BFC2D1 /* SettingsViewController.swift in Sources */,
@@ -334,6 +357,7 @@
 				FAD58AAD2457139100E6E0D9 /* SettingsWindowController.swift in Sources */,
 				FA51B9602469D4510095C8B7 /* AboutWindowController.swift in Sources */,
 				FAAFCD8924588785009E5E2E /* AboutViewController.swift in Sources */,
+				FA12C21124EA934800F92CA3 /* SettingsWindowControllerDelegate.swift in Sources */,
 				FA78F53F242FA73000785678 /* SettingsPreview.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -470,7 +494,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.3.6;
+				CURRENT_PROJECT_VERSION = 1.3.7;
 				DEVELOPMENT_TEAM = XX9N244QQT;
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -484,8 +508,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.3.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 1.3.7;
 				PRODUCT_BUNDLE_IDENTIFIER = AlexP.SlimHUD;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = NO;
@@ -504,7 +528,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.3.6;
+				CURRENT_PROJECT_VERSION = 1.3.7;
 				DEVELOPMENT_TEAM = XX9N244QQT;
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -518,8 +542,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.3.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 1.3.7;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = AlexP.SlimHUD;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/SlimHUD/AppDelegate.swift b/SlimHUD/AppDelegate.swift
@@ -154,6 +154,7 @@ class AppDelegate: NSWindowController, NSApplicationDelegate, SettingsWindowCont
 		brightnessView.bar?.background = SettingsController.darkGray
 	}
 
+	@available(OSX 10.14, *)
 	func setupDefaultIconsColors() {
 		setVolumeIconsTint(.white)
 		setBrightnessIconsTint(.white)
@@ -186,9 +187,11 @@ class AppDelegate: NSWindowController, NSApplicationDelegate, SettingsWindowCont
 		setVolumeDisabledColor(color: settingsController!.volumeDisabledColor)
 		setBrightnessColor(color: settingsController!.brightnessColor)
 		setKeyboardColor(color: settingsController!.keyboardColor)
-		setVolumeIconsTint(settingsController!.volumeIconColor)
-		setBrightnessIconsTint(settingsController!.brightnessIconColor)
-		setKeyboardIconsTint(settingsController!.keyboardIconColor)
+		if #available(OSX 10.14, *) {
+			setVolumeIconsTint(settingsController!.volumeIconColor)
+			setBrightnessIconsTint(settingsController!.brightnessIconColor)
+			setKeyboardIconsTint(settingsController!.keyboardIconColor)
+		}
 	}
 
 	func setupTimer(with t: TimeInterval) {
@@ -226,12 +229,15 @@ class AppDelegate: NSWindowController, NSApplicationDelegate, SettingsWindowCont
 
 
 
+	@available(OSX 10.14, *)
 	func setVolumeIconsTint(_ color: NSColor) {
 		volumeView.image?.contentTintColor = color
 	}
+	@available(OSX 10.14, *)
 	func setBrightnessIconsTint(_ color: NSColor) {
 		brightnessView.image?.contentTintColor = color
 	}
+	@available(OSX 10.14, *)
 	func setKeyboardIconsTint(_ color: NSColor) {
 		keyboardView.image?.contentTintColor = color
 	}

diff --git a/SlimHUD/Windows/Settings/Settings.storyboard b/SlimHUD/Windows/Settings/Settings.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="5Rj-lD-9e5">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="5Rj-lD-9e5">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17132"/>
         <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -237,7 +237,7 @@
                                                     </constraints>
                                                     <popUpButtonCell key="cell" type="push" title="Left" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="doP-qs-osh" id="0t7-P5-Q5v">
                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" metaFont="system"/>
+                                                        <font key="font" metaFont="menu"/>
                                                         <menu key="menu" id="w99-q2-YZ9">
                                                             <items>
                                                                 <menuItem title="Left" state="on" id="doP-qs-osh"/>
@@ -433,7 +433,7 @@
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <popUpButtonCell key="cell" type="push" title="Bars" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3Ls-VW-Pps" id="Dsf-ji-l5J">
                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" metaFont="system"/>
+                                                        <font key="font" metaFont="menu"/>
                                                         <menu key="menu" id="Bem-gC-ept">
                                                             <items>
                                                                 <menuItem title="Bars" state="on" id="3Ls-VW-Pps"/>
@@ -826,6 +826,8 @@
                         <outlet property="barsBox" destination="VQh-Gr-ghR" id="5ww-CU-jgc"/>
                         <outlet property="brightnessColorOutlet" destination="P9e-nh-i2k" id="fFw-Bl-2L4"/>
                         <outlet property="brightnessIconColorOutlet" destination="ghq-Wy-LQP" id="Nkb-4U-hkA"/>
+                        <outlet property="chagedColorOfLabel" destination="FLV-hq-l4L" id="i05-35-M28"/>
+                        <outlet property="changedColorOfOutlet" destination="zOO-f8-JwW" id="lGu-Ev-h4T"/>
                         <outlet property="continuousCheckOutlet" destination="f21-hD-jmd" id="wEa-ZR-enJ"/>
                         <outlet property="enabledBarsOutlet" destination="4rc-p0-xNQ" id="ZSx-HT-3gs"/>
                         <outlet property="heightSliderOutlet" destination="nVo-Uq-cll" id="kbZ-Ez-HGb"/>