patch. work on macos version >=10.12.2

Create LICENSE

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Anton Palgunov
+
+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.

MTMR.xcodeproj/project.pbxproj

@@ -40,6 +40,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		36C2ECD2207B3B1D003CDA33 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		B059D621205E03F5006E6B86 /* TouchBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarController.swift; sourceTree = "<group>"; };
 		B059D623205E04F3006E6B86 /* TouchBarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchBarItems.swift; sourceTree = "<group>"; };
 		B059D629205E13E5006E6B86 /* TouchBarPrivateApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarPrivateApi.h; sourceTree = "<group>"; };
@@ -102,6 +103,7 @@
 		B082B246205C7D8000BC04DC = {
 			isa = PBXGroup;
 			children = (
+				36C2ECD2207B3B1D003CDA33 /* README.md */,
 				B082B251205C7D8000BC04DC /* MTMR */,
 				B082B264205C7D8000BC04DC /* MTMRTests */,
 				B082B26F205C7D8000BC04DC /* MTMRUITests */,
@@ -402,7 +404,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -455,7 +457,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

MTMR/AppDelegate.swift

@@ -14,7 +14,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        TouchBarController.shared.setupControlStripPresence()
+        if #available(OSX 10.12.2, *) {
+            TouchBarController.shared.setupControlStripPresence()
+        } else {
+            // Fallback on earlier versions
+        }
         // Insert code here to initialize your application
     }
 

MTMR/TouchBarController.swift

@@ -8,31 +8,33 @@
 
 import Cocoa
 
+@available(OSX 10.12.2, *)
 class TouchBarController: NSObject, NSTouchBarDelegate {
 
     static let shared = TouchBarController()
-    
+
     let touchBar = NSTouchBar()
-    
+
     var timer = Timer()
     var timeButton: NSButton = NSButton()
-    
+
     private override init() {
         super.init()
         touchBar.delegate = self
         touchBar.defaultItemIdentifiers = [
             .escButton,
-            
+            .dismissButton,
+
             .brightDown,
             .brightUp,
-            
+
             .prev,
             .play,
             .next,
-            
+
             .sleep,
             .weather,
-            
+
             .volumeDown,
             .volumeUp,
             .battery,
@@ -49,26 +51,30 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, true)
         timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(self.updateTime), userInfo: nil, repeats: true)
     }
-    
+
     func updateControlStripPresence() {
         DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, true)
     }
