attempt to add support for Zwift Click v2

Add long press mode option for custom keymaps

.github/FUNDING.yml

@@ -1,3 +1,2 @@
 github: [jonasbark]
-open_collective: jonas-bark1
 custom: ["https://paypal.me/boni"]

.github/workflows/build.yml

@@ -179,6 +179,25 @@ jobs:
       - name: Zip directory (Windows)
         shell: pwsh
         run: |
+  
+          $source = "C:\Windows\System32"
+          $destination = "build\windows\x64\runner\Release"
+          
+          # List of required DLLs
+          $dlls = @("msvcp140.dll", "vcruntime140.dll", "vcruntime140_1.dll")
+          
+          # Copy each file
+          foreach ($dll in $dlls) {
+            $srcPath = Join-Path $source $dll
+            $destPath = Join-Path $destination $dll
+              
+            if (Test-Path $srcPath) {
+              Copy-Item -Path $srcPath -Destination $destPath -Force
+              Write-Output "Copied $dll to $destination"
+            } else {
+              Write-Warning "$dll not found in $source"
+            }
+          }
           Compress-Archive -Path "build/windows/x64/runner/Release/*" -DestinationPath "build/windows/x64/runner/Release/SwiftControl.windows.zip"
 
       #9 Upload Artifacts

CHANGELOG.md

