Merge pull request #195 from bobrosoft/master

README: add "yandexWeather" to the list of "Native Plugins" on top

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: toxblh
+ko_fi: toxblh

.gitignore

@@ -69,3 +69,5 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+.vscode

.travis.yml

@@ -0,0 +1,6 @@
+language: swift
+xcode_project: MTMR.xcodeproj
+xcode_scheme: UnitTests
+osx_image: xcode10
+install: gem install xcpretty
+script: "xcodebuild test -project MTMR.xcodeproj -scheme 'UnitTests' | xcpretty -c && exit ${PIPESTATUS[0]}"

MTMR.xcodeproj/project.pbxproj

@@ -7,29 +7,47 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		36300E83209F040900B31C71 /* SupportHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0008E542080286C003AD4DD /* SupportHelpers.swift */; };
+		36300E8F20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36300E8E20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift */; };
+		36300E9120A2D2B200B31C71 /* BackgroundColorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36300E9020A2D2B200B31C71 /* BackgroundColorTests.swift */; };
 		368EDDE720812A1D00E10953 /* ScrollViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 368EDDE620812A1D00E10953 /* ScrollViewItem.swift */; };
+		36A778BE20A6C27100B38714 /* GeneralExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A778BD20A6C27100B38714 /* GeneralExtensions.swift */; };
 		36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */; };
 		36C2ECD9207B74B4003CDA33 /* AppleScriptTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECD8207B74B4003CDA33 /* AppleScriptTouchBarItem.swift */; };
 		36C2ECDB207C3FE7003CDA33 /* ItemsParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */; };
 		36C2ECDD207C723B003CDA33 /* ParseConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */; };
 		36C2ECDE207C82DE003CDA33 /* ItemsParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */; };
 		36C2ECE0207CB1B0003CDA33 /* defaultPreset.json in Resources */ = {isa = PBXBuildFile; fileRef = 36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */; };
+		4CFF5E5C22E623DD00BFB1EE /* YandexWeatherBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF5E5B22E623DD00BFB1EE /* YandexWeatherBarItem.swift */; };
+		60173D3E20C0031B002C305F /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 60173D3D20C0031B002C305F /* LaunchAtLoginController.m */; };
 		6027D1B92080E52A004FFDC7 /* BrightnessViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */; };
 		6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */; };
 		6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */; };
 		6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */; };
+		60669B4320AD8FA80074E817 /* GroupBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60669B4220AD8FA80074E817 /* GroupBarItem.swift */; };
 		607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */; };
 		607EEA4D2087A8DA009DA5F0 /* CurrencyBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */; };
+		60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */; };
 		60F7D454208CC31400ABF5D2 /* InputSourceBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */; };
 		B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0008E542080286C003AD4DD /* SupportHelpers.swift */; };
+		B002E642216C0E38002774BA /* CoreDisplay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B002E641216C0E38002774BA /* CoreDisplay.framework */; };
+		B00D181D2152F4A5000806F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B00D181C2152F4A5000806F4 /* Sparkle.framework */; };
+		B00D181F2152F521000806F4 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B00D181C2152F4A5000806F4 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B04B7BB72087398C00C835D0 /* BatteryBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */; };
 		B05600D32083E9BB00EB218D /* CustomSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05600D22083E9BB00EB218D /* CustomSlider.swift */; };
 		B059D622205E03F5006E6B86 /* TouchBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B059D621205E03F5006E6B86 /* TouchBarController.swift */; };
 		B059D624205E04F3006E6B86 /* CustomButtonTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B059D623205E04F3006E6B86 /* CustomButtonTouchBarItem.swift */; };
 		B059D62D205F11E8006E6B86 /* DFRFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B059D62C205F11E8006E6B86 /* DFRFoundation.framework */; };
+		B0679BC1215AE73F000FC6B4 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = B0679BC0215AE73F000FC6B4 /* dsa_pub.pem */; };
+		B08126EF217BD0B900A98970 /* PomodoroBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B08126EE217BD0B900A98970 /* PomodoroBarItem.swift */; };
+		B08126F1217BE19000A98970 /* WidgetProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B08126F0217BE19000A98970 /* WidgetProtocol.swift */; };
+		B08173272135F02B005D4908 /* NightShiftBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B08173262135F02B005D4908 /* NightShiftBarItem.swift */; };
+		B081732A2135F354005D4908 /* CoreBrightness.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B08173292135F354005D4908 /* CoreBrightness.framework */; };
+		B081732C213739FE005D4908 /* DnDBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B081732B213739FE005D4908 /* DnDBarItem.swift */; };
 		B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B082B252205C7D8000BC04DC /* AppDelegate.swift */; };
 		B082B257205C7D8000BC04DC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B082B256205C7D8000BC04DC /* Assets.xcassets */; };
 		B082B25A205C7D8000BC04DC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B082B258205C7D8000BC04DC /* Main.storyboard */; };
+		B0846A752220C968000288A7 /* NetworkBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0846A742220C968000288A7 /* NetworkBarItem.swift */; };
 		B09EB1E4207C082000D5C1E0 /* HapticFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = B09EB1E3207C082000D5C1E0 /* HapticFeedback.swift */; };
 		B09EB1E6207C0F8E00D5C1E0 /* MultitouchSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B09EB1E5207C0F8E00D5C1E0 /* MultitouchSupport.framework */; };
 		B0A7E9AA205D6AA400EEF070 /* KeyPress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */; };
@@ -43,21 +61,30 @@
 		B0B17438207D6B590004B740 /* Vox.next.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B1742E207D6B590004B740 /* Vox.next.scpt */; };
 		B0B17439207D6B590004B740 /* Vox.nowPlaying.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B1742F207D6B590004B740 /* Vox.nowPlaying.scpt */; };
 		B0B1743A207D6B590004B740 /* iTunes.nowPlaying.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B17430207D6B590004B740 /* iTunes.nowPlaying.scpt */; };
+		B0F3112520C9E35F0076BB88 /* SupportNSTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */; };
+		B0F54A7A2295AC7D00B4C509 /* DarkModeBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F54A792295AC7D00B4C509 /* DarkModeBarItem.swift */; };
 		B0F8771A207AC1EA00D6E430 /* TouchBarSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		B082B262205C7D8000BC04DC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B082B247205C7D8000BC04DC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = B082B24E205C7D8000BC04DC;
-			remoteInfo = MTMR;
+/* Begin PBXCopyFilesBuildPhase section */
+		B00D181E2152F507000806F4 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 12;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				B00D181F2152F521000806F4 /* Sparkle.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
 		};
-/* End PBXContainerItemProxy section */
+/* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		36300E85209FD16700B31C71 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
+		36300E8E20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleScriptDefinitionTests.swift; sourceTree = "<group>"; };
+		36300E9020A2D2B200B31C71 /* BackgroundColorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundColorTests.swift; sourceTree = "<group>"; };
 		368EDDE620812A1D00E10953 /* ScrollViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollViewItem.swift; sourceTree = "<group>"; };
+		36A778BD20A6C27100B38714 /* GeneralExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralExtensions.swift; sourceTree = "<group>"; };
 		36BDC22F207CDA8600FCFEBE /* TECHNICAL_DEBT.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = TECHNICAL_DEBT.md; sourceTree = "<group>"; };
 		36C2ECD2207B3B1D003CDA33 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeTouchBarItem.swift; sourceTree = "<group>"; };
@@ -65,15 +92,22 @@
 		36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsParsing.swift; sourceTree = "<group>"; };
 		36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseConfigTests.swift; sourceTree = "<group>"; };
 		36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = defaultPreset.json; sourceTree = "<group>"; };
+		4CFF5E5B22E623DD00BFB1EE /* YandexWeatherBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YandexWeatherBarItem.swift; sourceTree = "<group>"; };
+		60173D3C20C0031B002C305F /* LaunchAtLoginController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = "<group>"; };
+		60173D3D20C0031B002C305F /* LaunchAtLoginController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = "<group>"; };
 		6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrightnessViewController.swift; sourceTree = "<group>"; };
 		6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VolumeViewController.swift; sourceTree = "<group>"; };
 		6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppScrubberTouchBarItem.swift; sourceTree = "<group>"; };
 		6042B6A82083E1F500C525C8 /* DeprecatedCarbonAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeprecatedCarbonAPI.h; sourceTree = "<group>"; };
 		6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = DeprecatedCarbonAPI.c; sourceTree = "<group>"; };
+		60669B4220AD8FA80074E817 /* GroupBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupBarItem.swift; sourceTree = "<group>"; };
 		607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeatherBarItem.swift; sourceTree = "<group>"; };
 		607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyBarItem.swift; sourceTree = "<group>"; };
+		60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicBarItem.swift; sourceTree = "<group>"; };
 		60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputSourceBarItem.swift; sourceTree = "<group>"; };
 		B0008E542080286C003AD4DD /* SupportHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportHelpers.swift; sourceTree = "<group>"; };
+		B002E641216C0E38002774BA /* CoreDisplay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreDisplay.framework; path = ../../../../../System/Library/Frameworks/CoreDisplay.framework; sourceTree = "<group>"; };
+		B00D181C2152F4A5000806F4 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryBarItem.swift; sourceTree = "<group>"; };
 		B05600D22083E9BB00EB218D /* CustomSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSlider.swift; sourceTree = "<group>"; };
 		B059D621205E03F5006E6B86 /* TouchBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarController.swift; sourceTree = "<group>"; };
@@ -81,6 +115,13 @@
 		B059D629205E13E5006E6B86 /* TouchBarPrivateApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarPrivateApi.h; sourceTree = "<group>"; };
 		B059D62A205F0E7D006E6B86 /* TouchBarPrivateApi-Bridging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TouchBarPrivateApi-Bridging.h"; sourceTree = "<group>"; };
 		B059D62C205F11E8006E6B86 /* DFRFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DFRFoundation.framework; path = ../../../../../System/Library/PrivateFrameworks/DFRFoundation.framework; sourceTree = "<group>"; };
+		B0679BC0215AE73F000FC6B4 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
+		B08126EE217BD0B900A98970 /* PomodoroBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PomodoroBarItem.swift; sourceTree = "<group>"; };
+		B08126F0217BE19000A98970 /* WidgetProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetProtocol.swift; sourceTree = "<group>"; };
+		B08173262135F02B005D4908 /* NightShiftBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightShiftBarItem.swift; sourceTree = "<group>"; };
+		B08173282135F128005D4908 /* CBBlueLightClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CBBlueLightClient.h; sourceTree = "<group>"; };
+		B08173292135F354005D4908 /* CoreBrightness.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBrightness.framework; path = ../../../../../System/Library/PrivateFrameworks/CoreBrightness.framework; sourceTree = "<group>"; };
+		B081732B213739FE005D4908 /* DnDBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DnDBarItem.swift; sourceTree = "<group>"; };
 		B082B24F205C7D8000BC04DC /* MTMR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MTMR.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B082B252205C7D8000BC04DC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		B082B256205C7D8000BC04DC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -89,6 +130,7 @@
 		B082B25C205C7D8000BC04DC /* MTMR.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MTMR.entitlements; sourceTree = "<group>"; };
 		B082B261205C7D8000BC04DC /* MTMRTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MTMRTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B082B267205C7D8000BC04DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B0846A742220C968000288A7 /* NetworkBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkBarItem.swift; sourceTree = "<group>"; };
 		B09EB1E3207C082000D5C1E0 /* HapticFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticFeedback.swift; sourceTree = "<group>"; };
 		B09EB1E5207C0F8E00D5C1E0 /* MultitouchSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MultitouchSupport.framework; path = ../../../../../System/Library/PrivateFrameworks/MultitouchSupport.framework; sourceTree = "<group>"; };
 		B0A7E9A9205D6AA400EEF070 /* KeyPress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPress.swift; sourceTree = "<group>"; };
@@ -102,6 +144,8 @@
 		B0B1742E207D6B590004B740 /* Vox.next.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vox.next.scpt; sourceTree = "<group>"; };
 		B0B1742F207D6B590004B740 /* Vox.nowPlaying.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vox.nowPlaying.scpt; sourceTree = "<group>"; };
 		B0B17430207D6B590004B740 /* iTunes.nowPlaying.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iTunes.nowPlaying.scpt; sourceTree = "<group>"; };
+		B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportNSTouchBar.swift; sourceTree = "<group>"; };
+		B0F54A792295AC7D00B4C509 /* DarkModeBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarkModeBarItem.swift; sourceTree = "<group>"; };
 		B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TouchBarSupport.m; sourceTree = "<group>"; };
 		B0F8771B207AC92700D6E430 /* TouchBarSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarSupport.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -111,8 +155,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B002E642216C0E38002774BA /* CoreDisplay.framework in Frameworks */,
+				B081732A2135F354005D4908 /* CoreBrightness.framework in Frameworks */,
 				B059D62D205F11E8006E6B86 /* DFRFoundation.framework in Frameworks */,
 				B09EB1E6207C0F8E00D5C1E0 /* MultitouchSupport.framework in Frameworks */,
+				B00D181D2152F4A5000806F4 /* Sparkle.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -129,6 +176,9 @@
 		B059D62B205F11E8006E6B86 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B002E641216C0E38002774BA /* CoreDisplay.framework */,
+				B00D181C2152F4A5000806F4 /* Sparkle.framework */,
+				B08173292135F354005D4908 /* CoreBrightness.framework */,
 				B09EB1E5207C0F8E00D5C1E0 /* MultitouchSupport.framework */,
 				B059D62C205F11E8006E6B86 /* DFRFoundation.framework */,
 			);
@@ -165,6 +215,7 @@
 				B082B256205C7D8000BC04DC /* Assets.xcassets */,
 				B082B258205C7D8000BC04DC /* Main.storyboard */,
 				B082B25B205C7D8000BC04DC /* Info.plist */,
+				B0679BC0215AE73F000FC6B4 /* dsa_pub.pem */,
 				B082B25C205C7D8000BC04DC /* MTMR.entitlements */,
 				36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */,
 				B082B252205C7D8000BC04DC /* AppDelegate.swift */,
@@ -177,6 +228,8 @@
 				B09EB1E3207C082000D5C1E0 /* HapticFeedback.swift */,
 				368EDDE620812A1D00E10953 /* ScrollViewItem.swift */,
 				B05600D22083E9BB00EB218D /* CustomSlider.swift */,
+				36A778BD20A6C27100B38714 /* GeneralExtensions.swift */,
+				B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */,
 			);
 			path = MTMR;
 			sourceTree = "<group>";
@@ -184,8 +237,11 @@
 		B082B264205C7D8000BC04DC /* MTMRTests */ = {
 			isa = PBXGroup;
 			children = (
+				36300E85209FD16700B31C71 /* .travis.yml */,
 				36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */,
 				B082B267205C7D8000BC04DC /* Info.plist */,
+				36300E8E20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift */,
+				36300E9020A2D2B200B31C71 /* BackgroundColorTests.swift */,
 			);
 			path = MTMRTests;
 			sourceTree = "<group>";
@@ -216,6 +272,9 @@
 				B0F8771B207AC92700D6E430 /* TouchBarSupport.h */,
 				6042B6A82083E1F500C525C8 /* DeprecatedCarbonAPI.h */,
 				6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */,
+				60173D3C20C0031B002C305F /* LaunchAtLoginController.h */,
+				60173D3D20C0031B002C305F /* LaunchAtLoginController.m */,
+				B08173282135F128005D4908 /* CBBlueLightClient.h */,
 			);
 			path = CBridge;
 			sourceTree = "<group>";
@@ -223,14 +282,23 @@
 		B0B88A07208CD12000A2C160 /* Widgets */ = {
 			isa = PBXGroup;
 			children = (
-				36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */,
-				6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */,
-				6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */,
-				B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */,
-				607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */,
-				607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */,
 				6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */,
+				B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */,
+				6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */,
+				607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */,
+				B081732B213739FE005D4908 /* DnDBarItem.swift */,
+				60669B4220AD8FA80074E817 /* GroupBarItem.swift */,
 				60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */,
+				60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */,
+				B0846A742220C968000288A7 /* NetworkBarItem.swift */,
+				B08173262135F02B005D4908 /* NightShiftBarItem.swift */,
+				B08126EE217BD0B900A98970 /* PomodoroBarItem.swift */,
+				36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */,
+				6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */,
+				607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */,
+				4CFF5E5B22E623DD00BFB1EE /* YandexWeatherBarItem.swift */,
+				B08126F0217BE19000A98970 /* WidgetProtocol.swift */,
+				B0F54A792295AC7D00B4C509 /* DarkModeBarItem.swift */,
 			);
 			path = Widgets;
 			sourceTree = "<group>";
@@ -245,6 +313,8 @@
 				B082B24B205C7D8000BC04DC /* Sources */,
 				B082B24C205C7D8000BC04DC /* Frameworks */,
 				B082B24D205C7D8000BC04DC /* Resources */,
+				B00D181E2152F507000806F4 /* CopyFiles */,
+				B0679BBF215AE085000FC6B4 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -266,7 +336,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B082B263205C7D8000BC04DC /* PBXTargetDependency */,
 			);
 			name = MTMRTests;
 			productName = MTMRTests;
@@ -280,11 +349,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = "Anton Palgunov";
 				TargetAttributes = {
 					B082B24E205C7D8000BC04DC = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.Sandbox = {
@@ -294,6 +364,7 @@
 					};
 					B082B260205C7D8000BC04DC = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -328,6 +399,7 @@
 				B0B17436207D6B590004B740 /* iTunes.next.scpt in Resources */,
 				B082B25A205C7D8000BC04DC /* Main.storyboard in Resources */,
 				B0B17435207D6B590004B740 /* Spotify.next.scpt in Resources */,
+				B0679BC1215AE73F000FC6B4 /* dsa_pub.pem in Resources */,
 				B0B17433207D6B590004B740 /* Finder.scpt in Resources */,
 				B0B17439207D6B590004B740 /* Vox.nowPlaying.scpt in Resources */,
 				B0B17438207D6B590004B740 /* Vox.next.scpt in Resources */,
@@ -346,6 +418,26 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		B0679BBF215AE085000FC6B4 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		B082B24B205C7D8000BC04DC /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -354,16 +446,28 @@
 				B059D622205E03F5006E6B86 /* TouchBarController.swift in Sources */,
 				B05600D32083E9BB00EB218D /* CustomSlider.swift in Sources */,
 				36C2ECD9207B74B4003CDA33 /* AppleScriptTouchBarItem.swift in Sources */,
+				B0846A752220C968000288A7 /* NetworkBarItem.swift in Sources */,
 				B0F8771A207AC1EA00D6E430 /* TouchBarSupport.m in Sources */,
+				B08126F1217BE19000A98970 /* WidgetProtocol.swift in Sources */,
 				B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */,
 				6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */,
 				B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */,
+				B0F54A7A2295AC7D00B4C509 /* DarkModeBarItem.swift in Sources */,
+				B08126EF217BD0B900A98970 /* PomodoroBarItem.swift in Sources */,
+				B081732C213739FE005D4908 /* DnDBarItem.swift in Sources */,
+				60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */,
 				B059D624205E04F3006E6B86 /* CustomButtonTouchBarItem.swift in Sources */,
+				60173D3E20C0031B002C305F /* LaunchAtLoginController.m in Sources */,
 				6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */,
 				607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */,
+				B0F3112520C9E35F0076BB88 /* SupportNSTouchBar.swift in Sources */,
+				4CFF5E5C22E623DD00BFB1EE /* YandexWeatherBarItem.swift in Sources */,
 				6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */,
 				B09EB1E4207C082000D5C1E0 /* HapticFeedback.swift in Sources */,
+				B08173272135F02B005D4908 /* NightShiftBarItem.swift in Sources */,
 				60F7D454208CC31400ABF5D2 /* InputSourceBarItem.swift in Sources */,
+				36A778BE20A6C27100B38714 /* GeneralExtensions.swift in Sources */,
+				60669B4320AD8FA80074E817 /* GroupBarItem.swift in Sources */,
 				36C2ECDB207C3FE7003CDA33 /* ItemsParsing.swift in Sources */,
 				B0A7E9AA205D6AA400EEF070 /* KeyPress.swift in Sources */,
 				36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */,
@@ -378,21 +482,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				36300E9120A2D2B200B31C71 /* BackgroundColorTests.swift in Sources */,
+				36300E8F20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift in Sources */,
 				36C2ECDD207C723B003CDA33 /* ParseConfigTests.swift in Sources */,
+				36300E83209F040900B31C71 /* SupportHelpers.swift in Sources */,
 				36C2ECDE207C82DE003CDA33 /* ItemsParsing.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B082B263205C7D8000BC04DC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = B082B24E205C7D8000BC04DC /* MTMR */;
-			targetProxy = B082B262205C7D8000BC04DC /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		B082B258205C7D8000BC04DC /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -523,14 +622,15 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = MTMR/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Toxblh.MTMR;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "MTMR/CBridge/TouchBarPrivateApi-Bridging.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -538,20 +638,22 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = D6D8BR2QNB;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = MTMR/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Toxblh.MTMR;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "MTMR/CBridge/TouchBarPrivateApi-Bridging.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -564,7 +666,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Toxblh.MTMRTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -579,7 +681,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = Toxblh.MTMRTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

MTMR.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Latest</string>
+	<string>Original</string>
 </dict>
 </plist>

MTMR.xcodeproj/xcshareddata/xcschemes/MTMR.xcscheme

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+               BuildableName = "MTMR.app"
+               BlueprintName = "MTMR"
+               ReferencedContainer = "container:MTMR.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B082B260205C7D8000BC04DC"
+               BuildableName = "MTMRTests.xctest"
+               BlueprintName = "MTMRTests"
+               ReferencedContainer = "container:MTMR.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+            BuildableName = "MTMR.app"
+            BlueprintName = "MTMR"
+            ReferencedContainer = "container:MTMR.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+            BuildableName = "MTMR.app"
+            BlueprintName = "MTMR"
+            ReferencedContainer = "container:MTMR.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+            BuildableName = "MTMR.app"
+            BlueprintName = "MTMR"
+            ReferencedContainer = "container:MTMR.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

MTMR.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B082B260205C7D8000BC04DC"
+               BuildableName = "MTMRTests.xctest"
+               BlueprintName = "MTMRTests"
+               ReferencedContainer = "container:MTMR.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

MTMR/AppDelegate.swift

@@ -7,28 +7,58 @@
 //
 
 import Cocoa
+import Sparkle
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
-    let statusItem = NSStatusBar.system.statusItem(withLength:NSStatusItem.squareLength)
+    let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
+    var isBlockedApp: Bool = false
+
     private var fileSystemSource: DispatchSourceFileSystemObject?
-    
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
+
+    func applicationDidFinishLaunching(_: Notification) {
+        // Configure Sparkle
+        SUUpdater.shared().automaticallyDownloadsUpdates = false
+        SUUpdater.shared().automaticallyChecksForUpdates = true
+        SUUpdater.shared().checkForUpdatesInBackground()
+
+        AXIsProcessTrustedWithOptions([kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true] as NSDictionary)
+
         TouchBarController.shared.setupControlStripPresence()
-        
+
         if let button = statusItem.button {
             button.image = #imageLiteral(resourceName: "StatusImage")
         }
         createMenu()
-        
+
         reloadOnDefaultConfigChanged()
+
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(updateIsBlockedApp), name: NSWorkspace.didLaunchApplicationNotification, object: nil)
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(updateIsBlockedApp), name: NSWorkspace.didTerminateApplicationNotification, object: nil)
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(updateIsBlockedApp), name: NSWorkspace.didActivateApplicationNotification, object: nil)
     }
 
-    func applicationWillTerminate(_ aNotification: Notification) {
-        
+    func applicationWillTerminate(_: Notification) {}
+
+    @objc func updateIsBlockedApp() {
+        var blacklistAppIdentifiers: [String] = []
+        if let blackListed = UserDefaults.standard.stringArray(forKey: "com.toxblh.mtmr.blackListedApps") {
+            blacklistAppIdentifiers = blackListed
+        }
+        var frontmostApplicationIdentifier: String? {
+            guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil }
+            return frontmostId
+        }
+
+        if frontmostApplicationIdentifier != nil {
+            isBlockedApp = blacklistAppIdentifiers.index(of: frontmostApplicationIdentifier!) != nil
+        } else {
+            isBlockedApp = false
+        }
+        createMenu()
     }
