.github/FUNDING.yml

@@ -3,4 +3,4 @@
 issuehunt: Toxblh
 patreon: toxblh
 ko_fi: toxblh
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WUAAG2HH58WE4
+custom: https://www.paypal.me/toxblh

MTMR/BasicView.swift

@@ -15,12 +15,12 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
     var fourfingers: NSPanGestureRecognizer!
     var swipeItems: [SwipeItem] = []
     var prevPositions: [Int: CGFloat] = [2:0, 3:0, 4:0]
-
+    
     // legacy gesture positions
     // by legacy I mean gestures to increse/decrease volume/brigtness which can be checked from app menu
     var legacyPrevPositions: [Int: CGFloat] = [2:0, 3:0, 4:0]
     var legacyGesturesEnabled = false
-
+    
     init(identifier: NSTouchBarItem.Identifier, items: [NSTouchBarItem], swipeItems: [SwipeItem]) {
         super.init(identifier: identifier)
         self.swipeItems = swipeItems
@@ -29,27 +29,27 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
         stackView.spacing = 8
         stackView.orientation = .horizontal
         view = stackView
-
+        
         twofingers = NSPanGestureRecognizer(target: self, action: #selector(twofingersHandler(_:)))
         twofingers.numberOfTouchesRequired = 2
         twofingers.allowedTouchTypes = .direct
         view.addGestureRecognizer(twofingers)
-
+        
         threefingers = NSPanGestureRecognizer(target: self, action: #selector(threefingersHandler(_:)))
         threefingers.numberOfTouchesRequired = 3
         threefingers.allowedTouchTypes = .direct
         view.addGestureRecognizer(threefingers)
-
+        
         fourfingers = NSPanGestureRecognizer(target: self, action: #selector(fourfingersHandler(_:)))
         fourfingers.numberOfTouchesRequired = 4
         fourfingers.allowedTouchTypes = .direct
         view.addGestureRecognizer(fourfingers)
     }
-
+    
     required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
+    
     func gestureHandler(position: CGFloat, fingers: Int, state: NSGestureRecognizer.State) {
         switch state {
         case .began:
@@ -72,9 +72,9 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
                     let prevPos = legacyPrevPositions[fingers]!
                     if ((position - prevPos) > 15) || ((prevPos - position) > 15) {
                         if position > prevPos {
-                            HIDPostAuxKey(NX_KEYTYPE_BRIGHTNESS_UP)
+                            GenericKeyPress(keyCode: CGKeyCode(144)).send()
                         } else if position < prevPos {
-                            HIDPostAuxKey(NX_KEYTYPE_BRIGHTNESS_DOWN)
+                            GenericKeyPress(keyCode: CGKeyCode(145)).send()
                         }
                         legacyPrevPositions[fingers] = position
                     }
@@ -89,7 +89,7 @@ class BasicView: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
             break
         }
     }
-
+    
     @objc func twofingersHandler(_ sender: NSGestureRecognizer?) {
         let position = (sender?.location(in: sender?.view).x)!
         self.gestureHandler(position: position, fingers: 2, state: sender!.state)

MTMR/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.27</string>
+	<string>0.26.1</string>
 	<key>CFBundleVersion</key>
-	<string>434</string>
+	<string>425</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

MTMR/ItemsParsing.swift

@@ -79,7 +79,7 @@ class SupportedTypesHolder {
             return (
                 item: .staticButton(title: ""),
                 actions: [
-                    Action(trigger: .singleTap, value: .hidKey(keycode: NX_KEYTYPE_BRIGHTNESS_UP))
+                    Action(trigger: .singleTap, value: .keyPress(keycode: 144))
                 ],
                 legacyAction: .none,
                 legacyLongAction: .none,
@@ -92,7 +92,7 @@ class SupportedTypesHolder {
             return (
                 item: .staticButton(title: ""),
                 actions: [
-                    Action(trigger: .singleTap, value: .hidKey(keycode: NX_KEYTYPE_BRIGHTNESS_DOWN))
+                    Action(trigger: .singleTap, value: .keyPress(keycode: 145))
                 ],
                 legacyAction: .none,
                 legacyLongAction: .none,

README.md

@@ -18,7 +18,7 @@ My idea is to create a platform for creating plugins to customize the TouchBar.
 <a href="https://t.me/joinchat/AmVYGg8vW38c13_3MxdE_g"><img height="20px" src="https://telegram.org/img/t_logo.png" /> Telegram</a>
 </p>
 
-<p align="center"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WUAAG2HH58WE4" title="Donate via Paypal"><img height="36px" src="Resources/support_paypal.svg" alt="PayPal donate button" /></a>
+<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">
@@ -480,8 +480,8 @@ by using background with color "#000000" and bordered == false you can create bu
 - Opening another program which can't edit text
     1. Open Terminal.app
     2. Put `open -a TextEdit ~/Library/Application\ Support/MTMR/items.json` command and press <kbd>Enter</kbd>
-
+    
-
+    
 #### Buttons or gestures doesn't work:
 - "After the last update my mtmr is not working anymore!"
 - "Buttons sometimes do not trigger action"

build.sh

@@ -63,8 +63,8 @@ echo "<?xml version=\"1.0\" standalone=\"yes\"?>
 echo ""
 echo "Homebrew   https://github.com/Homebrew/homebrew-cask/edit/master/Casks/mtmr.rb"
 echo ""
-echo "  version \"${VERSION}\""
+echo "  version '${VERSION}'"
-echo "  sha256 \"${SHA256}\""
+echo "  sha256 '${SHA256}'"
 echo ""
 echo "Update MTMR v${VERSION}"