@@ -1,3 +1,16 @@
+### 2.2.1 (2025-09-09) BETA
+- Attempt to add support for latest Zwift Click v2
+
+### 2.2.0 (2025-09-08)
+- Add Long Press Mode option for custom keymaps - buttons can now send sustained key presses instead of repeated taps, perfect for movement controls in games (fixes #61)
+- Windows: adjust key sending method to improve compatibility with more apps (fixes #62)
+
+### 2.1.0 (2025-07-03)
+- Windows: automatically focus compatible training apps (MyWhoosh, IndieVelo, Biketerra) when sending keystrokes, enabling seamless multi-window usage
+
+### 2.0.9 (2025-05-04)
+- you can now assign Escape and arrow down key to your custom keymap (#18)
+
 ### 2.0.8 (2025-05-02)
 - only use the light theme for the app
 - more troubleshooting information

README.md

@@ -4,7 +4,7 @@
 
 ## Description
 
-With SwiftControl you can control your favorite trainer app using your Zwift Click, Zwift Ride or Zwift Play devices. Here's what you can do with it, depending on your configuration:
+With SwiftControl you can **control your favorite trainer app** using your Zwift Click, Zwift Ride or Zwift Play devices. Here's what you can do with it, depending on your configuration:
 - Virtual Gear shifting
 - Steering / turning
 - adjust workout intensity
@@ -35,22 +35,22 @@ Get the latest version here: https://github.com/jonasbark/swiftcontrol/releases
 
 ## Supported Platforms
 - Android
+  - App is losing connection over time? Read about how to [keep the app alive](https://dontkillmyapp.com/).
 - macOS
 - Windows 
-  - make sure you have installed the "[Microsoft Visual C++ Runtime libraries](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170)"
   - Windows may flag the app as virus. I think it does so because the app does control the mouse and keyboard.
+  - Bluetooth connection unstable? You may need to use an [external Bluetooth adapter](https://github.com/jonasbark/swiftcontrol/issues/14#issuecomment-3193839509).
 - [Web](https://jonasbark.github.io/swiftcontrol/) (you won't be able to do much)
 
 ## Troubleshooting
 - Your Zwift device is found but connection does not work properly? You may need to update the firmware in Zwift Companion app.
-- The Android app is losing connection over time? Read about how to [keep the app alive](https://dontkillmyapp.com/).
 
 ## How does it work?
-The app connects to your Zwift device automatically. 
+The app connects to your Zwift device automatically. It does not connect to your trainer itself.
 
-- When using Android a "click" on a certain part of the screen is simulated to trigger the action.
+- When using Android a touch on a certain part of the screen is simulated to trigger the action.
 - When using macOS or Windows a keyboard or mouse click is used to trigger the action. 
-  - there are predefined Keymaps for MyWhoosh and indieVelo / Training Peaks
+  - there are predefined Keymaps for MyWhoosh, indieVelo / Training Peaks, and others
   - you can also create your own Keymaps for any other app
   - you can also use the mouse to click on a certain part of the screen, or use keyboard shortcuts
 

accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityApi.kt

@@ -4,7 +4,12 @@
 
 
 import android.util.Log
-import io.flutter.plugin.common.*
+import io.flutter.plugin.common.BasicMessageChannel
+import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
+import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
 
@@ -134,7 +139,7 @@ val AccessibilityApiPigeonMethodCodec = StandardMethodCodec(AccessibilityApiPige
 interface Accessibility {
   fun hasPermission(): Boolean
   fun openPermissions()
-  fun performTouch(x: Double, y: Double)
+  fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
   fun controlMedia(action: MediaAction)
 
   companion object {
@@ -184,8 +189,10 @@ interface Accessibility {
             val args = message as List<Any?>
             val xArg = args[0] as Double
             val yArg = args[1] as Double
+            val isKeyDownArg = args[2] as Boolean
+            val isKeyUpArg = args[3] as Boolean
             val wrapped: List<Any?> = try {
-              api.performTouch(xArg, yArg)
+              api.performTouch(xArg, yArg, isKeyDownArg, isKeyUpArg)
               listOf(null)
             } catch (exception: Throwable) {
               wrapError(exception)
@@ -235,9 +242,9 @@ private class AccessibilityApiPigeonStreamHandler<T>(
 }
 
 interface AccessibilityApiPigeonEventChannelWrapper<T> {
-  fun onListen(p0: Any?, sink: PigeonEventSink<T>) {}
+  open fun onListen(p0: Any?, sink: PigeonEventSink<T>) {}
 
-  fun onCancel(p0: Any?) {}
+  open fun onCancel(p0: Any?) {}
 }
 
 class PigeonEventSink<T>(private val sink: EventChannel.EventSink) {
@@ -253,7 +260,7 @@ class PigeonEventSink<T>(private val sink: EventChannel.EventSink) {
     sink.endOfStream()
   }
 }
-
+      
 abstract class StreamEventsStreamHandler : AccessibilityApiPigeonEventChannelWrapper<WindowEvent> {
   companion object {
     fun register(messenger: BinaryMessenger, streamHandler: StreamEventsStreamHandler, instanceName: String = "") {
@@ -266,4 +273,4 @@ abstract class StreamEventsStreamHandler : AccessibilityApiPigeonEventChannelWra
     }
   }
 }
-
+      

accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityPlugin.kt

@@ -51,23 +51,27 @@ class AccessibilityPlugin: FlutterPlugin, Accessibility {
     }, Bundle.EMPTY)
   }
 
-  override fun performTouch(x: Double, y: Double) {
-    Observable.toService?.performTouch(x = x, y = y) ?: error("Service not running")
+  override fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean) {
+    Observable.toService?.performTouch(x = x, y = y, isKeyUp = isKeyUp, isKeyDown = isKeyDown) ?: error("Service not running")
   }
 
   override fun controlMedia(action: MediaAction) {
     val audioService = context.getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
     when (action) {
       MediaAction.PLAY_PAUSE -> {
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
       }
       MediaAction.NEXT -> {
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+      }
+      MediaAction.VOLUME_DOWN -> {
+          audioService.adjustVolume(android.media.AudioManager.ADJUST_LOWER, android.media.AudioManager.FLAG_SHOW_UI)
+      }
+      MediaAction.VOLUME_UP -> {
+          audioService.adjustVolume(android.media.AudioManager.ADJUST_RAISE, android.media.AudioManager.FLAG_SHOW_UI)
       }
-      MediaAction.VOLUME_DOWN -> audioService.adjustVolume(android.media.AudioManager.ADJUST_LOWER, android.media.AudioManager.FLAG_SHOW_UI)
-      MediaAction.VOLUME_UP -> audioService.adjustVolume(android.media.AudioManager.ADJUST_RAISE, android.media.AudioManager.FLAG_SHOW_UI)
     }
   }
 

accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityService.kt

@@ -45,23 +45,20 @@ class AccessibilityService : AccessibilityService(), Listener {
         return outBounds
     }
 
-    private fun simulateTap(x: Double, y: Double) {
-        val gestureBuilder = GestureDescription.Builder()
-        val path = Path()
-        path.moveTo(x.toFloat(), y.toFloat())
-        path.lineTo(x.toFloat()+1, y.toFloat())
-
-        val stroke = StrokeDescription(path, 0, ViewConfiguration.getTapTimeout().toLong())
-        gestureBuilder.addStroke(stroke)
-
-        dispatchGesture(gestureBuilder.build(), null, null)
-    }
 
     override fun onInterrupt() {
         Log.d("AccessibilityService", "Service Interrupted")
     }
 
-    override fun performTouch(x: Double, y: Double) {
-        simulateTap(x, y)
+    override fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean) {
+        val gestureBuilder = GestureDescription.Builder()
+        val path = Path()
+        path.moveTo(x.toFloat(), y.toFloat())
+        path.lineTo(x.toFloat()+1, y.toFloat())
+
+        val stroke = StrokeDescription(path, 0, ViewConfiguration.getTapTimeout().toLong(), isKeyDown)
+        gestureBuilder.addStroke(stroke)
+
+        dispatchGesture(gestureBuilder.build(), null, null)
     }
 }

accessibility/android/src/main/kotlin/de/jonasbark/accessibility/Listener.kt

@@ -8,9 +8,9 @@ object Observable {
 }
 
 interface Listener {
-    fun performTouch(x: Double, y: Double)
+    fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
 }
 
 interface Receiver {
     fun onChange(packageName: String, window: Rect)
-}
+}

accessibility/api.dart

@@ -6,7 +6,7 @@ abstract class Accessibility {
 
   void openPermissions();
 
-  void performTouch(double x, double y);
+  void performTouch(double x, double y, {bool isKeyDown = true, bool isKeyUp = false});
 
   void controlMedia(MediaAction action);
 }

accessibility/lib/accessibility.dart

@@ -187,14 +187,14 @@ class Accessibility {
     }
   }
 
-  Future<void> performTouch(double x, double y) async {
+  Future<void> performTouch(double x, double y, {bool isKeyDown = true, bool isKeyUp = false, }) async {
     final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.performTouch$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[x, y]);
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[x, y, isKeyDown, isKeyUp]);
     final List<Object?>? pigeonVar_replyList =
         await pigeonVar_sendFuture as List<Object?>?;
     if (pigeonVar_replyList == null) {

keypress_simulator/packages/keypress_simulator/lib/src/keypress_simulator.dart

@@ -20,8 +20,12 @@ class KeyPressSimulator {
     return _platform.requestAccess(onlyOpenPrefPane: onlyOpenPrefPane);
   }
 
-  Future<void> simulateMouseClick(Offset position) {
-    return _platform.simulateMouseClick(position);
+  Future<void> simulateMouseClickDown(Offset position) {
+    return _platform.simulateMouseClick(position, keyDown: true);
+  }
+
+  Future<void> simulateMouseClickUp(Offset position) {
+    return _platform.simulateMouseClick(position, keyDown: false);
   }
 
   /// Simulate key down.

keypress_simulator/packages/keypress_simulator_macos/macos/Classes/KeypressSimulatorMacosPlugin.swift

@@ -62,6 +62,7 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
 
         let x: Double = args["x"] as! Double
         let y: Double = args["y"] as! Double
+        let keyDown: Bool = args["keyDown"] as! Bool
 
         let point = CGPoint(x: x, y: y)
 
@@ -72,19 +73,21 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
                            mouseButton: .left)
         move?.post(tap: .cghidEventTap)*/
 
-        // Mouse down
-        let mouseDown = CGEvent(mouseEventSource: nil,
-                                mouseType: .leftMouseDown,
-                                mouseCursorPosition: point,
-                                mouseButton: .left)
-        mouseDown?.post(tap: .cghidEventTap)
-
-        // Mouse up
-        let mouseUp = CGEvent(mouseEventSource: nil,
-                              mouseType: .leftMouseUp,
-                              mouseCursorPosition: point,
-                              mouseButton: .left)
-        mouseUp?.post(tap: .cghidEventTap)
+        if (keyDown) {
+            // Mouse down
+            let mouseDown = CGEvent(mouseEventSource: nil,
+                                    mouseType: .leftMouseDown,
+                                    mouseCursorPosition: point,
+                                    mouseButton: .left)
+            mouseDown?.post(tap: .cghidEventTap)
+        } else {
+            // Mouse up
+            let mouseUp = CGEvent(mouseEventSource: nil,
+                                  mouseType: .leftMouseUp,
+                                  mouseCursorPosition: point,
+                                  mouseButton: .left)
+            mouseUp?.post(tap: .cghidEventTap)
+        }
         result(true)
     }
 

keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_method_channel.dart

@@ -53,10 +53,11 @@ class MethodChannelKeyPressSimulator extends KeyPressSimulatorPlatform {
   }
 
   @override
-  Future<void> simulateMouseClick(Offset position) async {
-    final Map<String, double> arguments = {
+  Future<void> simulateMouseClick(Offset position, {required bool keyDown}) async {
+    final Map<String, Object?> arguments = {
       'x': position.dx,
       'y': position.dy,
+      'keyDown': keyDown,
     };
     await methodChannel.invokeMethod('simulateMouseClick', arguments);
   }

keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_platform_interface.dart

@@ -41,7 +41,7 @@ abstract class KeyPressSimulatorPlatform extends PlatformInterface {
     throw UnimplementedError('simulateKeyPress() has not been implemented.');
   }
 
-  Future<void> simulateMouseClick(Offset position) {
+  Future<void> simulateMouseClick(Offset position, {required bool keyDown}) {
     throw UnimplementedError('simulateKeyPress() has not been implemented.');
   }
 }

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.cpp

@@ -2,6 +2,8 @@
 
 // This must be included before many other Windows headers.
 #include <windows.h>
+#include <psapi.h>
+#include <string.h>
 
 #include <flutter/method_channel.h>
 #include <flutter/plugin_registrar_windows.h>
@@ -16,6 +18,16 @@ using flutter::EncodableValue;
 
 namespace keypress_simulator_windows {
 
+// Forward declarations
+struct FindWindowData {
+  std::string targetProcessName;
+  std::string targetWindowTitle;
+  HWND foundWindow;
+};
+
+BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam);
+HWND FindTargetWindow(const std::string& processName, const std::string& windowTitle);
+
 // static
 void KeypressSimulatorWindowsPlugin::RegisterWithRegistrar(
     flutter::PluginRegistrarWindows* registrar) {
@@ -54,33 +66,43 @@ void KeypressSimulatorWindowsPlugin::SimulateKeyPress(
     modifiers.push_back(key_modifier);
   }
 
-  INPUT input[6];
+  // List of compatible training apps to look for
+  std::vector<std::string> compatibleApps = {
+    "MyWhooshHD.exe",
+    "indieVelo.exe",
+    "biketerra.exe"
+  };
 
-  for (int32_t i = 0; i < modifiers.size(); i++) {
-    if (modifiers[i].compare("shiftModifier") == 0) {
-      input[i].ki.wVk = VK_SHIFT;
-    } else if (modifiers[i].compare("controlModifier") == 0) {
-      input[i].ki.wVk = VK_CONTROL;
-    } else if (modifiers[i].compare("altModifier") == 0) {
-      input[i].ki.wVk = VK_MENU;
-    } else if (modifiers[i].compare("metaModifier") == 0) {
-      input[i].ki.wVk = VK_LWIN;
+  // Try to find and focus a compatible app
+  HWND targetWindow = NULL;
+  for (const std::string& processName : compatibleApps) {
+    targetWindow = FindTargetWindow(processName, "");
+    if (targetWindow != NULL) {
+      // Only focus the window if it's not already in the foreground
+      if (GetForegroundWindow() != targetWindow) {
+        SetForegroundWindow(targetWindow);
+        Sleep(50); // Brief delay to ensure window is focused
+      }
+      break;
     }
-
-    input[i].ki.dwFlags = keyDown ? 0 : KEYEVENTF_KEYUP;
-    input[i].type = INPUT_KEYBOARD;
   }
 
-  /*int keyIndex = static_cast<int>(modifiers.size());
-  input[keyIndex].ki.wVk = static_cast<WORD>(keyCode);
-  input[keyIndex].ki.dwFlags = keyDown ? 0 : KEYEVENTF_KEYUP;
-  input[keyIndex].type = INPUT_KEYBOARD;*/
+  WORD sc = (WORD)MapVirtualKey(keyCode, MAPVK_VK_TO_VSC);
 
-  // Send key sequence to system
-  //SendInput(static_cast<UINT>(std::size(input)), input, sizeof(INPUT));
+  INPUT in = {0};
+  in.type = INPUT_KEYBOARD;
+  in.ki.wVk = 0;                 // when using SCANCODE, set VK=0
+  in.ki.wScan = sc;
+  in.ki.dwFlags = KEYEVENTF_SCANCODE | (keyDown ? 0 : KEYEVENTF_KEYUP);
+  if (keyCode == VK_LEFT || keyCode == VK_RIGHT || keyCode == VK_UP || keyCode == VK_DOWN ||
+    keyCode == VK_INSERT || keyCode == VK_DELETE || keyCode == VK_HOME || keyCode == VK_END ||
+    keyCode == VK_PRIOR || keyCode == VK_NEXT) {
+    in.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+  }
+  SendInput(1, &in, sizeof(INPUT));
 
-  BYTE byteValue = static_cast<BYTE>(keyCode);
-  keybd_event(byteValue, 0x45, keyDown ? 0 : KEYEVENTF_KEYUP, 0);
+  /*BYTE byteValue = static_cast<BYTE>(keyCode);
+  keybd_event(byteValue, 0x45, keyDown ? 0 : KEYEVENTF_KEYUP, 0);*/
 
   result->Success(flutter::EncodableValue(true));
 }
@@ -93,6 +115,7 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
   double x = 0;
   double y = 0;
 
+  bool keyDown = std::get<bool>(args.at(EncodableValue("keyDown")));
   auto it_x = args.find(EncodableValue("x"));
   if (it_x != args.end() && std::holds_alternative<double>(it_x->second)) {
       x = std::get<double>(it_x->second);
@@ -110,17 +133,80 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
   INPUT input = {0};
   input.type = INPUT_MOUSE;
 
-  // Mouse left button down
-  input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
-  SendInput(1, &input, sizeof(INPUT));
+  if (keyDown) {
+      // Mouse left button down
+      input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
+      SendInput(1, &input, sizeof(INPUT));
 
-  // Mouse left button up
-  input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
-  SendInput(1, &input, sizeof(INPUT));
+  } else {
+      // Mouse left button up
+      input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
+      SendInput(1, &input, sizeof(INPUT));
+  }
 
   result->Success(flutter::EncodableValue(true));
 }
 
+BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {
+  FindWindowData* data = reinterpret_cast<FindWindowData*>(lParam);
+
+  // Check if window is visible and not minimized
+  if (!IsWindowVisible(hwnd) || IsIconic(hwnd)) {
+    return TRUE; // Continue enumeration
+  }
+
+  // Get window title
+  char windowTitle[256];
+  GetWindowTextA(hwnd, windowTitle, sizeof(windowTitle));
+
+  // Get process name
+  DWORD processId;
+  GetWindowThreadProcessId(hwnd, &processId);
+  HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
+  char processName[MAX_PATH];
+  if (hProcess) {
+    DWORD size = sizeof(processName);
+    if (QueryFullProcessImageNameA(hProcess, 0, processName, &size)) {
+      // Extract just the filename from the full path
+      char* filename = strrchr(processName, '\\');
+      if (filename) {
+        filename++; // Skip the backslash
+      } else {
+        filename = processName;
+      }
+
+      // Check if this matches our target
+      if (!data->targetProcessName.empty() &&
+          _stricmp(filename, data->targetProcessName.c_str()) == 0) {
+        data->foundWindow = hwnd;
+        return FALSE; // Stop enumeration
+      }
+    }
+    CloseHandle(hProcess);
+  }
+
+  // Check window title if process name didn't match
+  if (!data->targetWindowTitle.empty() &&
+      _stricmp(windowTitle, data->targetWindowTitle.c_str()) == 0) {
+    data->foundWindow = hwnd;
+    return FALSE; // Stop enumeration
+  }
+
+  return TRUE; // Continue enumeration
+}
+
+HWND FindTargetWindow(const std::string& processName, const std::string& windowTitle) {
+  FindWindowData data;
+  data.targetProcessName = processName;
+  data.targetWindowTitle = windowTitle;
+  data.foundWindow = NULL;
+
+  EnumWindows(EnumWindowsCallback, reinterpret_cast<LPARAM>(&data));
+  return data.foundWindow;
+}
+
+
+
 void KeypressSimulatorWindowsPlugin::HandleMethodCall(
     const flutter::MethodCall<flutter::EncodableValue>& method_call,
     std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.h

@@ -30,6 +30,8 @@ class KeypressSimulatorWindowsPlugin : public flutter::Plugin {
       const flutter::MethodCall<flutter::EncodableValue>& method_call,
       std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
 
+
+
   // Called when a method is called on this plugin's channel from Dart.
   void HandleMethodCall(
       const flutter::MethodCall<flutter::EncodableValue>& method_call,

launch.json

@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+
+    {
+      "name": "swiftcontrol",
+      "request": "launch",
+      "type": "dart"
+    },
+    {
+      "name": "swiftcontrol (profile mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "profile"
+    },
+    {
+      "name": "swiftcontrol (release mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release"
+    }
+  ]
+}

lib/bluetooth/ble.dart

@@ -9,7 +9,7 @@ class BleUuid {
 }
 
 class Constants {
-  static const ZWIFT_MANUFACTURER_ID = 2378; // Zwift, Inc
+  static const ZWIFT_MANUFACTURER_ID = 2378; // Zwift, Inc => 0x094A
 
   // Zwift Play = RC1
   static const RC1_LEFT_SIDE = 0x03;
@@ -22,6 +22,11 @@ class Constants {
   // Zwift Click = BC1
   static const BC1 = 0x09;
 
+  // Zwift Click v2 Right (unconfirmed)
+  static const CLICK_V2_RIGHT_SIDE = 0x0A;
+  // Zwift Click v2 Right (unconfirmed)
+  static const CLICK_V2_LEFT_SIDE = 0x0B;
+
   static final RIDE_ON = Uint8List.fromList([0x52, 0x69, 0x64, 0x65, 0x4f, 0x6e]);
   static final VIBRATE_PATTERN = Uint8List.fromList([0x12, 0x12, 0x08, 0x0A, 0x06, 0x08, 0x02, 0x10, 0x00, 0x18]);
 
@@ -46,6 +51,8 @@ class Constants {
 
 enum DeviceType {
   click,
+  clickV2Right,
+  clickV2Left,
   playLeft,
   playRight,
   rideRight,
@@ -61,6 +68,10 @@ enum DeviceType {
     switch (data) {
       case Constants.BC1:
         return DeviceType.click;
+      case Constants.CLICK_V2_RIGHT_SIDE:
+        return DeviceType.clickV2Right;
+      case Constants.CLICK_V2_LEFT_SIDE:
+        return DeviceType.clickV2Left;
       case Constants.RC1_LEFT_SIDE:
         return DeviceType.playLeft;
       case Constants.RC1_RIGHT_SIDE:

lib/bluetooth/connection.dart

@@ -21,7 +21,7 @@ class Connection {
   final StreamController<BaseNotification> _actionStreams = StreamController<BaseNotification>.broadcast();
   Stream<BaseNotification> get actionStream => _actionStreams.stream;
 
-  final Map<BaseDevice, StreamSubscription<BleConnectionUpdate>> _connectionSubscriptions = {};
+  final Map<BaseDevice, StreamSubscription<bool>> _connectionSubscriptions = {};
   final StreamController<BaseDevice> _connectionStreams = StreamController<BaseDevice>.broadcast();
   Stream<BaseDevice> get connectionStream => _connectionStreams.stream;
 
@@ -34,11 +34,15 @@ class Connection {
       if (_lastScanResult.none((e) => e.deviceId == result.deviceId)) {
         _lastScanResult.add(result);
         final scanResult = BaseDevice.fromScanResult(result);
-        _actionStreams.add(
-          LogNotification('Found new device: ${result.name ?? scanResult?.runtimeType ?? result.deviceId}'),
-        );
+
         if (scanResult != null) {
+          _actionStreams.add(LogNotification('Found new device: ${scanResult.runtimeType}'));
           _addDevices([scanResult]);
+        } else {
+          final manufacturerData = result.manufacturerDataList;
+          final data =
+              manufacturerData.firstOrNullWhere((e) => e.companyId == Constants.ZWIFT_MANUFACTURER_ID)?.payload;
+          _actionStreams.add(LogNotification('Found unknown device with identifier: ${data?.firstOrNull}'));
         }
       }
     };
@@ -128,7 +132,7 @@ class Connection {
         _actionStreams.add(data);
       });
       final connectionStateSubscription = UniversalBle.connectionStream(bleDevice.device.deviceId).listen((state) {
-        bleDevice.isConnected = state.isConnected;
+        bleDevice.isConnected = state;
         _connectionStreams.add(bleDevice);
         if (!bleDevice.isConnected) {
           devices.remove(bleDevice);

lib/bluetooth/devices/base_device.dart

@@ -5,9 +5,11 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:swift_control/bluetooth/ble.dart';
 import 'package:swift_control/bluetooth/devices/zwift_click.dart';
+import 'package:swift_control/bluetooth/devices/zwift_clickv2.dart';
 import 'package:swift_control/bluetooth/devices/zwift_play.dart';
 import 'package:swift_control/bluetooth/devices/zwift_ride.dart';
 import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/actions/desktop.dart';
 import 'package:swift_control/utils/crypto/local_key_provider.dart';
 import 'package:swift_control/utils/crypto/zap_crypto.dart';
 import 'package:swift_control/utils/single_line_exception.dart';
@@ -29,6 +31,7 @@ abstract class BaseDevice {
 
   BleCharacteristic? syncRxCharacteristic;
   Timer? _longPressTimer;
+  Set<ZwiftButton> _previouslyPressedButtons = <ZwiftButton>{};
 
   List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK;
   String get customServiceId => BleUuid.ZWIFT_CUSTOM_SERVICE_UUID;
@@ -39,7 +42,7 @@ abstract class BaseDevice {
       //'Zwift Ride' => ZwiftRide(scanResult), special case for Zwift Ride: we must only connect to the left controller
       // https://www.makinolo.com/blog/2024/07/26/zwift-ride-protocol/
       'Zwift Play' => ZwiftPlay(scanResult),
-      'Zwift Click' => ZwiftClick(scanResult),
+      //'Zwift Click' => ZwiftClick(scanResult), special case for Zwift Click v2: we must only connect to the left controller
       _ => null,
     };
 
@@ -59,8 +62,10 @@ abstract class BaseDevice {
         DeviceType.click => ZwiftClick(scanResult),
         DeviceType.playRight => ZwiftPlay(scanResult),
         DeviceType.playLeft => ZwiftPlay(scanResult),
-        //DeviceType.rideRight => ZwiftRide(scanResult), // see comment above
         DeviceType.rideLeft => ZwiftRide(scanResult),
+        //DeviceType.rideRight => ZwiftRide(scanResult), // see comment above
+        DeviceType.clickV2Left => ZwiftClickV2(scanResult),
+        //DeviceType.clickV2Right => ZwiftClickV2(scanResult), // see comment above
         _ => null,
       };
     }
@@ -123,25 +128,15 @@ abstract class BaseDevice {
       throw Exception('Characteristics not found');
     }
 
-    await UniversalBle.setNotifiable(
-      device.deviceId,
-      customService.uuid,
-      asyncCharacteristic.uuid,
-      BleInputProperty.notification,
-    );
-    await UniversalBle.setNotifiable(
-      device.deviceId,
-      customService.uuid,
-      syncTxCharacteristic.uuid,
-      BleInputProperty.indication,
-    );
+    await UniversalBle.subscribeNotifications(device.deviceId, customService.uuid, asyncCharacteristic.uuid);
+    await UniversalBle.subscribeIndications(device.deviceId, customService.uuid, syncTxCharacteristic.uuid);
 
     await _setupHandshake();
   }
 
   Future<void> _setupHandshake() async {
     if (supportsEncryption) {
-      await UniversalBle.writeValue(
+      await UniversalBle.write(
         device.deviceId,
         customServiceId,
         syncRxCharacteristic!.uuid,
@@ -150,15 +145,15 @@ abstract class BaseDevice {
           ...Constants.REQUEST_START,
           ...zapEncryption.localKeyProvider.getPublicKeyBytes(),
         ]),
-        BleOutputProperty.withoutResponse,
+        withoutResponse: true,
       );
     } else {
-      await UniversalBle.writeValue(
+      await UniversalBle.write(
         device.deviceId,
         customServiceId,
         syncRxCharacteristic!.uuid,
         Constants.RIDE_ON,
-        BleOutputProperty.withoutResponse,
+        withoutResponse: true,
       );
     }
   }
@@ -245,14 +240,35 @@ abstract class BaseDevice {
               } else if (buttonsClicked.isEmpty) {
                 actionStreamInternal.add(LogNotification('Buttons released'));
                 _longPressTimer?.cancel();
+
+                // Handle release events for long press keys
+                final buttonsReleased = _previouslyPressedButtons.toList();
+                if (buttonsReleased.isNotEmpty) {
+                  await _performRelease(buttonsReleased);
+                }
+                _previouslyPressedButtons.clear();
               } else {
-                if (!(buttonsClicked.singleOrNull == ZwiftButton.onOffLeft ||
-                    buttonsClicked.singleOrNull == ZwiftButton.onOffRight)) {
-                  // we don't want to trigger the long press timer for the on/off buttons
+                // Handle release events for buttons that are no longer pressed
+                final buttonsReleased = _previouslyPressedButtons.difference(buttonsClicked.toSet()).toList();
+                if (buttonsReleased.isNotEmpty) {
+                  await _performRelease(buttonsReleased);
+                }
+
+                final isLongPress =
+                    buttonsClicked.singleOrNull != null &&
+                    actionHandler.supportedApp?.keymap.getKeyPair(buttonsClicked.single)?.isLongPress == true;
+
+                if (!isLongPress &&
+                    !(buttonsClicked.singleOrNull == ZwiftButton.onOffLeft ||
+                        buttonsClicked.singleOrNull == ZwiftButton.onOffRight)) {
+                  // we don't want to trigger the long press timer for the on/off buttons, also not when it's a long press key
                   _longPressTimer?.cancel();
                   _longPressTimer = Timer.periodic(const Duration(milliseconds: 250), (timer) async {
                     _performActions(buttonsClicked, true);
                   });
+                } else if (isLongPress) {
+                  // Update currently pressed buttons
+                  _previouslyPressedButtons = buttonsClicked.toSet();
                 }
 
                 _performActions(buttonsClicked, false);
@@ -273,7 +289,19 @@ abstract class BaseDevice {
       await _vibrate();
     }
     for (final action in buttonsClicked) {
-      actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
+      // For repeated actions, don't trigger key down/up events (useful for long press)
+      final isKeyDown = !repeated;
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: isKeyDown, isKeyUp: false)),
+      );
+    }
+  }
+
+  Future<void> _performRelease(List<ZwiftButton> buttonsReleased) async {
+    for (final action in buttonsReleased) {
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: false, isKeyUp: true)),
+      );
     }
   }
 
@@ -287,4 +315,15 @@ abstract class BaseDevice {
       BleOutputProperty.withoutResponse,
     );
   }
+
+  Future<void> disconnect() async {
+    _longPressTimer?.cancel();
+    _previouslyPressedButtons.clear();
+    // Release any held keys in long press mode
+    if (actionHandler is DesktopActions) {
+      await (actionHandler as DesktopActions).releaseAllHeldKeys();
+    }
+    await UniversalBle.disconnect(device.deviceId);
+    isConnected = false;
+  }
 }

lib/bluetooth/devices/zwift_clickv2.dart

@@ -0,0 +1,5 @@
+import 'package:swift_control/bluetooth/devices/zwift_ride.dart';
+
+class ZwiftClickV2 extends ZwiftRide {
+  ZwiftClickV2(super.scanResult);
+}

lib/pages/device.dart

@@ -105,7 +105,7 @@ class _DevicePageState extends State<DevicePage> {
                                   ),
                                 )
                                 .toList(),
-                        label: Text('Keymap'),
+                        label: Text('Select Keymap'),
                         onSelected: (app) async {
                           if (app == null) {
                             return;

lib/pages/touch_area.dart

@@ -91,6 +91,7 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
               buttons: [_pressedButton!],
               physicalKey: null,
               logicalKey: null,
+              isLongPress: false,
             ),
           );
           setState(() {});
@@ -98,7 +99,8 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
           // open menu
           if (Platform.isMacOS || Platform.isWindows) {
             await Future.delayed(Duration(milliseconds: 300));
-            await keyPressSimulator.simulateMouseClick(keyPair.touchPosition);
+            await keyPressSimulator.simulateMouseClickDown(keyPair.touchPosition);
+            await keyPressSimulator.simulateMouseClickUp(keyPair.touchPosition);
           }
         }
       }
@@ -121,10 +123,14 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
             (context) => [
               PopupMenuItem<PhysicalKeyboardKey>(
                 value: null,
-                child: const Text('Set Keyboard shortcut'),
+                child: ListTile(
+                  leading: Icon(Icons.keyboard_alt_outlined),
+                  title: const Text('Simulate Keyboard shortcut'),
+                ),
                 onTap: () async {
                   await showDialog<void>(
                     context: context,
+                    barrierDismissible: false, // enable Escape key
                     builder:
                         (c) =>
                             HotKeyListenerDialog(customApp: actionHandler.supportedApp! as CustomApp, keyPair: keyPair),
@@ -132,6 +138,32 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
                   setState(() {});
                 },
               ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: null,
+                child: ListTile(title: const Text('Simulate Touch'), leading: Icon(Icons.touch_app_outlined)),
+                onTap: () {
+                  keyPair.physicalKey = null;
+                  keyPair.logicalKey = null;
+                  setState(() {});
+                },
+              ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: null,
+                onTap: () {
+                  keyPair.isLongPress = !keyPair.isLongPress;
+                  setState(() {});
+                },
+                child: CheckboxListTile(
+                  value: keyPair.isLongPress,
+                  onChanged: (value) {
+                    keyPair.isLongPress = value ?? false;
+                    setState(() {});
+                    Navigator.of(context).pop();
+                  },
+                  title: const Text('Long Press Mode (vs. repeating)'),
+                ),
+              ),
+              PopupMenuDivider(),
               PopupMenuItem(
                 child: PopupMenuButton<PhysicalKeyboardKey>(
                   padding: EdgeInsets.zero,
@@ -168,25 +200,17 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
 
                     setState(() {});
                   },
-                  child: SizedBox(
-                    height: 50,
-                    width: 180,
-                    child: Align(alignment: Alignment.centerLeft, child: Text('Set Media key')),
+                  child: ListTile(
+                    leading: Icon(Icons.music_note_outlined),
+                    trailing: Icon(Icons.arrow_right),
+                    title: Text('Simulate Media key'),
                   ),
                 ),
               ),
+              PopupMenuDivider(),
               PopupMenuItem<PhysicalKeyboardKey>(
                 value: null,
-                child: const Text('Use as touch button'),
-                onTap: () {
-                  keyPair.physicalKey = null;
-                  keyPair.logicalKey = null;
-                  setState(() {});
-                },
-              ),
-              PopupMenuItem<PhysicalKeyboardKey>(
-                value: null,
-                child: const Text('Remove'),
+                child: ListTile(title: const Text('Delete Keymap'), leading: Icon(Icons.delete, color: Colors.red)),
                 onTap: () {
                   actionHandler.supportedApp!.keymap.keyPairs.remove(keyPair);
                   setState(() {});
@@ -316,7 +340,10 @@ class _TouchDot extends StatelessWidget {
           decoration: BoxDecoration(
             color: color.withOpacity(0.6),
             shape: BoxShape.circle,
-            border: Border.all(color: Colors.black, width: 2),
+            border: Border.all(
+              color: keyPair.isLongPress ? Colors.green : Colors.black,
+              width: keyPair.isLongPress ? 3 : 2,
+            ),
           ),
           child: Icon(
             keyPair.isSpecialKey
@@ -343,6 +370,8 @@ class _TouchDot extends StatelessWidget {
                   PhysicalKeyboardKey.audioVolumeDown => 'Media: Volume Down',
                   _ => keyPair.logicalKey?.keyLabel ?? 'Unknown',
                 }, style: TextStyle(color: Colors.black87, fontSize: 12)),
+              if (keyPair.isLongPress)
+                Text('Long Press', style: TextStyle(color: Colors.green, fontSize: 10, fontWeight: FontWeight.bold)),
             ],
           ),
         ),

lib/utils/actions/android.dart

@@ -22,7 +22,7 @@ class AndroidActions extends BaseActions {
   }
 
   @override
-  Future<String> performAction(ZwiftButton button) async {
+  Future<String> performAction(ZwiftButton button, {bool isKeyDown = true, bool isKeyUp = false}) async {
     if (supportedApp == null) {
       return ("Could not perform ${button.name}: No keymap set");
     }
@@ -42,9 +42,9 @@ class AndroidActions extends BaseActions {
     }
     final point = supportedApp!.resolveTouchPosition(action: button, windowInfo: windowInfo);
     if (point != Offset.zero) {
-      accessibilityHandler.performTouch(point.dx, point.dy);
-      return "No touch performed";
+      accessibilityHandler.performTouch(point.dx, point.dy, isKeyDown: isKeyDown, isKeyUp: isKeyUp);
+      return "Touch performed at: ${point.dx.toInt()}, ${point.dy.toInt()}";
     }
-    return "Touch performed at: ${point.dx.toInt()}, ${point.dy.toInt()}";
+    return "No touch performed";
   }
 }

lib/utils/actions/base_actions.dart

@@ -9,12 +9,12 @@ abstract class BaseActions {
     this.supportedApp = supportedApp;
   }
 
-  Future<String> performAction(ZwiftButton action);
+  Future<String> performAction(ZwiftButton action, {bool isKeyDown = true, bool isKeyUp = false});
 }
 
 class StubActions extends BaseActions {
   @override
-  Future<String> performAction(ZwiftButton action) {
+  Future<String> performAction(ZwiftButton action, {bool isKeyDown = true, bool isKeyUp = false}) {
     return Future.value(action.name);
   }
 }

lib/utils/actions/desktop.dart

@@ -3,8 +3,11 @@ import 'package:swift_control/utils/actions/base_actions.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
 
 class DesktopActions extends BaseActions {
+  // Track keys that are currently held down in long press mode
+  final Set<ZwiftButton> _heldKeys = <ZwiftButton>{};
+
   @override
-  Future<String> performAction(ZwiftButton action) async {
+  Future<String> performAction(ZwiftButton action, {bool isKeyDown = true, bool isKeyUp = false}) async {
     if (supportedApp == null) {
       return ('Supported app is not set');
     }
@@ -14,14 +17,60 @@ class DesktopActions extends BaseActions {
       return ('Keymap entry not found for action: $action');
     }
 
-    if (keyPair.physicalKey != null) {
-      await keyPressSimulator.simulateKeyDown(keyPair.physicalKey);
-      await keyPressSimulator.simulateKeyUp(keyPair.physicalKey);
-      return 'Key pressed: ${keyPair.logicalKey?.keyLabel}';
+    // Handle long press mode
+    if (keyPair.isLongPress) {
+      if (isKeyDown && !isKeyUp) {
+        // Key press: start long press
+        if (!_heldKeys.contains(action)) {
+          _heldKeys.add(action);
+          if (keyPair.physicalKey != null) {
+            await keyPressSimulator.simulateKeyDown(keyPair.physicalKey);
+            return 'Long press started: ${keyPair.logicalKey?.keyLabel}';
+          } else {
+            final point = supportedApp!.resolveTouchPosition(action: action, windowInfo: null);
+            await keyPressSimulator.simulateMouseClickDown(point);
+            return 'Long Mouse click started at: $point';
+          }
+        }
+      } else if (isKeyUp && !isKeyDown) {
+        // Key release: end long press
+        if (_heldKeys.contains(action)) {
+          _heldKeys.remove(action);
+          if (keyPair.physicalKey != null) {
+            await keyPressSimulator.simulateKeyUp(keyPair.physicalKey);
+            return 'Long press ended: ${keyPair.logicalKey?.keyLabel}';
+          } else {
+            final point = supportedApp!.resolveTouchPosition(action: action, windowInfo: null);
+            await keyPressSimulator.simulateMouseClickUp(point);
+            return 'Long Mouse click ended at: $point';
+          }
+        }
+      }
+      // Ignore other combinations in long press mode
+      return 'Long press active';
     } else {
-      final point = supportedApp!.resolveTouchPosition(action: action, windowInfo: null);
-      await keyPressSimulator.simulateMouseClick(point);
-      return 'Mouse clicked at: $point';
+      // Handle regular key press mode (existing behavior)
+      if (keyPair.physicalKey != null) {
+        await keyPressSimulator.simulateKeyDown(keyPair.physicalKey);
+        await keyPressSimulator.simulateKeyUp(keyPair.physicalKey);
+        return 'Key pressed: ${keyPair.logicalKey?.keyLabel}';
+      } else {
+        final point = supportedApp!.resolveTouchPosition(action: action, windowInfo: null);
+        await keyPressSimulator.simulateMouseClickDown(point);
+        await keyPressSimulator.simulateMouseClickUp(point);
+        return 'Mouse clicked at: $point';
+      }
     }
   }
+
+  // Release all held keys (useful for cleanup)
+  Future<void> releaseAllHeldKeys() async {
+    for (final action in _heldKeys.toList()) {
+      final keyPair = supportedApp?.keymap.getKeyPair(action);
+      if (keyPair?.physicalKey != null) {
+        await keyPressSimulator.simulateKeyUp(keyPair!.physicalKey);
+      }
+    }
+    _heldKeys.clear();
+  }
 }

lib/utils/keymap/apps/custom_app.dart

@@ -42,14 +42,21 @@ class CustomApp extends SupportedApp {
     ZwiftButton zwiftButton, {
     required PhysicalKeyboardKey physicalKey,
     required LogicalKeyboardKey? logicalKey,
+    bool isLongPress = false,
   }) {
     // set the key for the zwift button
     final keyPair = keymap.getKeyPair(zwiftButton);
     if (keyPair != null) {
       keyPair.physicalKey = physicalKey;
       keyPair.logicalKey = logicalKey;
+      keyPair.isLongPress = isLongPress;
     } else {
-      keymap.keyPairs.add(KeyPair(buttons: [zwiftButton], physicalKey: physicalKey, logicalKey: logicalKey));
+      keymap.keyPairs.add(KeyPair(
+        buttons: [zwiftButton], 
+        physicalKey: physicalKey, 
+        logicalKey: logicalKey,
+        isLongPress: isLongPress,
+      ));
     }
   }
 }

lib/utils/keymap/keymap.dart

@@ -17,7 +17,7 @@ class Keymap {
       separator: ('\n---------\n'),
       transform:
           (k) =>
-              '''Button: ${k.buttons.joinToString(transform: (e) => e.name)}\nKeyboard key: ${k.logicalKey?.keyLabel ?? 'Not assigned'}\nAction: ${k.buttons.firstOrNull?.action}${k.touchPosition != Offset.zero ? '\nTouch Position: ${k.touchPosition.toString()}' : ''}''',
+              '''Button: ${k.buttons.joinToString(transform: (e) => e.name)}\nKeyboard key: ${k.logicalKey?.keyLabel ?? 'Not assigned'}\nAction: ${k.buttons.firstOrNull?.action}${k.touchPosition != Offset.zero ? '\nTouch Position: ${k.touchPosition.toString()}' : ''}${k.isLongPress ? '\nLong Press: Enabled' : ''}''',
     );
   }
 
@@ -41,12 +41,14 @@ class KeyPair {
   PhysicalKeyboardKey? physicalKey;
   LogicalKeyboardKey? logicalKey;
   Offset touchPosition;
+  bool isLongPress;
 
   KeyPair({
     required this.buttons,
     required this.physicalKey,
     required this.logicalKey,
     this.touchPosition = Offset.zero,
+    this.isLongPress = false,
   });
 
   bool get isSpecialKey =>
@@ -78,6 +80,7 @@ class KeyPair {
       'logicalKey': logicalKey?.keyId.toString() ?? '0',
       'physicalKey': physicalKey?.usbHidUsage.toString() ?? '0',
       'touchPosition': {'x': touchPosition.dx, 'y': touchPosition.dy},
+      'isLongPress': isLongPress,
     });
   }
 
@@ -96,6 +99,7 @@ class KeyPair {
       physicalKey:
           int.parse(decoded['physicalKey']) != 0 ? PhysicalKeyboardKey(int.parse(decoded['physicalKey'])) : null,
       touchPosition: Offset(decoded['touchPosition']['x'], decoded['touchPosition']['y']),
+      isLongPress: decoded['isLongPress'] ?? false,
     );
   }
 }

lib/widgets/custom_keymap_selector.dart

@@ -67,7 +67,6 @@ class _HotKeyListenerState extends State<HotKeyListenerDialog> {
     setState(() {
       if (event is KeyDownEvent) {
         _pressedKey = event;
-      } else if (event is KeyUpEvent) {
         widget.customApp.setKey(
           _pressedButton!,
           physicalKey: _pressedKey!.physicalKey,

lib/widgets/menu.dart

@@ -6,12 +6,26 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 List<Widget> buildMenuButtons() {
   return [
-    TextButton(
-      onPressed: () {
-        launchUrlString('https://paypal.me/boni');
+    PopupMenuButton(
+      itemBuilder: (BuildContext context) {
+        return [
+          PopupMenuItem(
+            child: Text('PayPal'),
+            onTap: () {
+              launchUrlString('https://paypal.me/boni');
+            },
+          ),
+          PopupMenuItem(
+            child: Text('Other'),
+            onTap: () {
+              launchUrlString('https://github.com/sponsors/jonasbark?frequency=one-time');
+            },
+          ),
+        ];
       },
-      child: Text('Donate ♥'),
+      icon: Text('Donate ♥', style: TextStyle(color: Colors.red, fontWeight: FontWeight.bold)),
     ),
+    SizedBox(width: 8),
     const MenuButton(),
     SizedBox(width: 8),
   ];

lib/widgets/title.dart

@@ -24,10 +24,12 @@ class _AppTitleState extends State<AppTitle> {
     final response = await http.get(Uri.parse('https://api.github.com/repos/jonasbark/swiftcontrol/releases/latest'));
     if (response.statusCode == 200) {
       final data = jsonDecode(response.body);
-      final latestVersion = data['tag_name'].split('+').first;
+      final tagName = data['tag_name'] as String;
+      final latestVersion = tagName.split('+').first;
       final currentVersion = 'v${_packageInfoValue!.version}';
 
-      if (latestVersion != null && latestVersion != currentVersion) {
+      // we anything but +0 is considered beta
+      if (latestVersion != currentVersion && tagName.endsWith("+0")) {
         final assets = data['assets'] as List;
         if (Platform.isAndroid) {
           final apkUrl = assets.firstOrNullWhere((asset) => asset['name'].endsWith('.apk'))['browser_download_url'];
@@ -89,7 +91,7 @@ class _AppTitleState extends State<AppTitle> {
         Text('SwiftControl'),
         if (_packageInfoValue != null)
           Text(
-            'v${_packageInfoValue!.version}',
+            'v${_packageInfoValue!.version}+${_packageInfoValue!.buildNumber}',
             style: TextStyle(fontFamily: "monospace", fontFamilyFallback: <String>["Courier"], fontSize: 12),
           )
         else

macos/Podfile

@@ -1,4 +1,4 @@
-platform :osx, '10.14'
+platform :osx, '10.15'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

macos/Podfile.lock

@@ -64,7 +64,7 @@ SPEC CHECKSUMS:
   device_info_plus: 1b14eed9bf95428983aed283a8d51cce3d8c4215
   file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
   flutter_local_notifications: 4ccab5b7a22835214a6672e3f9c5e8ae207dab36
-  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
   keypress_simulator_macos: f8556f9101f9f2f175652e0bceddf0fe82a4c6b2
   package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
   screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161
@@ -73,6 +73,6 @@ SPEC CHECKSUMS:
   url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
-PODFILE CHECKSUM: 7eb978b976557c8c1cd717d8185ec483fd090a82
+PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009
 
 COCOAPODS: 1.16.2

macos/Runner.xcodeproj/project.pbxproj

@@ -555,7 +555,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -643,7 +643,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -693,7 +693,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

pubspec.lock

@@ -28,10 +28,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   bluez:
     dependency: transitive
     description:
@@ -148,10 +148,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -212,10 +212,10 @@ packages:
     dependency: "direct main"
     description:
       name: flex_color_scheme
-      sha256: "3344f8f6536c6ce0473b98e9f084ef80ca89024ad3b454f9c32cf840206f4387"
+      sha256: "034d5720747e6af39b2ad090d82dd92d33fde68e7964f1814b714c9d49ddbd64"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   flex_seed_scheme:
     dependency: transitive
     description:
@@ -249,10 +249,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: d59eeafd6df92174b1d5f68fc9d66634c97ce2e7cfe2293476236547bb19bbbd
+      sha256: a9966c850de5e445331b854fa42df96a8020066d67f125a5964cbc6556643f68
       url: "https://pub.dev"
     source: hosted
-    version: "19.0.0"
+    version: "19.4.1"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -265,18 +265,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c"
+      sha256: "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.1.0"
   flutter_local_notifications_windows:
     dependency: transitive
     description:
       name: flutter_local_notifications_windows
-      sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
+      sha256: ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -294,10 +294,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_web_bluetooth
-      sha256: "1363831def5eed1e1064d1eca04e8ccb35446e8f758579c3c519e156b77926da"
+      sha256: ad26a1b3fef95b86ea5f63793b9a0cdc1a33490f35d754e4e711046cae3ebbf8
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -431,26 +431,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "11.0.1"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -788,10 +788,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.6"
   time:
     dependency: transitive
     description:
@@ -828,10 +828,10 @@ packages:
     dependency: "direct main"
     description:
       name: universal_ble
-      sha256: "35d210e93a5938c6a6d1fd3c710cf4ac90b1bdd1b11c8eb2beeb32600672e6e6"
+      sha256: "6a5c6c1fb295015934a5aef3dc751ae7e00721535275f8478bfe74db77b238c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.21.1"
   url_launcher:
     dependency: "direct main"
     description:
@@ -900,18 +900,18 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
   web:
     dependency: transitive
     description:
@@ -969,5 +969,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.29.0"
+  dart: ">=3.8.0-0 <4.0.0"
+  flutter: ">=3.35.0"

pubspec.yaml

@@ -1,7 +1,7 @@
 name: swift_control
 description: "SwiftControl - Control your virtual riding"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 2.0.8+0
+version: 2.2.1+3
 
 environment:
   sdk: ^3.7.0
@@ -11,8 +11,8 @@ dependencies:
     sdk: flutter
 
   url_launcher: ^6.3.1
-  flutter_local_notifications: ^19.0.0
-  universal_ble: any
+  flutter_local_notifications: ^19.4.1
+  universal_ble: ^0.21.1
   protobuf: ^3.1.0
   permission_handler: ^11.4.0
   dartx: any
@@ -23,7 +23,7 @@ dependencies:
   keypress_simulator:
     path: keypress_simulator/packages/keypress_simulator
   shared_preferences: ^2.5.3
-  flex_color_scheme: ^8.2.0
+  flex_color_scheme: ^8.3.0
   package_info_plus: ^8.3.0
   accessibility:
     path: accessibility

test/long_press_test.dart

@@ -0,0 +1,75 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter/services.dart';
+import 'package:swift_control/utils/keymap/keymap.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+
+void main() {
+  group('Long Press KeyPair Tests', () {
+    test('KeyPair should encode and decode isLongPress property', () {
+      // Create a KeyPair with long press enabled
+      final keyPair = KeyPair(
+        buttons: [ZwiftButton.a],
+        physicalKey: PhysicalKeyboardKey.keyA,
+        logicalKey: LogicalKeyboardKey.keyA,
+        isLongPress: true,
+      );
+
+      // Encode the KeyPair
+      final encoded = keyPair.encode();
+      
+      // Decode the KeyPair
+      final decoded = KeyPair.decode(encoded);
+      
+      // Verify the decoded KeyPair has the correct properties
+      expect(decoded, isNotNull);
+      expect(decoded!.isLongPress, true);
+      expect(decoded.buttons, equals([ZwiftButton.a]));
+      expect(decoded.physicalKey, equals(PhysicalKeyboardKey.keyA));
+      expect(decoded.logicalKey, equals(LogicalKeyboardKey.keyA));
+    });
+
+    test('KeyPair should default isLongPress to false when not specified in decode', () {
+      // Create a legacy encoded KeyPair without isLongPress property
+      const legacyEncoded = '''
+      {
+        "actions": ["a"],
+        "logicalKey": "97",
+        "physicalKey": "458752",
+        "touchPosition": {"x": 0.0, "y": 0.0}
+      }
+      ''';
+
+      // Decode the legacy KeyPair
+      final decoded = KeyPair.decode(legacyEncoded);
+      
+      // Verify the decoded KeyPair defaults isLongPress to false
+      expect(decoded, isNotNull);
+      expect(decoded!.isLongPress, false);
+    });
+
+    test('KeyPair constructor should default isLongPress to false', () {
+      final keyPair = KeyPair(
+        buttons: [ZwiftButton.a],
+        physicalKey: PhysicalKeyboardKey.keyA,
+        logicalKey: LogicalKeyboardKey.keyA,
+      );
+
+      expect(keyPair.isLongPress, false);
+    });
+
+    test('KeyPair should correctly encode isLongPress false', () {
+      final keyPair = KeyPair(
+        buttons: [ZwiftButton.a],
+        physicalKey: PhysicalKeyboardKey.keyA,
+        logicalKey: LogicalKeyboardKey.keyA,
+        isLongPress: false,
+      );
+
+      final encoded = keyPair.encode();
+      final decoded = KeyPair.decode(encoded);
+      
+      expect(decoded, isNotNull);
+      expect(decoded!.isLongPress, false);
+    });
+  });
+}