-    
-    @objc func openPrefereces(_ sender: Any?) {
+
+    @objc func openPreferences(_: Any?) {
         let task = Process()
         let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
         let presetPath = appSupportDirectory.appending("/items.json")
@@ -36,65 +66,99 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         task.arguments = [presetPath]
         task.launch()
     }
-    
-    @objc func updatePreset(_ sender: Any?) {
-        TouchBarController.shared.createAndUpdatePreset()
+
+    @objc func toggleControlStrip(_: Any?) {
+        TouchBarController.shared.showControlStripState = !TouchBarController.shared.showControlStripState
+        TouchBarController.shared.resetControlStrip()
+        createMenu()
     }
-    
-    @objc func openPreset(_ sender: Any?) {
-        let dialog = NSOpenPanel();
-        
-        dialog.title                   = "Choose a items.json file"
-        dialog.showsResizeIndicator    = true
-        dialog.showsHiddenFiles        = true
-        dialog.canChooseDirectories    = false
-        dialog.canCreateDirectories    = false
-        dialog.allowsMultipleSelection = false
-        dialog.allowedFileTypes        = ["json"]
-        dialog.directoryURL = NSURL.fileURL(withPath: NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR"), isDirectory: true)
-        
-        if (dialog.runModal() == NSApplication.ModalResponse.OK) {
-            let result = dialog.url
-            
-            if (result != nil) {
-                let path = result!.path
-                let jsonData = path.fileData
-                let jsonItems = jsonData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
-                
-                TouchBarController.shared.createAndUpdatePreset(jsonItems: jsonItems)
+
+    @objc func toggleBlackListedApp(_: Any?) {
+        let appIdentifier = TouchBarController.shared.frontmostApplicationIdentifier
+        if appIdentifier != nil {
+            if let index = TouchBarController.shared.blacklistAppIdentifiers.index(of: appIdentifier!) {
+                TouchBarController.shared.blacklistAppIdentifiers.remove(at: index)
+            } else {
+                TouchBarController.shared.blacklistAppIdentifiers.append(appIdentifier!)
             }
+
+            UserDefaults.standard.set(TouchBarController.shared.blacklistAppIdentifiers, forKey: "com.toxblh.mtmr.blackListedApps")
+            UserDefaults.standard.synchronize()
+
+            TouchBarController.shared.updateActiveApp()
+            updateIsBlockedApp()
         }
     }
-    
+
+    @objc func openPreset(_: Any?) {
+        let dialog = NSOpenPanel()
+
+        dialog.title = "Choose a items.json file"
+        dialog.showsResizeIndicator = true
+        dialog.showsHiddenFiles = true
+        dialog.canChooseDirectories = false
+        dialog.canCreateDirectories = false
+        dialog.allowsMultipleSelection = false
+        dialog.allowedFileTypes = ["json"]
+        dialog.directoryURL = NSURL.fileURL(withPath: NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR"), isDirectory: true)
+
+        if dialog.runModal() == .OK, let path = dialog.url?.path {
+            TouchBarController.shared.reloadPreset(path: path)
+        }
+    }
+
+    @objc func toggleStartAtLogin(_: Any?) {
+        LaunchAtLoginController().setLaunchAtLogin(!LaunchAtLoginController().launchAtLogin, for: NSURL.fileURL(withPath: Bundle.main.bundlePath))
+        createMenu()
+    }
+
     func createMenu() {
         let menu = NSMenu()
-        menu.addItem(withTitle: "Preferences", action: #selector(openPrefereces(_:)), keyEquivalent: ",")
-        menu.addItem(withTitle: "Reload Preset", action: #selector(updatePreset(_:)), keyEquivalent: "r")
-        menu.addItem(withTitle: "Open Preset", action: #selector(openPreset(_:)), keyEquivalent: "O")
+
+        let startAtLogin = NSMenuItem(title: "Start at login", action: #selector(toggleStartAtLogin(_:)), keyEquivalent: "L")
+        startAtLogin.state = LaunchAtLoginController().launchAtLogin ? .on : .off
+
+        let toggleBlackList = NSMenuItem(title: "Toggle current app in blacklist", action: #selector(toggleBlackListedApp(_:)), keyEquivalent: "B")
+        toggleBlackList.state = isBlockedApp ? .on : .off
+
+        let hideControlStrip = NSMenuItem(title: "Hide Control Strip", action: #selector(toggleControlStrip(_:)), keyEquivalent: "T")
+        hideControlStrip.state = TouchBarController.shared.showControlStripState ? .off : .on
+
+        let settingSeparator = NSMenuItem(title: "Settings", action: nil, keyEquivalent: "")
+        settingSeparator.isEnabled = false
+
+        menu.addItem(withTitle: "Preferences", action: #selector(openPreferences(_:)), keyEquivalent: ",")
+        menu.addItem(withTitle: "Open preset", action: #selector(openPreset(_:)), keyEquivalent: "O")
+        menu.addItem(withTitle: "Check for Updates...", action: #selector(SUUpdater.checkForUpdates(_:)), keyEquivalent: "").target = SUUpdater.shared()
+
+        menu.addItem(NSMenuItem.separator())
+        menu.addItem(settingSeparator)
+        menu.addItem(hideControlStrip)
+        menu.addItem(toggleBlackList)
+        menu.addItem(startAtLogin)
         menu.addItem(NSMenuItem.separator())
         menu.addItem(withTitle: "Quit", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")
         statusItem.menu = menu
     }
 
     func reloadOnDefaultConfigChanged() {
-        let file = NSURL.fileURL(withPath: NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR/items.json"))
-        
+        let file = NSURL.fileURL(withPath: standardConfigPath)
+
         let fd = open(file.path, O_EVTONLY)
-        
-        self.fileSystemSource = DispatchSource.makeFileSystemObjectSource(fileDescriptor: fd, eventMask: .write, queue: DispatchQueue(label: "DefaultConfigChanged"))
-        
-        self.fileSystemSource?.setEventHandler(handler: {
+
+        fileSystemSource = DispatchSource.makeFileSystemObjectSource(fileDescriptor: fd, eventMask: .write, queue: DispatchQueue(label: "DefaultConfigChanged"))
+
+        fileSystemSource?.setEventHandler(handler: {
             print("Config changed, reloading...")
             DispatchQueue.main.async {
-                TouchBarController.shared.createAndUpdatePreset()
+                TouchBarController.shared.reloadPreset(path: file.path)
             }
         })
-        
-        self.fileSystemSource?.setCancelHandler(handler: {
+
+        fileSystemSource?.setCancelHandler(handler: {
             close(fd)
         })
-        
-        self.fileSystemSource?.resume()
+
+        fileSystemSource?.resume()
     }
 }
-

MTMR/AppleScriptTouchBarItem.swift

@@ -4,50 +4,59 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
     private var script: NSAppleScript!
     private let interval: TimeInterval
     private var forceHideConstraint: NSLayoutConstraint!
-    
-    init?(identifier: NSTouchBarItem.Identifier, source: SourceProtocol, interval: TimeInterval, onTap: @escaping ()->(), onLongTap: @escaping ()->()) {
+
+    init?(identifier: NSTouchBarItem.Identifier, source: SourceProtocol, interval: TimeInterval) {
         self.interval = interval
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
-        self.forceHideConstraint = self.view.widthAnchor.constraint(equalToConstant: 0)
-        guard let script = source.appleScript else {
-            button.title = "no script"
-            return
-        }
-        self.script = script
-        button.bezelColor = .clear
-        DispatchQueue.main.async {
+        super.init(identifier: identifier, title: "⏳")
+        forceHideConstraint = view.widthAnchor.constraint(equalToConstant: 0)
+        title = "scheduled"
+        DispatchQueue.appleScriptQueue.async {
+            guard let script = source.appleScript else {
+                DispatchQueue.main.async {
+                    self.title = "no script"
+                }
+                return
+            }
+            self.script = script
+            DispatchQueue.main.async {
+                self.isBordered = false
+            }
+            
             var error: NSDictionary?
             guard script.compileAndReturnError(&error) else {
                 #if DEBUG
                     print(error?.description ?? "unknown error")
                 #endif
                 DispatchQueue.main.async {
-                    self.button.title = "error"
+                    self.title = "error"
                 }
                 return
             }
             self.refreshAndSchedule()
         }
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     func refreshAndSchedule() {
         #if DEBUG
-            print("refresh happened")
+            print("refresh happened (interval \(interval)), self \(identifier.rawValue))")
         #endif
-        let scriptResult = self.execute()
+        let scriptResult = execute()
         DispatchQueue.main.async {
-            self.button.title = scriptResult
+            self.title = scriptResult
             self.forceHideConstraint.isActive = scriptResult == ""
+            #if DEBUG
+                print("did set new script result title \(scriptResult)")
+            #endif
         }
-        DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
+        DispatchQueue.appleScriptQueue.asyncAfter(deadline: .now() + interval) { [weak self] in
             self?.refreshAndSchedule()
         }
     }
-    
+
     func execute() -> String {
         var error: NSDictionary?
         let output = script.executeAndReturnError(&error)
@@ -57,12 +66,8 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
         }
         return output.stringValue ?? ""
     }
-
 }
 
-extension SourceProtocol {
-    var appleScript: NSAppleScript? {
-        guard let source = self.string else { return nil }
-        return NSAppleScript(source: source)
-    }
+extension DispatchQueue {
+    static let appleScriptQueue = DispatchQueue(label: "mtmr.applescript")
 }

MTMR/Assets.xcassets/dark-mode-off.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "sun-icon-256.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

MTMR/Assets.xcassets/dark-mode-on.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "39857.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

MTMR/Assets.xcassets/dnd-off.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dnd-off.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

MTMR/Assets.xcassets/dnd-on.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dnd-on.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MTMR/Assets.xcassets/ill_down.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "KeyboardBrightDown.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

MTMR/Assets.xcassets/ill_up.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "KeyboardBrightUp.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

MTMR/Assets.xcassets/nightShiftOff.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "NightShift.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

MTMR/Assets.xcassets/nightShiftOn.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "NightShiftEnabled.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MTMR/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -619,7 +619,7 @@
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
-                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -676,6 +676,7 @@
                 </application>
                 <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="MTMR" customModuleProvider="target"/>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+                <customObject id="VW7-73-dHf" customClass="SUUpdater"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="75" y="0.0"/>

MTMR/CBridge/CBBlueLightClient.h

@@ -0,0 +1,34 @@
+//
+//  CBBlueLightClient.h
+//  MTMR
+//
+//  Created by Anton Palgunov on 28/08/2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef struct {
+    int hour;
+    int minute;
+} Time;
+
+typedef struct {
+    Time fromTime;
+    Time toTime;
+} Schedule;
+
+typedef struct {
+    BOOL active;
+    BOOL enabled;
+    BOOL sunSchedulePermitted;
+    int mode;
+    Schedule schedule;
+    unsigned long long disableFlags;
+} Status;
+
+@interface CBBlueLightClient: NSObject
+- (BOOL) setEnabled: (BOOL)enabled;
+- (BOOL) setMode: (int)mode;
+- (void) getBlueLightStatus: (Status *)status;
+@end

MTMR/CBridge/LaunchAtLoginController.h

@@ -0,0 +1,35 @@
+//
+//  LaunchAtLoginController.h
+//
+//  Copyright 2011 Tomáš Znamenáček
+//  Copyright 2010 Ben Clark-Robinson
+//
+//  Permission is hereby granted, free of charge, to any person obtaining
+//  a copy of this software and associated documentation files (the ‘Software’),
+//  to deal in the Software without restriction, including without limitation
+//  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//  and/or sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+//  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+//  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+//  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+@import Foundation;
+@import CoreServices;
+
+@interface LaunchAtLoginController : NSObject {}
+
+@property(assign) BOOL launchAtLogin;
+
+- (BOOL) willLaunchAtLogin: (NSURL*) itemURL;
+- (void) setLaunchAtLogin: (BOOL) enabled forURL: (NSURL*) itemURL;
+
+@end

MTMR/CBridge/LaunchAtLoginController.m

@@ -0,0 +1,128 @@
+//
+//  LaunchAtLoginController.m
+//
+//  Copyright 2011 Tomáš Znamenáček
+//  Copyright 2010 Ben Clark-Robinson
+//
+//  Permission is hereby granted, free of charge, to any person obtaining
+//  a copy of this software and associated documentation files (the ‘Software’),
+//  to deal in the Software without restriction, including without limitation
+//  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//  and/or sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+//  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+//  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+//  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#import "LaunchAtLoginController.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+static NSString *const StartAtLoginKey = @"launchAtLogin";
+
+@interface LaunchAtLoginController ()
+@property(assign) LSSharedFileListRef loginItems;
+@end
+
+@implementation LaunchAtLoginController
+@synthesize loginItems;
+
+#pragma mark Change Observing
+
+void sharedFileListDidChange(LSSharedFileListRef inList, void *context)
+{
+    LaunchAtLoginController *self = (__bridge id) context;
+    [self willChangeValueForKey:StartAtLoginKey];
+    [self didChangeValueForKey:StartAtLoginKey];
+}
+
+#pragma mark Initialization
+
+- (id) init
+{
+    self = [super init];
+    loginItems = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL);
+    LSSharedFileListAddObserver(loginItems, CFRunLoopGetMain(),
+                                (CFStringRef)NSDefaultRunLoopMode, sharedFileListDidChange, (voidPtr)CFBridgingRetain(self));
+    return self;
+}
+
+- (void) dealloc
+{
+    LSSharedFileListRemoveObserver(loginItems, CFRunLoopGetMain(),
+                                   (CFStringRef)NSDefaultRunLoopMode, sharedFileListDidChange, (__bridge void *)(self));
+    CFRelease(loginItems);
+}
+
+#pragma mark Launch List Control
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+LSSharedFileListItemRef copyItemWithURLinFileList(NSURL* wantedURL, LSSharedFileListRef fileList) {
+    if (wantedURL == NULL || fileList == NULL)
+        return NULL;
+    
+    NSArray *listSnapshot = (__bridge_transfer NSArray *)LSSharedFileListCopySnapshot(fileList, NULL);
+    for(NSUInteger i = 0; i< [listSnapshot count]; i++) {
+        LSSharedFileListItemRef item = (__bridge LSSharedFileListItemRef)[listSnapshot objectAtIndex:i];
+        UInt32 resolutionFlags = kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes;
+        CFURLRef currentItemURL = NULL;
+        LSSharedFileListItemResolve(item, resolutionFlags, &currentItemURL, NULL);
+        if (currentItemURL && [(__bridge_transfer NSURL*)currentItemURL isEqual:wantedURL]) {
+            CFRetain(item);
+            return item;
+        }
+    }
+    
+    return NULL;
+}
+#pragma clang diagnostic pop
+
+- (BOOL) willLaunchAtLogin: (NSURL*) itemURL
+{
+    return !!copyItemWithURLinFileList(itemURL, loginItems);
+}
+
+- (void) setLaunchAtLogin: (BOOL) enabled forURL: (NSURL*) itemURL
+{
+    LSSharedFileListItemRef appItem = copyItemWithURLinFileList(itemURL, loginItems);
+    if (enabled && !appItem) {
+        LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst,
+                                      NULL, NULL, (__bridge CFURLRef)itemURL, NULL, NULL);
+    } else if (!enabled && appItem) {
+        LSSharedFileListItemRemove(loginItems, appItem);
+    }
+    if (appItem) {
+        CFRelease(appItem);
+    }
+}
+
+#pragma mark Basic Interface
+
+- (NSURL*) appURL
+{
+    return [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]];
+}
+
+- (void) setLaunchAtLogin: (BOOL) enabled
+{
+    [self willChangeValueForKey:StartAtLoginKey];
+    [self setLaunchAtLogin:enabled forURL:[self appURL]];
+    [self didChangeValueForKey:StartAtLoginKey];
+}
+
+- (BOOL) launchAtLogin
+{
+    return [self willLaunchAtLogin:[self appURL]];
+}
+
+@end
+#pragma clang diagnostic pop

MTMR/CBridge/TouchBarPrivateApi-Bridging.h

@@ -9,6 +9,8 @@
 #import "TouchBarPrivateApi.h"
 #import "TouchBarSupport.h"
 #import "DeprecatedCarbonAPI.h"
+#import "CBBlueLightClient.h"
+#import "LaunchAtLoginController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -18,4 +20,7 @@ CF_EXPORT IOReturn MTActuatorClose(CFTypeRef actuatorRef);
 CF_EXPORT IOReturn MTActuatorActuate(CFTypeRef actuatorRef, SInt32 actuationID, UInt32 arg1, Float32 arg2, Float32 arg3);
 CF_EXPORT bool MTActuatorIsOpen(CFTypeRef actuatorRef);
 
+CF_EXPORT void CoreDisplay_Display_SetUserBrightness(int CGDirectDisplayID, double level);
+CF_EXPORT double CoreDisplay_Display_GetUserBrightness(int CGDirectDisplayID);
+
 NS_ASSUME_NONNULL_END

MTMR/CBridge/TouchBarPrivateApi.h

@@ -17,13 +17,16 @@ extern void DFRSystemModalShowsCloseBoxWhenFrontMost(BOOL);
 
 @interface NSTouchBar (PrivateMethods)
 
-// presentSystemModalFunctionBar:placement:systemTrayItemIdentifier:
+// macOS 10.14
++ (void)presentSystemModalTouchBar:(NSTouchBar *)touchBar placement:(long long)placement systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
++ (void)presentSystemModalTouchBar:(NSTouchBar *)touchBar systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
++ (void)dismissSystemModalTouchBar:(NSTouchBar *)touchBar;
++ (void)minimizeSystemModalTouchBar:(NSTouchBar *)touchBar;
+
+// macOS 10.13
 + (void)presentSystemModalFunctionBar:(NSTouchBar *)touchBar placement:(long long)placement systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
-
 + (void)presentSystemModalFunctionBar:(NSTouchBar *)touchBar systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
-
 + (void)dismissSystemModalFunctionBar:(NSTouchBar *)touchBar;
-
 + (void)minimizeSystemModalFunctionBar:(NSTouchBar *)touchBar;
 
 @end

MTMR/CBridge/TouchBarSupport.h

@@ -10,8 +10,6 @@
 
 @interface MediaKeys : NSObject
 
-+ (void)decreaseVolume;
-+ (void)increaseVolume;
-+ (void)muteVolume;
++ (void)HIDPostAuxKey:(UInt8)keyCode;
 
 @end

MTMR/CBridge/TouchBarSupport.m

@@ -7,6 +7,7 @@
 //
 
 #import "TouchBarSupport.h"
+#import <IOKit/hidsystem/ev_keymap.h>
 
 @implementation MediaKeys
 
@@ -30,7 +31,7 @@ static io_connect_t get_event_driver(void)
 }
 
 
-static void HIDPostAuxKey( const UInt8 auxKeyCode )
+static void HIDReleaseAuxKey( const UInt8 auxKeyCode )
 {
     NXEventData   event;
     kern_return_t kr;
@@ -51,16 +52,8 @@ static void HIDPostAuxKey( const UInt8 auxKeyCode )
     kr = IOHIDPostEvent( get_event_driver(), NX_SYSDEFINED, loc, &event, kNXEventDataVersion, 0, FALSE );
 }
 
-+ (void)decreaseVolume {
-    HIDPostAuxKey(NX_KEYTYPE_SOUND_DOWN);
-}
-
-+ (void)increaseVolume {
-    HIDPostAuxKey(NX_KEYTYPE_SOUND_UP);
-}
-
-+ (void)muteVolume {
-    HIDPostAuxKey(NX_KEYTYPE_MUTE);
++ (void)HIDPostAuxKey: (UInt8)keyCode {
+    HIDReleaseAuxKey(keyCode);
 }
 
 @end

MTMR/CustomButtonTouchBarItem.swift

@@ -9,39 +9,93 @@
 import Cocoa
 
 class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
-    private let tapClosure: () -> ()?
-    private let longTapClosure: () -> ()?
-    private(set) var button: NSButton!
+    var tapClosure: (() -> Void)?
+    var longTapClosure: (() -> Void)?
     
-    private var singleClick: NSClickGestureRecognizer!
+    private let hf: HapticFeedback = HapticFeedback()
+    private var button: NSButton!
+    private var singleClick: HapticClickGestureRecognizer!
     private var longClick: NSPressGestureRecognizer!
 
-    init(identifier: NSTouchBarItem.Identifier, title: String, onTap callback: @escaping () -> (), onLongTap callbackLong: @escaping () -> (), bezelColor: NSColor? = .clear) {
-        self.tapClosure = callback
-        self.longTapClosure = callbackLong
-        
+    init(identifier: NSTouchBarItem.Identifier, title: String) {
+        attributedTitle = title.defaultTouchbarAttributedString
+
         super.init(identifier: identifier)
-        button = NSButton(title: title, target: self, action: nil)
-        button.bezelColor = bezelColor
-        button.title = title
-        self.view = button
-        
+        button = CustomHeightButton(title: title, target: nil, action: nil)
+
         longClick = NSPressGestureRecognizer(target: self, action: #selector(handleGestureLong))
         longClick.allowedTouchTypes = .direct
         longClick.delegate = self
-        
-        singleClick = NSClickGestureRecognizer(target: self, action: #selector(handleGestureSingle))
+
+        singleClick = HapticClickGestureRecognizer(target: self, action: #selector(handleGestureSingle))
         singleClick.allowedTouchTypes = .direct
         singleClick.delegate = self
-        
-        self.view.addGestureRecognizer(longClick)
-        self.view.addGestureRecognizer(singleClick)
+
+        reinstallButton()
+        button.attributedTitle = attributedTitle
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
+    var isBordered: Bool = true {
+        didSet {
+            reinstallButton()
+        }
+    }
+
+    var backgroundColor: NSColor? {
+        didSet {
+            reinstallButton()
+        }
+    }
+
+    var title: String {
+        get {
+            return attributedTitle.string
+        }
+        set {
+            attributedTitle = newValue.defaultTouchbarAttributedString
+        }
+    }
+
+    var attributedTitle: NSAttributedString {
+        didSet {
+            button?.imagePosition = attributedTitle.length > 0 ? .imageLeading : .imageOnly
+            button?.attributedTitle = attributedTitle
+        }
+    }
+
+    var image: NSImage? {
+        didSet {
+            button.image = image
+        }
+    }
+
+    private func reinstallButton() {
+        let title = button.attributedTitle
+        let image = button.image
+        let cell = CustomButtonCell(parentItem: self)
+        button.cell = cell
+        if let color = backgroundColor {
+            cell.isBordered = true
+            button.bezelColor = color
+            cell.backgroundColor = color
+        } else {
+            button.isBordered = isBordered
+            button.bezelStyle = isBordered ? .rounded : .inline
+        }
+        button.imageScaling = .scaleProportionallyDown
+        button.imageHugsTitle = true
+        button.attributedTitle = title
+        button?.imagePosition = title.length > 0 ? .imageLeading : .imageOnly
+        button.image = image
+        view = button
+
+        view.addGestureRecognizer(longClick)
+        view.addGestureRecognizer(singleClick)
+    }
 
     func gestureRecognizer(_ gestureRecognizer: NSGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: NSGestureRecognizer) -> Bool {
         if gestureRecognizer == singleClick && otherGestureRecognizer == longClick {
@@ -49,36 +103,91 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
         }
         return true
     }
-    
+
     @objc func handleGestureSingle(gr: NSClickGestureRecognizer) {
-        let hf: HapticFeedback = HapticFeedback()
         switch gr.state {
         case .ended:
-            hf.tap(strong: 2)
-            self.tapClosure()
+            tapClosure?()
             break
         default:
             break
         }
     }
-    
+
     @objc func handleGestureLong(gr: NSPressGestureRecognizer) {
-        let hf: HapticFeedback = HapticFeedback()
         switch gr.state {
         case .began:
-            if self.longTapClosure != nil {
+            if let closure = self.longTapClosure {
                 hf.tap(strong: 2)
-                self.tapClosure()
-            } else {
+                closure()
+            } else if let closure = self.tapClosure {
                 hf.tap(strong: 6)
-                self.longTapClosure()
+                closure()
                 print("long click")
             }
             break
         default:
             break
-            
         }
     }
 }
 
+class CustomHeightButton: NSButton {
+    override var intrinsicContentSize: NSSize {
+        var size = super.intrinsicContentSize
+        size.height = 30
+        return size
+    }
+}
+
+class CustomButtonCell: NSButtonCell {
+    weak var parentItem: CustomButtonTouchBarItem?
+
+    init(parentItem: CustomButtonTouchBarItem) {
+        super.init(textCell: "")
+        self.parentItem = parentItem
+    }
+
+    override func highlight(_ flag: Bool, withFrame cellFrame: NSRect, in controlView: NSView) {
+        super.highlight(flag, withFrame: cellFrame, in: controlView)
+        if !isBordered {
+            if flag {
+                setAttributedTitle(attributedTitle, withColor: .lightGray)
+            } else if let parentItem = self.parentItem {
+                attributedTitle = parentItem.attributedTitle
+            }
+        }
+    }
+
+    required init(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func setAttributedTitle(_ title: NSAttributedString, withColor color: NSColor) {
+        let attrTitle = NSMutableAttributedString(attributedString: title)
+        attrTitle.addAttributes([.foregroundColor: color], range: NSRange(location: 0, length: attrTitle.length))
+        attributedTitle = attrTitle
+    }
+}
+
+class HapticClickGestureRecognizer: NSClickGestureRecognizer {
+    let hf: HapticFeedback = HapticFeedback()
+    
+    override func touchesBegan(with event: NSEvent) {
+        hf.tap(strong: 2)
+        super.touchesBegan(with: event)
+    }
+    
+    override func touchesEnded(with event: NSEvent) {
+        hf.tap(strong: 1)
+        super.touchesEnded(with: event)
+    }
+}
+
+extension String {
+    var defaultTouchbarAttributedString: NSAttributedString {
+        let attrTitle = NSMutableAttributedString(string: self, attributes: [.foregroundColor: NSColor.white, .font: NSFont.systemFont(ofSize: 15, weight: .regular), .baselineOffset: 1])
+        attrTitle.setAlignment(.center, range: NSRange(location: 0, length: count))
+        return attrTitle
+    }
+}

MTMR/CustomSlider.swift

@@ -9,34 +9,34 @@
 import Foundation
 
 class CustomSliderCell: NSSliderCell {
-    var knobImage:NSImage!
-    private var _currentKnobRect:NSRect!
-    private var _barRect:NSRect!
-    
+    var knobImage: NSImage!
+    private var _currentKnobRect: NSRect!
+    private var _barRect: NSRect!
+
     required init(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
-    
+
     override init() {
         super.init()
     }
-    
-    init(knob:NSImage?) {
-        knobImage = knob;
+
+    init(knob: NSImage?) {
+        knobImage = knob
         super.init()
     }
-    
+
     override func drawKnob(_ knobRect: NSRect) {
-        if (knobImage == nil) {
+        if knobImage == nil {
             super.drawKnob(knobRect)
-            return;
+            return
         }
 
-        _currentKnobRect = knobRect;
+        _currentKnobRect = knobRect
         drawBar(inside: _barRect, flipped: true)
 
-        let x = (knobRect.origin.x * (_barRect.size.width - (knobImage.size.width - knobRect.size.width)) / _barRect.size.width)+1;
-        let y = knobRect.origin.y+3
+        let x = (knobRect.origin.x * (_barRect.size.width - (knobImage.size.width - knobRect.size.width)) / _barRect.size.width) + 1
+        let y = knobRect.origin.y + 3
 
         knobImage.draw(
             at: NSPoint(x: x, y: y),
@@ -45,63 +45,62 @@ class CustomSliderCell: NSSliderCell {
             fraction: 1
         )
     }
-    
-    override func drawBar(inside aRect: NSRect, flipped: Bool) {
+
+    override func drawBar(inside aRect: NSRect, flipped _: Bool) {
         _barRect = aRect
-        
-        var rect = aRect
-        rect.size.height = CGFloat(4)
+
         let barRadius = CGFloat(2)
-        let value = CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
-        let finalWidth = CGFloat(value * (self.controlView!.frame.size.width - 12))
-        
-        var leftRect = rect
-        leftRect.size.width = finalWidth
-        let bg = NSBezierPath(roundedRect: rect, xRadius: barRadius, yRadius: barRadius)
+
+        var bgRect = aRect
+        bgRect.size.height = CGFloat(4)
+
+        let bg = NSBezierPath(roundedRect: bgRect, xRadius: barRadius, yRadius: barRadius)
         NSColor.lightGray.setFill()
         bg.fill()
-        
-        let active = NSBezierPath(roundedRect: leftRect, xRadius: barRadius, yRadius: barRadius)
+
+        var activeRect = bgRect
+
+        activeRect.size.width = CGFloat((Double(bgRect.size.width) / (maxValue - minValue)) * doubleValue)
+        let active = NSBezierPath(roundedRect: activeRect, xRadius: barRadius, yRadius: barRadius)
         NSColor.darkGray.setFill()
         active.fill()
     }
 }
 
-class CustomSlider:NSSlider {
-    
-    var currentValue:CGFloat = 0
-    
+class CustomSlider: NSSlider {
+    var currentValue: CGFloat = 0
+
     override func setNeedsDisplay(_ invalidRect: NSRect) {
         super.setNeedsDisplay(invalidRect)
     }
-    
+
     override func awakeFromNib() {
         super.awakeFromNib()
-        if ((self.cell?.isKind(of: CustomSliderCell.self)) == false) {
-            let cell:CustomSliderCell = CustomSliderCell()
+        if (cell?.isKind(of: CustomSliderCell.self)) == false {
+            let cell: CustomSliderCell = CustomSliderCell()
             self.cell = cell
         }
     }
-    
-    convenience init(knob:NSImage) {
+
+    convenience init(knob: NSImage) {
         self.init()
-        self.cell = CustomSliderCell(knob: knob)
+        cell = CustomSliderCell(knob: knob)
     }
-    
+
     required init?(coder: NSCoder) {
         super.init(coder: coder)
     }
-    
+
     override init(frame frameRect: NSRect) {
         super.init(frame: frameRect)
     }
-    
+
     func knobImage() -> NSImage {
         let cell = self.cell as! CustomSliderCell
         return cell.knobImage
     }
-    
-    func setKnobImage(image:NSImage) {
+
+    func setKnobImage(image: NSImage) {
         let cell = self.cell as! CustomSliderCell
         cell.knobImage = image
     }

MTMR/GeneralExtensions.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+#if swift(>=4.1)
+    // compactMap supported
+#else
+    extension Sequence {
+        func compactMap<ElementOfResult>(_ transform: (Self.Element) throws -> ElementOfResult?) rethrows -> [ElementOfResult] {
+            return try flatMap(transform)
+        }
+    }
+#endif
+
+extension String {
+    var ifNotEmpty: String? {
+        return count > 0 ? self : nil
+    }
+}

MTMR/HapticFeedback.swift

@@ -9,9 +9,28 @@
 import IOKit
 
 class HapticFeedback {
-    private var actuatorRef: CFTypeRef?
-    private var deviceID: UInt64 = 0x200000001000000
-    private var error: IOReturn = 0
+    private var correctDeviceId: UInt64?
+    
+    // Here we have list of possible IDs for Haptic Generator Device. They are not constant
+    // To find deviceID, you will need IORegistryExplorer app from Additional Tools for Xcode dmg
+    // which you can download from https://developer.apple.com/download/more/?=Additional%20Tools
+    // Open IORegistryExplorer app, search for AppleMultitouchDevice and get "Multitouch ID"
+    // There should be programmatic way to get it but I can't find, no docs for macOS :(
+    private let possibleDeviceIDs: [UInt64] = [
+        0x200_0000_0100_0000, // MacBook Pro 2016/2017
+        0x300000080500000 // MacBook Pro 2019 (possibly 2018 as well)
+    ]
+    
+    init() {
+        // Let's find our Haptic device
+        possibleDeviceIDs.forEach {(deviceID) in
+            guard correctDeviceId == nil else {return}
+            let actuatorRef: CFTypeRef? = MTActuatorCreateFromDeviceID(deviceID).takeRetainedValue()
+            if actuatorRef != nil {
+                correctDeviceId = deviceID
+            }
+        }
+    }
 
     // Don't know how to do strong is enum one of
     // 1 like back Click
@@ -24,34 +43,37 @@ class HapticFeedback {
     // 16 nothing
     // you can get a plist `otool -s __TEXT __tpad_act_plist /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/Current/MultitouchSupport|tail -n +3|awk -F'\t' '{print $2}'|xxd -r -p`
 
-    func tap(strong:Int32) -> Void {
-        actuatorRef = MTActuatorCreateFromDeviceID(deviceID).takeRetainedValue()
-
+    func tap(strong: Int32) {
+        guard correctDeviceId != nil else {
+            print("guard correctDeviceId == nil (no haptic device found?)")
+            return
+        }
+        
+        let actuatorRef: CFTypeRef? = MTActuatorCreateFromDeviceID(correctDeviceId!).takeRetainedValue()
+        
         guard actuatorRef != nil else {
             print("guard actuatorRef == nil")
             return
         }
 
-        error = MTActuatorOpen(actuatorRef!)
-        guard error == kIOReturnSuccess else {
+        var result: IOReturn
+        
+        result = MTActuatorOpen(actuatorRef!)
+        guard result == kIOReturnSuccess else {
             print("guard MTActuatorOpen")
             return
         }
 
-        error = MTActuatorActuate(actuatorRef!, strong, 0, 0.0, 0.0)
-        guard error == kIOReturnSuccess else {
+        result = MTActuatorActuate(actuatorRef!, strong, 0, 0.0, 0.0)
+        guard result == kIOReturnSuccess else {
             print("guard MTActuatorActuate")
             return
         }
 
-        error = MTActuatorClose(actuatorRef!)
-        guard error == kIOReturnSuccess else {
+        result = MTActuatorClose(actuatorRef!)
+        guard result == kIOReturnSuccess else {
             print("guard MTActuatorClose")
             return
         }
-
-        return
     }
 }
-
-

MTMR/Info.plist

@@ -17,20 +17,52 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.12</string>
+	<string>0.21.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>254</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>
 	<true/>
+	<key>NSAppleEventsUsageDescription</key>
+	<string>AppleEvents needed for correct work AppleScript</string>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>MTMR needs access to Media for work</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>MTMR needs access to Bluetooth for work</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>MTMR needs access to Calendar for work</string>
+	<key>NSCameraUsageDescription</key>
+	<string>MTMR needs access to Camera for work</string>
+	<key>NSHomeKitUsageDescription</key>
+	<string>MTMR needs access to HomeKit for work</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Anton Palgunov. All rights reserved.</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
 	<key>NSLocationUsageDescription</key>
-	<string>...</string>
+	<string>Weather widget need your location for correct work</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>MTMR needs access to Photo for work</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSRemindersUsageDescription</key>
+	<string>MTMR needs access to Reminders for work</string>
+	<key>NSSystemAdministrationUsageDescription</key>
+	<string>MTMR needs access to Administation for work</string>
+	<key>SUFeedURL</key>
+	<string>https://mtmr.app/appcast.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+	<key>kTCCServiceMediaLibrary</key>
+	<string>MTMR needs access to Music for work</string>
 </dict>
 </plist>

MTMR/ItemsParsing.swift

@@ -1,11 +1,9 @@
-import Foundation
 import AppKit
+import Foundation
 
 extension Data {
     func barItemDefinitions() -> [BarItemDefinition]? {
-//      TODO: Need improve a speed, very low loading JSON with comments ~20sec
-//      return try? JSONDecoder().decode([BarItemDefinition].self, from: self.utf8string!.stripComments().data(using: .utf8)!
-        return try? JSONDecoder().decode([BarItemDefinition].self, from: self)
+        return try? JSONDecoder().decode([BarItemDefinition].self, from: utf8string!.stripComments().data(using: .utf8)!)
     }
 }
 
@@ -19,7 +17,7 @@ struct BarItemDefinition: Decodable {
         case type
     }
 
-    init(type: ItemType, action: ActionType, longAction: LongActionType, additionalParameters: [GeneralParameters.CodingKeys:GeneralParameter]) {
+    init(type: ItemType, action: ActionType, longAction: LongActionType, additionalParameters: [GeneralParameters.CodingKeys: GeneralParameter]) {
         self.type = type
         self.action = action
         self.longAction = longAction
@@ -31,6 +29,7 @@ struct BarItemDefinition: Decodable {
         let type = try container.decode(String.self, forKey: .type)
         let parametersDecoder = SupportedTypesHolder.sharedInstance.lookup(by: type)
         var additionalParameters = try GeneralParameters(from: decoder).parameters
+
         if let result = try? parametersDecoder(decoder),
             case let (itemType, action, longAction, parameters) = result {
             parameters.forEach { additionalParameters[$0] = $1 }
@@ -39,48 +38,133 @@ struct BarItemDefinition: Decodable {
             self.init(type: .staticButton(title: "unknown"), action: .none, longAction: .none, additionalParameters: additionalParameters)
         }
     }
-
 }
 
+typealias ParametersDecoder = (Decoder) throws -> (
+    item: ItemType,
+    action: ActionType,
+    longAction: LongActionType,
+    parameters: [GeneralParameters.CodingKeys: GeneralParameter]
+)
+
 class SupportedTypesHolder {
-    typealias ParametersDecoder = (Decoder) throws ->(item: ItemType, action: ActionType, longAction: LongActionType, parameters: [GeneralParameters.CodingKeys: GeneralParameter])
     private var supportedTypes: [String: ParametersDecoder] = [
-        "escape": { _ in return (item: .staticButton(title: "esc"), action: .keyPress(keycode: 53), longAction: .none, parameters: [.align: .align(.left)])  },
-        "delete": { _ in return (item: .staticButton(title: "del"), action: .keyPress(keycode: 117), longAction: .none, parameters: [:])},
+        "escape": { _ in (
+            item: .staticButton(title: "esc"),
+            action: .keyPress(keycode: 53),
+            longAction: .none,
+            parameters: [.align: .align(.left)]
+        ) },
+
+        "delete": { _ in (
+            item: .staticButton(title: "del"),
+            action: .keyPress(keycode: 117),
+            longAction: .none,
+            parameters: [:]
+        ) },
+
         "brightnessUp": { _ in
             let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "brightnessUp"))
-            return (item: .staticButton(title: ""), action: .keyPress(keycode: 113), longAction: .none, parameters: [.image: imageParameter])
+            return (
+                item: .staticButton(title: ""),
+                action: .keyPress(keycode: 144),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "brightnessDown": { _ in
             let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "brightnessDown"))
-            return (item: .staticButton(title: ""), action: .keyPress(keycode: 107), longAction: .none, parameters: [.image: imageParameter])
+            return (
+                item: .staticButton(title: ""),
+                action: .keyPress(keycode: 145),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
+        "illuminationUp": { _ in
+            let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "ill_up"))
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_ILLUMINATION_UP),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
+        },
+
+        "illuminationDown": { _ in
+            let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "ill_down"))
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_ILLUMINATION_DOWN),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
+        },
+
         "volumeDown": { _ in
-            let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarVolumeDownTemplate)!)
-            return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_SOUND_DOWN), longAction: .none, parameters: [.image: imageParameter])
+            let imageParameter = GeneralParameter.image(source: NSImage(named: NSImage.touchBarVolumeDownTemplateName)!)
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_SOUND_DOWN),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "volumeUp": { _ in
-            let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarVolumeUpTemplate)!)
-            return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_SOUND_UP), longAction: .none, parameters: [.image: imageParameter])
+            let imageParameter = GeneralParameter.image(source: NSImage(named: NSImage.touchBarVolumeUpTemplateName)!)
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_SOUND_UP),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "mute": { _ in
-            let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarAudioOutputMuteTemplate)!)
-            return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_MUTE), longAction: .none, parameters: [.image: imageParameter])
+            let imageParameter = GeneralParameter.image(source: NSImage(named: NSImage.touchBarAudioOutputMuteTemplateName)!)
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_MUTE),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "previous": { _ in
-            let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarRewindTemplate)!)
-            return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_PREVIOUS), longAction: .none, parameters: [.image: imageParameter])
+            let imageParameter = GeneralParameter.image(source: NSImage(named: NSImage.touchBarRewindTemplateName)!)
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_PREVIOUS),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "play": { _ in
-            let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarPlayPauseTemplate)!)
-            return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_PLAY), longAction: .none, parameters: [.image: imageParameter])
+            let imageParameter = GeneralParameter.image(source: NSImage(named: NSImage.touchBarPlayPauseTemplateName)!)
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_PLAY),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "next": { _ in
-            let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarFastForwardTemplate)!)
-            return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_NEXT), longAction: .none, parameters: [.image: imageParameter])
+            let imageParameter = GeneralParameter.image(source: NSImage(named: NSImage.touchBarFastForwardTemplateName)!)
+            return (
+                item: .staticButton(title: ""),
+                action: .hidKey(keycode: NX_KEYTYPE_NEXT),
+                longAction: .none,
+                parameters: [.image: imageParameter]
+            )
         },
+
         "weather": { decoder in
-            enum CodingKeys: String, CodingKey { case refreshInterval; case units; case api_key ; case icon_type }
+            enum CodingKeys: String, CodingKey { case refreshInterval; case units; case api_key; case icon_type }
             let container = try decoder.container(keyedBy: CodingKeys.self)
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
             let units = try container.decodeIfPresent(String.self, forKey: .units)
@@ -88,53 +172,156 @@ class SupportedTypesHolder {
             let icon_type = try container.decodeIfPresent(String.self, forKey: .icon_type)
             let action = try ActionType(from: decoder)
             let longAction = try LongActionType(from: decoder)
-            return (item: .weather(interval: interval ?? 1800.00, units: units ?? "metric", api_key: api_key ?? "32c4256d09a4c52b38aecddba7a078f6", icon_type: icon_type ?? "text"), action: action, longAction: longAction, parameters: [:])
+            return (
+                item: .weather(interval: interval ?? 1800.00, units: units ?? "metric", api_key: api_key ?? "32c4256d09a4c52b38aecddba7a078f6", icon_type: icon_type ?? "text"),
+                action,
+                longAction,
+                parameters: [:]
+            )
         },
+        
+        "yandexWeather": { decoder in
+            enum CodingKeys: String, CodingKey { case refreshInterval }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
+            let action = try ActionType(from: decoder)
+            let longAction = try LongActionType(from: decoder)
+            return (
+                item: .yandexWeather(interval: interval ?? 1800.00),
+                action,
+                longAction,
+                parameters: [:]
+            )
+        },
+
         "currency": { decoder in
-            enum CodingKeys: String, CodingKey { case refreshInterval; case from; case to }
+            enum CodingKeys: String, CodingKey { case refreshInterval; case from; case to; case full }
             let container = try decoder.container(keyedBy: CodingKeys.self)
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
             let from = try container.decodeIfPresent(String.self, forKey: .from)
             let to = try container.decodeIfPresent(String.self, forKey: .to)
+            let full = try container.decodeIfPresent(Bool.self, forKey: .full)
             let action = try ActionType(from: decoder)
             let longAction = try LongActionType(from: decoder)
-            return (item: .currency(interval: interval ?? 600.00, from: from ?? "RUB", to: to ?? "USD"), action: action, longAction: longAction, parameters: [:])
+            return (
+                item: .currency(interval: interval ?? 600.00, from: from ?? "RUB", to: to ?? "USD", full: full ?? false),
+                action,
+                longAction,
+                parameters: [:]
+            )
         },
+
         "dock": { decoder in
-            return (item: .dock(), action: .none, longAction: .none, parameters: [:])
+            enum CodingKeys: String, CodingKey { case autoResize }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let autoResize = try container.decodeIfPresent(Bool.self, forKey: .autoResize) ?? false
+            return (
+                item: .dock(autoResize: autoResize),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
         },
-        "inputsource": { decoder in
-            return (item: .inputsource(), action: .none, longAction: .none, parameters: [:])
+
+        "inputsource": { _ in
+            (
+                item: .inputsource(),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
         },
+
         "volume": { decoder in
             enum CodingKeys: String, CodingKey { case image }
             let container = try decoder.container(keyedBy: CodingKeys.self)
             if var img = try container.decodeIfPresent(Source.self, forKey: .image) {
-                return (item: .volume(), action: .none, longAction: .none, parameters: [.image: .image(source: img)])
+                return (
+                    item: .volume(),
+                    action: .none,
+                    longAction: .none,
+                    parameters: [.image: .image(source: img)]
+                )
             } else {
-                return (item: .volume(), action: .none, longAction: .none, parameters: [:])
+                return (
+                    item: .volume(),
+                    action: .none,
+                    longAction: .none,
+                    parameters: [:]
+                )
             }
         },
+
         "brightness": { decoder in
             enum CodingKeys: String, CodingKey { case refreshInterval; case image }
             let container = try decoder.container(keyedBy: CodingKeys.self)
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
             if var img = try container.decodeIfPresent(Source.self, forKey: .image) {
-                return (item: .brightness(refreshInterval: interval ?? 0.5), action: .none, longAction: .none, parameters: [.image: .image(source: img)])
+                return (
+                    item: .brightness(refreshInterval: interval ?? 0.5),
+                    action: .none,
+                    longAction: .none,
+                    parameters: [.image: .image(source: img)]
+                )
             } else {
-                return (item: .brightness(refreshInterval: interval ?? 0.5), action: .none, longAction: .none, parameters: [:])
+                return (
+                    item: .brightness(refreshInterval: interval ?? 0.5),
+                    action: .none,
+                    longAction: .none,
+                    parameters: [:]
+                )
             }
         },
-        "sleep": { _ in return (item: .staticButton(title: "☕️"), action: .shellScript(executable: "/usr/bin/pmset", parameters: ["sleepnow"]), longAction: .none, parameters: [:]) },
-        "displaySleep": { _ in return (item: .staticButton(title: "☕️"), action: .shellScript(executable: "/usr/bin/pmset", parameters: ["displaysleepnow"]), longAction: .none,  parameters: [:])},
+
+        "sleep": { _ in (
+            item: .staticButton(title: "☕️"),
+            action: .shellScript(executable: "/usr/bin/pmset", parameters: ["sleepnow"]),
+            longAction: .none,
+            parameters: [:]
+        ) },
+
+        "displaySleep": { _ in (
+            item: .staticButton(title: "☕️"),
+            action: .shellScript(executable: "/usr/bin/pmset", parameters: ["displaysleepnow"]),
+            longAction: .none,
+            parameters: [:]
+        ) },
+
+        "music": { decoder in
+            enum CodingKeys: String, CodingKey { case refreshInterval; case disableMarquee }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
+            let disableMarquee = try container.decodeIfPresent(Bool.self, forKey: .disableMarquee)
+            return (
+                item: .music(interval: interval ?? 5.0, disableMarquee: disableMarquee ?? false),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
+        },
+
+        "group": { decoder in
+            enum CodingKeys: CodingKey { case items }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let items = try container.decode([BarItemDefinition].self, forKey: .items)
+            return (
+                item: .groupBar(items: items),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
+        },
     ]
 
     static let sharedInstance = SupportedTypesHolder()
 
     func lookup(by type: String) -> ParametersDecoder {
-        return supportedTypes[type] ?? { decoder in
-            return (item: try ItemType(from: decoder), action: try ActionType(from: decoder), longAction: try LongActionType(from: decoder), parameters: [:])
-        }
+        return supportedTypes[type] ?? { decoder in (
+            item: try ItemType(from: decoder),
+            action: try ActionType(from: decoder),
+            longAction: try LongActionType(from: decoder),
+            parameters: [:]
+        ) }
     }
 
     func register(typename: String, decoder: @escaping ParametersDecoder) {
@@ -143,7 +330,12 @@ class SupportedTypesHolder {
 
     func register(typename: String, item: ItemType, action: ActionType, longAction: LongActionType) {
         register(typename: typename) { _ in
-            return (item: item, action: action, longAction: longAction, parameters: [:])
+            (
+                item: item,
+                action,
+                longAction,
+                parameters: [:]
+            )
         }
     }
 }
@@ -151,14 +343,22 @@ class SupportedTypesHolder {
 enum ItemType: Decodable {
     case staticButton(title: String)
     case appleScriptTitledButton(source: SourceProtocol, refreshInterval: Double)
-    case timeButton(formatTemplate: String)
+    case timeButton(formatTemplate: String, timeZone: String?)
     case battery()
-    case dock()
+    case dock(autoResize: Bool)
     case volume()
     case brightness(refreshInterval: Double)
     case weather(interval: Double, units: String, api_key: String, icon_type: String)
-    case currency(interval: Double, from: String, to: String)
+    case yandexWeather(interval: Double)
+    case currency(interval: Double, from: String, to: String, full: Bool)
     case inputsource()
+    case music(interval: Double, disableMarquee: Bool)
+    case groupBar(items: [BarItemDefinition])
+    case nightShift()
+    case dnd()
+    case pomodoro(workTime: Double, restTime: Double)
+    case network(flip: Bool)
+    case darkMode()
 
     private enum CodingKeys: String, CodingKey {
         case type
@@ -167,6 +367,8 @@ enum ItemType: Decodable {
         case refreshInterval
         case from
         case to
+        case full
+        case timeZone
         case units
         case api_key
         case icon_type
@@ -174,6 +376,12 @@ enum ItemType: Decodable {
         case image
         case url
         case longUrl
+        case items
+        case workTime
+        case restTime
+        case flip
+        case autoResize
+        case disableMarquee
     }
 
     enum ItemTypeRaw: String, Decodable {
@@ -185,8 +393,16 @@ enum ItemType: Decodable {
         case volume
         case brightness
         case weather
+        case yandexWeather
         case currency
         case inputsource
+        case music
+        case groupBar
+        case nightShift
+        case dnd
+        case pomodoro
+        case network
+        case darkMode
     }
 
     init(from decoder: Decoder) throws {
@@ -197,45 +413,88 @@ enum ItemType: Decodable {
             let source = try container.decode(Source.self, forKey: .source)
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
             self = .appleScriptTitledButton(source: source, refreshInterval: interval)
+
         case .staticButton:
             let title = try container.decode(String.self, forKey: .title)
             self = .staticButton(title: title)
+
         case .timeButton:
             let template = try container.decodeIfPresent(String.self, forKey: .formatTemplate) ?? "HH:mm"
-            self = .timeButton(formatTemplate: template)
+            let timeZone = try container.decodeIfPresent(String.self, forKey: .timeZone) ?? nil
+            self = .timeButton(formatTemplate: template, timeZone: timeZone)
+
         case .battery:
             self = .battery()
+
         case .dock:
-            self = .dock()
+            let autoResize = try container.decodeIfPresent(Bool.self, forKey: .autoResize) ?? false
+            self = .dock(autoResize: autoResize)
+
         case .volume:
             self = .volume()
+
         case .brightness:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 0.5
             self = .brightness(refreshInterval: interval)
+
         case .weather:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
             let units = try container.decodeIfPresent(String.self, forKey: .units) ?? "metric"
             let api_key = try container.decodeIfPresent(String.self, forKey: .api_key) ?? "32c4256d09a4c52b38aecddba7a078f6"
             let icon_type = try container.decodeIfPresent(String.self, forKey: .icon_type) ?? "text"
             self = .weather(interval: interval, units: units, api_key: api_key, icon_type: icon_type)
+            
+        case .yandexWeather:
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
+            self = .yandexWeather(interval: interval)
+
         case .currency:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 600.0
             let from = try container.decodeIfPresent(String.self, forKey: .from) ?? "RUB"
             let to = try container.decodeIfPresent(String.self, forKey: .to) ?? "USD"
-            self = .currency(interval: interval, from: from, to: to)
+            let full = try container.decodeIfPresent(Bool.self, forKey: .full) ?? false
+            self = .currency(interval: interval, from: from, to: to, full: full)
+
         case .inputsource:
             self = .inputsource()
+
+        case .music:
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 5.0
+            let disableMarquee = try container.decodeIfPresent(Bool.self, forKey: .disableMarquee) ?? false
+            self = .music(interval: interval, disableMarquee: disableMarquee)
+
+        case .groupBar:
+            let items = try container.decode([BarItemDefinition].self, forKey: .items)
+            self = .groupBar(items: items)
+
+        case .nightShift:
+            self = .nightShift()
+
+        case .dnd:
+            self = .dnd()
+
+        case .pomodoro:
+            let workTime = try container.decodeIfPresent(Double.self, forKey: .workTime) ?? 1500.0
+            let restTime = try container.decodeIfPresent(Double.self, forKey: .restTime) ?? 600.0
+            self = .pomodoro(workTime: workTime, restTime: restTime)
+
+        case .network:
+            let flip = try container.decodeIfPresent(Bool.self, forKey: .flip) ?? false
+            self = .network(flip: flip)
+
+        case .darkMode:
+            self = .darkMode()
         }
     }
 }
 
 enum ActionType: Decodable {
     case none
-    case hidKey(keycode: Int)
+    case hidKey(keycode: Int32)
     case keyPress(keycode: Int)
-    case appleSctipt(source: SourceProtocol)
+    case appleScript(source: SourceProtocol)
     case shellScript(executable: String, parameters: [String])
-    case custom(closure: ()->())
+    case custom(closure: () -> Void)
     case openUrl(url: String)
 
     private enum CodingKeys: String, CodingKey {
@@ -258,48 +517,53 @@ enum ActionType: Decodable {
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let type = try container.decodeIfPresent(ActionTypeRaw.self, forKey: .action)
+
         switch type {
         case .some(.hidKey):
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+            let keycode = try container.decode(Int32.self, forKey: .keycode)
             self = .hidKey(keycode: keycode)
+
         case .some(.keyPress):
             let keycode = try container.decode(Int.self, forKey: .keycode)
             self = .keyPress(keycode: keycode)
+
         case .some(.appleScript):
             let source = try container.decode(Source.self, forKey: .actionAppleScript)
-            self = .appleSctipt(source: source)
+            self = .appleScript(source: source)
+
         case .some(.shellScript):
             let executable = try container.decode(String.self, forKey: .executablePath)
             let parameters = try container.decodeIfPresent([String].self, forKey: .shellArguments) ?? []
             self = .shellScript(executable: executable, parameters: parameters)
+
         case .some(.openUrl):
             let url = try container.decode(String.self, forKey: .url)
             self = .openUrl(url: url)
+
         case .none:
             self = .none
         }
     }
 }
 
-
 enum LongActionType: Decodable {
     case none
-    case hidKey(keycode: Int)
+    case hidKey(keycode: Int32)
     case keyPress(keycode: Int)
-    case appleSctipt(source: SourceProtocol)
+    case appleScript(source: SourceProtocol)
     case shellScript(executable: String, parameters: [String])
-    case custom(closure: ()->())
+    case custom(closure: () -> Void)
     case openUrl(url: String)
-    
+
     private enum CodingKeys: String, CodingKey {
         case longAction
-        case keycode
-        case actionAppleScript
-        case executablePath
-        case shellArguments
+        case longKeycode
+        case longActionAppleScript
+        case longExecutablePath
+        case longShellArguments
         case longUrl
     }
-    
+
     private enum LongActionTypeRaw: String, Decodable {
         case hidKey
         case keyPress
@@ -307,89 +571,46 @@ enum LongActionType: Decodable {
         case shellScript
         case openUrl
     }
-    
+
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let longType = try container.decodeIfPresent(LongActionTypeRaw.self, forKey: .longAction)
+
         switch longType {
         case .some(.hidKey):
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+            let keycode = try container.decode(Int32.self, forKey: .longKeycode)
             self = .hidKey(keycode: keycode)
+
         case .some(.keyPress):
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+            let keycode = try container.decode(Int.self, forKey: .longKeycode)
             self = .keyPress(keycode: keycode)
+
         case .some(.appleScript):
-            let source = try container.decode(Source.self, forKey: .actionAppleScript)
-            self = .appleSctipt(source: source)
+            let source = try container.decode(Source.self, forKey: .longActionAppleScript)
+            self = .appleScript(source: source)
+
         case .some(.shellScript):
-            let executable = try container.decode(String.self, forKey: .executablePath)
-            let parameters = try container.decodeIfPresent([String].self, forKey: .shellArguments) ?? []
+            let executable = try container.decode(String.self, forKey: .longExecutablePath)
+            let parameters = try container.decodeIfPresent([String].self, forKey: .longShellArguments) ?? []
             self = .shellScript(executable: executable, parameters: parameters)
+
         case .some(.openUrl):
             let longUrl = try container.decode(String.self, forKey: .longUrl)
             self = .openUrl(url: longUrl)
+
         case .none:
             self = .none
         }
     }
 }
 
-extension ItemType: Equatable {}
-func ==(lhs: ItemType, rhs: ItemType) -> Bool {
-    switch (lhs, rhs) {
-    case let (.staticButton(a), .staticButton(b)):
-        return a == b
-    case let (.appleScriptTitledButton(a, b), .appleScriptTitledButton(c, d)):
-        return a == c && b == d
-
-    default:
-        return false
-    }
-}
-
-extension ActionType: Equatable {}
-func ==(lhs: ActionType, rhs: ActionType) -> Bool {
-    switch (lhs, rhs) {
-    case (.none, .none):
-        return true
-    case let (.hidKey(a), .hidKey(b)),
-         let (.keyPress(a), .keyPress(b)):
-        return a == b
-    case let (.appleSctipt(a), .appleSctipt(b)):
-        return a == b
-    case let (.shellScript(a, b), .shellScript(c, d)):
-        return a == c && b == d
-    case let (.openUrl(a), .openUrl(b)):
-        return a == b
-    default:
-        return false
-    }
-}
-
-
-extension LongActionType: Equatable {}
-func ==(lhs: LongActionType, rhs: LongActionType) -> Bool {
-    switch (lhs, rhs) {
-    case (.none, .none):
-        return true
-    case let (.hidKey(a), .hidKey(b)),
-         let (.keyPress(a), .keyPress(b)):
-        return a == b
-    case let (.appleSctipt(a), .appleSctipt(b)):
-        return a == b
-    case let (.shellScript(a, b), .shellScript(c, d)):
-        return a == c && b == d
-    case let (.openUrl(a), .openUrl(b)):
-        return a == b
-    default:
-        return false
-    }
-}
-
 enum GeneralParameter {
     case width(_: CGFloat)
     case image(source: SourceProtocol)
     case align(_: Align)
+    case bordered(_: Bool)
+    case background(_: NSColor)
+    case title(_: String)
 }
 
 struct GeneralParameters: Decodable {
@@ -399,84 +620,125 @@ struct GeneralParameters: Decodable {
         case width
         case image
         case align
+        case bordered
+        case background
+        case title
     }
+
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         var result: [GeneralParameters.CodingKeys: GeneralParameter] = [:]
+
         if let value = try container.decodeIfPresent(CGFloat.self, forKey: .width) {
             result[.width] = .width(value)
         }
+
         if let imageSource = try container.decodeIfPresent(Source.self, forKey: .image) {
             result[.image] = .image(source: imageSource)
         }
+
         let align = try container.decodeIfPresent(Align.self, forKey: .align) ?? .center
         result[.align] = .align(align)
+
+        if let borderedFlag = try container.decodeIfPresent(Bool.self, forKey: .bordered) {
+            result[.bordered] = .bordered(borderedFlag)
+        }
+
+        if let backgroundColor = try container.decodeIfPresent(String.self, forKey: .background)?.hexColor {
+            result[.background] = .background(backgroundColor)
+        }
+
+        if let title = try container.decodeIfPresent(String.self, forKey: .title) {
+            result[.title] = .title(title)
+        }
+
         parameters = result
     }
 }
+
 protocol SourceProtocol {
     var data: Data? { get }
     var string: String? { get }
     var image: NSImage? { get }
+    var appleScript: NSAppleScript? { get }
 }
+
 struct Source: Decodable, SourceProtocol {
     let filePath: String?
     let base64: String?
     let inline: String?
-    
+
     private enum CodingKeys: String, CodingKey {
         case filePath
         case base64
         case inline
     }
-    
+
     var data: Data? {
         return base64?.base64Data ?? inline?.data(using: .utf8) ?? filePath?.fileData
     }
+
     var string: String? {
-        return inline ?? self.data?.utf8string
+        return inline ?? filePath?.fileString
     }
+
     var image: NSImage? {
         return data?.image
     }
 
+    var appleScript: NSAppleScript? {
+        return filePath?.fileURL.appleScript ?? string?.appleScript
+    }
+
     private init(filePath: String?, base64: String?, inline: String?) {
         self.filePath = filePath
         self.base64 = base64
         self.inline = inline
     }
+
     init(filePath: String) {
         self.init(filePath: filePath, base64: nil, inline: nil)
     }
 }
+
 extension NSImage: SourceProtocol {
     var data: Data? {
         return nil
     }
+
     var string: String? {
         return nil
     }
+
     var image: NSImage? {
         return self
     }
-}
-extension SourceProtocol where Self: Equatable {}
-func ==(left: SourceProtocol, right: SourceProtocol) -> Bool {
-    return left.data == right.data
+
+    var appleScript: NSAppleScript? {
+        return nil
+    }
 }
 
 extension String {
     var base64Data: Data? {
         return Data(base64Encoded: self)
     }
+
     var fileData: Data? {
         return try? Data(contentsOf: URL(fileURLWithPath: self))
     }
+
+    var fileString: String? {
+        var encoding: String.Encoding = .utf8
+        return try? String(contentsOfFile: self, usedEncoding: &encoding)
+    }
 }
+
 extension Data {
     var utf8string: String? {
         return String(data: self, encoding: .utf8)
     }
+
     var image: NSImage? {
         return NSImage(data: self)?.resize(maxSize: NSSize(width: 24, height: 24))
     }
@@ -487,3 +749,20 @@ enum Align: String, Decodable {
     case center
     case right
 }
+
+extension String {
+    var fileURL: URL {
+        return URL(fileURLWithPath: self)
+    }
+
+    var appleScript: NSAppleScript? {
+        return NSAppleScript(source: self)
+    }
+}
+
+extension URL {
+    var appleScript: NSAppleScript? {
+        guard FileManager.default.fileExists(atPath: path) else { return nil }
+        return NSAppleScript(contentsOf: self, error: nil)
+    }
+}

MTMR/KeyPress.swift

@@ -18,7 +18,7 @@ struct GenericKeyPress: KeyPress {
 }
 
 extension KeyPress {
-    func send () {
+    func send() {
         let src = CGEventSource(stateID: .hidSystemState)
         let keyDown = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: true)
         let keyUp = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: false)
@@ -29,45 +29,7 @@ extension KeyPress {
     }
 }
 
-func doKey(_ key: Int, down: Bool) {
-    let flags = NSEvent.ModifierFlags(rawValue: down ? 0xa00 : 0xb00)
-    let data1 = (key << 16) | ((down ? 0xa : 0xb) << 8)
-    
-    let ev = NSEvent.otherEvent(
-        with: NSEvent.EventType.systemDefined,
-        location: NSPoint(x:0.0, y:0.0),
-        modifierFlags: flags,
-        timestamp: TimeInterval(0),
-        windowNumber: 0,
-        context: nil,
-        // context: 0,
-        subtype: 8,
-        data1: data1,
-        data2: -1
-    )
-    let cev = ev!.cgEvent!
-    cev.post(tap: CGEventTapLocation(rawValue: 0)!)
+func HIDPostAuxKey(_ key: Int32) {
+    let key = UInt8(key)
+    MediaKeys.hidPostAuxKey(key)
 }
-
-func HIDPostAuxKey(_ key: Int) {
-    doKey(key, down: true)
-    doKey(key, down: false)
-}
-
-
-//     hidsystem/ev_keymap.h
-let NX_KEYTYPE_SOUND_UP   = 0
-let NX_KEYTYPE_SOUND_DOWN = 1
-let NX_KEYTYPE_MUTE = 7
-
-let NX_KEYTYPE_BRIGHTNESS_UP    = 2
-let NX_KEYTYPE_BRIGHTNESS_DOWN  = 3
-
-let NX_KEYTYPE_PLAY       = 16
-let NX_KEYTYPE_NEXT       = 17
-let NX_KEYTYPE_PREVIOUS   = 18
-
-
-
-
-

MTMR/ScrollViewItem.swift

@@ -1,7 +1,9 @@
 import Foundation
 
-class ScrollViewItem: NSCustomTouchBarItem {
-    
+class ScrollViewItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
+    var twofingersPrev: CGFloat = 0.0
+    var threefingersPrev: CGFloat = 0.0
+
     init(identifier: NSTouchBarItem.Identifier, items: [NSTouchBarItem]) {
         super.init(identifier: identifier)
         let views = items.compactMap { $0.view }
@@ -10,11 +12,64 @@ class ScrollViewItem: NSCustomTouchBarItem {
         stackView.orientation = .horizontal
         let scrollView = NSScrollView(frame: CGRect(origin: .zero, size: stackView.fittingSize))
         scrollView.documentView = stackView
-        self.view = scrollView
+        view = scrollView
+
+        let twofingers = NSPanGestureRecognizer(target: self, action: #selector(twofingersHandler(_:)))
+        twofingers.allowedTouchTypes = .direct
+        twofingers.numberOfTouchesRequired = 2
+        view.addGestureRecognizer(twofingers)
+
+        let threefingers = NSPanGestureRecognizer(target: self, action: #selector(threefingersHandler(_:)))
+        threefingers.allowedTouchTypes = .direct
+        threefingers.numberOfTouchesRequired = 3
+        view.addGestureRecognizer(threefingers)
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
+    @objc func twofingersHandler(_ sender: NSGestureRecognizer?) { // Volume
+        let position = (sender?.location(in: sender?.view).x)!
+
+        switch sender!.state {
+        case .began:
+            twofingersPrev = position
+        case .changed:
+            if ((position - twofingersPrev) > 10) || ((twofingersPrev - position) > 10) {
+                if position > twofingersPrev {
+                    HIDPostAuxKey(NX_KEYTYPE_SOUND_UP)
+                } else if position < twofingersPrev {
+                    HIDPostAuxKey(NX_KEYTYPE_SOUND_DOWN)
+                }
+                twofingersPrev = position
+            }
+        case .ended:
+            twofingersPrev = 0.0
+        default:
+            break
+        }
+    }
+
+    @objc func threefingersHandler(_ sender: NSGestureRecognizer?) { // Brightness
+        let position = (sender?.location(in: sender?.view).x)!
+
+        switch sender!.state {
+        case .began:
+            threefingersPrev = position
+        case .changed:
+            if ((position - threefingersPrev) > 15) || ((threefingersPrev - position) > 15) {
+                if position > threefingersPrev {
+                    GenericKeyPress(keyCode: CGKeyCode(144)).send()
+                } else if position < threefingersPrev {
+                    GenericKeyPress(keyCode: CGKeyCode(145)).send()
+                }
+                threefingersPrev = position
+            }
+        case .ended:
+            threefingersPrev = 0.0
+        default:
+            break
+        }
+    }
 }

MTMR/SupportHelpers.swift

@@ -6,146 +6,99 @@
 //  Copyright © 2018 Anton Palgunov. All rights reserved.
 //
 
+import AppKit
 import Foundation
 
 extension String {
     func trim() -> String {
-        return self.trimmingCharacters(in: NSCharacterSet.whitespaces)
+        return trimmingCharacters(in: NSCharacterSet.whitespaces)
     }
 
-    func substring(from: Int, to: Int) -> String {
-        let start = index(startIndex, offsetBy: from)
-        let end = index(start, offsetBy: to - from)
-        return String(self[start ..< end])
-    }
-    
-    func substring(range: NSRange) -> String {
-        return substring(from: range.lowerBound, to: range.upperBound)
-    }
-    
-    func indexDistance(of character: Character) -> Int? {
-        guard let index = index(of: character) else { return nil }
-        return distance(from: startIndex, to: index)
-    }
-    
     func stripComments() -> String {
-        let str = self
-        let singleComment = 1;
-        let multiComment = 2;
-        var insideString = false
-        var insideComment = 0
-        var offset = 0
-        var ret = ""
-        
-        for var i in 0..<str.count - 1 {
-            let currentChar = Array(str)[i]
-            let nextChar = Array(str)[i+1]
-            
-            if (insideComment == 0 && currentChar == "\"") {
-                let escaped = Array(str)[i - 1] == "\\" && Array(str)[i - 2] != "\\"
-                if (!escaped) {
-                    insideString = !insideString
-                }
-            }
-            
-            if (insideString) {
-                let jumpStr = String(str[str.index(startIndex, offsetBy: i)..<str.endIndex])
-                i += (jumpStr.indexDistance(of: "\""))!
-                continue
-            }
-            
-            if (insideComment == 0 && String(currentChar) + String(nextChar) == "//") {
-                ret += str.substring(from: offset, to: i)
-                offset = i
-                insideComment = singleComment
-                i += 1
-            } else if (insideComment == singleComment && String(currentChar) + String(nextChar) == "\r\n") {
-                i += 1
-                insideComment = 0
-                offset = i
-            } else if (insideComment == singleComment && currentChar == "\n") {
-                insideComment = 0
-                offset = i
-            } else if (insideComment == 0 && String(currentChar) + String(nextChar) == "/*") {
-                ret += str.substring(from: offset, to: i)
-                offset = i
-                insideComment = multiComment
-                i += 1
-            } else if (insideComment == multiComment && String(currentChar) + String(nextChar) == "*/") {
-                i += 1
-                insideComment = 0
-                offset = i + 1
-            }
+        // ((\s|,)\/\*[\s\S]*?\*\/)|(( |, ")\/\/.*)
+        return replacingOccurrences(of: "((\\s|,)\\/\\*[\\s\\S]*?\\*\\/)|(( |, \\\")\\/\\/.*)", with: "", options: .regularExpression)
+    }
+
+    var hexColor: NSColor? {
+        let hex = trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
+        var int = UInt32()
+        Scanner(string: hex).scanHexInt32(&int)
+        let a, r, g, b: UInt32
+        switch hex.count {
+        case 3: // RGB (12-bit)
+            (r, g, b, a) = ((int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17, 255)
+        case 6: // RGB (24-bit)
+            (r, g, b, a) = (int >> 16, int >> 8 & 0xFF, int & 0xFF, 255)
+        case 8: // ARGB (32-bit)
+            (r, g, b, a) = (int >> 24, int >> 16 & 0xFF, int >> 8 & 0xFF, int & 0xFF)
+        default:
+            return nil
         }
-        
-        return ret + str.substring(from: offset, to: str.count)
+        return NSColor(red: CGFloat(r) / 255, green: CGFloat(g) / 255, blue: CGFloat(b) / 255, alpha: CGFloat(a) / 255)
     }
 }
 
 extension NSImage {
-    func resize(maxSize:NSSize) -> NSImage {
-        var ratio:Float = 0.0
-        let imageWidth = Float(self.size.width)
-        let imageHeight = Float(self.size.height)
+    func resize(maxSize: NSSize) -> NSImage {
+        var ratio: Float = 0.0
+        let imageWidth = Float(size.width)
+        let imageHeight = Float(size.height)
         let maxWidth = Float(maxSize.width)
         let maxHeight = Float(maxSize.height)
-        
+
         // Get ratio (landscape or portrait)
-        if (imageWidth > imageHeight) {
+        if imageWidth > imageHeight {
             // Landscape
-            ratio = maxWidth / imageWidth;
-        }
-        else {
+            ratio = maxWidth / imageWidth
+        } else {
             // Portrait
-            ratio = maxHeight / imageHeight;
+            ratio = maxHeight / imageHeight
         }
-        
+
         // Calculate new size based on the ratio
         let newWidth = imageWidth * ratio
         let newHeight = imageHeight * ratio
-        
+
         // Create a new NSSize object with the newly calculated size
-        let newSize:NSSize = NSSize(width: Int(newWidth), height: Int(newHeight))
-        
+        let newSize: NSSize = NSSize(width: Int(newWidth), height: Int(newHeight))
+
         // Cast the NSImage to a CGImage
-        var imageRect:NSRect = NSMakeRect(0, 0, self.size.width, self.size.height)
-        let imageRef = self.cgImage(forProposedRect: &imageRect, context: nil, hints: nil)
-        
+        var imageRect: NSRect = NSMakeRect(0, 0, size.width, size.height)
+        let imageRef = cgImage(forProposedRect: &imageRect, context: nil, hints: nil)
+
         // Create NSImage from the CGImage using the new size
         let imageWithNewSize = NSImage(cgImage: imageRef!, size: newSize)
-        
+
         // Return the new image
         return imageWithNewSize
     }
-    
-    func rotateByDegreess(degrees:CGFloat) -> NSImage {
-        
-        var imageBounds = NSZeroRect ; imageBounds.size = self.size
+
+    func rotateByDegreess(degrees: CGFloat) -> NSImage {
+        var imageBounds = NSZeroRect; imageBounds.size = size
         let pathBounds = NSBezierPath(rect: imageBounds)
         var transform = NSAffineTransform()
         transform.rotate(byDegrees: degrees)
         pathBounds.transform(using: transform as AffineTransform)
-        let rotatedBounds:NSRect = NSMakeRect(NSZeroPoint.x, NSZeroPoint.y , self.size.width, self.size.height )
+        let rotatedBounds: NSRect = NSMakeRect(NSZeroPoint.x, NSZeroPoint.y, size.width, size.height)
         let rotatedImage = NSImage(size: rotatedBounds.size)
-        
-        //Center the image within the rotated bounds
+
+        // Center the image within the rotated bounds
         imageBounds.origin.x = NSMidX(rotatedBounds) - (NSWidth(imageBounds) / 2)
-        imageBounds.origin.y  = NSMidY(rotatedBounds) - (NSHeight(imageBounds) / 2)
-        
+        imageBounds.origin.y = NSMidY(rotatedBounds) - (NSHeight(imageBounds) / 2)
+
         // Start a new transform
         transform = NSAffineTransform()
         // Move coordinate system to the center (since we want to rotate around the center)
-        transform.translateX(by: +(NSWidth(rotatedBounds) / 2 ), yBy: +(NSHeight(rotatedBounds) / 2))
+        transform.translateX(by: +(NSWidth(rotatedBounds) / 2), yBy: +(NSHeight(rotatedBounds) / 2))
         transform.rotate(byDegrees: degrees)
         // Move the coordinate system bak to normal
-        transform.translateX(by: -(NSWidth(rotatedBounds) / 2 ), yBy: -(NSHeight(rotatedBounds) / 2))
+        transform.translateX(by: -(NSWidth(rotatedBounds) / 2), yBy: -(NSHeight(rotatedBounds) / 2))
         // Draw the original image, rotated, into the new image
         rotatedImage.lockFocus()
         transform.concat()
-        self.draw(in: imageBounds, from: NSZeroRect, operation: NSCompositingOperation.copy, fraction: 1.0)
+        draw(in: imageBounds, from: NSZeroRect, operation: NSCompositingOperation.copy, fraction: 1.0)
         rotatedImage.unlockFocus()
-        
+
         return rotatedImage
     }
-
 }

MTMR/SupportNSTouchBar.swift

@@ -0,0 +1,31 @@
+//
+//  ExtendNSTouchBar.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 07/06/2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+func presentSystemModal(_ touchBar: NSTouchBar!, systemTrayItemIdentifier identifier: NSTouchBarItem.Identifier!) {
+    if #available(OSX 10.14, *) {
+        NSTouchBar.presentSystemModalTouchBar(touchBar, systemTrayItemIdentifier: identifier)
+    } else {
+        NSTouchBar.presentSystemModalFunctionBar(touchBar, systemTrayItemIdentifier: identifier)
+    }
+}
+
+func presentSystemModal(_ touchBar: NSTouchBar!, placement: Int64, systemTrayItemIdentifier identifier: NSTouchBarItem.Identifier!) {
+    if #available(OSX 10.14, *) {
+        NSTouchBar.presentSystemModalTouchBar(touchBar, placement: placement, systemTrayItemIdentifier: identifier)
+    } else {
+        NSTouchBar.presentSystemModalFunctionBar(touchBar, placement: placement, systemTrayItemIdentifier: identifier)
+    }
+}
+
+func minimizeSystemModal(_ touchBar: NSTouchBar!) {
+    if #available(OSX 10.14, *) {
+        NSTouchBar.minimizeSystemModalTouchBar(touchBar)
+    } else {
+        NSTouchBar.minimizeSystemModalFunctionBar(touchBar)
+    }
+}

MTMR/TouchBarController.swift

@@ -13,19 +13,21 @@ struct ExactItem {
     let presetItem: BarItemDefinition
 }
 
-extension ItemType {
+let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
+let standardConfigPath = appSupportDirectory.appending("/items.json")
 
+extension ItemType {
     var identifierBase: String {
         switch self {
         case .staticButton(title: _):
             return "com.toxblh.mtmr.staticButton."
         case .appleScriptTitledButton(source: _):
             return "com.toxblh.mtmr.appleScriptButton."
-        case .timeButton(formatTemplate: _):
+        case .timeButton(formatTemplate: _, timeZone: _):
             return "com.toxblh.mtmr.timeButton."
         case .battery():
             return "com.toxblh.mtmr.battery."
-        case .dock():
+        case .dock(autoResize: _):
             return "com.toxblh.mtmr.dock"
         case .volume():
             return "com.toxblh.mtmr.volume"
@@ -33,13 +35,28 @@ extension ItemType {
             return "com.toxblh.mtmr.brightness"
         case .weather(interval: _, units: _, api_key: _, icon_type: _):
             return "com.toxblh.mtmr.weather"
-        case .currency(interval: _, from: _, to: _):
+        case .yandexWeather(interval: _):
+            return "com.toxblh.mtmr.yandexWeather"
+        case .currency(interval: _, from: _, to: _, full: _):
             return "com.toxblh.mtmr.currency"
         case .inputsource():
             return "com.toxblh.mtmr.inputsource."
+        case .music(interval: _):
+            return "com.toxblh.mtmr.music."
+        case .groupBar(items: _):
+            return "com.toxblh.mtmr.groupBar."
+        case .nightShift(items: _):
+            return "com.toxblh.mtmr.nightShift."
+        case .dnd(items: _):
+            return "com.toxblh.mtmr.dnd."
+        case .pomodoro(interval: _):
+            return PomodoroBarItem.identifier
+        case .network(flip: _):
+            return NetworkBarItem.identifier
+        case .darkMode(items: _):
+            return DarkModeBarItem.identifier
         }
     }
-
 }
 
 extension NSTouchBarItem.Identifier {
@@ -47,11 +64,12 @@ extension NSTouchBarItem.Identifier {
 }
 
 class TouchBarController: NSObject, NSTouchBarDelegate {
-
     static let shared = TouchBarController()
 
-    let touchBar = NSTouchBar()
+    var touchBar: NSTouchBar!
 
+    fileprivate var lastPresetPath = ""
+    var jsonItems: [BarItemDefinition] = []
     var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
     var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
     var leftIdentifiers: [NSTouchBarItem.Identifier] = []
@@ -61,57 +79,107 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     var scrollArea: NSCustomTouchBarItem?
     var centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
 
+    var showControlStripState: Bool {
+        get {
+            return UserDefaults.standard.bool(forKey: "com.toxblh.mtmr.settings.showControlStrip")
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: "com.toxblh.mtmr.settings.showControlStrip")
+        }
+    }
+
+    var blacklistAppIdentifiers: [String] = []
+    var frontmostApplicationIdentifier: String? {
+        guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil }
+        return frontmostId
+    }
+
     private override init() {
         super.init()
-        SupportedTypesHolder.sharedInstance.register(typename: "exitTouchbar", item: .staticButton(title: "exit"), action: .custom(closure: { [weak self] in self?.dismissTouchBar()}), longAction: .none)
+        SupportedTypesHolder.sharedInstance.register(typename: "exitTouchbar", item: .staticButton(title: "exit"), action: .custom(closure: { [weak self] in self?.dismissTouchBar() }), longAction: .none)
 
-        createAndUpdatePreset()
-    }
-    
-    func createAndUpdatePreset(jsonItems: [BarItemDefinition]? = nil) {
-        var jsonItems = jsonItems
-        self.itemDefinitions = [:]
-        self.items = [:]
-        self.leftIdentifiers = []
-        self.centerItems = []
-        self.rightIdentifiers = []
-        
-        if (jsonItems == nil) {
-            jsonItems = readConfig()
+        SupportedTypesHolder.sharedInstance.register(typename: "close") { _ in
+            (item: .staticButton(title: ""), action: .custom(closure: { [weak self] in
+                guard let `self` = self else { return }
+                self.reloadPreset(path: self.lastPresetPath)
+            }), longAction: .none, parameters: [.width: .width(30), .image: .image(source: (NSImage(named: NSImage.stopProgressFreestandingTemplateName))!)])
         }
-        loadItemDefinitions(jsonItems: jsonItems!)
+
+        if let blackListed = UserDefaults.standard.stringArray(forKey: "com.toxblh.mtmr.blackListedApps") {
+            blacklistAppIdentifiers = blackListed
+        }
+
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didLaunchApplicationNotification, object: nil)
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didTerminateApplicationNotification, object: nil)
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didActivateApplicationNotification, object: nil)
+
+        reloadStandardConfig()
+    }
+
+    func createAndUpdatePreset(newJsonItems: [BarItemDefinition]) {
+        if let oldBar = self.touchBar {
+            minimizeSystemModal(oldBar)
+        }
+        touchBar = NSTouchBar()
+        jsonItems = newJsonItems
+        itemDefinitions = [:]
+        items = [:]
+        leftIdentifiers = []
+        centerItems = []
+        rightIdentifiers = []
+
+        loadItemDefinitions(jsonItems: jsonItems)
         createItems()
-        
+
         centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in
-            return items[identifier]
+            items[identifier]
         })
-        
-        self.centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
-        self.scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems)
-        
+
+        centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
+        scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems)
+
         touchBar.delegate = self
         touchBar.defaultItemIdentifiers = []
-        touchBar.defaultItemIdentifiers = self.leftIdentifiers + [centerScrollArea] + self.rightIdentifiers
-        self.presentTouchBar()
+        touchBar.defaultItemIdentifiers = leftIdentifiers + [centerScrollArea] + rightIdentifiers
+
+        updateActiveApp()
     }
-    
-    func readConfig() -> [BarItemDefinition]?  {
-        let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
-        let presetPath = appSupportDirectory.appending("/items.json")
+
+    @objc func activeApplicationChanged(_: Notification) {
+        updateActiveApp()
+    }
+
+    func updateActiveApp() {
+        if frontmostApplicationIdentifier != nil && blacklistAppIdentifiers.index(of: frontmostApplicationIdentifier!) != nil {
+            dismissTouchBar()
+        } else {
+            presentTouchBar()
+        }
+    }
+
+    func reloadStandardConfig() {
+        let presetPath = standardConfigPath
         if !FileManager.default.fileExists(atPath: presetPath),
             let defaultPreset = Bundle.main.path(forResource: "defaultPreset", ofType: "json") {
             try? FileManager.default.createDirectory(atPath: appSupportDirectory, withIntermediateDirectories: true, attributes: nil)
             try? FileManager.default.copyItem(atPath: defaultPreset, toPath: presetPath)
         }
-        
-        let jsonData = presetPath.fileData
-        
-        return jsonData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
+
+        reloadPreset(path: presetPath)
     }
-    
+
+    func reloadPreset(path: String) {
+        lastPresetPath = path
+        let items = path.fileData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
+        createAndUpdatePreset(newJsonItems: items)
+    }
+
     func loadItemDefinitions(jsonItems: [BarItemDefinition]) {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH-mm-ss"
+        let time = dateFormatter.string(from: Date())
         for item in jsonItems {
-            let identifierString = item.type.identifierBase.appending(UUID().uuidString)
+            let identifierString = item.type.identifierBase.appending(time + "--" + UUID().uuidString)
             let identifier = NSTouchBarItem.Identifier(identifierString)
             itemDefinitions[identifier] = item
             if item.align == .left {
@@ -125,19 +193,19 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             }
         }
     }
-    
+
     func createItems() {
-        for (identifier, definition) in self.itemDefinitions {
-            self.items[identifier] = self.createItem(forIdentifier: identifier, definition: definition)
+        for (identifier, definition) in itemDefinitions {
+            items[identifier] = createItem(forIdentifier: identifier, definition: definition)
         }
     }
-    
+
     @objc func setupControlStripPresence() {
         DFRSystemModalShowsCloseBoxWhenFrontMost(false)
         let item = NSCustomTouchBarItem(identifier: .controlStripItem)
-        item.view = NSButton(image: #imageLiteral(resourceName: "Strip"), target: self, action: #selector(presentTouchBar))
+        item.view = NSButton(image: #imageLiteral(resourceName: "StatusImage"), target: self, action: #selector(presentTouchBar))
         NSTouchBarItem.addSystemTrayItem(item)
-        DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, true)
+        updateControlStripPresence()
     }
 
     func updateControlStripPresence() {
@@ -145,16 +213,27 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     }
 
     @objc private func presentTouchBar() {
-        NSTouchBar.presentSystemModalFunctionBar(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
+        if showControlStripState {
+            updateControlStripPresence()
+            presentSystemModal(touchBar, systemTrayItemIdentifier: .controlStripItem)
+        } else {
+            presentSystemModal(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
+        }
     }
 
     @objc private func dismissTouchBar() {
-        NSTouchBar.minimizeSystemModalFunctionBar(touchBar)
+        minimizeSystemModal(touchBar)
+        updateControlStripPresence()
     }
 
-    func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
+    @objc func resetControlStrip() {
+        dismissTouchBar()
+        presentTouchBar()
+    }
+
+    func touchBar(_: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
         if identifier == centerScrollArea {
-            return self.scrollArea
+            return scrollArea
         }
 
         guard let item = self.items[identifier],
@@ -164,106 +243,135 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         }
         return item
     }
-    
-    func createItem(forIdentifier identifier: NSTouchBarItem.Identifier, definition item: BarItemDefinition) -> NSTouchBarItem? {
-        let action = self.action(forItem: item)
-        let longAction = self.longAction(forItem: item)
 
+    func createItem(forIdentifier identifier: NSTouchBarItem.Identifier, definition item: BarItemDefinition) -> NSTouchBarItem? {
         var barItem: NSTouchBarItem!
         switch item.type {
-        case .staticButton(title: let title):
-            barItem = CustomButtonTouchBarItem(identifier: identifier, title: title, onTap: action, onLongTap: longAction, bezelColor: NSColor.controlColor)
-        case .appleScriptTitledButton(source: let source, refreshInterval: let interval):
-            barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval, onTap: action, onLongTap: longAction)
-        case .timeButton(formatTemplate: let template):
-            barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template, onTap: action, onLongTap: longAction)
+        case let .staticButton(title: title):
+            barItem = CustomButtonTouchBarItem(identifier: identifier, title: title)
+        case let .appleScriptTitledButton(source: source, refreshInterval: interval):
+            barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval)
+        case let .timeButton(formatTemplate: template, timeZone: timeZone):
+            barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template, timeZone: timeZone)
         case .battery():
-            barItem = BatteryBarItem(identifier: identifier, onTap: action, onLongTap: longAction)
-        case .dock:
-            barItem = AppScrubberTouchBarItem(identifier: identifier)
+            barItem = BatteryBarItem(identifier: identifier)
+        case let .dock(autoResize: autoResize):
+            barItem = AppScrubberTouchBarItem(identifier: identifier, autoResize: autoResize)
         case .volume:
-            if case .image(let source)? = item.additionalParameters[.image] {
+            if case let .image(source)? = item.additionalParameters[.image] {
                 barItem = VolumeViewController(identifier: identifier, image: source.image)
             } else {
                 barItem = VolumeViewController(identifier: identifier)
             }
-        case .brightness(refreshInterval: let interval):
-            if case .image(let source)? = item.additionalParameters[.image] {
+        case let .brightness(refreshInterval: interval):
+            if case let .image(source)? = item.additionalParameters[.image] {
                 barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval, image: source.image)
             } else {
                 barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval)
             }
-        case .weather(interval: let interval, units: let units, api_key: let api_key, icon_type: let icon_type):
-            barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type, onTap: action, onLongTap: longAction)
-        case .currency(interval: let interval, from: let from, to: let to):
-            barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, onTap: action, onLongTap: longAction)
+        case let .weather(interval: interval, units: units, api_key: api_key, icon_type: icon_type):
+            barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type)
+        case let .yandexWeather(interval: interval):
+            barItem = YandexWeatherBarItem(identifier: identifier, interval: interval)
+        case let .currency(interval: interval, from: from, to: to, full: full):
+            barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, full: full)
         case .inputsource():
-            barItem = InputSourceBarItem(identifier: identifier, onTap: action, onLongTap: longAction)
+            barItem = InputSourceBarItem(identifier: identifier)
+        case let .music(interval: interval, disableMarquee: disableMarquee):
+            barItem = MusicBarItem(identifier: identifier, interval: interval, disableMarquee: disableMarquee)
+        case let .groupBar(items: items):
+            barItem = GroupBarItem(identifier: identifier, items: items)
+        case .nightShift():
+            barItem = NightShiftBarItem(identifier: identifier)
+        case .dnd():
+            barItem = DnDBarItem(identifier: identifier)
+        case let .pomodoro(workTime: workTime, restTime: restTime):
+            barItem = PomodoroBarItem(identifier: identifier, workTime: workTime, restTime: restTime)
+        case let .network(flip: flip):
+            barItem = NetworkBarItem(identifier: identifier, flip: flip)
+        case .darkMode():
+            barItem = DarkModeBarItem(identifier: identifier)
         }
-        
-        if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {
+
+        if let action = self.action(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
+            item.tapClosure = action
+        }
+        if let longAction = self.longAction(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
+            item.longTapClosure = longAction
+        }
+        if case let .bordered(bordered)? = item.additionalParameters[.bordered], let item = barItem as? CustomButtonTouchBarItem {
+            item.isBordered = bordered
+        }
+        if case let .background(color)? = item.additionalParameters[.background], let item = barItem as? CustomButtonTouchBarItem {
+            item.backgroundColor = color
+        }
+        if case let .width(value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {
             widthBarItem.setWidth(value: value)
         }
-        if case .image(let source)? = item.additionalParameters[.image], let item = barItem as? CustomButtonTouchBarItem {
-            let button = item.button!
-            button.image = source.image
-            button.imagePosition = .imageLeading
-            button.imageHugsTitle = true
-            button.bezelColor = .clear
+        if case let .image(source)? = item.additionalParameters[.image], let item = barItem as? CustomButtonTouchBarItem {
+            item.image = source.image
+        }
+        if case let .title(value)? = item.additionalParameters[.title] {
+            if let item = barItem as? GroupBarItem {
+                item.collapsedRepresentationLabel = value
+            } else if let item = barItem as? CustomButtonTouchBarItem {
+                item.title = value
+            }
         }
         return barItem
     }
 
-    func action(forItem item: BarItemDefinition) -> ()->() {
+    func action(forItem item: BarItemDefinition) -> (() -> Void)? {
         switch item.action {
-        case .hidKey(keycode: let keycode):
+        case let .hidKey(keycode: keycode):
             return { HIDPostAuxKey(keycode) }
-        case .keyPress(keycode: let keycode):
+        case let .keyPress(keycode: keycode):
             return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
-        case .appleSctipt(source: let source):
+        case let .appleScript(source: source):
             guard let appleScript = source.appleScript else {
                 print("cannot create apple script for item \(item)")
                 return {}
             }
             return {
-                var error: NSDictionary?
-                appleScript.executeAndReturnError(&error)
-                if let error = error {
-                    print("error \(error) when handling \(item) ")
+                DispatchQueue.appleScriptQueue.async {
+                    var error: NSDictionary?
+                    appleScript.executeAndReturnError(&error)
+                    if let error = error {
+                        print("error \(error) when handling \(item) ")
+                    }
                 }
             }
-        case .shellScript(executable: let executable, parameters: let parameters):
+        case let .shellScript(executable: executable, parameters: parameters):
             return {
                 let task = Process()
                 task.launchPath = executable
                 task.arguments = parameters
                 task.launch()
             }
-        case .openUrl(url: let url):
+        case let .openUrl(url: url):
             return {
                 if let url = URL(string: url), NSWorkspace.shared.open(url) {
                     #if DEBUG
-                    print("URL was successfully opened")
+                        print("URL was successfully opened")
                     #endif
                 } else {
                     print("error", url)
                 }
             }
-        case .custom(closure: let closure):
+        case let .custom(closure: closure):
             return closure
         case .none:
-            return {}
+            return nil
         }
     }
 
-    
-    func longAction(forItem item: BarItemDefinition) -> ()->() {
+    func longAction(forItem item: BarItemDefinition) -> (() -> Void)? {
         switch item.longAction {
-        case .hidKey(keycode: let keycode):
+        case let .hidKey(keycode: keycode):
             return { HIDPostAuxKey(keycode) }
-        case .keyPress(keycode: let keycode):
+        case let .keyPress(keycode: keycode):
             return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
-        case .appleSctipt(source: let source):
+        case let .appleScript(source: source):
             guard let appleScript = source.appleScript else {
                 print("cannot create apple script for item \(item)")
                 return {}
@@ -275,27 +383,27 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
                     print("error \(error) when handling \(item) ")
                 }
             }
-        case .shellScript(executable: let executable, parameters: let parameters):
+        case let .shellScript(executable: executable, parameters: parameters):
             return {
                 let task = Process()
                 task.launchPath = executable
                 task.arguments = parameters
                 task.launch()
             }
-        case .openUrl(url: let url):
+        case let .openUrl(url: url):
             return {
                 if let url = URL(string: url), NSWorkspace.shared.open(url) {
                     #if DEBUG
-                    print("URL was successfully opened")
+                        print("URL was successfully opened")
                     #endif
                 } else {
                     print("error", url)
                 }
             }
-        case .custom(closure: let closure):
+        case let .custom(closure: closure):
             return closure
         case .none:
-            return {}
+            return nil
         }
     }
 }
@@ -306,13 +414,13 @@ protocol CanSetWidth {
 
 extension NSCustomTouchBarItem: CanSetWidth {
     func setWidth(value: CGFloat) {
-        self.view.widthAnchor.constraint(equalToConstant: value).isActive = true
+        view.widthAnchor.constraint(equalToConstant: value).isActive = true
     }
 }
 
 extension BarItemDefinition {
     var align: Align {
-        if case .align(let result)? = self.additionalParameters[.align] {
+        if case let .align(result)? = additionalParameters[.align] {
             return result
         }
         return .center

MTMR/Widgets/AppScrubberTouchBarItem.swift

@@ -8,69 +8,80 @@
 import Cocoa
 
 class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrubberDataSource {
-    
     private var scrubber: NSScrubber!
-    
+
     private let hf: HapticFeedback = HapticFeedback()
 
+    private var timer: Timer!
+    private var ticks: Int = 0
+    private let minTicks: Int = 5
+    private let maxTicks: Int = 20
+    private var lastSelected: Int = 0
+    private var autoResize: Bool = false
+    private var widthConstraint: NSLayoutConstraint?
+
     private var persistentAppIdentifiers: [String] = []
     private var runningAppsIdentifiers: [String] = []
-    
+
     private var frontmostApplicationIdentifier: String? {
-        get {
-            guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil }
-            return frontmostId
-        }
+        guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil }
+        return frontmostId
     }
-    
+
     private var applications: [DockItem] = []
     
-    private var timeAtPress: NSDate?
+    convenience override init(identifier: NSTouchBarItem.Identifier) {
+        self.init(identifier: identifier, autoResize: false)
+    }
     
-    override init(identifier: NSTouchBarItem.Identifier) {
+    static var iconWidth = 36
+    static var spacingWidth = 2
+
+    init(identifier: NSTouchBarItem.Identifier, autoResize: Bool) {
         super.init(identifier: identifier)
+        self.autoResize = autoResize
         
-        scrubber = NSScrubber();
+        scrubber = NSScrubber()
         scrubber.delegate = self
         scrubber.dataSource = self
         scrubber.mode = .free // .fixed
-        let layout = NSScrubberFlowLayout();
-        layout.itemSize = NSSize(width: 44, height: 30)
-        layout.itemSpacing = 2
+        let layout = NSScrubberFlowLayout()
+        layout.itemSize = NSSize(width: AppScrubberTouchBarItem.iconWidth, height: 32)
+        layout.itemSpacing = CGFloat(AppScrubberTouchBarItem.spacingWidth)
         scrubber.scrubberLayout = layout
         scrubber.selectionBackgroundStyle = .roundedBackground
         scrubber.showsAdditionalContentIndicators = true
 
         view = scrubber
-        
+
         scrubber.register(NSScrubberImageItemView.self, forItemIdentifier: NSUserInterfaceItemIdentifier(rawValue: "ScrubberApplicationsItemReuseIdentifier"))
-        
+
         NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didLaunchApplicationNotification, object: nil)
         NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didTerminateApplicationNotification, object: nil)
         NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didActivateApplicationNotification, object: nil)
-        
+
         if let persistent = UserDefaults.standard.stringArray(forKey: "com.toxblh.mtmr.dock.persistent") {
-            self.persistentAppIdentifiers = persistent
+            persistentAppIdentifiers = persistent
         }
-        
+
         updateRunningApplication()
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
-    @objc func activeApplicationChanged(n: Notification) {
+
+    @objc func activeApplicationChanged(n _: Notification) {
         updateRunningApplication()
     }
-    
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+
+    override func observeValue(forKeyPath _: String?, of _: Any?, change _: [NSKeyValueChangeKey: Any]?, context _: UnsafeMutableRawPointer?) {
         updateRunningApplication()
     }
-    
+
     func updateRunningApplication() {
         let newApplications = launchedApplications()
-        
+
         let index = newApplications.index {
             $0.bundleIdentifier == frontmostApplicationIdentifier
         }
@@ -78,111 +89,150 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
         applications = newApplications
         applications += getDockPersistentAppsList()
         scrubber.reloadData()
-        
+        updateSize()
+
         scrubber.selectedIndex = index ?? 0
     }
     
-    public func numberOfItems(for scrubber: NSScrubber) -> Int {
+    func updateSize() {
+        if self.autoResize {
+            if let constraint: NSLayoutConstraint = self.widthConstraint {
+                constraint.isActive = false
+                self.scrubber.removeConstraint(constraint)
+            }
+            let width = (AppScrubberTouchBarItem.iconWidth + AppScrubberTouchBarItem.spacingWidth) * self.applications.count - AppScrubberTouchBarItem.spacingWidth
+            self.widthConstraint = self.scrubber.widthAnchor.constraint(equalToConstant: CGFloat(width))
+            self.widthConstraint!.isActive = true
+        }
+    }
+
+    public func numberOfItems(for _: NSScrubber) -> Int {
         return applications.count
     }
-    
+
     public func scrubber(_ scrubber: NSScrubber, viewForItemAt index: Int) -> NSScrubberItemView {
         let item = scrubber.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "ScrubberApplicationsItemReuseIdentifier"), owner: self) as? NSScrubberImageItemView ?? NSScrubberImageItemView()
         item.imageView.imageScaling = .scaleProportionallyDown
-        
+
         let app = applications[index]
-        
+
         if let icon = app.icon {
             item.image = icon
+            item.image.size = NSSize(width: 26, height: 26)
         }
 
         item.removeFromSuperview()
-    
+
         let dotView = NSView(frame: .zero)
         dotView.wantsLayer = true
-        if self.runningAppsIdentifiers.contains(app.bundleIdentifier!) {
+        if runningAppsIdentifiers.contains(app.bundleIdentifier!) {
             dotView.layer?.backgroundColor = NSColor.white.cgColor
         } else {
             dotView.layer?.backgroundColor = NSColor.black.cgColor
         }
-        dotView.layer?.cornerRadius = 2
-        dotView.setFrameOrigin(NSPoint(x: 20, y: 0))
-        dotView.frame.size = NSSize(width: 4, height: 4)
+        dotView.layer?.cornerRadius = 1.5
+        dotView.setFrameOrigin(NSPoint(x: 17, y: 1))
+        dotView.frame.size = NSSize(width: 3, height: 3)
         item.addSubview(dotView)
 
         return item
     }
-    
-    public func didBeginInteracting(with scrubber: NSScrubber) {
-        timeAtPress = NSDate()
+
+    public func didBeginInteracting(with _: NSScrubber) {
+        stopTimer()
+        ticks = 0
+        timer = Timer.scheduledTimer(timeInterval: 0.1, target: self, selector: #selector(checkTimer), userInfo: nil, repeats: true)
     }
-    
-    public func didCancelInteracting(with scrubber: NSScrubber) {
-        timeAtPress = nil
+
+    @objc private func checkTimer() {
+        ticks += 1
+
+        if ticks == minTicks {
+            hf.tap(strong: 2)
+        }
+
+        if ticks > maxTicks {
+            stopTimer()
+            hf.tap(strong: 6)
+        }
     }
-    
-    
+
+    private func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+        lastSelected = 0
+    }
+
+    public func didCancelInteracting(with _: NSScrubber) {
+        stopTimer()
+    }
+
     public func didFinishInteracting(with scrubber: NSScrubber) {
-        let timePressed = NSDate().timeIntervalSince(timeAtPress! as Date)
-        if (timePressed > 0.5 && scrubber.selectedIndex > 0) {
-            self.longPress(with: scrubber)
+        stopTimer()
+
+        if ticks == 0 {
             return
         }
-        
-        hf.tap(strong: 6)
-        
+
+        if ticks >= minTicks && scrubber.selectedIndex > 0 {
+            longPress(selected: scrubber.selectedIndex)
+            return
+        }
+
         let bundleIdentifier = applications[scrubber.selectedIndex].bundleIdentifier
         if bundleIdentifier!.contains("file://") {
             NSWorkspace.shared.openFile(bundleIdentifier!.replacingOccurrences(of: "file://", with: ""))
         } else {
             NSWorkspace.shared.launchApplication(withBundleIdentifier: bundleIdentifier!, options: [.default], additionalEventParamDescriptor: nil, launchIdentifier: nil)
+            hf.tap(strong: 6)
         }
-        
+        updateRunningApplication()
+
         // NB: if you can't open app which on another space, try to check mark
         // "When switching to an application, switch to a Space with open windows for the application"
         // in Mission control settings
     }
-    
-    private func longPress(with scrubber: NSScrubber) {
-        let timePressed = NSDate().timeIntervalSince(timeAtPress! as Date)
-        
-        let bundleIdentifier = applications[scrubber.selectedIndex].bundleIdentifier
-        
-        if (timePressed > 2.0) {
-            if let processIdentifier = applications[scrubber.selectedIndex].pid {
-                hf.tap(strong: 6)
-                NSRunningApplication(processIdentifier: processIdentifier)?.forceTerminate()
+
+    private func longPress(selected: Int) {
+        let bundleIdentifier = applications[selected].bundleIdentifier
+
+        if ticks > maxTicks {
+            if let processIdentifier = applications[selected].pid {
+                if !(NSRunningApplication(processIdentifier: processIdentifier)?.terminate())! {
+                    NSRunningApplication(processIdentifier: processIdentifier)?.forceTerminate()
+                }
             }
         } else {
             hf.tap(strong: 6)
             if let index = self.persistentAppIdentifiers.index(of: bundleIdentifier!) {
-                self.persistentAppIdentifiers.remove(at: index)
-                updateRunningApplication()
+                persistentAppIdentifiers.remove(at: index)
             } else {
-                self.persistentAppIdentifiers.append(bundleIdentifier!)
+                persistentAppIdentifiers.append(bundleIdentifier!)
             }
-            
-            UserDefaults.standard.set(self.persistentAppIdentifiers, forKey: "com.toxblh.mtmr.dock.persistent")
+
+            UserDefaults.standard.set(persistentAppIdentifiers, forKey: "com.toxblh.mtmr.dock.persistent")
             UserDefaults.standard.synchronize()
         }
+        ticks = 0
+        updateRunningApplication()
     }
 
     private func launchedApplications() -> [DockItem] {
-        self.runningAppsIdentifiers = []
+        runningAppsIdentifiers = []
         var returnable: [DockItem] = []
         for app in NSWorkspace.shared.runningApplications {
             guard app.activationPolicy == NSApplication.ActivationPolicy.regular else { continue }
             guard let bundleIdentifier = app.bundleIdentifier else { continue }
-            
-            self.runningAppsIdentifiers.append(bundleIdentifier)
-            
+
+            runningAppsIdentifiers.append(bundleIdentifier)
+
             let dockItem = DockItem(bundleIdentifier: bundleIdentifier, icon: getIcon(forBundleIdentifier: bundleIdentifier), pid: app.processIdentifier)
             returnable.append(dockItem)
         }
         return returnable
     }
 
-    public func getIcon(forBundleIdentifier bundleIdentifier: String? = nil, orPath path: String? = nil, orType type: String? = nil) -> NSImage {
+    public func getIcon(forBundleIdentifier bundleIdentifier: String? = nil, orPath path: String? = nil, orType _: String? = nil) -> NSImage {
         if bundleIdentifier != nil {
             if let appPath = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: bundleIdentifier!) {
                 return NSWorkspace.shared.icon(forFile: appPath)
@@ -196,13 +246,12 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
         let genericIcon = NSImage(contentsOfFile: "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/GenericDocumentIcon.icns")
         return genericIcon ?? NSImage(size: .zero)
     }
-    
 
     public func getDockPersistentAppsList() -> [DockItem] {
         var returnable: [DockItem] = []
-        
-        for (index, bundleIdentifier) in persistentAppIdentifiers.enumerated() {
-            if !self.runningAppsIdentifiers.contains(bundleIdentifier) {
+
+        for bundleIdentifier in persistentAppIdentifiers {
+            if !runningAppsIdentifiers.contains(bundleIdentifier) {
                 let dockItem = DockItem(bundleIdentifier: bundleIdentifier, icon: getIcon(forBundleIdentifier: bundleIdentifier))
                 returnable.append(dockItem)
             }

MTMR/Widgets/BatteryBarItem.swift

@@ -6,24 +6,32 @@
 //  Copyright © 2018 Anton Palgunov. All rights reserved.
 //
 
-import IOKit.ps
 import Foundation
+import IOKit.ps
 
 class BatteryBarItem: CustomButtonTouchBarItem {
-    private var timer: Timer!
-    
-    init(identifier: NSTouchBarItem.Identifier, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
-        super.init(identifier: identifier, title: " ", onTap: onTap, onLongTap: onLongTap)
-        self.view = button
-        
-        let batteryInfo = BatteryInfo(button: button)
-        batteryInfo.start()
-        batteryInfo.updateInfo()
+    private let batteryInfo = BatteryInfo()
+
+    init(identifier: NSTouchBarItem.Identifier) {
+        super.init(identifier: identifier, title: " ")
+
+        batteryInfo.start { [weak self] in
+            self?.refresh()
+        }
+        refresh()
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    func refresh() {
+        attributedTitle = batteryInfo.formattedInfo()
+    }
+
+    deinit {
+        batteryInfo.stop()
+    }
 }
 
 class BatteryInfo: NSObject {
@@ -34,102 +42,99 @@ class BatteryInfo: NSObject {
     var isCharging: Bool = false
     var ACPower: String = ""
     var timeRemaining: String = ""
-    
-    var button: NSButton?
-    var loop:CFRunLoopSource?
-    
-    init(button: NSButton) {
-        super.init()
-        
-        self.button = button
-        self.start()
-    }
-    
-    func start() {
+    var notifyBlock: () -> Void = {}
+    var loop: CFRunLoopSource?
+
+    func start(notifyBlock: @escaping () -> Void) {
+        self.notifyBlock = notifyBlock
         let opaque = Unmanaged.passRetained(self).toOpaque()
         let context = UnsafeMutableRawPointer(opaque)
-        loop = IOPSNotificationCreateRunLoopSource({ (context) in
+        loop = IOPSNotificationCreateRunLoopSource({ context in
             guard let ctx = context else {
                 return
             }
-            
+
             let watcher = Unmanaged<BatteryInfo>.fromOpaque(ctx).takeUnretainedValue()
-            watcher.updateInfo()
-            }, context).takeRetainedValue() as CFRunLoopSource
+            watcher.notifyBlock()
+        }, context).takeRetainedValue() as CFRunLoopSource
         CFRunLoopAddSource(CFRunLoopGetCurrent(), loop, CFRunLoopMode.defaultMode)
     }
-    
+
     func stop() {
-        if !(self.loop != nil) {
+        notifyBlock = {}
+        guard let loop = self.loop else {
             return
         }
-        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), self.loop, CFRunLoopMode.defaultMode)
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), loop, CFRunLoopMode.defaultMode)
         self.loop = nil
     }
-    
+
     func getPSInfo() {
         let psInfo = IOPSCopyPowerSourcesInfo().takeRetainedValue()
         let psList = IOPSCopyPowerSourcesList(psInfo).takeRetainedValue() as [CFTypeRef]
-        
+
         for ps in psList {
             if let psDesc = IOPSGetPowerSourceDescription(psInfo, ps).takeUnretainedValue() as? [String: Any] {
-                let current = psDesc[kIOPSCurrentCapacityKey]
-                if (current != nil) {
-                    self.current = current as! Int
+                if let current = psDesc[kIOPSCurrentCapacityKey] as? Int {
+                    self.current = current
                 }
-                
-                let timeToEmpty = psDesc[kIOPSTimeToEmptyKey]
-                if (timeToEmpty != nil) {
-                    self.timeToEmpty = timeToEmpty as! Int
+
+                if let timeToEmpty = psDesc[kIOPSTimeToEmptyKey] as? Int {
+                    self.timeToEmpty = timeToEmpty
                 }
-                
-                let timeToFull = psDesc[kIOPSTimeToFullChargeKey]
-                if (timeToFull != nil) {
-                    self.timeToFull = timeToFull as! Int
+
+                if let timeToFull = psDesc[kIOPSTimeToFullChargeKey] as? Int {
+                    self.timeToFull = timeToFull
                 }
-                
-                let isCharged = psDesc[kIOPSIsChargedKey]
-                if (isCharged != nil) {
-                    self.isCharged = isCharged as! Bool
+
+                if let isCharged = psDesc[kIOPSIsChargedKey] as? Bool {
+                    self.isCharged = isCharged
                 }
-                
-                let isCharging = psDesc[kIOPSIsChargingKey]
-                if (isCharging != nil) {
-                    self.isCharging = isCharging as! Bool
+
+                if let isCharging = psDesc[kIOPSIsChargingKey] as? Bool {
+                    self.isCharging = isCharging
                 }
-                
-                let ACPower = psDesc[kIOPSPowerSourceStateKey]
-                if (ACPower != nil) {
-                    self.ACPower = ACPower as! String
+
+                if let ACPower = psDesc[kIOPSPowerSourceStateKey] as? String {
+                    self.ACPower = ACPower
                 }
             }
         }
     }
-    
+
     func getFormattedTime(time: Int) -> String {
-        if (time > 0) {
-            let timeFormatted = NSString(format: " (%d:%02d)", time / 60, time % 60) as String
+        if time > 0 {
+            let timeFormatted = NSString(format: " %d:%02d", time / 60, time % 60) as String
             return timeFormatted
-        } else if (time == 0) {
-            return ""
         }
-        
-        return " (?)"
+
+        return ""
     }
-    
-    public func updateInfo() {
+
+    public func formattedInfo() -> NSAttributedString {
         var title = ""
-        self.getPSInfo()
-        
+        getPSInfo()
+
         if ACPower == "AC Power" {
-            title += "⚡️"
+            if current < 100 {
+                title += "⚡️"
+            }
             timeRemaining = getFormattedTime(time: timeToFull)
         } else {
             timeRemaining = getFormattedTime(time: timeToEmpty)
         }
-        
-        title += String(current) + "%" + timeRemaining
-        button?.title = title
+
+        title += String(current) + "%"
+
+        var color = NSColor.white
+        if current <= 10 && ACPower != "AC Power" {
+            color = NSColor.red
+        }
+
+        let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: NSFont.systemFont(ofSize: 15), .baselineOffset: 1])
+        let newTitleSecond = NSMutableAttributedString(string: timeRemaining as String, attributes: [NSAttributedString.Key.foregroundColor: color, NSAttributedString.Key.font: NSFont.systemFont(ofSize: 8, weight: .regular), NSAttributedString.Key.baselineOffset: 7])
+        newTitle.append(newTitleSecond)
+        newTitle.setAlignment(.center, range: NSRange(location: 0, length: title.count))
+        return newTitle
     }
-    
 }

MTMR/Widgets/BrightnessViewController.swift

@@ -1,63 +1,71 @@
-import Cocoa
 import AppKit
 import AVFoundation
+import Cocoa
 import CoreAudio
 
 class BrightnessViewController: NSCustomTouchBarItem {
     private(set) var sliderItem: CustomSlider!
-    
+
     init(identifier: NSTouchBarItem.Identifier, refreshInterval: Double, image: NSImage? = nil) {
         super.init(identifier: identifier)
-        
-        if (image == nil) {
+
+        if image == nil {
             sliderItem = CustomSlider()
         } else {
             sliderItem = CustomSlider(knob: image!)
         }
         sliderItem.target = self
-        sliderItem.action =  #selector(BrightnessViewController.sliderValueChanged(_:))
+        sliderItem.action = #selector(BrightnessViewController.sliderValueChanged(_:))
         sliderItem.minValue = 0.0
         sliderItem.maxValue = 100.0
-        sliderItem.floatValue = getBrightness()*100
-        
-        self.view = sliderItem
-        
+        sliderItem.floatValue = getBrightness() * 100
+
+        view = sliderItem
+
         let timer = Timer.scheduledTimer(timeInterval: refreshInterval, target: self, selector: #selector(BrightnessViewController.updateBrightnessSlider), userInfo: nil, repeats: true)
-        RunLoop.current.add(timer, forMode: RunLoopMode.commonModes)
+        RunLoop.current.add(timer, forMode: RunLoop.Mode.common)
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
     deinit {
         sliderItem.unbind(NSBindingName.value)
     }
-    
+
     @objc func updateBrightnessSlider() {
         DispatchQueue.main.async {
             self.sliderItem.floatValue = self.getBrightness() * 100
         }
     }
-    
+
     @objc func sliderValueChanged(_ sender: Any) {
         if let sliderItem = sender as? NSSlider {
-            setBrightness(level: Float32(sliderItem.intValue)/100.0)
+            setBrightness(level: Float32(sliderItem.intValue) / 100.0)
         }
     }
-    
+
     private func getBrightness() -> Float32 {
-        var level: Float32 = 0.5
-        let service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IODisplayConnect"))
-        
-        IODisplayGetFloatParameter(service, 0, kIODisplayBrightnessKey as CFString, &level)
-        return level
+        if #available(OSX 10.13, *) {
+            return Float32(CoreDisplay_Display_GetUserBrightness(0))
+        } else {
+            var level: Float32 = 0.5
+            let service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IODisplayConnect"))
+
+            IODisplayGetFloatParameter(service, 0, kIODisplayBrightnessKey as CFString, &level)
+            return level
+        }
     }
-    
+
     private func setBrightness(level: Float) {
-        let service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IODisplayConnect"))
-        
-        IODisplaySetFloatParameter(service, 0, kIODisplayBrightnessKey as CFString, level)
-        IOObjectRelease(service)
+        if #available(OSX 10.13, *) {
+            CoreDisplay_Display_SetUserBrightness(0, Double(level))
+        } else {
+            let service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IODisplayConnect"))
+
+            IODisplaySetFloatParameter(service, 1, kIODisplayBrightnessKey as CFString, level)
+            IOObjectRelease(service)
+        }
     }
 }

MTMR/Widgets/CurrencyBarItem.swift

@@ -10,11 +10,13 @@ import Cocoa
 import CoreLocation
 
 class CurrencyBarItem: CustomButtonTouchBarItem {
-    private let activity = NSBackgroundActivityScheduler(identifier: "com.toxblh.mtmr.currency.updatecheck")
+    private let activity: NSBackgroundActivityScheduler
     private var prefix: String
+    private var postfix: String
     private var from: String
     private var to: String
     private var oldValue: Float32!
+    private var full: Bool = false
 
     private let currencies = [
         "USD": "$",
@@ -36,20 +38,26 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
         "ETH": "Ξ",
     ]
 
-    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, full: Bool) {
+        activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
         activity.interval = interval
         self.from = from
         self.to = to
+        self.full = full
 
         if let prefix = currencies[from] {
             self.prefix = prefix
         } else {
-            self.prefix = from
+            prefix = from
         }
 
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
+        if let postfix = currencies[to] {
+            self.postfix = postfix
+        } else {
+            postfix = to
+        }
 
-        self.view = button
+        super.init(identifier: identifier, title: "⏳")
 
         activity.repeats = true
         activity.qualityOfService = .utility
@@ -60,22 +68,21 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
         updateCurrency()
     }
 
-    required init?(coder: NSCoder) {
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
     @objc func updateCurrency() {
         let urlRequest = URLRequest(url: URL(string: "https://api.coinbase.com/v2/exchange-rates?currency=\(from)")!)
 
-        let task = URLSession.shared.dataTask(with: urlRequest) { (data, response, error) in
+        let task = URLSession.shared.dataTask(with: urlRequest) { data, _, error in
             if error == nil {
                 do {
-                    let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String : AnyObject]
-//                    print(json)
+                    let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String: AnyObject]
                     var value: Float32!
 
-                    if let data_array = json["data"] as? [String : AnyObject] {
-                        if let rates = data_array["rates"] as? [String : AnyObject] {
+                    if let data_array = json["data"] as? [String: AnyObject] {
+                        if let rates = data_array["rates"] as? [String: AnyObject] {
                             if let item = rates["\(self.to)"] as? String {
                                 value = Float32(item)
                             }
@@ -105,16 +112,19 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
                 color = NSColor.red
             }
         }
-        self.oldValue = value
 
-        button.title = String(format: "%@%.2f", self.prefix, value)
+        oldValue = value
 
-        let textRange = NSRange(location: 0, length: button.title.count)
-        let newTitle = NSMutableAttributedString(string: button.title)
-        newTitle.addAttribute(NSAttributedStringKey.foregroundColor, value: color, range: textRange)
-        newTitle.addAttribute(NSAttributedStringKey.font, value: button.font!, range: textRange)
-        newTitle.setAlignment(.center, range: textRange)
+        var title = ""
+        if full {
+            title = String(format: "%@‣%.2f%@", prefix, value, postfix)
+        } else {
+            title = String(format: "%@%.2f", prefix, value)
+        }
 
-        button.attributedTitle = newTitle
+        let regularFont = attributedTitle.attribute(.font, at: 0, effectiveRange: nil) as? NSFont ?? NSFont.systemFont(ofSize: 15)
+        let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: regularFont])
+        newTitle.setAlignment(.center, range: NSRange(location: 0, length: title.count))
+        attributedTitle = newTitle
     }
 }

MTMR/Widgets/DarkModeBarItem.swift

@@ -0,0 +1,57 @@
+import Foundation
+
+class DarkModeBarItem: CustomButtonTouchBarItem, Widget {
+    static var name: String = "darkmode"
+    static var identifier: String = "com.toxblh.mtmr.darkmode"
+
+    private var timer: Timer!
+
+    init(identifier: NSTouchBarItem.Identifier) {
+        super.init(identifier: identifier, title: "")
+        isBordered = false
+        setWidth(value: 24)
+
+        tapClosure = { [weak self] in self?.DarkModeToggle() }
+
+        timer = Timer.scheduledTimer(timeInterval: 3, target: self, selector: #selector(refresh), userInfo: nil, repeats: true)
+
+        refresh()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func DarkModeToggle() {
+        DarkMode.isEnabled = !DarkMode.isEnabled
+        refresh()
+    }
+
+    @objc func refresh() {
+        image = DarkMode.isEnabled ? #imageLiteral(resourceName: "dark-mode-on") : #imageLiteral(resourceName: "dark-mode-off")
+    }
+}
+
+
+struct DarkMode {
+    private static let prefix = "tell application \"System Events\" to tell appearance preferences to"
+
+    static var isEnabled: Bool {
+        get {
+            return UserDefaults.standard.string(forKey: "AppleInterfaceStyle") == "Dark"
+        }
+        set {
+            toggle(force: newValue)
+        }
+    }
+
+    static func toggle(force: Bool? = nil) {
+        let value = force.map(String.init) ?? "not dark mode"
+        runAppleScript("\(prefix) set dark mode to \(value)")
+    }
+}
+
+func runAppleScript(_ source: String) -> String? {
+    return NSAppleScript(source: source)?.executeAndReturnError(nil).stringValue
+}
+

MTMR/Widgets/DnDBarItem.swift

@@ -0,0 +1,78 @@
+//
+//  DnDBarItem.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 29/08/2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Foundation
+
+class DnDBarItem: CustomButtonTouchBarItem {
+    private var timer: Timer!
+
+    init(identifier: NSTouchBarItem.Identifier) {
+        super.init(identifier: identifier, title: "")
+        isBordered = false
+        setWidth(value: 32)
+
+        tapClosure = { [weak self] in self?.DnDToggle() }
+
+        timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(refresh), userInfo: nil, repeats: true)
+
+        refresh()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func DnDToggle() {
+        DoNotDisturb.isEnabled = !DoNotDisturb.isEnabled
+        refresh()
+    }
+
+    @objc func refresh() {
+        image = DoNotDisturb.isEnabled ? #imageLiteral(resourceName: "dnd-on") : #imageLiteral(resourceName: "dnd-off")
+    }
+}
+
+public struct DoNotDisturb {
+    private static let appId = "com.apple.notificationcenterui" as CFString
+    private static let dndPref = "com.apple.notificationcenterui.dndprefs_changed"
+
+    private static func set(_ key: String, value: CFPropertyList?) {
+        CFPreferencesSetValue(key as CFString, value, appId, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)
+    }
+
+    private static func commitChanges() {
+        CFPreferencesSynchronize(appId, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)
+        DistributedNotificationCenter.default().postNotificationName(NSNotification.Name(dndPref), object: nil, userInfo: nil, deliverImmediately: true)
+        NSRunningApplication.runningApplications(withBundleIdentifier: appId as String).first?.terminate()
+    }
+
+    private static func enable() {
+        set("dndStart", value: nil)
+        set("dndEnd", value: nil)
+        set("doNotDisturb", value: true as CFPropertyList)
+        set("doNotDisturbDate", value: Date() as CFPropertyList)
+        commitChanges()
+    }
+
+    private static func disable() {
+        set("dndStart", value: nil)
+        set("dndEnd", value: nil)
+        set("doNotDisturb", value: false as CFPropertyList)
+        set("doNotDisturbDate", value: nil)
+        commitChanges()
+    }
+
+    static var isEnabled: Bool {
+        get {
+            return CFPreferencesGetAppBooleanValue("doNotDisturb" as CFString, appId, nil)
+        }
+        set {
+            newValue ? enable() : disable()
+        }
+    }
+}

MTMR/Widgets/GroupBarItem.swift

@@ -0,0 +1,100 @@
+//
+//  GroupBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 11.05.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+import Cocoa
+
+class GroupBarItem: NSPopoverTouchBarItem, NSTouchBarDelegate {
+    var jsonItems: [BarItemDefinition]
+
+    var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
+    var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
+    var leftIdentifiers: [NSTouchBarItem.Identifier] = []
+    var centerIdentifiers: [NSTouchBarItem.Identifier] = []
+    var centerItems: [NSTouchBarItem] = []
+    var rightIdentifiers: [NSTouchBarItem.Identifier] = []
+    var scrollArea: NSCustomTouchBarItem?
+    var centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
+
+    init(identifier: NSTouchBarItem.Identifier, items: [BarItemDefinition]) {
+        jsonItems = items
+        super.init(identifier: identifier)
+        popoverTouchBar.delegate = self
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {}
+
+    @objc override func showPopover(_: Any?) {
+        itemDefinitions = [:]
+        items = [:]
+        leftIdentifiers = []
+        centerItems = []
+        rightIdentifiers = []
+
+        loadItemDefinitions(jsonItems: jsonItems)
+        createItems()
+
+        centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in
+            items[identifier]
+        })
+
+        centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
+        scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems)
+
+        TouchBarController.shared.touchBar.delegate = self
+        TouchBarController.shared.touchBar.defaultItemIdentifiers = []
+        TouchBarController.shared.touchBar.defaultItemIdentifiers = leftIdentifiers + [centerScrollArea] + rightIdentifiers
+
+        if TouchBarController.shared.showControlStripState {
+            presentSystemModal(TouchBarController.shared.touchBar, systemTrayItemIdentifier: .controlStripItem)
+        } else {
+            presentSystemModal(TouchBarController.shared.touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
+        }
+    }
+
+    func touchBar(_: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
+        if identifier == centerScrollArea {
+            return scrollArea
+        }
+
+        guard let item = self.items[identifier],
+            let definition = self.itemDefinitions[identifier],
+            definition.align != .center else {
+            return nil
+        }
+        return item
+    }
+
+    func loadItemDefinitions(jsonItems: [BarItemDefinition]) {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH-mm-ss"
+        let time = dateFormatter.string(from: Date())
+        for item in jsonItems {
+            let identifierString = item.type.identifierBase.appending(time + "--" + UUID().uuidString)
+            let identifier = NSTouchBarItem.Identifier(identifierString)
+            itemDefinitions[identifier] = item
+            if item.align == .left {
+                leftIdentifiers.append(identifier)
+            }
+            if item.align == .right {
+                rightIdentifiers.append(identifier)
+            }
+            if item.align == .center {
+                centerIdentifiers.append(identifier)
+            }
+        }
+    }
+
+    func createItems() {
+        for (identifier, definition) in itemDefinitions {
+            items[identifier] = TouchBarController.shared.createItem(forIdentifier: identifier, definition: definition)
+        }
+    }
+}

MTMR/Widgets/InputSourceBarItem.swift

@@ -9,42 +9,46 @@
 import Cocoa
 
 class InputSourceBarItem: CustomButtonTouchBarItem {
-
     fileprivate var notificationCenter: CFNotificationCenter
+    let buttonSize = NSSize(width: 21, height: 21)
 
-    init(identifier: NSTouchBarItem.Identifier, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
-        notificationCenter = CFNotificationCenterGetDistributedCenter();
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
+    init(identifier: NSTouchBarItem.Identifier) {
+        notificationCenter = CFNotificationCenterGetDistributedCenter()
+        super.init(identifier: identifier, title: "⏳")
 
-        observeIputSourceChangedNotification();
+        observeIputSourceChangedNotification()
         textInputSourceDidChange()
-
-        self.button.action = #selector(switchInputSource)
+        tapClosure = { [weak self] in
+            self?.switchInputSource()
+        }
     }
 
-    required init?(coder: NSCoder) {
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    deinit {
+        CFNotificationCenterRemoveEveryObserver(notificationCenter, UnsafeRawPointer(Unmanaged.passUnretained(self).toOpaque()))
+    }
+
     @objc public func textInputSourceDidChange() {
         let currentSource = TISCopyCurrentKeyboardInputSource().takeUnretainedValue()
 
-        var iconImage: NSImage? = nil
+        var iconImage: NSImage?
 
-        if let imageURL = currentSource.iconImageURL {
-            if let image = NSImage(contentsOf: imageURL) {
-                iconImage = image
-            }
-        }
-
-        if iconImage == nil, let iconRef = currentSource.iconRef {
+        if let imageURL = currentSource.iconImageURL,
+            let image = NSImage(contentsOf: imageURL) {
+            iconImage = image
+        } else if let iconRef = currentSource.iconRef {
             iconImage = NSImage(iconRef: iconRef)
         }
 
-        if (iconImage != nil) {
-            self.button.image = iconImage
+        if let iconImage = iconImage {
+            iconImage.size = buttonSize
+            image = iconImage
+            title = ""
         } else {
-            self.button.title = currentSource.name
+            title = currentSource.name
         }
     }
 
@@ -60,15 +64,15 @@ class InputSourceBarItem: CustomButtonTouchBarItem {
         })
 
         for item in inputSources {
-            if (item.id != currentSource.id) {
+            if item.id != currentSource.id {
                 TISSelectInputSource(item)
                 break
             }
         }
     }
 
-    @objc public func observeIputSourceChangedNotification(){
-        let callback: CFNotificationCallback = { center, observer, name, object, info in
+    @objc public func observeIputSourceChangedNotification() {
+        let callback: CFNotificationCallback = { _, observer, _, _, _ in
             let mySelf = Unmanaged<InputSourceBarItem>.fromOpaque(observer!).takeUnretainedValue()
             mySelf.textInputSourceDidChange()
         }
@@ -91,7 +95,7 @@ extension TISInputSource {
 
     private func getProperty(_ key: CFString) -> AnyObject? {
         let cfType = TISGetInputSourceProperty(self, key)
-        if (cfType != nil) {
+        if cfType != nil {
             return Unmanaged<AnyObject>.fromOpaque(cfType!).takeUnretainedValue()
         } else {
             return nil
@@ -126,4 +130,3 @@ extension TISInputSource {
         return OpaquePointer(TISGetInputSourceProperty(self, kTISPropertyIconRef)) as IconRef?
     }
 }
-

MTMR/Widgets/MusicBarItem.swift

@@ -0,0 +1,397 @@
+//
+//  MusicBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 05.05.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+import ScriptingBridge
+
+class MusicBarItem: CustomButtonTouchBarItem {
+    private enum Player: String {
+        case iTunes = "com.apple.iTunes"
+        case Spotify = "com.spotify.client"
+        case VOX = "com.coppertino.Vox"
+        case Chrome = "com.google.Chrome"
+        case Safari = "com.apple.Safari"
+    }
+    
+    private let playerBundleIdentifiers = [
+        Player.iTunes,
+        Player.Spotify,
+        Player.VOX,
+        Player.Chrome,
+        Player.Safari,
+    ]
+    
+    private let interval: TimeInterval
+    private let disableMarquee: Bool
+    private var songTitle: String?
+    private var timer: Timer?
+    private let iconSize = NSSize(width: 21, height: 21)
+
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, disableMarquee: Bool) {
+        self.interval = interval
+        self.disableMarquee = disableMarquee
+
+        super.init(identifier: identifier, title: "⏳")
+        isBordered = false
+
+        tapClosure = { [weak self] in self?.playPause() }
+        longTapClosure = { [weak self] in self?.nextTrack() }
+
+        refreshAndSchedule()
+    }
+
+    @objc func marquee() {
+        let str = title
+        if str.count > 10 {
+            let indexFirst = str.index(str.startIndex, offsetBy: 0)
+            let indexSecond = str.index(str.startIndex, offsetBy: 1)
+            title = String(str.suffix(from: indexSecond)) + String(str[indexFirst])
+        }
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    @objc func playPause() {
+        for ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident.rawValue) {
+                if musicPlayer.isRunning {
+                    if ident == .Spotify {
+                        let mp = (musicPlayer as SpotifyApplication)
+                        mp.playpause!()
+                        return
+                    } else if ident == .iTunes {
+                        let mp = (musicPlayer as iTunesApplication)
+                        mp.playpause!()
+                        return
+                    } else if ident == .VOX {
+                        let mp = (musicPlayer as VoxApplication)
+                        mp.playpause!()
+                        return
+                    } else if ident == .Safari {
+                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_play')[0].click()", in: tab)
+                                    return
+                                } else if (tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_play')[0].click()", in: tab)
+                                    return
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementById('movie_player').click()", in: tab)
+                                    return
+                                }
+                            }
+                        }
+                    }
+                    //                    else if (ident == .Chrome) {
+                    //                        let chromeApplication = musicPlayer as GoogleChromeApplication
+                    //                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
+                    //                        for window in chromeWindows! {
+                    //                            for tab in window.tabs!() {
+                    //                                let tab = tab as! GoogleChromeTab
+                    //                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "document.getElementsByClassName('player-controls__btn_play')[0].click()")
+                    //                                    break
+                    //                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "document.getElementsByClassName('audio_page_player_ctrl')[0].click()")
+                    //                                    break
+                    //                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "alert(document.title)") // , id: tab
+                    //                                    break // document.getElementById('movie_player').click()
+                    //                                }
+                    //                            }
+                    //                        }
+                    //                    }
+                    break
+                }
+            }
+        }
+    }
+
+    @objc func nextTrack() {
+        for ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident.rawValue) {
+                if musicPlayer.isRunning {
+                    if ident == .Spotify {
+                        let mp = (musicPlayer as SpotifyApplication)
+                        mp.nextTrack!()
+                        updatePlayer()
+                        return
+                    } else if ident == .iTunes {
+                        let mp = (musicPlayer as iTunesApplication)
+                        mp.nextTrack!()
+                        updatePlayer()
+                        return
+                    } else if ident == .VOX {
+                        let mp = (musicPlayer as VoxApplication)
+                        mp.next!()
+                        updatePlayer()
+                        return
+                    } else if ident == .Safari {
+                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_next')[0].click()", in: tab)
+                                    updatePlayer()
+                                    return
+                                } else if (tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_next')[0].click()", in: tab)
+                                    updatePlayer()
+                                    return
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('ytp-next-button')[0].click()", in: tab)
+                                    updatePlayer()
+                                    return
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    func refreshAndSchedule() {
+        DispatchQueue.main.async {
+            self.updatePlayer()
+            DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
+                self?.refreshAndSchedule()
+            }
+        }
+    }
+
+    func updatePlayer() {
+        var iconUpdated = false
+        var titleUpdated = false
+
+        for var ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident.rawValue) {
+                if musicPlayer.isRunning {
+                    var tempTitle = ""
+                    if ident == .Spotify {
+                        tempTitle = (musicPlayer as SpotifyApplication).title
+                    } else if ident == .iTunes {
+                        tempTitle = (musicPlayer as iTunesApplication).title
+                    } else if ident == .VOX {
+                        tempTitle = (musicPlayer as VoxApplication).title
+                    } else if ident == .Safari {
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    //                                    if (!(tab.name?.hasSuffix("на Яндекс.Музыке"))!) {
+                                    tempTitle = (tab.name)!
+                                    break
+                                    //                                    }
+                                } else if (tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))! {
+                                    tempTitle = (tab.name)!
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    tempTitle = (tab.name)!
+                                    break
+                                }
+                            }
+                        }
+                    } else if ident == .Chrome {
+                        let chromeApplication = musicPlayer as GoogleChromeApplication
+                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
+                        for window in chromeWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! GoogleChromeTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    if !(tab.title?.hasSuffix("на Яндекс.Музыке"))! {
+                                        tempTitle = tab.title!
+                                        break
+                                    }
+                                } else if (tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))! {
+                                    tempTitle = tab.title!
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    tempTitle = tab.title!
+                                    break
+                                }
+                            }
+                        }
+                    }
+
+                    if tempTitle == self.songTitle {
+                        return
+                    } else {
+                        self.songTitle = tempTitle
+                    }
+
+                    if let songTitle = self.songTitle?.ifNotEmpty {
+                        self.timer?.invalidate()
+                        self.timer = nil
+                        
+                        if (disableMarquee) {
+                            self.title = " " + songTitle
+                        } else {
+                            self.title = " " + songTitle + "     "
+                            self.timer = Timer.scheduledTimer(timeInterval: 0.25, target: self, selector: #selector(self.marquee), userInfo: nil, repeats: true)
+                        }
+                        
+                        titleUpdated = true
+                    }
+                    if let _ = tempTitle.ifNotEmpty,
+                        let appPath = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: ident.rawValue) {
+                        let image = NSWorkspace.shared.icon(forFile: appPath)
+                        image.size = self.iconSize
+                        self.image = image
+                        iconUpdated = true
+                    }
+                    break
+                }
+            }
+        }
+
+        DispatchQueue.main.async {
+            if !iconUpdated {
+                self.image = nil
+            }
+
+            if !titleUpdated {
+                self.title = ""
+            }
+        }
+    }
+}
+
+@objc protocol SpotifyApplication {
+    @objc optional var currentTrack: SpotifyTrack { get }
+    @objc optional func nextTrack()
+    @objc optional func previousTrack()
+    @objc optional func playpause()
+}
+
+extension SBApplication: SpotifyApplication {}
+
+@objc protocol SpotifyTrack {
+    @objc optional var artist: String { get }
+    @objc optional var name: String { get }
+}
+
+extension SBObject: SpotifyTrack {}
+
+extension SpotifyApplication {
+    var title: String {
+        guard let t = currentTrack else { return "" }
+        return (t.artist ?? "") + " — " + (t.name ?? "")
+    }
+}
+
+@objc protocol iTunesApplication {
+    @objc optional var currentTrack: iTunesTrack { get }
+    @objc optional func playpause()
+    @objc optional func nextTrack()
+    @objc optional func previousTrack()
+}
+
+extension SBApplication: iTunesApplication {}
+
+@objc protocol iTunesTrack {
+    @objc optional var artist: String { get }
+    @objc optional var name: String { get }
+}
+
+extension SBObject: iTunesTrack {}
+
+extension iTunesApplication {
+    var title: String {
+        guard let t = currentTrack else { return "" }
+        return (t.artist ?? "") + " — " + (t.name ?? "")
+    }
+}
+
+@objc protocol VoxApplication {
+    @objc optional func playpause()
+    @objc optional func next()
+    @objc optional func previous()
+    @objc optional var track: String { get }
+    @objc optional var artist: String { get }
+}
+
+extension SBApplication: VoxApplication {}
+
+extension VoxApplication {
+    var title: String {
+        return (artist ?? "") + " — " + (track ?? "")
+    }
+}
+
+@objc public protocol SBObjectProtocol: NSObjectProtocol {
+    func get() -> Any!
+}
+
+@objc public protocol SBApplicationProtocol: SBObjectProtocol {
+    func activate()
+    var delegate: SBApplicationDelegate! { get set }
+}
+
+@objc public protocol SafariApplication: SBApplicationProtocol {
+    @objc optional func windows() -> SBElementArray
+    @objc optional func doJavaScript(_ x: String!, in in_: Any!) -> Any // Applies a string of JavaScript code to a document.
+}
+
+extension SBApplication: SafariApplication {}
+
+@objc public protocol SafariWindow: SBObjectProtocol {
+    @objc optional var name: String { get } // The title of the window.
+    @objc optional func tabs() -> SBElementArray
+    //    @objc optional var document: SafariDocument { get } // The document whose contents are displayed in the window.
+    //    @objc optional func setCurrentTab(_ currentTab: SafariTab!) // The current tab.
+}
+
+extension SBObject: SafariWindow {}
+
+// @objc public protocol SafariDocument: SBObjectProtocol {
+//    @objc optional var name: String { get } // Its name.
+//    @objc optional var URL: String { get } // The current URL of the document.
+// }
+// extension SBObject: SafariDocument {}
+
+@objc public protocol SafariTab: SBObjectProtocol {
+    @objc optional var URL: String { get } // The current URL of the tab.
+    @objc optional var name: String { get } // The name of the tab.
+}
+
+extension SBObject: SafariTab {}
+
+@objc public protocol GoogleChromeApplication: SBApplicationProtocol {
+    @objc optional func windows() -> SBElementArray
+    @objc optional func executeJavaScript(javascript: String!) -> Any // Applies a string of JavaScript code to a document. //, id: Any!
+}
+
+extension SBApplication: GoogleChromeApplication {}
+
+@objc public protocol GoogleChromeWindow: SBObjectProtocol {
+    @objc optional var name: String { get } // The title of the window.
+    @objc optional func tabs() -> SBElementArray
+}
+
+extension SBObject: GoogleChromeWindow {}
+
+@objc public protocol GoogleChromeTab: SBObjectProtocol {
+    @objc optional var URL: String { get } // The current URL of the tab.
+    @objc optional var title: String { get } // The name of the tab.
+}
+
+extension SBObject: GoogleChromeTab {}

MTMR/Widgets/NetworkBarItem.swift

@@ -0,0 +1,147 @@
+//
+//  NetworkBarItem.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 23/02/2019.
+//  Copyright © 2019 Anton Palgunov. All rights reserved.
+//
+
+import Foundation
+
+class NetworkBarItem: CustomButtonTouchBarItem, Widget {
+    static var name: String = "network"
+    static var identifier: String = "com.toxblh.mtmr.network"
+    
+    private let flip: Bool
+    
+    init(identifier: NSTouchBarItem.Identifier, flip: Bool = false) {
+        self.flip = flip
+        super.init(identifier: identifier, title: " ")
+        startMonitoringProcess()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func startMonitoringProcess() {
+        var pipe: Pipe
+        var outputHandle: FileHandle
+        var bandwidthProcess: Process?
+        var dSpeed: UInt64?
+        var uSpeed: UInt64?
+        var curr: Array<Substring>?
+        var dataAvailable: NSObjectProtocol!
+
+        pipe = Pipe()
+        bandwidthProcess = Process()
+        bandwidthProcess?.launchPath = "/usr/bin/env"
+        bandwidthProcess?.arguments = ["netstat", "-w1", "-l", "en0"]
+        bandwidthProcess?.standardOutput = pipe
+
+        outputHandle = pipe.fileHandleForReading
+        outputHandle.waitForDataInBackgroundAndNotify(forModes: [RunLoop.Mode.common])
+
+        dataAvailable = NotificationCenter.default.addObserver(
+            forName: NSNotification.Name.NSFileHandleDataAvailable,
+            object: outputHandle,
+            queue: nil
+        ) { _ -> Void in
+            let data = pipe.fileHandleForReading.availableData
+            if data.count > 0 {
+                if let str = NSString(data: data, encoding: String.Encoding.utf8.rawValue) {
+                    curr = [""]
+                    curr = str
+                        .replacingOccurrences(of: "  ", with: " ")
+                        .split(separator: " ")
+                    if curr == nil || (curr?.count)! < 6 {} else {
+                        if Int64(curr![2]) == nil {} else {
+                            dSpeed = UInt64(curr![2])
+                            uSpeed = UInt64(curr![5])
+
+                            self.setTitle(up: self.getHumanizeSize(speed: uSpeed!), down: self.getHumanizeSize(speed: dSpeed!))
+                        }
+                    }
+                }
+                outputHandle.waitForDataInBackgroundAndNotify()
+            } else {
+                NotificationCenter.default.removeObserver(dataAvailable)
+            }
+        }
+
+        var dataReady: NSObjectProtocol!
+        dataReady = NotificationCenter.default.addObserver(
+            forName: Process.didTerminateNotification,
+            object: outputHandle,
+            queue: nil
+        ) { _ -> Void in
+            print("Task terminated!")
+            NotificationCenter.default.removeObserver(dataReady)
+        }
+
+        bandwidthProcess?.launch()
+    }
+
+    func getHumanizeSize(speed: UInt64) -> String {
+        let humanText: String
+
+        if speed < 1024 {
+            humanText = String(format: "%.0f", Double(speed)) + " B/s"
+        } else if speed < (1024 * 1024) {
+            humanText = String(format: "%.1f", Double(speed) / 1024) + " KB/s"
+        } else if speed < (1024 * 1024 * 1024) {
+            humanText = String(format: "%.1f", Double(speed) / (1024 * 1024)) + " MB/s"
+        } else {
+            humanText = String(format: "%.2f", Double(speed) / (1024 * 1024 * 1024)) + " GB/s"
+        }
+
+        return humanText
+    }
+    
+    func appendUpSpeed(appendString: NSMutableAttributedString, up: String, titleFont: NSFont, newStr: Bool = false) {
+        appendString.append(NSMutableAttributedString(
+            string: newStr ? "\n↑" : "↑",
+            attributes: [
+                NSAttributedString.Key.foregroundColor: NSColor.blue,
+                NSAttributedString.Key.font: titleFont,
+                ]))
+        
+        appendString.append(NSMutableAttributedString(
+            string: up,
+            attributes: [
+                NSAttributedString.Key.font: titleFont,
+                ]))
+    }
+    
+    func appendDownSpeed(appendString: NSMutableAttributedString, down: String, titleFont: NSFont, newStr: Bool = false) {
+        appendString.append(NSMutableAttributedString(
+            string: newStr ? "\n↓" : "↓",
+            attributes: [
+                NSAttributedString.Key.foregroundColor: NSColor.red,
+                NSAttributedString.Key.font: titleFont,
+                ]))
+            
+            appendString.append(NSMutableAttributedString(
+                string: down,
+                attributes: [
+                    NSAttributedString.Key.font: titleFont
+                ]))
+    }
+    
+    func setTitle(up: String, down: String) {
+        let titleFont = NSFont.monospacedDigitSystemFont(ofSize: 12, weight: NSFont.Weight.light)
+        
+        let newTitle: NSMutableAttributedString = NSMutableAttributedString(string: "")
+        
+        if (self.flip) {
+            appendUpSpeed(appendString: newTitle, up: up, titleFont: titleFont)
+            appendDownSpeed(appendString: newTitle, down: down, titleFont: titleFont, newStr: true)
+        } else {
+            appendDownSpeed(appendString: newTitle, down: down, titleFont: titleFont)
+            appendUpSpeed(appendString: newTitle, up: up, titleFont: titleFont, newStr: true)
+        }
+        
+        
+        self.attributedTitle = newTitle
+    }
+}

MTMR/Widgets/NightShiftBarItem.swift

@@ -0,0 +1,53 @@
+//
+//  NightShiftBarItem.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 28/08/2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Foundation
+
+class NightShiftBarItem: CustomButtonTouchBarItem {
+    private let nsclient = CBBlueLightClient()
+    private var timer: Timer!
+
+    private var blueLightStatus: Status {
+        var status: Status = Status()
+        nsclient.getBlueLightStatus(&status)
+        return status
+    }
+
+    private var isNightShiftEnabled: Bool {
+        return blueLightStatus.enabled.boolValue
+    }
+
+    private func setNightShift(state: Bool) {
+        nsclient.setEnabled(state)
+    }
+
+    init(identifier: NSTouchBarItem.Identifier) {
+        super.init(identifier: identifier, title: "")
+        isBordered = false
+        setWidth(value: 28)
+
+        tapClosure = { [weak self] in self?.nightShiftAction() }
+
+        timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(refresh), userInfo: nil, repeats: true)
+
+        refresh()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func nightShiftAction() {
+        setNightShift(state: !isNightShiftEnabled)
+        refresh()
+    }
+
+    @objc func refresh() {
+        image = isNightShiftEnabled ? #imageLiteral(resourceName: "nightShiftOn") : #imageLiteral(resourceName: "nightShiftOff")
+    }
+}

MTMR/Widgets/PomodoroBarItem.swift

@@ -0,0 +1,124 @@
+//
+//  PomodoroBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 10.05.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+
+class PomodoroBarItem: CustomButtonTouchBarItem, Widget {
+    static let identifier = "com.toxblh.mtmr.pomodoro."
+    static let name = "pomodoro"
+    static let decoder: ParametersDecoder = { decoder in
+        enum CodingKeys: String, CodingKey {
+            case workTime
+            case restTime
+        }
+
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let workTime = try container.decodeIfPresent(Double.self, forKey: .workTime)
+        let restTime = try container.decodeIfPresent(Double.self, forKey: .restTime)
+
+        return (
+            item: .pomodoro(workTime: workTime ?? 1500.00, restTime: restTime ?? 300),
+            action: .none,
+            longAction: .none,
+            parameters: [:]
+        )
+    }
+
+    private enum TimeTypes {
+        case work
+        case rest
+        case none
+    }
+
+    private let defaultTitle = "🍅"
+    private let workTime: TimeInterval
+    private let restTime: TimeInterval
+    private var typeTime: TimeTypes = .none
+    private var timer: DispatchSourceTimer?
+
+    private var timeLeft: Int = 0
+    private var timeLeftString: String {
+        return String(format: "%.2i:%.2i", timeLeft / 60, timeLeft % 60)
+    }
+
+    init(identifier: NSTouchBarItem.Identifier, workTime: TimeInterval, restTime: TimeInterval) {
+        self.workTime = workTime
+        self.restTime = restTime
+        super.init(identifier: identifier, title: defaultTitle)
+        tapClosure = { [weak self] in self?.startStopWork() }
+        longTapClosure = { [weak self] in self?.startStopRest() }
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+        timer?.cancel()
+        timer = nil
+    }
+
+    @objc func startStopWork() {
+        typeTime = .work
+        startStopTimer()
+    }
+
+    @objc func startStopRest() {
+        typeTime = .rest
+        startStopTimer()
+    }
+
+    func startStopTimer() {
+        timer == nil ? start() : reset()
+    }
+
+    private func start() {
+        timeLeft = Int(typeTime == .work ? workTime : restTime)
+        let queue: DispatchQueue = DispatchQueue(label: "Timer")
+        timer = DispatchSource.makeTimerSource(flags: .strict, queue: queue)
+        timer?.schedule(deadline: .now(), repeating: .seconds(1), leeway: .never)
+        timer?.setEventHandler(handler: tick)
+        timer?.resume()
+
+        NSSound.beep()
+    }
+
+    private func finish() {
+        if typeTime != .none {
+            sendNotification()
+        }
+
+        reset()
+    }
+
+    private func reset() {
+        typeTime = .none
+        timer?.cancel()
+        timer = nil
+        title = defaultTitle
+    }
+
+    private func tick() {
+        timeLeft -= 1
+        DispatchQueue.main.async {
+            if self.timeLeft >= 0 {
+                self.title = self.defaultTitle + " " + self.timeLeftString
+            } else {
+                self.finish()
+            }
+        }
+    }
+
+    private func sendNotification() {
+        let notification: NSUserNotification = NSUserNotification()
+        notification.title = "Pomodoro"
+        notification.informativeText = typeTime == .work ? "it's time to rest your mind!" : "It's time to work!"
+        notification.soundName = "Submarine"
+        NSUserNotificationCenter.default.deliver(notification)
+    }
+}

MTMR/Widgets/TimeTouchBarItem.swift

@@ -3,22 +3,23 @@ import Cocoa
 class TimeTouchBarItem: CustomButtonTouchBarItem {
     private let dateFormatter = DateFormatter()
     private var timer: Timer!
-//    private let button = NSButton(title: "", target: nil, action: nil)
-    
-    init(identifier: NSTouchBarItem.Identifier, formatTemplate: String, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
-        dateFormatter.setLocalizedDateFormatFromTemplate(formatTemplate)
-        super.init(identifier: identifier, title: " ", onTap: onTap, onLongTap: onLongTap)
+
+    init(identifier: NSTouchBarItem.Identifier, formatTemplate: String, timeZone: String? = nil) {
+        dateFormatter.dateFormat = formatTemplate
+        if let abbr = timeZone {
+            dateFormatter.timeZone = TimeZone(abbreviation: abbr)
+        }
+        super.init(identifier: identifier, title: " ")
         timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(updateTime), userInfo: nil, repeats: true)
-        self.view = button
+        isBordered = false
         updateTime()
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     @objc func updateTime() {
-        button.title = self.dateFormatter.string(from: Date())
+        title = dateFormatter.string(from: Date())
     }
-    
 }

MTMR/Widgets/VolumeViewController.swift

@@ -1,55 +1,56 @@
-import Cocoa
 import AppKit
 import AVFoundation
+import Cocoa
 import CoreAudio
 
 class VolumeViewController: NSCustomTouchBarItem {
     private(set) var sliderItem: CustomSlider!
-    
+
     init(identifier: NSTouchBarItem.Identifier, image: NSImage? = nil) {
         super.init(identifier: identifier)
-        
+
         var forPropertyAddress = AudioObjectPropertyAddress(
             mSelector: kAudioHardwareServiceDeviceProperty_VirtualMasterVolume,
             mScope: kAudioDevicePropertyScopeOutput,
-            mElement: kAudioObjectPropertyElementMaster)
-        
+            mElement: kAudioObjectPropertyElementMaster
+        )
+
         AudioObjectAddPropertyListenerBlock(defaultDeviceID, &forPropertyAddress, nil, audioObjectPropertyListenerBlock)
-        
-        if (image == nil) {
+
+        if image == nil {
             sliderItem = CustomSlider()
         } else {
             sliderItem = CustomSlider(knob: image!)
         }
         sliderItem.target = self
-        sliderItem.action =  #selector(VolumeViewController.sliderValueChanged(_:))        
+        sliderItem.action = #selector(VolumeViewController.sliderValueChanged(_:))
         sliderItem.minValue = 0.0
         sliderItem.maxValue = 100.0
-        sliderItem.floatValue = getInputGain()*100
+        sliderItem.floatValue = getInputGain() * 100
 
-        self.view = sliderItem
+        view = sliderItem
     }
-    
-    func audioObjectPropertyListenerBlock (numberAddresses: UInt32, addresses: UnsafePointer<AudioObjectPropertyAddress>) {
+
+    func audioObjectPropertyListenerBlock(numberAddresses _: UInt32, addresses _: UnsafePointer<AudioObjectPropertyAddress>) {
         DispatchQueue.main.async {
             self.sliderItem.floatValue = self.getInputGain() * 100
         }
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
     deinit {
         sliderItem.unbind(NSBindingName.value)
     }
-    
+
     @objc func sliderValueChanged(_ sender: Any) {
         if let sliderItem = sender as? NSSlider {
-            _ = setInputGain(Float32(sliderItem.intValue)/100.0)
+            _ = setInputGain(Float32(sliderItem.intValue) / 100.0)
         }
     }
-    
+
     private var defaultDeviceID: AudioObjectID {
         var deviceID: AudioObjectID = AudioObjectID(0)
         var size: UInt32 = UInt32(MemoryLayout<AudioObjectID>.size)
@@ -60,7 +61,7 @@ class VolumeViewController: NSCustomTouchBarItem {
         AudioObjectGetPropertyData(AudioObjectID(kAudioObjectSystemObject), &address, 0, nil, &size, &deviceID)
         return deviceID
     }
-    
+
     private func getInputGain() -> Float32 {
         var volume: Float32 = 0.5
         var size: UInt32 = UInt32(MemoryLayout.size(ofValue: volume))
@@ -71,16 +72,16 @@ class VolumeViewController: NSCustomTouchBarItem {
         AudioObjectGetPropertyData(defaultDeviceID, &address, 0, nil, &size, &volume)
         return volume
     }
-    
+
     private func setInputGain(_ volume: Float32) -> OSStatus {
         var inputVolume: Float32 = volume
-        
+
         if inputVolume == 0.0 {
-           _ = setMute( mute: 1)
+            _ = setMute(mute: 1)
         } else {
-            _ = setMute( mute: 0)
+            _ = setMute(mute: 0)
         }
-        
+
         let size: UInt32 = UInt32(MemoryLayout.size(ofValue: inputVolume))
         var address: AudioObjectPropertyAddress = AudioObjectPropertyAddress()
         address.mScope = AudioObjectPropertyScope(kAudioDevicePropertyScopeOutput)
@@ -88,8 +89,8 @@ class VolumeViewController: NSCustomTouchBarItem {
         address.mSelector = AudioObjectPropertySelector(kAudioHardwareServiceDeviceProperty_VirtualMasterVolume)
         return AudioObjectSetPropertyData(defaultDeviceID, &address, 0, nil, size, &inputVolume)
     }
-    
-    private func setMute( mute: Int) -> OSStatus {
+
+    private func setMute(mute: Int) -> OSStatus {
         var muteVal: Int = mute
         var address: AudioObjectPropertyAddress = AudioObjectPropertyAddress()
         address.mSelector = AudioObjectPropertySelector(kAudioDevicePropertyMute)
@@ -99,4 +100,3 @@ class VolumeViewController: NSCustomTouchBarItem {
         return AudioObjectSetPropertyData(defaultDeviceID, &address, 0, nil, size, &muteVal)
     }
 }
-

MTMR/Widgets/WeatherBarItem.swift

@@ -10,49 +10,48 @@ import Cocoa
 import CoreLocation
 
 class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
-    private let activity = NSBackgroundActivityScheduler(identifier: "com.toxblh.mtmr.weather.updatecheck")
+    private let activity: NSBackgroundActivityScheduler
     private var units: String
     private var api_key: String
     private var units_str = "°F"
     private var prev_location: CLLocation!
     private var location: CLLocation!
-    private let iconsImages = ["01d": "☀️", "01n": "☀️", "02d":  "⛅️", "02n":  "⛅️", "03d": "☁️", "03n": "☁️", "04d": "☁️", "04n": "☁️", "09d": "⛅️", "09n": "⛅️", "10d": "🌦", "10n": "🌦", "11d": "🌩", "11n": "🌩", "13d": "❄️", "13n": "❄️", "50d": "🌫", "50n": "🌫"]
-    private let iconsText = ["01d": "☀", "01n": "☀", "02d":  "☁", "02n":  "☁", "03d": "☁", "03n": "☁", "04d": "☁", "04n": "☁", "09d": "☂", "09n": "☂", "10d": "☂", "10n": "☂", "11d": "☈", "11n": "☈", "13d": "☃", "13n": "☃", "50d": "♨", "50n": "♨"]
+    private let iconsImages = ["01d": "☀️", "01n": "☀️", "02d": "⛅️", "02n": "⛅️", "03d": "☁️", "03n": "☁️", "04d": "☁️", "04n": "☁️", "09d": "⛅️", "09n": "⛅️", "10d": "🌦", "10n": "🌦", "11d": "🌩", "11n": "🌩", "13d": "❄️", "13n": "❄️", "50d": "🌫", "50n": "🌫"]
+    private let iconsText = ["01d": "☀", "01n": "☀", "02d": "☁", "02n": "☁", "03d": "☁", "03n": "☁", "04d": "☁", "04n": "☁", "09d": "☂", "09n": "☂", "10d": "☂", "10n": "☂", "11d": "☈", "11n": "☈", "13d": "☃", "13n": "☃", "50d": "♨", "50n": "♨"]
     private var iconsSource: Dictionary<String, String>
-    
-    private var manager:CLLocationManager!
-    
-    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text", onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+
+    private var manager: CLLocationManager!
+
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text") {
+        activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
         activity.interval = interval
         self.units = units
         self.api_key = api_key
-        
+
         if self.units == "metric" {
             units_str = "°C"
         }
-        
+
         if self.units == "imperial" {
             units_str = "°F"
         }
-        
+
         if icon_type == "images" {
             iconsSource = iconsImages
         } else {
             iconsSource = iconsText
         }
-        
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
 
-        self.view = button
-        
+        super.init(identifier: identifier, title: "⏳")
+
         let status = CLLocationManager.authorizationStatus()
         if status == .restricted || status == .denied {
             print("User permission not given")
             return
         }
-        
+
         if !CLLocationManager.locationServicesEnabled() {
-            print("Location services not enabled");
+            print("Location services not enabled")
             return
         }
 
@@ -63,43 +62,43 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
             completion(NSBackgroundActivityScheduler.Result.finished)
         }
         updateWeather()
-        
+
         manager = CLLocationManager()
         manager.delegate = self
         manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
         manager.startUpdatingLocation()
     }
-    
-    required init?(coder: NSCoder) {
+
+    required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     @objc func updateWeather() {
-        if self.location != nil {
-            let urlRequest = URLRequest(url: URL(string: "https://api.openweathermap.org/data/2.5/weather?lat=\(location.coordinate.latitude)&lon=\(location.coordinate.longitude)&units=\(self.units)&appid=\(self.api_key)")!)
-            
-            let task = URLSession.shared.dataTask(with: urlRequest) { (data, response, error) in
-                
+        if location != nil {
+            let urlRequest = URLRequest(url: URL(string: "https://api.openweathermap.org/data/2.5/weather?lat=\(location.coordinate.latitude)&lon=\(location.coordinate.longitude)&units=\(units)&appid=\(api_key)")!)
+
+            let task = URLSession.shared.dataTask(with: urlRequest) { data, _, error in
+
                 if error == nil {
                     do {
-                        let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String : AnyObject]
+                        let json = try JSONSerialization.jsonObject(with: data!, options: .mutableContainers) as! [String: AnyObject]
 //                        print(json)
                         var temperature: Int!
                         var condition_icon = ""
-                        
-                        if let main = json["main"] as? [String : AnyObject] {
+
+                        if let main = json["main"] as? [String: AnyObject] {
                             if let temp = main["temp"] as? Double {
                                 temperature = Int(temp)
                             }
                         }
-                        
+
                         if let weather = json["weather"] as? NSArray, let item = weather[0] as? NSDictionary {
                             let icon = item["icon"] as! String
                             if let test = self.iconsSource[icon] {
                                 condition_icon = test
                             }
                         }
-                        
+
                         if temperature != nil {
                             DispatchQueue.main.async {
                                 self.setWeather(text: "\(condition_icon) \(temperature!)\(self.units_str)")
@@ -110,31 +109,30 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
                     }
                 }
             }
-            
+
             task.resume()
         }
     }
-    
+
     func setWeather(text: String) {
-        button.title = text
+        title = text
     }
-    
-    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+
+    func locationManager(_: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
         let lastLocation = locations.last!
-        self.location = lastLocation
+        location = lastLocation
         if prev_location == nil {
             updateWeather()
         }
         prev_location = lastLocation
     }
-    
-    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-        print(error);
+
+    func locationManager(_: CLLocationManager, didFailWithError error: Error) {
+        print(error)
     }
-    
-    func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
+
+    func locationManager(_: CLLocationManager, didChangeAuthorization _: CLAuthorizationStatus) {
 //        print("inside didChangeAuthorization ");
         updateWeather()
     }
-    
 }

MTMR/Widgets/WidgetProtocol.swift

@@ -0,0 +1,12 @@
+//
+//  WidgetProtocol.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 20/10/2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+protocol Widget {
+    static var name: String { get }
+    static var identifier: String { get }
+}

MTMR/Widgets/YandexWeatherBarItem.swift

@@ -0,0 +1,145 @@
+//
+//  YandexWeatherBarItem.swift
+//  MTMR
+//
+//  Created by bobrosoft on 22/07/2019.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+import CoreLocation
+
+class YandexWeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
+    private let activity: NSBackgroundActivityScheduler
+    private let unitsStr = "°C"
+    private let iconsSource = ["Ясно": "☀️", "Малооблачно": "🌤", "Облачно с прояснениями": "⛅️", "Пасмурно": "☁️", "Небольшой дождь": "🌦", "Дождь": "🌧", "Ливень": "⛈", "Гроза": "🌩", "Небольшой снег": "❄️", "Снег": "🌨", "Туман": "🌫"]
+    private var location: CLLocation!
+    private var prevLocation: CLLocation!
+    private var manager: CLLocationManager!
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval) {
+        activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
+        activity.interval = interval
+        
+        super.init(identifier: identifier, title: "⏳")
+        
+        let status = CLLocationManager.authorizationStatus()
+        if status == .restricted || status == .denied {
+            print("User permission not given")
+            return
+        }
+        
+        if !CLLocationManager.locationServicesEnabled() {
+            print("Location services not enabled")
+            return
+        }
+        
+        activity.repeats = true
+        activity.qualityOfService = .utility
+        activity.schedule { (completion: NSBackgroundActivityScheduler.CompletionHandler) in
+            self.updateWeather()
+            completion(NSBackgroundActivityScheduler.Result.finished)
+        }
+        updateWeather()
+        
+        manager = CLLocationManager()
+        manager.delegate = self
+        manager.desiredAccuracy = kCLLocationAccuracyHundredMeters
+        manager.startUpdatingLocation()
+        
+        tapClosure = tapClosure ?? defaultTapAction
+    }
+    
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func updateWeather() {
+        var urlRequest = URLRequest(url: URL(string: getWeatherUrl())!)
+        urlRequest.addValue("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36", forHTTPHeaderField: "user-agent") // important for the right format
+        
+        let task = URLSession.shared.dataTask(with: urlRequest) { data, _, error in
+            guard error == nil, let response = data?.utf8string else {
+                return
+            }
+//            print(response)
+            
+            var matches: [[String]]
+            var temperature: String?
+            matches = response.matchingStrings(regex: "fact__temp.*?temp__value.*?>(.*?)<")
+            temperature = matches.first?.item(at: 1)
+            
+            var icon: String?
+            matches = response.matchingStrings(regex: "link__condition.*?>(.*?)<")
+            icon = matches.first?.item(at: 1)
+            if let _ = icon, let test = self.iconsSource[icon!] {
+                icon = test
+            }
+            
+            if temperature != nil {
+                DispatchQueue.main.async {
+                    self.setWeather(text: "\(icon ?? "?") \(temperature!)\(self.unitsStr)")
+                }
+            }
+        }
+        
+        task.resume()
+    }
+    
+    func getWeatherUrl() -> String {
+        if location != nil {
+            return "https://yandex.ru/pogoda/?lat=\(location.coordinate.latitude)&lon=\(location.coordinate.longitude)"
+        } else {
+            return "https://yandex.ru/pogoda/" // Yandex will try to determine your location by default
+        }
+    }
+    
+    func setWeather(text: String) {
+        title = text
+    }
+    
+    func defaultTapAction() {
+        print(getWeatherUrl())
+        if let url = URL(string: getWeatherUrl()) {
+            NSWorkspace.shared.open(url)
+        }
+    }
+    
+    func locationManager(_: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        let lastLocation = locations.last!
+        location = lastLocation
+        if prevLocation == nil {
+            updateWeather()
+        }
+        prevLocation = lastLocation
+    }
+    
+    func locationManager(_: CLLocationManager, didFailWithError error: Error) {
+        print(error)
+    }
+    
+    func locationManager(_: CLLocationManager, didChangeAuthorization _: CLAuthorizationStatus) {
+        updateWeather()
+    }
+}
+
+extension String {
+    func matchingStrings(regex: String) -> [[String]] {
+        guard let regex = try? NSRegularExpression(pattern: regex, options: []) else { return [] }
+        let nsString = self as NSString
+        let results  = regex.matches(in: self, options: [], range: NSMakeRange(0, nsString.length))
+        return results.map { result in
+            (0..<result.numberOfRanges).map {
+                result.range(at: $0).location != NSNotFound
+                    ? nsString.substring(with: result.range(at: $0))
+                    : ""
+            }
+        }
+    }
+}
+
+extension Array {
+    func item(at index: Int) -> Element? {
+        return indices.contains(index) ? self[index] : nil
+    }
+}

MTMR/defaultPreset.json

@@ -1,78 +1,89 @@
 [
-  { "type": "escape", "align": "left" },
-  { "type": "exitTouchbar", "width": 44, "align": "left" },
-  { "type": "brightnessDown", "width": 44, "align": "left" },
   {
-    "type": "brightness",
-    "width": 60,
+    "type": "escape",
+    "width": 64,
+    "align": "left"
+  },
+  {
+    "type": "dnd",
     "align": "left",
-    "image": {
-      "base64":
-        "iVBORw0KGgoAAAANSUhEUgAAAIAAAACAAQMAAAD58POIAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURffLOPfLNyaSVzUAAAACdFJOU/kBxOqnWgAAAbJJREFUSMfVljtyhDAQBVulQCFH4CgcDR1NR9ERFBKoeA5GfGddtkNvwFINFKP5tED22+Zxwviv6QVKfIEc/iNoF5gkpLIeYI8SUp4PsAUJiekADQntF6isQjvxCTrhAJlFqMMBeIH9BMsD7DAb2BhvYbIyNAOCZIWqYKGTpDZJFQu9EKVd44RxQRq3IrULWD62C8wSssWUZEsR0k6wcDOrJZmoBpMKI+s5qkBQCQOUJADVOECdOsDS0gDbsgHMfT4rVwHSrZQFIN5ABka8BgDgAeZ+BztBgvUEnSgVlhNsTFJjvoF5HAZorBpdYKAiSRbqNyBIUr6AjZMdPwO72R40MElS+wZUWA+wQ6LAYkFvdIhkmA+wQSDDdIAGAZ6A34H0x0fca11gBZZsIHSIfnE/5+NjCn/OuiuUB+/aunZwDeNayjXdTpDN0wlY+r1PfWu75nfj8RogN2JuCN2Y5qgMwTI0wGPUnQw6Qarx0sVNKA5Mn6VUL22lIbZoYitDbPmlvocc9Umfl2D7adz1reC3pF8av4m+DCenp/ndZuG3E7fhuC3pH2+vnz8V3MfE+bnxBTXuuIMTrLWHAAAAAElFTkSuQmCC"
-    }
+    "width": 38
   },
-  { "type": "brightnessUp", "width": 44, "align": "left" },
+  { "type": "brightnessDown", "width": 32, "bordered": false, "align": "left" },
+  { "type": "brightnessUp", "width": 32, "bordered": false, "align": "left" },
+
+  // Spotify
   {
     "type": "appleScriptTitledButton",
     "source": {
-      "inline":
-        "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+      "inline": "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
     },
     "action": "appleScript",
     "actionAppleScript": {
-      "inline":
-        "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
+      "inline": "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
     },
     "refreshInterval": 1,
     "image": {
-      "base64":
-        "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"
+      "base64": "iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAYUExURUdwTB3WXx3UXh3VXx7XYBkXFRpVLRyURmIaeAQAAAAEdFJOUwDDO3fSqUUkAAABbklEQVRIx61VbW6DMAztoAeYNA7ApB6gkzhAWS24wIAL0HABaK6/pHFNEhy8TXu/kPzkPD/8cTj8K7KPAqB+K5NhQPCUrABCXe7HOUYYZxgVRLiG8RfY4DUgFFtC7cffAfZTFBwBdhWEKfgEq4ocEjgj4ZQifO6/QG9kkETp1dDeVWfRKx3XYSW0LoqY5kCElXDrQkyeCCuh6WL0M4nIWQIyzqixdfKU1koFDKvyCA8NJMzU4xiD+b4kfHRpsIyKc6hBwjVptFHVY51EMAINNDFGJITKDNQcdpX74Hz0CQ3rY5qwMp4EIxrlafzrsYZ2Veb0DkRgfNCUok4Y1fqEijfyi2b8RE9beWqa48Y/uvCNMcH9btfUi+/CGLR1vhL6Zz9N/vBlaCU+7lwY/cmJ67Ryen/2tj23PLqJBodZH8vgj544vOL4pxfI5acrSFxi8hrkU9TSKr78ZpnL50A8KPJJEo+afBblwyqf5j/iGys5j6ScrST2AAAAAElFTkSuQmCC"
     }
   },
+
+  // iTunes
   {
     "type": "appleScriptTitledButton",
     "source": {
-      "inline":
-        "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+      "inline": "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
     },
     "action": "appleScript",
     "actionAppleScript": {
-      "inline":
-        "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
+      "inline": "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
     },
-    "refreshInterval": 1,
+    "longAction": "appleScript",
+    "longActionAppleScript": {
+      "inline": "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rprev track\rend if\rend tell\rend if\r"
+    },
+    "refreshInterval": 2,
     "image": {
-      "base64":
-        "iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAYUExURUdwTB3WXx3UXh3VXx7XYBkXFRpVLRyURmIaeAQAAAAEdFJOUwDDO3fSqUUkAAABbklEQVRIx61VbW6DMAztoAeYNA7ApB6gkzhAWS24wIAL0HABaK6/pHFNEhy8TXu/kPzkPD/8cTj8K7KPAqB+K5NhQPCUrABCXe7HOUYYZxgVRLiG8RfY4DUgFFtC7cffAfZTFBwBdhWEKfgEq4ocEjgj4ZQifO6/QG9kkETp1dDeVWfRKx3XYSW0LoqY5kCElXDrQkyeCCuh6WL0M4nIWQIyzqixdfKU1koFDKvyCA8NJMzU4xiD+b4kfHRpsIyKc6hBwjVptFHVY51EMAINNDFGJITKDNQcdpX74Hz0CQ3rY5qwMp4EIxrlafzrsYZ2Veb0DkRgfNCUok4Y1fqEijfyi2b8RE9beWqa48Y/uvCNMcH9btfUi+/CGLR1vhL6Zz9N/vBlaCU+7lwY/cmJ67Ryen/2tj23PLqJBodZH8vgj544vOL4pxfI5acrSFxi8hrkU9TSKr78ZpnL50A8KPJJEo+afBblwyqf5j/iGys5j6ScrST2AAAAAElFTkSuQmCC"
+      "base64": "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"
     }
   },
+  { "type": "displaySleep", "width": 40, "align": "right", "bordered": false },
+  {
+    "type": "weather",
+    "align": "right",
+    "icon_type": "images",
+    "api_key": "ca93a0bb8cdb428552660d83249e4bc9",
+    "bordered": false
+  },
   {
-    "type": "appleScriptTitledButton",
-    "source": {
-      "inline":
-        "if application \"VOX\" is running then\rtell application \"VOX\"\rif player state is 1 then\rreturn (get artist) & \" – \" & (get track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
-    },
-    "action": "appleScript",
-    "actionAppleScript": {
-      "inline":
-        "if application \"VOX\" is running then\rtell application \"VOX\"\rif player state is 1 then\rnext\rend if\rend tell\rend if\r"
-    },
-    "refreshInterval": 1,
-    "image": {
-      "base64":
-        "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"
-    }
+    "type": "volumeDown",
+    "bordered": false,
+    "align": "right",
+    "width": 28
   },
-  { "type": "previous", "width": 44 },
-  { "type": "play", "width": 44 },
-  { "type": "next", "width": 44 },
-  { "type": "weather", "icon_type": "images", "units": "metric" },
-  { "type": "currency", "from": "BTC", "to": "USD" },
-  { "type": "sleep", "width": 44 },
-  { "type": "mute", "width": 40, "align": "right" },
-  { "type": "volumeDown", "width": 34, "align": "right" },
-  { "type": "volume", "width": 60, "align": "right" },
-  { "type": "volumeUp", "width": 34, "align": "right" },
-  { "type": "battery", "align": "right" },
-  { "type": "timeButton", "align": "right" }
+  {
+    "type": "volumeUp",
+    "bordered": false,
+    "align": "right",
+    "width": 28
+  },
+  {
+    "type": "play",
+    "align": "right",
+    "width": 38
+  },
+  {
+    "type": "battery",
+    "align": "right",
+    "bordered": false
+  },
+  {
+    "type": "timeButton",
+    "formatTemplate": "HH:mm",
+    "align": "right",
+    "bordered": false,
+    "longAction": "shellScript",
+    "longExecutablePath": "/usr/bin/pmset",
+    "longShellArguments": ["sleepnow"]
+  }
 ]

MTMR/dsa_pub.pem

@@ -0,0 +1,36 @@
+-----BEGIN PUBLIC KEY-----
+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
+35sZE2RHp4aEb9WceYHpjz8orPiLHJ/7OPbZ
+-----END PUBLIC KEY-----

MTMRTests/AppleScriptDefinitionTests.swift

@@ -0,0 +1,39 @@
+import XCTest
+
+class AppleScriptDefinitionTests: XCTestCase {
+    func testInline() {
+        let buttonNoActionFixture = """
+            [  { "type": "appleScriptTitledButton",  "source": { "inline":  "tell everything fine" } } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .appleScriptTitledButton(let source, _)? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(source.string, "tell everything fine")
+    }
+
+    func testPath() {
+        let buttonNoActionFixture = """
+            [  { "type": "appleScriptTitledButton",  "source": { "filePath":  "/ololo/pew" } } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .appleScriptTitledButton(let source, _)? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        let sourceStruct = source as? Source
+        XCTAssertEqual(sourceStruct?.filePath, "/ololo/pew")
+    }
+
+    func testRefreshInterval() {
+        let buttonNoActionFixture = """
+            [  { "type": "appleScriptTitledButton",  "source": { "inline":  "tell everything fine" },  "refreshInterval": 305} ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .appleScriptTitledButton(_, 305)? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+    }
+}

MTMRTests/BackgroundColorTests.swift

@@ -0,0 +1,27 @@
+import XCTest
+
+class BackgroundColorTests: XCTestCase {
+    func testOpaque() {
+        let buttonNoActionFixture = """
+            [  { "type": "staticButton",  "title": "Pew", "background": "#FF0000" } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case let .background(color)? = result?.first?.additionalParameters[.background] else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(color, .red)
+    }
+
+    func testAlpha() {
+        let buttonNoActionFixture = """
+            [  { "type": "staticButton",  "title": "Pew", "background": "#FF000080" } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case let .background(color)? = result?.first?.additionalParameters[.background] else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(color.alphaComponent, 0.5, accuracy: 0.01)
+    }
+}

MTMRTests/ParseConfigTests.swift

@@ -1,15 +1,19 @@
 import XCTest
-@testable import MTMR
 
 class ParseConfig: XCTestCase {
-    
     func testButtonNoAction() {
         let buttonNoActionFixture = """
             [  { "type": "staticButton",  "title": "Pew" } ]
         """.data(using: .utf8)!
         let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
-        XCTAssertEqual(result?.first?.type, .staticButton(title: "Pew"))
-        XCTAssertEqual(result?.first?.action, .some(.none))
+        guard case .staticButton("Pew")? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        guard case .none? = result?.first?.action else {
+            XCTFail()
+            return
+        }
     }
 
     func testButtonKeyCodeAction() {
@@ -17,17 +21,47 @@ class ParseConfig: XCTestCase {
             [  { "type": "staticButton",  "title": "Pew", "action": "hidKey", "keycode": 123} ]
         """.data(using: .utf8)!
         let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture)
-        XCTAssertEqual(result?.first?.type, .staticButton(title: "Pew"))
-        XCTAssertEqual(result?.first?.action, .hidKey(keycode: 123))
+        guard case .staticButton("Pew")? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        guard case .hidKey(keycode: 123)? = result?.first?.action else {
+            XCTFail()
+            return
+        }
     }
-    
+
     func testPredefinedItem() {
         let buttonKeycodeFixture = """
-            [  { "type": "brightnessUp" } ]
+            [  { "type": "escape" } ]
         """.data(using: .utf8)!
         let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture)
-        XCTAssertEqual(result?.first?.type, .staticButton(title: "🔆"))
-        XCTAssertEqual(result?.first?.action, .keyPress(keycode: 113))
+        guard case .staticButton("esc")? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        guard case .keyPress(keycode: 53)? = result?.first?.action else {
+            XCTFail()
+            return
+        }
+    }
+
+    func testExtendedWidthForPredefinedItem() {
+        let buttonKeycodeFixture = """
+            [  { "type": "escape", "width": 110}, ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture)
+        guard case .staticButton("esc")? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        guard case .keyPress(keycode: 53)? = result?.first?.action else {
+            XCTFail()
+            return
+        }
+        guard case .width(110)? = result?.first?.additionalParameters[.width] else {
+            XCTFail()
+            return
+        }
     }
-    
 }

README.md

@@ -1,96 +1,124 @@
+# My touchbar. My rules. [![GitHub release](https://img.shields.io/github/release/toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/releases) [![license](https://img.shields.io/github/license/Toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/blob/master/LICENSE)![minimal system requirements](https://img.shields.io/badge/required-macOS%2010.12.2-blue.svg) ![travis](https://travis-ci.org/Toxblh/MTMR.svg?branch=master)
+
+<img src="Resources/logo.png" align="right"
+     title="MTMR by Toxblh" width="110" height="110">
+
+_The TouchBar Customization App for your MacBook Pro_
+
+My idea is to create a platform for creating plugins to customize the TouchBar. I very much like BTT and having a full custom TouchBar (my BTT preset), and I wanted to create it. It's my first Swift project for MacOS :)
+
+**Share your presets [here](https://github.com/Toxblh/MTMR-presets)**
 
 <p align="center">
-    <img src="Resources/logo.png" width="120">
+  <img src="./Resources/aaaaa-acc6-17fee7572ed0.png" alt="Mackbook with touchbar" width="800">
 </p>
 
-# My TouchBar. My rules
-[![GitHub release](https://img.shields.io/github/release/toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/releases)
-
 <p align="center">
-    <img src="Resources/TouchBar-v0.8.1.png">
+<a href="https://discord.gg/CmNcDuQ"><img height="20px" src="https://camo.githubusercontent.com/88f53948f291c54736bf08f5fd7b037a848dfc62/68747470733a2f2f646973636f72646170702e636f6d2f6173736574732f30376463613830613130326434313439653937333664346231363263666636662e69636f"> Discord</a>
+<a href="https://t.me/joinchat/AmVYGg8vW38c13_3MxdE_g"><img height="20px" src="https://telegram.org/img/t_logo.png" /> Telegram</a>
 </p>
 
-My the idea is to create the program like a platform for plugins for customization TouchBar. I very like BTT and a full custom TouchBar (my [BTT preset](https://github.com/Toxblh/btt-touchbar-preset)). And I want to create it. And it's my the first Swift project for MacOS :)
-
-### Roadmap
-- [x] Create the first prototype with TouchBar in Storyboard
-- [x] Put in stripe menu on startup the application
-- [x] Find how to simulate real buttons like brightness, volume, night shift and etc.
-- [x] Time in touchbar!
-- [x] First the weather plugin
-- [x] Find how to open full-screen TouchBar without the cross and stripe menu
-- [x] Find how to add haptic feedback
-- [x] Add icon and menu in StatusBar
-- [x] Hide from Dock
-- [x] Status menu: "preferences", "quit"
-- [x] JSON or another approch for save preset, maybe in `~/Library/Application Support/MTMR/`
-- [x] Custom buttons size, actions by click
-- [x] Layout: [always left, NSSliderView for center, always right]
-- [ ] Overwrite default values from item types (e.g. title for brightness)
-- [ ] Custom settings for paddings and margins for buttons
-- [ ] XPC Service for scripts
-- [ ] UI for settings
-- [ ] Import config from BTT
-- [ ] System for autoupdate (maybe https://sparkle-project.org/)
-
-Settings:
-- [ ] Intarface for plugins and export like presets
-- [ ] Startup at login
-- [ ] Show on/off in Dock
-- [ ] Show on/off in StatusBar
-- [ ] On/off Haptic Feedback
-
-Maybe:
-- [ ] Refactoring the application on packages (AppleScript, JavaScript? and Swift?)
-
+<p align="center"><a href="https://www.paypal.me/toxblh/10" title="Donate via Paypal"><img height="36px" src="Resources/support_paypal.svg" alt="PayPal donate button" /></a>
+<a href="https://www.buymeacoffee.com/toxblh" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" height="36px" ></a>
+<a href="https://www.patreon.com/bePatron?u=9900748"><img height="36px"  src="https://c5.patreon.com/external/logo/become_a_patron_button.png" srcset="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png 2x"></a>
+<a href="https://www.producthunt.com/posts/my-touchbar-my-rules-mtmr">
+    <img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=my-touchbar-my-rules-mtmr&theme=light" alt="My TouchBar My Rules (MTMR)" height="36px" style="max-width:100%">
+</a></p>
 
 ## Installation
-1. Download last release [Releases](https://github.com/Toxblh/MTMR/releases)
-3. Open MTMR
-4. Open preset `open ~/Library/Application\ Support/MTMR/items.json` and customize it. Restart MTMR to apply changes.
 
-## Preset
+- Download lastest [release](https://github.com/Toxblh/MTMR/releases) (.dmg) from github
+- Or via Homebrew `brew cask install mtmr`
+- [Dario Prski](https://medium.com/@urdigitalpulse) has written a [fantastic article on medium](https://medium.com/@urdigitalpulse/customise-your-macbook-pro-touch-bar-966998e606b5) that goes into more detail on installing MTMR
 
-File for customize your preset for MTMR: `open ~/Library/Application\ Support/MTMR/items.json`
+**On first install** you need to allow access for MTMR in Accessibility otherwise buttons like <kbd>Esc</kbd>, <kbd>Volume</kbd>, <kbd>Brightness</kbd> and other system keys won't work
+
+<p align="center">
+<img width="450" alt="screenshot 2019-02-24 at 23 19 20" src="https://user-images.githubusercontent.com/2198153/53307057-2b078200-388c-11e9-8212-8c2b1aff0aa6.png">
+</p>
+
+<p align="center">
+🍏→ System Preferences → Security and Privacy → tab Privacy → Accessibility → MTMR
+</p>
+
+## Examples
+
+- [@Toxblh preset](Resources/toxblh.json)
+- [@ReDetection preset](Resources/ReDetection.json)
+- [@luongvo209 preset](Resources/luongvo209.json)
+- [aadi_vs_anand preset](Resources/aadi_vs_anand.json)
+
+<p align="center">
+  <img src="./Resources/Artboard.png" alt="Presets for touchbar" width="800">
+</p>
+
+## Customization
+
+MTMR preferences are stored under `~/Library/Application\ Support/MTMR/items.json`.
+
+The pre-installed configuration contains less or more than you'll probably want, try to configure:
 
 ## Built-in button types:
 
+> Buttons
+
 - escape
 - exitTouchbar
 - brightnessUp
 - brightnessDown
+- illuminationUp (keyboard illumination)
+- illuminationDown (keyboard illumination)
 - volumeDown
 - volumeUp
 - mute
-- dock
 
 > Native Plugins
+
 - battery
 - currency
 - weather
+- yandexWeather
+- inputsource
+- music (tap for pause, longTap for next)
+- dock (half-long click to open app, full-long click to kill app)
+- nightShift
+- dnd (Don't disturb)
+- darkMode
+- pomodoro
+- network
 
 > Media Keys
+
 - previous
 - play
 - next
 
 > AppleScript plugins
+
 - sleep
 - displaySleep
 
+## Gestures on central part:
+
+- two finger slide: change you Volume
+- three finger slide: change you Brightness
+
 ## Built-in slider types:
 
 - brightness
 - volume
 
-### You can also make a custom buttons using these types
+### You can also make custom buttons using these types
+
 - `staticButton`
+
 ```json
  "type": "staticButton",
  "title": "esc",
 ```
 
 - `appleScriptTitledButton`
+
 ```js
     "type": "appleScriptTitledButton",
     "refreshInterval": 60, //optional
@@ -104,47 +132,152 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
 ```
 
 - `timeButton`
+
 ```js
   "type": "timeButton",
   "formatTemplate": "HH:mm" //optional
 ```
 
+## Groups
+
+```js
+{
+"type": "group",
+"align": "center",
+"bordered": true,
+"title": "stats",
+"items": [
+    { "type": "play" }, { "type": "mute" }, ...]
+}
+```
+
+To close a group, use the button:
+
+```
+{
+"type": "close",
+"width": 64
+},
+```
+
 ## Native plugins
-- `weather`
-> Provider: https://openweathermap.org Need allowance location service
+
+#### `timeButton`
+
+> Attention! Works not all: https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
+
+```js
+{
+  "type": "timeButton",
+  "formatTemplate": "dd HH:mm",
+  "timeZone": "UTC"
+}
+```
+
+#### `weather`
+
+> Provider: https://openweathermap.org \
+> Note: you need to register on https://openweathermap.org to get your API key \
+> Note: you may need to wait for near 20 mins until your API key will be activated by Openweathermap \
+> Note: you need to allow using "Location Services" in your Mac OS "Security & Privacy" settings for MTMR
+
 ```js
   "type": "weather",
-  "refreshInterval": 600,
+  "refreshInterval": 600, // in seconds
   "units": "metric", // or imperial
   "icon_type": "text" // or images
   "api_key": "" // you can get the key on openweather
 ```
 
-- `currency`
+#### `yandexWeather` (experimental)
+
+> Provider: https://yandex.ru/pogoda. One click to open up weather forecast in your browser. \
+> Note: you need to allow using "Location Services" in your Mac OS "Security & Privacy" settings for MTMR
+
+```js
+  "type": "yandexWeather",
+  "refreshInterval": 600 // in seconds
+```
+
+#### `currency`
+
 > Provider: https://coinbase.com
+
 ```js
   "type": "currency",
-  "refreshInterval": 600,
+  "refreshInterval": 600, // in seconds
   "align": "right",
   "from": "BTC",
   "to": "USD",
+  "full": true // £‣1.29$
+```
+
+#### `music`
+
+```js
+{
+  "type": "music",
+  "align": "center",
+  "width": 80, // Optional
+  "bordered": false, // Optional
+  "refreshInterval": 2, // in seconds. Optional. Default 5 seconds
+  "disableMarquee": true // to disable marquee effect. Optional. Default false
+},
+```
+
+#### `pomodoro`
+
+> Pomodoro plugin. One click to start the work timer, longclick to start the rest timer. Click in progress for reset.
+
+```js
+{
+  "type": "pomodoro",
+  "workTime": 1200, // set time work in seconds. Default 1500 (25 min)
+  "restTime": 600 // set time rest in seconds. Default 300 (5 min)
+},
+```
+
+#### `network`
+
+> Network plugin. The plugin to show usage a network
+
+```js
+{
+  "type": "network",
+  "flip": true
+},
+```
+
+#### `dock`
+
+> Dock plugin
+
+```js
+{
+  "type": "dock",
+  "autoResize": true
+},
 ```
 
 ## Actions:
+
 - `hidKey`
-> https://github.com/aosm/IOHIDFamily/blob/master/IOHIDSystem/IOKit/hidsystem/ev_keymap.h use only numbers
+  > https://github.com/aosm/IOHIDFamily/blob/master/IOHIDSystem/IOKit/hidsystem/ev_keymap.h use only numbers
+
 ```json
  "action": "hidKey",
  "keycode": 53,
 ```
 
 - `keyPress`
+
 ```json
  "action": "keyPress",
  "keycode": 1,
 ```
 
 - `appleScript`
+
 ```js
  "action": "appleScript",
  "actionAppleScript": {
@@ -154,6 +287,7 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
 ```
 
 - `shellScript`
+
 ```js
  "action": "shellScript",
  "executablePath": "/usr/bin/pmset",
@@ -162,87 +296,84 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
 ```
 
 - `openUrl`
+
 ```js
  "action": "openUrl",
  "url": "https://google.com",
 ```
 
-## Additional paramaters:
+## LongActions
+
+If you want to longPress for some operations, it is similar to the configuration for Actions but with additional parameters, for example:
+
+```js
+ "longAction": "hidKey",
+ "longKeycode": 53,
+```
+
+- longAction
+- longKeycode
+- longActionAppleScript
+- longExecutablePath
+- longShellArguments
+- longUrl
+
+## Additional parameters:
+
+- `width` restrict how much room a particular button will take
 
-- `width` allow to restrict how much room a particular button will take
 ```json
   "width": 34
 ```
 
 - `align` can stick the item to the side. default is center
+
 ```js
-  "align": "left" //or "right" or "center"
+  "align": "left" // "left", "right" or "center"
 ```
 
-## Example configuration:
-```json
-[
-  { "type": "escape", "width": 110 },
-  { "type": "exitTouchbar", "align": "left" },
-  {
-    "type": "brightnessUp",
-    "align": "left",
-    "width": 36
-  },
-  {
-    "type": "staticButton",
-    "align": "left",
-    "title": "🔆",
-    "action": "keyPress",
-    "keycode": 113,
-    "width": 36
-  },
+- `bordered` you can do button without border
 
-  {
-    "type": "appleScriptTitledButton",
-    "source": {
-      "filePath": "/Users/toxblh/Library/Application Support/MTMR/iTunes.nowPlaying.scpt"
-    },
-    "refreshInterval": 1
-  },
- {
-    "type": "staticButton",
-    "align": "left",
-    "image": { "base64" : "%base64Finder%"},
-    "action": "appleScript",
-    "actionAppleScript": {
-        "inline": "tell application \"Finder\"\rmake new Finder window\rset target of front window to path to home folder as string\ractivate\rend tell"
-    },
-    "width": 36
-  },
-  {
-    "type": "appleScriptTitledButton",
-    "source": {
-      "inline": "if application \"Safari\" is running then\r\ttell application \"Safari\"\r\t\trepeat with t in tabs of windows\r\t\t\ttell t\r\t\t\t\tif URL starts with \"https:\/\/music.yandex.ru\" and name does not end with \"на Яндекс.Музыке\" then\r\t\t\t\t\treturn name of t as text\r\t\t\t\tend if\r\t\t\tend tell\r\t\tend repeat\r\tend tell\rend if\rreturn \"\""
-    },
-    "refreshInterval": 1
-  },
-  { "type": "previous", "width": 36, "align": "right" },
-  { "type": "play", "width": 36, "align": "right" },
-  { "type": "next", "width": 36, "align": "right" },
-  { "type": "sleep", "width": 36 , "align": "right"},
-  { "type": "displaySleep", "align": "right" },
-  { "type": "weather", "refreshInterval": 1800, "width": 70, "align": "right" },
-  { "type": "volumeDown", "width": 36 , "align": "right"},
-  { "type": "volumeUp", "width": 36 , "align": "right"},
-  { "type": "battery", "refreshInterval": 60 , "align": "right"},
-  { "type": "appleScriptTitledButton", "refreshInterval": 1800, "source": { "filePath": "/Users/redetection/Library/Application Support/MTMR/Weather.scpt"} , "align": "right"},
-  { "type": "timeButton", "formatTemplate": "HH:mm", "width": 64, "align": "right" }
-]
+```js
+  "bordered": "false" // "true" or "false"
 ```
 
+### Roadmap
 
-### Author's presets
+- [x] Create the first prototype with TouchBar in Storyboard
+- [x] Put in stripe menu on startup the application
+- [x] Find how to simulate real buttons like brightness, volume, night shift and etc.
+- [x] Time in touchbar!
+- [x] First the weather plugin
+- [x] Find how to open full-screen TouchBar without the cross and stripe menu
+- [x] Find how to add haptic feedback
+- [x] Add icon and menu in StatusBar
+- [x] Hide from Dock
+- [x] Status menu: "preferences", "quit"
+- [x] JSON or another approch for save preset, maybe in `~/Library/Application Support/MTMR/`
+- [x] Custom buttons size, actions by click
+- [x] Layout: [always left, NSSliderView for center, always right]
+- [x] System for autoupdate (https://sparkle-project.org/)
+- [ ] Overwrite default values from item types (e.g. title for brightness)
+- [ ] Custom settings for paddings and margins for buttons
+- [ ] XPC Service for scripts
+- [ ] UI for settings
+- [ ] Import config from BTT
 
-[@Toxblh preset](Resources/toxblh.json)
+Settings:
 
-[@ReDetection preset](Resources/ReDetection.json)
+- [ ] Interface for plugins and export like presets
+- [x] Startup at login
+- [ ] Show on/off in Dock
+- [ ] Show on/off in StatusBar
+- [ ] On/off Haptic Feedback
+
+Maybe:
+
+- [ ] Refactoring the application into packages (AppleScript, JavaScript? and Swift?)
 
 ## Credits
 
 Built by [@Toxblh](https://patreon.com/toxblh) and [@ReDetection](http://patreon.com/ReDetection).
+
+[![Analytics](https://ga-beacon.appspot.com/UA-96373624-2/mtmr?pixel)](https://github.com/igrigorik/ga-beacon)

Resources/aadi_vs_anand.json

@@ -0,0 +1,129 @@
+[
+  { "type": "escape", "align": "left" },
+  // --- iTunes ---
+  {
+    "type": "appleScriptTitledButton",
+    "source": {
+      "inline":
+        "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+    },
+    "action": "appleScript",
+    "actionAppleScript": {
+      "inline":
+        "if application \"iTunes\" is running then\rtell application \"iTunes\"\rif player state is playing then\rnext track\rend if\rend tell\rend if\r"
+    },
+    "refreshInterval": 1,
+    "image": {
+      "base64":
+        "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"
+    }
+  },
+  
+  // --- VOX ---
+  // {
+  //   "type": "appleScriptTitledButton",
+  //   "source": {
+  //     "inline":
+  //       "if application \"VOX\" is running then\rtell application \"VOX\"\rif player state is 1 then\rreturn (get artist) & \" – \" & (get track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+  //   },
+  //   "action": "appleScript",
+  //   "actionAppleScript": {
+  //     "inline":
+  //       "if application \"VOX\" is running then\rtell application \"VOX\"\rif player state is 1 then\rnext\rend if\rend tell\rend if\r"
+  //   },
+  //   "refreshInterval": 1,
+  //   "image": {
+  //     "base64":
+  //       "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAADAUExURUdwTHd7gqeqtKClrd/k7n+Di7e7xI6TnNHX4cPI0Xp9hJibpOfs9u/1/vX7/rq/yZiborK3wEpOUxgYFlFXYiIhHycpLD9ESjI0NgsLCj09O4SKk19lcbBkALhoAHJ3gT8rAzMvJJugqKhcAL5xAOSxB4I/AJ5SAGpweXuAiZJJAG8zAeXr9WNiYM+NANqeAMd9APHACfr9/e7JPrO5w6mrsA4bKC0gCHhtTyAYBFcpAZduKK2JP/fost/Eb5SUlFFfi9AAAAASdFJOUwDJE9FgWjb+/vyHppTXtbn9mDupvZ0AAAdoSURBVFjDlZcLQ6O6FoWrtgI+Owl5EGgp2DrEgnV6wD4c7f//V3ftAE7nzOj17NGxpayPtXfSZGcw+CjOh1c3N9eIm5ur4fngv8Xp8KZE+F2U5bq8GZ5+WU5qP6jzsRdTeF7e1AEoN8Ovya/LMsg9mxZJErpIksJarwnK8nr4FblfQ52EDOH0zL1KUuvVfnn9eTVOryCPoVZQuGj/FOApMAhx9Uktzq/L2ksT3FuQhIVVVVRVRa+SogA1KbzgExPD0s/xdBOmKdOqODR95IdEaZba0LAkbfzyg0rA/pgekxZKV4cmtxXTEmFUEufNodIKYJjLkcbf9UEM90mqZJU3qeJRxDkXAv/hlbJNXkmVJjCBNP5CGPq1TZSyiWB5XomIi+woRBSJKj8YUVgFQ4E//FMfQM8s40VTyIhDpLVRNIJKaWLwSNqm4mEMl/YPwrkP/9AbER+UkxtWbbcvLrbbkBlCcDa23BABHn4bi1PSM2a1PFgZwbwJty+TybSLyeRlyxQlIuNY6FgpDKd/PB+uXP2tFHEheCtvhW3Q65dtiEyQRixMrBjG4uo4gTpNFApvU9Kr6sWp77qY3BFj8lLBBJdpykOLwaqPkgioAEnFi1RCz7Z3uJ2U37sgCBB3W5ZJLm0VJQmVIXgfgSAvQpYK1ACDx7bTOT2dlA8uWsYEl0EQ3KDUKcOECvqRCGgGpApXf9M/PNx3QQwyMZ9uGWZWiGelsFAHvQFUMEx4WAku2HZC+k6+vF/ip0U4wmSrBJcFZgss9xZuYYAlWhaGC1PhMb1++R6EaAl3lRFcFUI5C7duDlAFwpCzSogsfCH93fdWvm+jRYCASs5fwkyIinGsVrBAc2FYxwVLlKhgQG3n8+kv/WwjhNhsZvveQ5+EqrhKWOHVlMNtgyUkhHkpdPjy1CZA+pl4bkOIfWcBQ/EEC1xWWmKxsi6HussA9WUwQBV0BmbPz3y32+x2nD8/z/okpvM5LAjGeEg51JiFtQeAEqHhWUIGJq0B0m9mLjYdgSxMnQVhGHIIkcP5YNjEAGjJJDfF5AnzzRnY/9K3hP3SjSUAk0oLzaQOwyJGEb41FgWVuOIymHYZCKfPGFaxzBHEcQ5cYrXD3LHNt8E3WkdDbpBY8vMdMHsW0Jui9v26MCDAggNMAfgZoghGdIDbPMXewY0RWfHzqQMsN2QgC/MAkVcZWZi1DuYAJJlQBlVM0vx2cDZOw4QAPEt/AcTzDgkkh3w8Hh8SPZvtKIc2haefKapo2mE4G5x5nQOuLQA0jwggCcAqF1SFnZQEwEwCwGZ0P+sAXQqa69gBJvgeLCUBhMS6arSWogV0NWwB2gHG5KAggDYO0OXQATghJP4QIPsFiJHCEYB2YgBE5gBzNxEyjVHYcOxKKDfquRE6u39wFXh6dADJaccG4HLsANIIEb89PnaEvSYLG2kYAG0G+3YMnh4fDxbfe4wkAS47gAAyShsA2iSWUgsiYHfJMCF2ZKDVA9AkET4WbhgvB6OxxeoiuZZRVT/2BFjQfOemMX53qNn+e5fA42OtAOCYiYXNR4PznL4LJoLA1G8rQjjCTCmxc9+GzU4oNXvonr9avTUZPc7QdyHH0j4mgIqQVZQHq1VvAgRKf7MRKISZPWAG0ONXq1Vg6WYahMIbYz24pJ6ECYIyf7EiBBGm3/da0c6KX/ifTnv9P74iu66G3iUAI4+KoCNpeNS8rha9ifnkfmlcLO+n816+WL3mEVVcY2ew4xEtqsgBjUWEQkWsfFssWhdgPM0xoBg8iKl2JF8s3kpngCtMo3jsNljkUDAmYQFVWC9+tAgHeQ93AR/8WKw9d6MMWWFdBn0OJsJsjERZLn4QomOsWmmrpk9Kn0eYxpGiMfBG7dZ0FrcW8B2N1PoV9zkEUehn1b2hy68lxg/F0owVaXzW7Y0j6kwZuiqhUIaW8M54F9Olcq0irF0R1vAkfTdAFmwaKhjDUgfCur39n+NwF9ZrFhnMWm5YiM737L0/GHkxtYD4RKIWILz1+jf86/Vv69I4fSTRTNojAxgIdPUgCE7VjXhzhHAEJ1/nUUSl4qTHKeDyuMnCycCzjiCwyUYsWK9fofzhxIC8rtcBi2SlqPeEnu7/rekGwcutwhTHhKoYHlWvEa8u6FVN17D/Or3Ncfu/Wu5R7I2bmNECRiYYRpuaYtKiBa+0u0j9K7aguMFZZvTvVvUCFuoce5ygSmA9xlcRDR8iyzaZqVq50Coc1zBw8WezfBEfmqBGX+8QXLs1HY9tV3aMMeQSp4A6aP6qdx4aNHyMWnxBHbpwzTIW9vadkGTf/1BPdYhxsqrR7zuGoD4/6pp+iKVkaY3zWGxHHx55TuJxXZa1RSmwIyAyeoGVlf4wG9CBLD755Nx1ehHHub9e+3lBpxUh+0DuuO4ef/H5AXR0gkpg+EofjQed1ej8VsTuEk6T8cno/54cRyc2zms3Bcr+4Esvazz9C/IOYWlESNseoWtU3n5V3tYCDEA8tAce5j3enFyc/scT/Pno4qSLi9HHhf8f8eOIRf9lFswAAAAASUVORK5CYII="
+  //   }
+  // },
+  { "type": "dock", "width": 200, "align": "left"}, 
+  //{ "type": "button", "title": "alfred"}, 
+  //{ "type": "volume", "width": 160, "align": "right"},
+  { 
+  "type": "group",
+  "align": "right", 
+  "bordered": false,
+  "title": "Media",
+  "items": [
+   {"type": "close", "bordered": false, "align": "left"}, 
+   {
+    "type": "brightnessDown",
+    "bordered": false,
+    "align": "left",
+    "width": 36
+  },
+   { 
+    "type": "brightness",
+    "width": 200,
+    "align": "left",
+    "image": {
+      "base64":
+        "iVBORw0KGgoAAAANSUhEUgAAAIAAAACAAQMAAAD58POIAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURffLOPfLNyaSVzUAAAACdFJOU/kBxOqnWgAAAbJJREFUSMfVljtyhDAQBVulQCFH4CgcDR1NR9ERFBKoeA5GfGddtkNvwFINFKP5tED22+Zxwviv6QVKfIEc/iNoF5gkpLIeYI8SUp4PsAUJiekADQntF6isQjvxCTrhAJlFqMMBeIH9BMsD7DAb2BhvYbIyNAOCZIWqYKGTpDZJFQu9EKVd44RxQRq3IrULWD62C8wSssWUZEsR0k6wcDOrJZmoBpMKI+s5qkBQCQOUJADVOECdOsDS0gDbsgHMfT4rVwHSrZQFIN5ABka8BgDgAeZ+BztBgvUEnSgVlhNsTFJjvoF5HAZorBpdYKAiSRbqNyBIUr6AjZMdPwO72R40MElS+wZUWA+wQ6LAYkFvdIhkmA+wQSDDdIAGAZ6A34H0x0fca11gBZZsIHSIfnE/5+NjCn/OuiuUB+/aunZwDeNayjXdTpDN0wlY+r1PfWu75nfj8RogN2JuCN2Y5qgMwTI0wGPUnQw6Qarx0sVNKA5Mn6VUL22lIbZoYitDbPmlvocc9Umfl2D7adz1reC3pF8av4m+DCenp/ndZuG3E7fhuC3pH2+vnz8V3MfE+bnxBTXuuIMTrLWHAAAAAElFTkSuQmCC"
+    }
+  },
+  {
+    "type": "brightnessUp",
+    "bordered": false,
+    "align": "left",
+    "width": 36
+  },
+  {
+    "type": "volumeDown",
+    "bordered": false,
+    "align": "left",
+    "width": 36,
+  },
+  { "type": "volume", "width": 200, "align": "left"},
+  {
+    "type": "volumeUp",
+    "bordered": false,
+    "align": "left",
+    "width": 36
+  },
+   {"type": "previous", "bordered": false, "align": "center"},
+    //{"type": "play", "bordered": false, "align": "center"}, 
+    
+    {
+     "type": "appleScriptTitledButton",
+     "align": "center",
+     "source": {
+       "inline":
+         "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rreturn (get artist of current track) & \" – \" & (get name of current track)\relse\rreturn \"\"\rend if\rend tell\rend if\rreturn \"\"\r"
+     },
+     "action": "appleScript",
+     "actionAppleScript": {
+       "inline":
+         "if application \"Spotify\" is running then\rtell application \"Spotify\"\rif player state is playing then\rpause\rend if\rend tell\rend if\r"
+     },
+     "refreshInterval": 0.0001,
+     "image": {
+       "base64":
+         "iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAYUExURUdwTB3WXx3UXh3VXx7XYBkXFRpVLRyURmIaeAQAAAAEdFJOUwDDO3fSqUUkAAABbklEQVRIx61VbW6DMAztoAeYNA7ApB6gkzhAWS24wIAL0HABaK6/pHFNEhy8TXu/kPzkPD/8cTj8K7KPAqB+K5NhQPCUrABCXe7HOUYYZxgVRLiG8RfY4DUgFFtC7cffAfZTFBwBdhWEKfgEq4ocEjgj4ZQifO6/QG9kkETp1dDeVWfRKx3XYSW0LoqY5kCElXDrQkyeCCuh6WL0M4nIWQIyzqixdfKU1koFDKvyCA8NJMzU4xiD+b4kfHRpsIyKc6hBwjVptFHVY51EMAINNDFGJITKDNQcdpX74Hz0CQ3rY5qwMp4EIxrlafzrsYZ2Veb0DkRgfNCUok4Y1fqEijfyi2b8RE9beWqa48Y/uvCNMcH9btfUi+/CGLR1vhL6Zz9N/vBlaCU+7lwY/cmJ67Ryen/2tj23PLqJBodZH8vgj544vOL4pxfI5acrSFxi8hrkU9TSKr78ZpnL50A8KPJJEo+afBblwyqf5j/iGys5j6ScrST2AAAAAElFTkSuQmCC"
+     }
+  },
+   {"type": "next", "bordered": false, "align": "center"},
+  ]
+},
+  { "type": "inputsource", "align": "right", }, 
+  { "type": "mute", "bordered": false, "align": "right"}, 
+  { "type": "dnd", "align": "right"},
+  { "type": "nightShift", "align": "right"},
+  { "type": "sleep", "align": "right", "bordered": false},
+  { "type": "currency",
+  "refreshInterval": 600, // in seconds
+  "bordered": false,
+  "align": "right",
+  "from": "USD",
+  "to": "HKD",},
+  {
+  "type": "pomodoro",
+  "bordered": false,
+  "align": "right",
+  "workTime": 1800, // set time work in seconds. Default 1500 (25 min)
+  "restTime": 600, // set time rest in seconds. Default 300 (5 min)
+  },
+  { "type": "weather", "refreshInterval": 60, "units": "metric", "align": "right", "bordered": false, "icon_type": "images", "api_key": "84645702688e83a35e2549ca77f73369"},
+  { "type": "battery", "align": "right", "bordered": false },
+  { "type": "timeButton", "align": "right", "formatTemplate": "E MMM d h:mm a", "bordered": false  }
+]

Resources/support_paypal.svg

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 250 49" style="enable-background:new 0 0 250 49;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#189BD7;}
+	.st1{enable-background:new    ;}
+	.st2{fill:#FFFFFF;}
+</style>
+<title>support</title>
+<path class="st0" d="M6.6,0h236.8c3.7,0,6.6,3,6.6,6.6v35.8c0,3.7-3,6.6-6.6,6.6c0,0,0,0,0,0H6.6C3,49,0,46,0,42.4c0,0,0,0,0,0V6.6
+	C0,3,3,0,6.6,0z"/>
+<g class="st1">
+	<path class="st2" d="M25.4,18.8c-0.6-0.8-1.6-1.4-2.9-1.4c-1.4,0-3,0.8-3,2.6c0,1.8,1.5,2.2,3,2.7c2,0.7,4.1,1.3,4.1,4.1
+		c0,2.8-2.3,4-4.6,4c-1.7,0-3.4-0.7-4.4-2.1l1.2-0.9c0.6,1,1.7,1.8,3.2,1.8c1.4,0,3.1-0.9,3.1-2.7c0-2-1.6-2.4-3.4-3
+		c-1.9-0.6-3.8-1.4-3.8-3.9c0-2.7,2.4-3.9,4.5-3.9c1.9,0,3.3,0.8,3.9,1.7L25.4,18.8z"/>
+	<path class="st2" d="M36.4,30.6c0-0.5-0.1-1.2-0.1-1.6h0c-0.5,1.1-1.9,1.8-3.2,1.8c-2.3,0-3.5-1.5-3.5-3.8v-5.7h1.3v5.1
+		c0,1.9,0.6,3.2,2.5,3.2c1.4,0,2.8-1.1,2.8-3.6v-4.7h1.3v7.2c0,0.5,0,1.4,0.1,2H36.4z"/>
+	<path class="st2" d="M42.5,35.3h-1.3v-14h1.3v1.6h0.1c0.8-1.2,2.2-1.8,3.5-1.8c2.9,0,4.8,2.1,4.8,4.9c0,2.7-1.9,4.9-4.8,4.9
+		c-1.3,0-2.7-0.7-3.5-1.8h-0.1V35.3z M45.9,22.2c-2.1,0-3.6,1.6-3.6,3.7c0,2.1,1.5,3.7,3.6,3.7c2.2,0,3.5-1.7,3.5-3.7
+		C49.4,23.9,48.1,22.2,45.9,22.2z"/>
+	<path class="st2" d="M55,35.3h-1.3v-14H55v1.6h0.1c0.8-1.2,2.2-1.8,3.5-1.8c2.9,0,4.8,2.1,4.8,4.9c0,2.7-1.9,4.9-4.8,4.9
+		c-1.3,0-2.7-0.7-3.5-1.8H55V35.3z M58.4,22.2c-2.1,0-3.6,1.6-3.6,3.7c0,2.1,1.5,3.7,3.6,3.7c2.2,0,3.5-1.7,3.5-3.7
+		C61.9,23.9,60.6,22.2,58.4,22.2z"/>
+	<path class="st2" d="M70.4,30.8c-2.9,0-4.9-2.1-4.9-4.9c0-2.8,2.1-4.9,4.9-4.9c2.9,0,4.9,2.1,4.9,4.9
+		C75.4,28.7,73.3,30.8,70.4,30.8z M70.4,22.2c-2.1,0-3.5,1.7-3.5,3.7c0,2.1,1.4,3.7,3.5,3.7c2.2,0,3.5-1.6,3.5-3.7
+		C74,23.9,72.6,22.2,70.4,22.2z"/>
+</g>
+<g class="st1">
+	<path class="st2" d="M78.3,21.3h1.3c0,0.5,0.1,1.2,0.1,1.6h0c0.5-1.1,1.7-1.8,3-1.8c0.3,0,0.6,0,0.9,0.1l-0.2,1.3
+		c-0.2-0.1-0.6-0.1-0.9-0.1c-1.4,0-2.7,1-2.7,3.5v4.7h-1.3v-7.2C78.4,22.9,78.4,22,78.3,21.3z"/>
+</g>
+<g class="st1">
+	<path class="st2" d="M89.5,22.4h-2.6v5.4c0,1.4,0.6,1.7,1.4,1.7c0.4,0,0.8-0.1,1.2-0.3l0.1,1.2c-0.5,0.2-1,0.3-1.6,0.3
+		c-1,0-2.4-0.4-2.4-2.5v-5.8h-1.9v-1.1h1.9v-2.6h1.3v2.6h2.6V22.4z"/>
+	<path class="st2" d="M100.8,30.8c-2.9,0-4.9-2.1-4.9-4.9c0-2.8,2.1-4.9,4.9-4.9c2.9,0,4.9,2.1,4.9,4.9
+		C105.7,28.7,103.7,30.8,100.8,30.8z M100.8,22.2c-2.1,0-3.5,1.7-3.5,3.7c0,2.1,1.4,3.7,3.5,3.7c2.2,0,3.5-1.6,3.5-3.7
+		C104.3,23.9,102.9,22.2,100.8,22.2z"/>
+	<path class="st2" d="M109.8,21.3c0,0.5,0.1,1.2,0.1,1.6h0c0.5-1.1,1.9-1.8,3.2-1.8c2.3,0,3.5,1.5,3.5,3.8v5.7h-1.3v-5.1
+		c0-1.9-0.6-3.2-2.5-3.2c-1.4,0-2.8,1.1-2.8,3.6v4.7h-1.3v-7.2c0-0.5,0-1.4-0.1-2H109.8z"/>
+</g>
+<path class="st2" d="M166,18.3c0.1,0,0.2,0,0.3,0h4.9c1.1-0.1,2.2,0.1,3.2,0.4c0.8,0.2,1.5,0.7,2,1.4c0.5,0.8,0.7,1.8,0.6,2.8
+	c-0.1,0.9-0.3,1.7-0.6,2.5c-0.3,0.8-0.8,1.5-1.4,2.1c-0.9,0.7-2,1.2-3.1,1.4c-1.1,0.1-2.2,0.1-3.3,0.1c-0.3,0-0.5,0.1-0.6,0.4
+	c-0.1,0.2-0.2,0.4-0.2,0.6c-0.2,1.2-0.4,2.4-0.6,3.6c-0.1,0.4-0.4,0.7-0.8,0.7h-2.8c-0.3,0-0.5-0.2-0.5-0.5c0,0,0,0,0-0.1
+	c0.8-4.9,1.5-9.8,2.3-14.6C165.4,18.7,165.7,18.4,166,18.3z M169.1,21.5c-0.1,0.1-0.2,0.3-0.2,0.4c-0.2,1.2-0.4,2.5-0.6,3.7h0.9
+	c0.8,0.1,1.6-0.1,2.3-0.4c0.5-0.3,0.9-0.8,1-1.4c0.2-0.5,0.2-1.1,0-1.6c-0.2-0.4-0.5-0.6-0.9-0.8c-0.7-0.2-1.3-0.2-2-0.2
+	C169.5,21.4,169.3,21.4,169.1,21.5L169.1,21.5z"/>
+<path class="st2" d="M179.3,24.1c1-0.6,2.1-0.9,3.2-0.8c0.9,0,1.7,0.2,2.5,0.6c0.3,0.2,0.5,0.5,0.7,0.8c0.1-0.3,0.1-0.5,0.1-0.8
+	c0.1-0.2,0.3-0.4,0.5-0.4h2.7c0.3,0,0.5,0.2,0.5,0.5c0,0,0,0.1,0,0.1c-0.5,3.1-1,6.2-1.5,9.4c-0.1,0.4-0.4,0.7-0.8,0.7h-2.5
+	c-0.2,0-0.4-0.1-0.5-0.3c0-0.1,0-0.3,0-0.4c0-0.2,0.1-0.4,0.1-0.6c-0.6,0.6-1.3,1-2.1,1.3c-0.9,0.3-1.9,0.3-2.9,0.1
+	c-0.7-0.1-1.4-0.5-2-1c-0.6-0.6-1.1-1.5-1.2-2.4c-0.2-1.1-0.1-2.1,0.2-3.2C176.9,26.2,177.9,24.9,179.3,24.1z M182.6,26.2
+	c-0.6,0.1-1.2,0.3-1.6,0.7c-0.6,0.5-1,1.1-1.1,1.9c-0.1,0.6,0,1.3,0.3,1.8c0.3,0.4,0.7,0.7,1.2,0.8c0.8,0.2,1.7,0.1,2.4-0.3
+	c1.1-0.7,1.7-1.9,1.5-3.2c-0.1-0.6-0.5-1.2-1.1-1.4C183.6,26.2,183.1,26.2,182.6,26.2z"/>
+<path class="st2" d="M191,23.7c0.1-0.1,0.3-0.2,0.5-0.2h2.6c0.2,0,0.4,0.1,0.6,0.2c0.1,0.2,0.2,0.4,0.3,0.6l1.5,5.1
+	c1.2-1.7,2.3-3.5,3.5-5.2c0.1-0.2,0.3-0.4,0.4-0.6c0.2-0.1,0.4-0.2,0.6-0.2c0.9,0,1.8,0,2.7,0c0.3,0,0.5,0.3,0.4,0.5
+	c0,0.1,0,0.2-0.1,0.3l-9.2,13.2c-0.1,0.2-0.4,0.4-0.7,0.4h-2.7c-0.2,0-0.3,0-0.4-0.1c-0.2-0.2-0.2-0.5-0.1-0.7l2.8-3.9
+	c0-0.1,0-0.1,0-0.2l-3-8.8C190.8,24,190.9,23.8,191,23.7z"/>
+<path class="st2" d="M206.9,18.3c0.1,0,0.2,0,0.4,0h5.1c1-0.1,2.1,0.1,3.1,0.4c0.8,0.3,1.4,0.8,1.9,1.5c0.5,0.9,0.7,1.8,0.5,2.8
+	c-0.1,1-0.4,2-0.9,2.9c-0.4,0.8-1,1.5-1.7,2c-0.8,0.5-1.7,0.9-2.7,1c-1.1,0.1-2.2,0.1-3.3,0.1c-0.3,0-0.5,0.2-0.6,0.4
+	c-0.1,0.2-0.1,0.4-0.2,0.6l-0.6,3.8c0,0.3-0.3,0.5-0.5,0.5h-3c-0.3,0-0.5-0.2-0.5-0.5c0,0,0,0,0-0.1c0.8-4.9,1.5-9.8,2.3-14.6
+	C206.3,18.6,206.6,18.4,206.9,18.3z M209.9,21.9c-0.2,1.3-0.4,2.5-0.6,3.8c0.9,0,1.8,0,2.7-0.2c0.5-0.1,0.9-0.4,1.1-0.7
+	c0.3-0.5,0.5-1,0.5-1.5c0.1-0.4-0.1-0.9-0.3-1.3c-0.3-0.3-0.7-0.5-1.1-0.5c-0.6-0.1-1.1-0.1-1.7-0.1
+	C210.1,21.4,209.9,21.6,209.9,21.9C209.9,21.8,209.9,21.8,209.9,21.9L209.9,21.9z"/>
+<path class="st2" d="M233.6,18.3c0.1,0,0.3,0,0.4,0h2.4c0.3,0,0.5,0.2,0.5,0.5c0,0,0,0.1,0,0.1c-0.8,4.9-1.5,9.8-2.3,14.7
+	c-0.1,0.4-0.4,0.7-0.8,0.7h-2.4c-0.3,0-0.5-0.2-0.5-0.5c0,0,0-0.1,0-0.1c0.8-5,1.6-9.9,2.3-14.9C233.2,18.6,233.4,18.4,233.6,18.3z"
+	/>
+<path class="st2" d="M152.5,19c0.8,0.4,1.5,1.2,1.8,2c0.3,1.1,0.4,2.2,0.1,3.3c-0.2,1.5-0.9,3-1.9,4.1c-0.6,0.7-1.4,1.3-2.3,1.6
+	c-1.3,0.5-2.7,0.7-4.1,0.7c-0.3,0-0.6,0-0.8,0.1c-0.3,0.2-0.5,0.5-0.6,0.8c-0.3,1.6-0.5,3.1-0.8,4.7c0,0.2-0.1,0.5-0.1,0.7
+	c-0.1,0.4-0.5,0.7-0.9,0.7H139c-0.2,0-0.5-0.1-0.6-0.3c-0.1-0.2-0.1-0.4,0-0.6c0.1-0.6,0.2-1.3,0.3-1.9c0-0.1,0-0.2,0.1-0.4
+	c0.3-2.3,0.7-4.6,1.1-6.8c0-0.2,0.1-0.4,0.2-0.7c0.2-0.2,0.4-0.4,0.7-0.5c0.3,0,0.6,0,0.9,0c1.2,0,2.4,0,3.6-0.1
+	c1.6-0.2,3.2-0.8,4.5-1.9c1.2-1.1,2-2.4,2.4-3.9C152.3,20.1,152.4,19.6,152.5,19z"/>
+<path class="st2" d="M221.4,23.6c0.9-0.3,1.9-0.4,2.9-0.2c0.6,0.1,1.2,0.3,1.8,0.6c0.2,0.2,0.5,0.4,0.6,0.7c0-0.3,0.1-0.5,0.1-0.8
+	c0.1-0.2,0.3-0.4,0.5-0.3h2.7c0.3,0,0.5,0.2,0.5,0.5c0,0,0,0.1,0,0.1l-1.5,9.3c0,0.4-0.4,0.7-0.8,0.7h-2.5c-0.3,0-0.5-0.2-0.5-0.4
+	c0,0,0,0,0-0.1c0-0.3,0.1-0.5,0.1-0.8c-0.7,0.7-1.5,1.1-2.4,1.4c-0.9,0.2-1.8,0.2-2.7,0c-0.9-0.2-1.6-0.7-2.2-1.3
+	c-0.7-0.9-1-2-1-3.2c0-1.7,0.7-3.4,1.9-4.6C219.7,24.4,220.5,23.9,221.4,23.6z M223.5,26.2c-0.9,0.1-1.8,0.6-2.3,1.4
+	c-0.4,0.7-0.6,1.5-0.5,2.3c0.1,0.6,0.4,1.1,0.9,1.3c0.6,0.3,1.3,0.4,2,0.3c0.8-0.2,1.6-0.7,2-1.4c0.4-0.7,0.6-1.5,0.4-2.3
+	c-0.2-0.6-0.6-1.1-1.1-1.3C224.5,26.2,224.1,26.2,223.5,26.2L223.5,26.2z"/>
+<path class="st2" d="M133.8,34.7c-0.2,0-0.3-0.1-0.3-0.3v-0.2c0.1-0.2,0.1-0.5,0.1-0.7l3.1-19.7c0-0.2,0.1-0.4,0.2-0.6
+	c0.1-0.2,0.3-0.3,0.6-0.3h8.5c1.4,0,2.7,0.3,4,0.9c0.9,0.5,1.7,1.3,2,2.3c0.3,0.9,0.3,1.8,0.1,2.8c-0.1,0.6-0.2,1.1-0.4,1.6
+	c-0.4,1.4-1.2,2.8-2.3,3.8c-1.2,1-2.7,1.6-4.3,1.8c-0.8,0.1-1.6,0.1-2.3,0.1h-1.7c-0.2,0-0.4,0-0.6,0c-0.4,0.1-0.7,0.3-0.9,0.7V27
+	v0.1c-0.1,0.2-0.1,0.5-0.2,0.8c-0.2,1-0.3,2-0.5,3.1c-0.2,1.3-0.4,2.5-0.6,3.8l0,0h-4.6L133.8,34.7z"/>
+<path class="st0" d="M146,13.3c1.3,0,2.6,0.3,3.8,0.9c0.9,0.5,1.5,1.2,1.8,2.1c0.2,0.8,0.3,1.7,0.1,2.6l0,0l0,0
+	c-0.1,0.5-0.2,1-0.4,1.5c-0.4,1.4-1.1,2.6-2.2,3.6c-1.2,1-2.6,1.5-4.1,1.7c-0.8,0.1-1.5,0.1-2.3,0.1h-1.7c-0.2,0-0.4,0-0.6,0.1
+	c-0.5,0.1-0.9,0.4-1.1,0.8l-0.1,0.1V27c-0.1,0.3-0.1,0.5-0.2,0.8c-0.2,1-0.3,2-0.5,3c-0.2,1.2-0.4,2.3-0.6,3.5h-4.2
+	c0.1-0.2,0.1-0.5,0.1-0.7v-0.2l1.1-7.1l1.9-12.1c0-0.1,0-0.1,0-0.2c0-0.1,0-0.3,0.1-0.4c0.1-0.1,0.2-0.1,0.3-0.2L146,13.3 M146,12.5
+	h-8.6c-0.3,0-0.6,0.2-0.8,0.5c-0.2,0.3-0.2,0.6-0.3,0.9l-3,19.3c-0.1,0.3-0.1,0.6-0.2,1v0.3c0.1,0.3,0.3,0.5,0.6,0.6h4.4h0.5
+	c0-0.1,0-0.2,0.1-0.4c0.3-2.3,0.7-4.6,1.1-6.8c0-0.2,0.1-0.4,0.1-0.7c0.2-0.2,0.4-0.4,0.7-0.5c0.2,0,0.3,0,0.5,0h1.7
+	c0.8,0,1.6,0,2.4-0.1c1.6-0.2,3.2-0.8,4.5-1.9c1.2-1.1,2-2.4,2.4-3.9c0.2-0.5,0.3-1.1,0.4-1.7l0,0c0.2-1,0.1-2-0.1-2.9
+	c-0.4-1.1-1.2-2-2.2-2.6c-1.3-0.6-2.7-0.9-4.1-0.9l0,0L146,12.5z"/>
+</svg>

Sparkle.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

Sparkle.framework/Modules

@@ -0,0 +1 @@
+Versions/Current/Modules

Sparkle.framework/PrivateHeaders

@@ -0,0 +1 @@
+Versions/Current/PrivateHeaders

Sparkle.framework/Resources

@@ -0,0 +1 @@
+Versions/Current/Resources

Sparkle.framework/Sparkle

@@ -0,0 +1 @@
+Versions/Current/Sparkle

Sparkle.framework/Versions/A/Headers/SPUDownloadData.h

@@ -0,0 +1,43 @@
+//
+//  SPUDownloadData.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 8/10/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * A class for containing downloaded data along with some information about it.
+ */
+SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
+
+- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType;
+
+/*!
+ * The raw data that was downloaded.
+ */
+@property (nonatomic, readonly) NSData *data;
+
+/*!
+ * The IANA charset encoding name if available. Eg: "utf-8"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName;
+
+/*!
+ * The MIME type if available. Eg: "text/plain"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *MIMEType;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sparkle.framework/Versions/A/Headers/SPUDownloader.h

@@ -0,0 +1,25 @@
+//
+//  SPUDownloader.h
+//  Downloader
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloaderProtocol.h"
+
+@protocol SPUDownloaderDelegate;
+
+// This object implements the protocol which we have defined. It provides the actual behavior for the service. It is 'exported' by the service to make it available to the process hosting the service over an NSXPCConnection.
+@interface SPUDownloader : NSObject <SPUDownloaderProtocol>
+
+// Due to XPC remote object reasons, this delegate is strongly referenced
+// Invoke cleanup when done with this instance
+- (instancetype)initWithDelegate:(id <SPUDownloaderDelegate>)delegate;
+
+@end

Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h

@@ -0,0 +1,38 @@
+//
+//  SPUDownloaderDelegate.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUDownloadData;
+
+@protocol SPUDownloaderDelegate <NSObject>
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory;
+
+// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength;
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveDataOfLength:(uint64_t)length;
+
+// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download
+- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData;
+
+- (void)downloaderDidFailWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h

@@ -0,0 +1,13 @@
+//
+//  SPUDownloaderDeprecated.h
+//  Sparkle
+//
+//  Created by Deadpikle on 12/20/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloader.h"
+
+@interface SPUDownloaderDeprecated : SPUDownloader <SPUDownloaderProtocol>
+
+@end

Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h

@@ -0,0 +1,34 @@
+//
+//  SPUDownloaderProtocol.h
+//  PersistentDownloader
+//
+//  Created by Mayur Pawashe on 4/1/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUURLRequest;
+
+// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service.
+@protocol SPUDownloaderProtocol
+
+- (void)startPersistentDownloadWithRequest:(SPUURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename;
+
+- (void)startTemporaryDownloadWithRequest:(SPUURLRequest *)request;
+
+- (void)downloadDidFinish;
+
+- (void)cleanup;
+
+- (void)cancel;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h

@@ -0,0 +1,20 @@
+//
+//  SPUDownloaderSession.h
+//  Sparkle
+//
+//  Created by Deadpikle on 12/20/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloader.h"
+#import "SPUDownloaderProtocol.h"
+
+NS_CLASS_AVAILABLE(NSURLSESSION_AVAILABLE, 7_0)
+@interface SPUDownloaderSession : SPUDownloader <SPUDownloaderProtocol>
+
+@end

Sparkle.framework/Versions/A/Headers/SPUURLRequest.h

@@ -0,0 +1,35 @@
+//
+//  SPUURLRequest.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 5/19/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+// A class that wraps NSURLRequest and implements NSSecureCoding
+// This class exists because NSURLRequest did not support NSSecureCoding in macOS 10.8
+// I have not verified if NSURLRequest in 10.9 implements NSSecureCoding or not
+@interface SPUURLRequest : NSObject <NSSecureCoding>
+
+// Creates a new URL request
+// Only these properties are currently tracked:
+// * URL
+// * Cache policy
+// * Timeout interval
+// * HTTP header fields
+// * networkServiceType
++ (instancetype)URLRequestWithRequest:(NSURLRequest *)request;
+
+@property (nonatomic, readonly) NSURLRequest *request;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sparkle.framework/Versions/A/Headers/SUAppcast.h

@@ -0,0 +1,35 @@
+//
+//  SUAppcast.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 3/12/06.
+//  Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUAPPCAST_H
+#define SUAPPCAST_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUAppcastItem;
+SU_EXPORT @interface SUAppcast : NSObject
+
+@property (copy, nullable) NSString *userAgentString;
+@property (copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err;
+- (SUAppcast *)copyWithoutDeltaUpdates;
+
+@property (readonly, copy, nullable) NSArray *items;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

Sparkle.framework/Versions/A/Headers/SUAppcastItem.h

@@ -0,0 +1,51 @@
+//
+//  SUAppcastItem.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 3/12/06.
+//  Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUAPPCASTITEM_H
+#define SUAPPCASTITEM_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+SU_EXPORT @interface SUAppcastItem : NSObject
+@property (copy, readonly) NSString *title;
+@property (copy, readonly) NSString *dateString;
+@property (copy, readonly) NSString *itemDescription;
+@property (strong, readonly) NSURL *releaseNotesURL;
+@property (copy, readonly) NSString *DSASignature;
+@property (copy, readonly) NSString *minimumSystemVersion;
+@property (copy, readonly) NSString *maximumSystemVersion;
+@property (strong, readonly) NSURL *fileURL;
+@property (nonatomic, readonly) uint64_t contentLength;
+@property (copy, readonly) NSString *versionString;
+@property (copy, readonly) NSString *osString;
+@property (copy, readonly) NSString *displayVersionString;
+@property (copy, readonly) NSDictionary *deltaUpdates;
+@property (strong, readonly) NSURL *infoURL;
+
+// Initializes with data from a dictionary provided by the RSS class.
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error;
+
+@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
+@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate;
+@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
+
+// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
+@property (readonly, copy) NSDictionary *propertiesDictionary;
+
+- (NSURL *)infoURL;
+
+@end
+
+#endif

Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h

@@ -0,0 +1,22 @@
+//
+//  SUCodeSigningVerifier.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 7/5/12.
+//
+//
+
+#ifndef SUCODESIGNINGVERIFIER_H
+#define SUCODESIGNINGVERIFIER_H
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+SU_EXPORT @interface SUCodeSigningVerifier : NSObject
++ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundlePath matchesSignatureAtBundleURL:(NSURL *)newBundlePath error:(NSError  **)error;
++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundlePath error:(NSError **)error;
++ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundlePath;
++ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath;
+@end
+
+#endif

Sparkle.framework/Versions/A/Headers/SUErrors.h

@@ -0,0 +1,56 @@
+//
+//  SUErrors.h
+//  Sparkle
+//
+//  Created by C.W. Betts on 10/13/14.
+//  Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUERRORS_H
+#define SUERRORS_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+/**
+ * Error domain used by Sparkle
+ */
+SU_EXPORT extern NSString *const SUSparkleErrorDomain;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+typedef NS_ENUM(OSStatus, SUError) {
+    // Appcast phase errors.
+    SUAppcastParseError = 1000,
+    SUNoUpdateError = 1001,
+    SUAppcastError = 1002,
+    SURunningFromDiskImageError = 1003,
+
+    // Download phase errors.
+    SUTemporaryDirectoryError = 2000,
+    SUDownloadError = 2001,
+
+    // Extraction phase errors.
+    SUUnarchivingError = 3000,
+    SUSignatureError = 3001,
+    
+    // Installation phase errors.
+    SUFileCopyFailure = 4000,
+    SUAuthenticationFailure = 4001,
+    SUMissingUpdateError = 4002,
+    SUMissingInstallerToolError = 4003,
+    SURelaunchError = 4004,
+    SUInstallationError = 4005,
+    SUDowngradeError = 4006,
+    SUInstallationCancelledError = 4007,
+    
+    // System phase errors
+    SUSystemPowerOffError = 5000
+};
+#pragma clang diagnostic pop
+
+#endif

Sparkle.framework/Versions/A/Headers/SUExport.h

@@ -0,0 +1,18 @@
+//
+//  SUExport.h
+//  Sparkle
+//
+//  Created by Jake Petroules on 2014-08-23.
+//  Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUEXPORT_H
+#define SUEXPORT_H
+
+#ifdef BUILDING_SPARKLE
+#define SU_EXPORT __attribute__((visibility("default")))
+#else
+#define SU_EXPORT
+#endif
+
+#endif

Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h

@@ -0,0 +1,52 @@
+//
+//  SUStandardVersionComparator.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 12/21/07.
+//  Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUSTANDARDVERSIONCOMPARATOR_H
+#define SUSTANDARDVERSIONCOMPARATOR_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+#import "SUVersionComparisonProtocol.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+    Sparkle's default version comparator.
+
+    This comparator is adapted from MacPAD, by Kevin Ballard.
+    It's "dumb" in that it does essentially string comparison,
+    in components split by character type.
+*/
+SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
+
+/*!
+    Initializes a new instance of the standard version comparator.
+ */
+- (instancetype)init;
+
+/*!
+    Returns a singleton instance of the comparator.
+ 
+    It is usually preferred to alloc/init new a comparator instead.
+*/
++ (SUStandardVersionComparator *)defaultComparator;
+
+/*!
+    Compares version strings through textual analysis.
+
+    See the implementation for more details.
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
+@end
+
+NS_ASSUME_NONNULL_END
+#endif

Sparkle.framework/Versions/A/Headers/SUUpdater.h

@@ -0,0 +1,231 @@
+//
+//  SUUpdater.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 1/4/06.
+//  Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUUPDATER_H
+#define SUUPDATER_H
+
+#if __has_feature(modules)
+@import Cocoa;
+#else
+#import <Cocoa/Cocoa.h>
+#endif
+#import "SUExport.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUVersionDisplayProtocol.h"
+
+@class SUAppcastItem, SUAppcast;
+
+@protocol SUUpdaterDelegate;
+
+/*!
+    The main API in Sparkle for controlling the update mechanism.
+
+    This class is used to configure the update paramters as well as manually
+    and automatically schedule and control checks for updates.
+ */
+SU_EXPORT @interface SUUpdater : NSObject
+
+@property (unsafe_unretained) IBOutlet id<SUUpdaterDelegate> delegate;
+
+/*!
+ The shared updater for the main bundle.
+ 
+ This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle:
+ */
++ (SUUpdater *)sharedUpdater;
+
+/*!
+ The shared updater for a specified bundle.
+
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
+
+/*!
+ Designated initializer for SUUpdater.
+ 
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
+- (instancetype)initForBundle:(NSBundle *)bundle;
+
+/*!
+ Explicitly checks for updates and displays a progress dialog while doing so.
+
+ This method is meant for a main menu item.
+ Connect any menu item to this action in Interface Builder,
+ and Sparkle will check for updates and report back its findings verbosely
+ when it is invoked.
+
+ This will find updates that the user has opted into skipping.
+ */
+- (IBAction)checkForUpdates:(id)sender;
+
+/*!
+ The menu item validation used for the -checkForUpdates: action
+ */
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
+
+/*!
+ Checks for updates, but does not display any UI unless an update is found.
+
+ This is meant for programmatically initating a check for updates. That is,
+ it will display no UI unless it actually finds an update, in which case it
+ proceeds as usual.
+
+ If automatic downloading of updates it turned on and allowed, however,
+ this will invoke that behavior, and if an update is found, it will be downloaded
+ in the background silently and will be prepped for installation.
+
+ This will not find updates that the user has opted into skipping.
+ */
+- (void)checkForUpdatesInBackground;
+
+/*!
+ A property indicating whether or not to check for updates automatically.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property BOOL automaticallyChecksForUpdates;
+
+/*!
+ A property indicating whether or not updates can be automatically downloaded in the background.
+
+ Note that automatic downloading of updates can be disallowed by the developer
+ or by the user's system if silent updates cannot be done (eg: if they require authentication).
+ In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL automaticallyDownloadsUpdates;
+
+/*!
+ A property indicating the current automatic update check interval.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property NSTimeInterval updateCheckInterval;
+
+/*!
+ Begins a "probing" check for updates which will not actually offer to
+ update to that version.
+
+ However, the delegate methods
+ SUUpdaterDelegate::updater:didFindValidUpdate: and
+ SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
+ so you can use that information in your UI.
+
+ Updates that have been skipped by the user will not be found.
+ */
+- (void)checkForUpdateInformation;
+
+/*!
+ The URL of the appcast used to download update information.
+
+ Setting this property will persist in the host bundle's user defaults.
+ If you don't want persistence, you may want to consider instead implementing
+ SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+
+ This property must be called on the main thread.
+ */
+@property (copy) NSURL *feedURL;
+
+/*!
+ The host bundle that is being updated.
+ */
+@property (readonly, strong) NSBundle *hostBundle;
+
+/*!
+ The bundle this class (SUUpdater) is loaded into.
+ */
+@property (strong, readonly) NSBundle *sparkleBundle;
+
+/*!
+ The user agent used when checking for updates.
+
+ The default implementation can be overrided.
+ */
+@property (nonatomic, copy) NSString *userAgentString;
+
+/*!
+ The HTTP headers used when checking for updates.
+
+ The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
+ */
+@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+/*!
+ A property indicating whether or not the user's system profile information is sent when checking for updates.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL sendsSystemProfile;
+
+/*!
+ A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg)
+ */
+@property (nonatomic, copy) NSString *decryptionPassword;
+
+/*!
+    This function ignores normal update schedule, ignores user preferences,
+    and interrupts users with an unwanted immediate app update.
+
+    WARNING: this function should not be used in regular apps. This function
+    is a user-unfriendly hack only for very special cases, like unstable
+    rapidly-changing beta builds that would not run correctly if they were
+    even one day out of date.
+
+    Instead of this function you should set `SUAutomaticallyUpdate` to `YES`,
+    which will gracefully install updates when the app quits.
+
+    For UI-less/daemon apps that aren't usually quit, instead of this function,
+    you can use the delegate method
+    SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation:
+    to immediately start installation when an update was found.
+
+    A progress dialog is shown but the user will never be prompted to read the
+    release notes.
+
+    This function will cause update to be downloaded twice if automatic updates are
+    enabled.
+
+    You may want to respond to the userDidCancelDownload delegate method in case
+    the user clicks the "Cancel" button while the update is downloading.
+ */
+- (void)installUpdatesIfAvailable;
+
+/*!
+    Returns the date of last update check.
+
+    \returns \c nil if no check has been performed.
+ */
+@property (readonly, copy) NSDate *lastUpdateCheckDate;
+
+/*!
+    Appropriately schedules or cancels the update checking timer according to
+    the preferences for time interval and automatic checks.
+
+    This call does not change the date of the next check,
+    but only the internal NSTimer.
+ */
+- (void)resetUpdateCycle;
+
+/*!
+   A property indicating whether or not an update is in progress.
+
+   Note this property is not indicative of whether or not user initiated updates can be performed.
+   Use SUUpdater::validateMenuItem: for that instead.
+ */
+@property (readonly) BOOL updateInProgress;
+
+@end
+
+#endif

Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h

@@ -0,0 +1,301 @@
+//
+//  SUUpdaterDelegate.h
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 12/25/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+@protocol SUVersionComparison, SUVersionDisplay;
+@class SUUpdater, SUAppcast, SUAppcastItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
+#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
+#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+//	SUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+/*!
+ Provides methods to control the behavior of an SUUpdater object.
+ */
+@protocol SUUpdaterDelegate <NSObject>
+@optional
+
+/*!
+ Returns whether to allow Sparkle to pop up.
+ 
+ For example, this may be used to prevent Sparkle from interrupting a setup assistant.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Returns additional parameters to append to the appcast URL's query string.
+ 
+ This is potentially based on whether or not Sparkle will also be sending along the system profile.
+ 
+ \param updater The SUUpdater instance.
+ \param sendingProfile Whether the system profile will also be sent.
+ 
+ \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
+ */
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+/*!
+ Returns a custom appcast URL.
+ 
+ Override this to dynamically specify the entire URL.
+ 
+ An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+ and let the server handle what kind of feed to provide.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns whether Sparkle should prompt the user about automatic update checks.
+ 
+ Use this to override the default behavior.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Called after Sparkle has downloaded the appcast from the remote server.
+ 
+ Implement this if you want to do some special handling with the appcast once it finishes loading.
+ 
+ \param updater The SUUpdater instance.
+ \param appcast The appcast that was downloaded from the remote server.
+ */
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+/*!
+ Returns the item in the appcast corresponding to the update that should be installed.
+ 
+ If you're using special logic or extensions in your appcast,
+ implement this to use your own logic for finding a valid update, if any,
+ in the given appcast.
+ 
+ \param appcast The appcast that was downloaded from the remote server.
+ \param updater The SUUpdater instance.
+ */
+- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
+
+/*!
+ Called when a valid update is found by the update driver.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called when a valid update is not found.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
+
+/*!
+ Called immediately before downloading the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be downloaded.
+ \param request The mutable URL request that will be used to download the update.
+ */
+- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
+
+/*!
+ Called immediately after succesfull download of the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been downloaded.
+ */
+- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called after the specified update failed to download.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that failed to download.
+ \param error The error generated by the failed download.
+ */
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
+
+/*!
+ Called when the user clicks the cancel button while and update is being downloaded.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)userDidCancelDownload:(SUUpdater *)updater;
+
+/*!
+ Called immediately before extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be extracted.
+ */
+- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately after extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been extracted.
+ */
+- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately before installing the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
+
+/*!
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+ 
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch.
+ 
+ \return \c YES to delay the relaunch until \p invocation is invoked.
+ */
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
+
+/*!
+ Returns whether the application should be relaunched at all.
+ 
+ Some apps \b cannot be relaunched under certain circumstances.
+ This method can be used to explicitly prevent a relaunch.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately before relaunching.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Returns an object that compares version numbers to determine their arithmetic relation to each other.
+ 
+ This method allows you to provide a custom version comparator.
+ If you don't implement this method or return \c nil,
+ the standard version comparator will be used.
+ 
+ \sa SUStandardVersionComparator
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns an object that formats version numbers for display to the user.
+ 
+ If you don't implement this method or return \c nil,
+ the standard version formatter will be used.
+ 
+ \sa SUUpdateAlert
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns the path which is used to relaunch the client after the update is installed.
+ 
+ The default is the path of the host bundle.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+
+/*!
+ Called before an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called after an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called when an update is scheduled to be silently installed on quit.
+ This is after an update has been automatically downloaded in the background.
+ (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation Can be used to trigger an immediate silent install and relaunch.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
+
+/*!
+ Calls after an update that was scheduled to be silently installed on quit has been canceled.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that was proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
+
+/*!
+ Called after an update is aborted due to an error.
+ 
+ \param updater The SUUpdater instance.
+ \param error The error that caused the abort
+ */
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h

@@ -0,0 +1,37 @@
+//
+//  SUVersionComparisonProtocol.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 12/21/07.
+//  Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUVERSIONCOMPARISONPROTOCOL_H
+#define SUVERSIONCOMPARISONPROTOCOL_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+    Provides version comparison facilities for Sparkle.
+*/
+@protocol SUVersionComparison
+
+/*!
+    An abstract method to compare two version strings.
+
+    Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a,
+    and NSOrderedSame if they are equivalent.
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD!
+
+@end
+
+NS_ASSUME_NONNULL_END
+#endif

Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h

@@ -0,0 +1,29 @@
+//
+//  SUVersionDisplayProtocol.h
+//  EyeTV
+//
+//  Created by Uli Kusterer on 08.12.09.
+//  Copyright 2009 Elgato Systems GmbH. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+/*!
+    Applies special display formatting to version numbers.
+*/
+@protocol SUVersionDisplay
+
+/*!
+    Formats two version strings.
+
+    Both versions are provided so that important distinguishing information
+    can be displayed while also leaving out unnecessary/confusing parts.
+*/
+- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB;
+
+@end

Sparkle.framework/Versions/A/Headers/Sparkle.h

@@ -0,0 +1,33 @@
+//
+//  Sparkle.h
+//  Sparkle
+//
+//  Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07)
+//  Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SPARKLE_H
+#define SPARKLE_H
+
+// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
+// there are name-space collisions) so we can list all of them to start with:
+
+#import "SUAppcast.h"
+#import "SUAppcastItem.h"
+#import "SUStandardVersionComparator.h"
+#import "SUUpdater.h"
+#import "SUUpdaterDelegate.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUVersionDisplayProtocol.h"
+#import "SUErrors.h"
+
+#import "SPUDownloader.h"
+#import "SPUDownloaderDelegate.h"
+#import "SPUDownloaderDeprecated.h"
+#import "SPUDownloadData.h"
+#import "SPUDownloaderProtocol.h"
+#import "SPUDownloaderSession.h"
+#import "SPUURLRequest.h"
+#import "SUCodeSigningVerifier.h"
+
+#endif