-    
+
     @objc private func presentTouchBar() {
-        NSTouchBar.presentSystemModalFunctionBar(touchBar, systemTrayItemIdentifier: .controlStripItem)
+        NSTouchBar.presentSystemModalFunctionBar(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
     }
-    
-    private func dismissTouchBar() {
+
+    @objc private func dismissTouchBar() {
         NSTouchBar.minimizeSystemModalFunctionBar(touchBar)
     }
-    
+
     func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
         switch identifier {
         case .escButton:
             let item = NSCustomTouchBarItem(identifier: identifier)
             item.view = NSButton(title: "esc", target: self, action: #selector(handleEsc))
             return item
-            
+        case .dismissButton:
+            let item = NSCustomTouchBarItem(identifier: identifier)
+            item.view = NSButton(title: "exit", target: self, action: #selector(dismissTouchBar))
+            return item
+
         case .brightUp:
             let item = NSCustomTouchBarItem(identifier: identifier)
             item.view = NSButton(title: "🔆", target: self, action: #selector(handleBrightUp))
@@ -86,11 +92,11 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             let item = NSCustomTouchBarItem(identifier: identifier)
             item.view = NSButton(title: "🔊", target: self, action: #selector(handleVolumeUp))
             return item
- 
-//        case .prev:
-//            let item = NSCustomTouchBarItem(identifier: identifier)
-//            item.view = NSButton(title: "⏪", target: self, action: #selector(handlePrev))
-//            return item
+
+        case .prev:
+            let item = NSCustomTouchBarItem(identifier: identifier)
+            item.view = NSButton(title: "⏪", target: self, action: #selector(handlePrev))
+            return item
         case .play:
             let item = NSCustomTouchBarItem(identifier: identifier)
             item.view = NSButton(title: "⏯", target: self, action: #selector(handlePlay))
@@ -99,18 +105,18 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             let item = NSCustomTouchBarItem(identifier: identifier)
             item.view = NSButton(title: "⏩", target: self, action: #selector(handleNext))
             return item
-    
+
         case .time:
             let item = NSCustomTouchBarItem(identifier: identifier)
             timeButton = NSButton(title: self.getCurrentTime(), target: self, action: nil)
             item.view = timeButton
             return item
-            
+
         default:
             return nil
         }
     }
-    
+
     func getCurrentTime() -> String  {
         let date = Date()
         let dateFormatter = DateFormatter()
@@ -118,50 +124,50 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         let timestamp = dateFormatter.string(from: date)
         return timestamp
     }
-    
+
     @objc func updateTime() {
         timeButton.title = getCurrentTime()
     }
-    
+
     @objc func handleEsc() {
         let sender = ESCKeyPress()
         sender.send()
     }
-    
+
     @objc func handleVolumeUp() {
         HIDPostAuxKey(Int(NX_KEYTYPE_SOUND_UP))
     }
-    
+
     @objc func handleVolumeDown() {
         HIDPostAuxKey(Int(NX_KEYTYPE_SOUND_DOWN))
     }
-    
+
     @objc func handleBrightDown() {
 //        HIDPostAuxKey(Int(NX_KEYTYPE_BRIGHTNESS_DOWN))
-        
+
         let sender = BrightnessUpPress()
         sender.send()
     }
-    
+
     @objc func handleBrightUp() {
 //        HIDPostAuxKey(Int(NX_KEYTYPE_BRIGHTNESS_UP))
 
         let sender = BrightnessDownPress()
         sender.send()
     }
-    
+
     @objc func handlePrev() {
         HIDPostAuxKey(Int(NX_KEYTYPE_PREVIOUS))
     }
-    
+
     @objc func handlePlay() {
         HIDPostAuxKey(Int(NX_KEYTYPE_PLAY))
     }
-    
+
     @objc func handleNext() {
         HIDPostAuxKey(Int(NX_KEYTYPE_NEXT))
     }
-    
+
 //    func getBattery() {
 //        var error: NSDictionary?
 //        if let scriptObject = NSAppleScript(source: <#T##String#>) {

MTMR/TouchBarItems.swift

@@ -8,8 +8,10 @@
 
 import Cocoa
 
+@available(OSX 10.12.2, *)
 extension NSTouchBarItem.Identifier {
     static let escButton = NSTouchBarItem.Identifier("com.toxblh.mtmr.escButton")
+    static let dismissButton = NSTouchBarItem.Identifier("com.toxblh.mtmr.dismissButton")
     
     // Volume
     static let volumeUp = NSTouchBarItem.Identifier("com.toxblh.mtmr.volumeUp")

README.md

@@ -5,7 +5,7 @@
 # My TouchBar. My rules
 
 <p align="center">
-    <img src="Resources/TouchBarV0.1.png">
+    <img src="Resources/TouchBar-v0.2.png">
 </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. And I want to create it. And it's my the first Swift project for MacOS :)
@@ -17,6 +17,6 @@ My the idea is to create the program like a platform for plugins for customizati
 - [x] Time in touchbar!
 - [ ] First the weather plugin
 - [ ] Create the same panel like in my [BTT preset](https://github.com/Toxblh/btt-touchbar-preset)
-- [ ] Find how to open full-screen TouchBar without the cross and stripe menu
+- [x] Find how to open full-screen TouchBar without the cross and stripe menu
 - [ ] Find how to add haptic feedback
 - [ ] Refactoring the application on packages (AppleScript, JavaScript? and Swift?)