- improve iOS reactivity by delaying button events for a few milliseconds

- use correct icon for shift down buttons
- add more troubleshooting for iOS devices

.github/FUNDING.yml

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

.github/workflows/build.yml

@@ -1,9 +1,32 @@
 name: "Build"
 
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch:
+    inputs:
+      build_mac:
+        description: 'Build for macOS'
+        required: false
+        default: 'true'
+      build_windows:
+        description: 'Build for Windows'
+        required: false
+        default: 'true'
+      build_android:
+        description: 'Build for Android'
+        required: false
+        default: 'true'
+      build_ios:
+        description: 'Build for iOS'
+        required: false
+        default: 'true'
+      build_web:
+        description: 'Build for Web'
+        required: false
+        default: 'true'
+
+env:
+  SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
+  FLUTTER_VERSION: 3.35.5
 
 jobs:
   build:
@@ -21,17 +44,30 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install certificates
+        if: github.event.inputs.build_mac == 'true' || github.event.inputs.build_ios == 'true'
         env:
           DEVELOPER_ID_APPLICATION_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_APPLICATION_P12_BASE64_MAC }}
+          DEVELOPER_ID_INSTALLER_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_INSTALLER_P12_BASE64_MAC }}
           P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          APPSTORE_PROFILE_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_IOS_BASE64 }}
+          APPSTORE_PROFILE_MACOS_BASE64: ${{ secrets.APPSTORE_PROFILE_MACOS_BASE64 }}
+          APPSTORE_PROFILE_DEV_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_DEV_IOS_BASE64 }}
         run: |
           # create variables
           DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_application_certificate.p12
+          DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_installer_certificate.p12
+          PP_PATH_IOS=$RUNNER_TEMP/build_pp_ios.mobileprovision
+          PP_PATH_IOS_DEV=$RUNNER_TEMP/build_pp_ios_dev.mobileprovision
+          PP_PATH_MACOS=$RUNNER_TEMP/build_pp_macos.provisionprofile
           KEYCHAIN_PATH=$RUNNER_TEMP/pg-signing.keychain-db
           
           # import certificate and provisioning profile from secrets
           echo -n "$DEVELOPER_ID_APPLICATION_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH
+          echo -n "$DEVELOPER_ID_INSTALLER_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH
+          echo -n "$APPSTORE_PROFILE_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS
+          echo -n "$APPSTORE_PROFILE_DEV_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS_DEV
+          echo -n "$APPSTORE_PROFILE_MACOS_BASE64" | base64 --decode -o $PP_PATH_MACOS
           
           # create temporary keychain
           security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
@@ -41,61 +77,146 @@ jobs:
           
           # import certificate to keychain
           security import $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security import $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS_DEV ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_MACOS ~/Library/MobileDevice/Provisioning\ Profiles
 
-        #2 Setup Java
-      - name: Set Up Java
-        uses: actions/setup-java@v3.12.0
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
         with:
-          distribution: 'oracle'
-          java-version: '17'
+          cache: true
 
-        #3 Setup Flutter
-      - name: Set Up Flutter
-        uses: subosito/flutter-action@v2
+      - name: 🚀 Shorebird Release macOS
+        if: github.event.inputs.build_mac == 'true'
+        uses: shorebirdtech/shorebird-release@v1
         with:
-          channel: 'stable'
-
-        #4 Install Dependencies
-      - name: Install Dependencies
-        run: flutter pub get
-
-        #8 Build app ( macos Build )
-      - name: Build App
-        run: flutter build macos --release
-
-      - name: Code Signing
-        run: /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --options runtime SwiftControl.app -v
-        working-directory: build/macos/Build/Products/Release
-        env:
-          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: macos
 
       - name: Decode Keystore
+        if: github.event.inputs.build_android == 'true'
         run: |
           echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > android/android.keystore;
           echo "${{ secrets.KEYSTORE_PROPERTIES }}" > android/keystore.properties;
 
-        #6 Building APK
-      - name: Build APK
-        run: flutter build apk --release
+      - name: 🚀 Shorebird Release Android
+        if: github.event.inputs.build_android == 'true'
+        uses: shorebirdtech/shorebird-release@v1
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: android
+          args: "--artifact=apk"
+
+      - name: Set Up Flutter
+        if: github.event.inputs.build_web == 'true'
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Build Web
+        if: github.event.inputs.build_web == 'true'
         run: flutter build web --release --base-href "/swiftcontrol/"
 
-      - name: Handle archives
+      - name: Upload static files as artifact
+        if: github.event.inputs.build_web == 'true'
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: build/web
+
+      - name: Web Deploy
+        if: github.event.inputs.build_web == 'true'
+        uses: actions/deploy-pages@v4
+
+      - name: Extract latest changelog
+        id: changelog
+        run: |
+          chmod +x scripts/get_latest_changelog.sh
+          mkdir -p whatsnew
+          ./scripts/get_latest_changelog.sh | head -c 500 > whatsnew/whatsnew-en-US
+
+      - name: 🚀 Shorebird Release iOS
+        if: github.event.inputs.build_ios == 'true'
+        uses: shorebirdtech/shorebird-release@v1
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: ios
+          args: "--export-options-plist ios/ExportOptions.plist"
+
+      - name: Prepare App Store authentication key
+        if: github.event.inputs.build_ios == 'true' || github.event.inputs.build_mac == 'true'
+        env:
+          API_KEY_BASE64: ${{ secrets.APPSTORE_API_KEY_FILE_BASE64 }}
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+        run: |
+          mkdir -p ./private_keys;
+          printf %s "$API_KEY_BASE64" | base64 -D > "./private_keys/AuthKey_${APPSTORE_API_KEY}.p8";      
+
+      - name: Upload to Play Store
+        if: github.event.inputs.build_android == 'true'
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          packageName: de.jonasbark.swiftcontrol
+          releaseFiles: build/app/outputs/bundle/release/app-release.aab
+          track: production
+          whatsNewDirectory: whatsnew
+
+      - name: Upload to macOS App Store
+        if: github.event.inputs.build_mac == 'true'
+        env:
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+          APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
+        run: |
+          productbuild --component "build/macos/Build/Products/Release/SwiftControl.app" /Applications "SwiftControl.pkg" --sign "3rd Party Mac Developer Installer: JONAS TASSILO BARK (UZRHKPVWN9)";    
+          xcrun altool --upload-app -f SwiftControl.pkg -t osx --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID"; 
+
+      - name: Upload to iOS App Store
+        if: github.event.inputs.build_ios == 'true'
+        env:
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+          APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
+        run: |
+          xcrun altool --upload-app -f build/ios/ipa/swift_play.ipa -t ios --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID";
+
+      - name: Handle Android archives
+        if: github.event.inputs.build_android == 'true'
         run: |
           cp build/app/outputs/flutter-apk/app-release.apk build/app/outputs/flutter-apk/SwiftControl.android.apk
+
+      - name: Code Signing of macOS app
+        if: github.event.inputs.build_mac == 'true'
+        run: /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime SwiftControl.app -v
+        working-directory: build/macos/Build/Products/Release
+        env:
+          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
+
+      - name: Handle macOS archives
+        if: github.event.inputs.build_mac == 'true'
+        run: |
           cd build/macos/Build/Products/Release/
           zip -r SwiftControl.macos.zip SwiftControl.app/
 
-        #9 Upload Artifacts
-      - name: Upload Artifacts
+      - name: Upload Android Artifacts
+        if: github.event.inputs.build_android == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: Releases
           path: |
             build/app/outputs/flutter-apk/SwiftControl.android.apk
+
+      - name: Upload macOS Artifacts
+        if: github.event.inputs.build_mac == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Releases
+          path: |
             build/macos/Build/Products/Release/SwiftControl.macos.zip
 
         #10 Extract Version
@@ -128,20 +249,15 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "build/app/outputs/flutter-apk/SwiftControl.android.apk,build/macos/Build/Products/Release/SwiftControl.macos.zip"
+          allowUpdates: true
+          prerelease: ${{ endsWith(env.VERSION, '1337') }}
+          bodyFile: scripts/RELEASE_NOTES.md
           tag: v${{ env.VERSION }}
           token: ${{ secrets.TOKEN }}
 
-      - name: Upload static files as artifact
-        id: deployment
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: build/web
-
-      - name: Web Deploy
-        uses: actions/deploy-pages@v4
-
   windows:
     needs: build
+    if: github.event.inputs.build_windows == 'true'
     name: Build & Release on Windows
     runs-on: windows-latest
 
@@ -157,22 +273,39 @@ jobs:
           distribution: 'oracle'
           java-version: '17'
 
-        #3 Setup Flutter
-      - name: Set Up Flutter
-        uses: subosito/flutter-action@v2
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
         with:
-          channel: 'stable'
+          cache: true
 
-        #4 Install Dependencies
-      - name: Install Dependencies
-        run: flutter pub get
-
-      - name: Build App
-        run: flutter build windows
+      - name: 🚀 Shorebird Release Windows
+        uses: shorebirdtech/shorebird-release@v1
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: windows
 
       - 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
@@ -200,5 +333,6 @@ jobs:
         with:
           allowUpdates: true
           artifacts: "build/windows/x64/runner/Release/SwiftControl.windows.zip"
+          bodyFile: scripts/RELEASE_NOTES.md
           tag: v${{ env.VERSION }}
           token: ${{ secrets.TOKEN }}

.github/workflows/patch.yml

@@ -0,0 +1,161 @@
+name: "Patch"
+
+on:
+  workflow_dispatch:
+
+env:
+  SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
+  FLUTTER_VERSION: 3.35.5
+
+jobs:
+  build:
+    name: Patch iOS, Android & macOS
+    runs-on: macos-latest
+
+    permissions:
+      id-token: write
+      pages: write
+      contents: write
+
+    steps:
+      #1 Checkout Repository
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
+        with:
+          cache: true
+
+      - name: Install certificates
+        env:
+          DEVELOPER_ID_APPLICATION_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_APPLICATION_P12_BASE64_MAC }}
+          DEVELOPER_ID_INSTALLER_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_INSTALLER_P12_BASE64_MAC }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          APPSTORE_PROFILE_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_IOS_BASE64 }}
+          APPSTORE_PROFILE_MACOS_BASE64: ${{ secrets.APPSTORE_PROFILE_MACOS_BASE64 }}
+          APPSTORE_PROFILE_DEV_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_DEV_IOS_BASE64 }}
+        run: |
+          # create variables
+          DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_application_certificate.p12
+          DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_installer_certificate.p12
+          PP_PATH_IOS=$RUNNER_TEMP/build_pp_ios.mobileprovision
+          PP_PATH_IOS_DEV=$RUNNER_TEMP/build_pp_ios_dev.mobileprovision
+          PP_PATH_MACOS=$RUNNER_TEMP/build_pp_macos.provisionprofile
+          KEYCHAIN_PATH=$RUNNER_TEMP/pg-signing.keychain-db
+          
+          # import certificate and provisioning profile from secrets
+          echo -n "$DEVELOPER_ID_APPLICATION_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH
+          echo -n "$DEVELOPER_ID_INSTALLER_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH
+          echo -n "$APPSTORE_PROFILE_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS
+          echo -n "$APPSTORE_PROFILE_DEV_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS_DEV
+          echo -n "$APPSTORE_PROFILE_MACOS_BASE64" | base64 --decode -o $PP_PATH_MACOS
+          
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          # security default-keychain -s $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          # import certificate to keychain
+          security import $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security import $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS_DEV ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_MACOS ~/Library/MobileDevice/Provisioning\ Profiles
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > android/android.keystore;
+          echo "${{ secrets.KEYSTORE_PROPERTIES }}" > android/keystore.properties;
+
+      - name: 🚀 Shorebird Patch macOS
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: macos
+          release-version: latest
+          args: '--allow-asset-diffs'
+
+      - name: 🚀 Shorebird Patch Android
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: android
+          release-version: latest
+          args: '--allow-asset-diffs'
+
+      - name: 🚀 Shorebird Patch iOS
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: ios
+          release-version: latest
+          args: '--allow-asset-diffs'
+
+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+
+      # shorebird struggles with the app from GitHub
+      - name: Build macOS
+        env:
+          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
+        run: |
+          flutter build macos --release;
+          cd build/macos/Build/Products/Release/;
+          zip -r SwiftControl.macos.zip SwiftControl.app/;
+          version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r');
+          echo "VERSION=$version" >> $GITHUB_ENV;
+          /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime SwiftControl.app -v;
+
+      #9 Upload Artifacts
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          overwrite: true
+          name: Releases
+          path: |
+            build/macos/Build/Products/Release/SwiftControl.macos.zip
+
+      # add artifact to release
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: "build/macos/Build/Products/Release/SwiftControl.macos.zip"
+          bodyFile: scripts/RELEASE_NOTES.md
+          tag: v${{ env.VERSION }}
+          token: ${{ secrets.TOKEN }}
+
+  windows:
+    name: Patch Windows
+    runs-on: windows-latest
+
+    steps:
+      #1 Checkout Repository
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+        #2 Setup Java
+      - name: Set Up Java
+        uses: actions/setup-java@v3.12.0
+        with:
+          distribution: 'oracle'
+          java-version: '17'
+
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
+        with:
+          cache: true
+
+      - name: 🚀 Shorebird Patch Windows
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: windows
+          release-version: latest
+          args: '--allow-asset-diffs'

.github/workflows/web.yml

@@ -0,0 +1,51 @@
+name: "Build"
+
+on:
+  push:
+    branches:
+      - web
+      - wahoo_kickr_bike_shift
+      - main
+    paths:
+      - '.github/workflows/web.yml'
+      - 'lib/**'
+      - 'accessibility/**'
+      - 'keypress_simulator/**'
+      - 'pubspec.yaml'
+
+jobs:
+  build:
+    name: Build Web
+    runs-on: macos-latest
+
+    permissions:
+      id-token: write
+      pages: write
+      contents: write
+
+    steps:
+      #1 Checkout Repository
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+        #3 Setup Flutter
+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+        #4 Install Dependencies
+      - name: Install Dependencies
+        run: flutter pub get
+
+      - name: Build Web
+        run: flutter build web --release --base-href "/swiftcontrol/"
+
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: build/web
+
+      - name: Web Deploy
+        uses: actions/deploy-pages@v4

.gitignore

@@ -45,3 +45,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+service-account.json

.vscode/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"
+    }
+  ]
+}

CHANGELOG.md

@@ -1,3 +1,92 @@
+### 3.0.4 (not released yet) 
+- adjusted MyWhoosh keyboard navigation mapping (thanks @bin101)
+- initial support for Wahook Kickr Bike Shift (thanks @MattW2)
+- initial support for Elite Square Smart Frame 
+
+### 3.0.3 (2025-10-12)
+- SwiftControl now supports iOS!
+  - Note that you can't run SwiftControl and your trainer app on the same iPhone due to iOS limitations but...:
+- You can now use SwiftControl as "remote control" for other devices, such as an iPad. Example scenario:
+    - your phone (Android/iOS) runs SwiftControl and connects to your Click devices
+    - your iPad or other tablet runs e.g. MyWhoosh (does not need to have SwiftControl installed)
+    - after pairing SwiftControl to your iPad / tablet via Bluetooth your phone will send the button presses to your iPad / tablet
+- Ride: analog paddles are now supported thanks to contributor @jmoro
+- you can now zoom in and out in the Keymap customization screen
+
+### 2.6.3 (2025-10-01)
+- fix a few issues with the new touch placement feature
+- add a workaround for Zwift Click V2 which resets the device when button events are no longer sent
+- fix issue on Android and Desktop where only a "touch down" was sent, but no "touch up"
+- improve UI when handling custom keymaps around the edges of the screen
+
+### 2.6.0 (2025-09-30)
+- refactor touch placements: show touches on screen, fix misplaced coordinates - should fix #64
+- show firmware version of connected device
+- Fix crashes on some Android devices
+- warn the user how to make Zwift Click V2 work properly
+- many UI improvements
+- add setting to enable or disable vibration on button press for Zwift Ride and Zwift Play controllers
+
+### 2.5.0 (2025-09-25)
+- Improve usability
+- SwiftControl is now available via the Play Store: https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol
+  - SwiftControl will continue to be available to download for free on GitHub
+  - contact me if you already donated and I'll get a voucher for you :)
+
+### 2.4.0+1 (2025-09-17)
+- Windows: fix mouse clicks at wrong location due to display scaling (fixes #64)
+
+### 2.4.0 (2025-09-16)
+- Show an overview of the keymap bindings
+- Allow customizing an existing keymap
+- Add more donation options
+
+### 2.3.0 (2025-09-11)
+- 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
+
+### 2.0.7 (2025-04-18)
+- add Biketerra.com keymap
+- some UX improvements
+
+### 2.0.6 (2025-04-15)
+- fix MyWhoosh up / downshift button assignment (I key vs K key)
+
+### 2.0.5 (2025-04-13)
+- fix Zwift Click button assignment (#12)
+
+### 2.0.4 (2025-04-10)
+- vibrate Zwift Play / Zwift Ride controller on gear shift (thanks @cagnulein, closes #16)
+
+### 2.0.3 (2025-04-08)
+- adjust TrainingPeaks Virtual key mapping (#12)
+- attempt to reconnect device if connection is lost 
+- Android: detect freeform windows for MyWhoosh + TrainingPeaks Virtual keymaps 
+
+### 2.0.2 (2025-04-07)
+- fix bluetooth scan issues on older Android devices by asking for location permission
+
+### 2.0.1 (2025-04-06)
+- long pressing a button will trigger the action again every 250ms
+
+### 2.0.0 (2025-04-06)
+- You can now customize the actions (touches, mouse clicks or keyboard keys) for all buttons on all supported Zwift devices
+- now shows the battery level of the connected devices
+- add more troubleshooting information
+
 ### 1.1.10 (2025-04-03)
 - Add more troubleshooting during connection
 

README.md

@@ -4,7 +4,12 @@
 
 ## Description
 
-With SwiftControl you can control your favorite trainer app using your Zwift Click, Zwift Ride or Zwift Play devices. Primarily useful to perform virtual gear shifting.
+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
+- control music on your device
+- more? If you can do it via keyboard, mouse or touch, you can do it with SwiftControl
 
 
 https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
@@ -13,39 +18,66 @@ https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
 
 
 ## Downloads
-Get the latest version here: https://github.com/jonasbark/swiftcontrol/releases
+Check the compatibility matrix below!
+
+<a href="https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol"><img width="270" height="80" alt="GetItOnGooglePlay_Badge_Web_color_English" src="https://github.com/user-attachments/assets/a059d5a1-2efb-4f65-8117-ef6a99823b21" /></a>
+<a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=iphone"><img width="270" height="80" alt="App Store" src="https://github.com/user-attachments/assets/c23f977a-48f6-4951-811e-ae530dbfa014" /></a>
+<a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=mac"><img width="270" height="80" alt="Mac App Store" src="https://github.com/user-attachments/assets/b3552436-409c-43b0-ba7d-b6a72ae30ff1" /></a>
+
+
+Get the latest version for Windows here: https://github.com/jonasbark/swiftcontrol/releases
 
 ## Supported Apps
 - MyWhoosh
-- indieVelo / Training Peaks
-- any other: 
-  - Android: you can customize the gear shifting touch points in the app
-  - Desktop: you can customize the keyboard shortcuts in the app
+- TrainingPeaks Virtual / indieVelo
+- Biketerra.com (they do offer native integration already - check it out)
+- Rouvy (most Zwift devices are already supported by Rouvy)
+- any other! You can add custom mapping and adjust touch points or keyboard shortcuts to your liking
 
 ## Supported Devices
 - Zwift Click
+- Zwift Click v2 (mostly, see issue #68)
 - Zwift Ride
 - Zwift Play
+- Elite Square Smart Frame (beta)
+- Wahoo Kickr Bike Shift (beta)
 
 ## Supported Platforms
-- Android
-- 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)")
-- [Web](https://jonasbark.github.io/swiftcontrol/) (you won't be able to do much)
+
+| Platform you want to run your Trainer app, e.g. MyWhoosh on | Possible | Link                                                                                                                                                                                                                                                        | Information                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|-------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Android                                                     | ✅        | <a href="https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol"><img width="270" height="80" alt="GetItOnGooglePlay_Badge_Web_color_English" src="https://github.com/user-attachments/assets/a059d5a1-2efb-4f65-8117-ef6a99823b21" /></a> |                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| iPad (and possibly Apple TV)                                | ✅        | <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=iphone"><img width="270" height="80" alt="App Store" src="https://github.com/user-attachments/assets/c23f977a-48f6-4951-811e-ae530dbfa014" /></a>                                 | You will need to use SwiftControl as a "remote" to control the trainer app on your iPad. Typically you would use an iPhone or an Android phone for that.                                                                                                                                                                                                                                                                               |
+| Windows                                                     | ✅        | [Get it here](https://github.com/jonasbark/swiftcontrol/releases)                                                                                                                                                                       | - Windows may flag the app as virus. It likely does so because the app controls the mouse and keyboard.<br>- Bluetooth connection unstable? You may need to use an [external Bluetooth adapter](https://github.com/jonasbark/swiftcontrol/issues/14#issuecomment-3193839509).<br>- Make sure your Zwift device is not paired with Windows Bluetooth settings: [more information](https://github.com/jonasbark/swiftcontrol/issues/70). |
+| macOS                                                       | ✅        | <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=mac"><img width="270" height="80" alt="Mac App Store" src="https://github.com/user-attachments/assets/b3552436-409c-43b0-ba7d-b6a72ae30ff1" /></a>                                |                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| iPhone                                                      | ❌        |                                                                                                                                                                                                                                                             | Note that you can't run SwiftControl and your trainer app on the same iPhone due to iOS limitations, but you can use it to remotely control MyWhoosh and similar on e.g. an iPad.                                                                                                                                                                                                                                                      |
+
+
+For testing purposes you can also run it on [Web](https://jonasbark.github.io/swiftcontrol/) but this is just a tech demo - you won't be able to control other apps.
 
 ## Troubleshooting
-Your Zwift device is found but connection does not work properly? You may need to update the firmware in Zwift Companion app.
+Check the troubleshooting guide [here](TROUBLESHOOTING.md).
 
 ## How does it work?
-The app connects to your Zwift device automatically. 
+The app connects to your Zwift devices 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 macOS or Windows a keyboard click is used to trigger the action. Typically + and - keys are used to shift gears, while MyWhoosh uses K and I keys.
+- **Android**: SwiftControl uses the AccessibilityService API to simulate touch gestures on specific parts of your screen to trigger actions in training apps. The service monitors which training app window is currently active to ensure gestures are sent to the correct app.
+- **iOS**: use SwiftControl as "remote control" for other devices, such as an iPad. Example scenario:
+  - your phone (Android/iOS) runs SwiftControl and connects to your Zwift devices
+  - your iPad or other tablet runs e.g. MyWhoosh (does not need to have SwiftControl installed)
+  - after pairing SwiftControl to your iPad / tablet via Bluetooth your phone will send the button presses to your iPad / tablet
+- **macOS** / **Windows** a keyboard or mouse click is used to trigger the action. 
+  - 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
+</details>
+
+## Alternatives
+- [qdomyos-zwift](https://www.qzfitness.com/) directly controls the trainer (as opposed to controlling the trainer app). This can be useful if your trainer app does not support virtual shifting.
 
 ## Donate
-Please consider donating to support the development of this app. 
+Please consider donating to support the development of this app :)
 
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/boni)
-
-## TODO
-- implement more actions for Play + Ride
+- [via PayPal](https://paypal.me/boni)
+- [via Credit Card, Google Pay, Apple Pay, etc (USD)](https://donate.stripe.com/8x24gzc5c4ZE3VJdt36J201)
+- [via Credit Card, Google Pay, Apple Pay, etc (EUR)](https://donate.stripe.com/9B6aEX0muajY8bZ1Kl6J200)

TROUBLESHOOTING.md

@@ -0,0 +1,28 @@
+## Click device cannot be found
+You may need to update the firmware in Zwift Companion app.
+
+## Click device does not send any data
+You may need to update the firmware in Zwift Companion app.
+
+## My Click v2 disconnects after a minute
+Check [this](https://github.com/jonasbark/swiftcontrol/issues/68) discussion.
+
+To make your Click V2 work best you should connect it in the Zwift app once each day.
+If you don't do that SwiftControl will need to reconnect every minute.
+
+1. Open Zwift app (not the Companion)
+2. Log in (subscription not required) and open the device connection screen
+3. Connect your Trainer, then connect the Click V2
+4. Close the Zwift app again and connect again in SwiftControl
+
+## Remote control is not working - nothing happens
+- Try to unpair it from your phone / computer Bluetooth settings, then re-pair it.
+- Try restarting the pairing process in SwiftControl
+- try restarting Bluetooth on your phone and on the device you want to control
+- If your other device is an iOS device, go to Settings > Accessibility > Touch > AssistiveTouch > Pointer Devices > Devices and pair your device. Make sure AssistiveTouch is enabled.
+- it is very important that both devices (e.g. iPhone and iPad) receive the "pairing dialog" after initial connection. If you miss it, unpair and try again. It may take a few seconds for the dialog to appear. Afterwards you may need to click on "Reconnect" in SwiftControl / restart SwiftControl.
+
+## Remote control only clicks on a single coordinate on my iPad
+iOS seems to be buggy here - try this in the iOS settings:
+AssistiveTouch settings > Pointer Devices > Devices > Connected Devices > iPhone (or SwiftControl iOS) > Button 1 
+switch the setting to None, then back to Single-Tap and it should work again

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

@@ -61,23 +61,29 @@ enum class MediaAction(val raw: Int) {
 /** Generated class from Pigeon that represents data sent in messages. */
 data class WindowEvent (
   val packageName: String,
-  val windowHeight: Long,
-  val windowWidth: Long
+  val top: Long,
+  val bottom: Long,
+  val right: Long,
+  val left: Long
 )
  {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): WindowEvent {
       val packageName = pigeonVar_list[0] as String
-      val windowHeight = pigeonVar_list[1] as Long
-      val windowWidth = pigeonVar_list[2] as Long
-      return WindowEvent(packageName, windowHeight, windowWidth)
+      val top = pigeonVar_list[1] as Long
+      val bottom = pigeonVar_list[2] as Long
+      val right = pigeonVar_list[3] as Long
+      val left = pigeonVar_list[4] as Long
+      return WindowEvent(packageName, top, bottom, right, left)
     }
   }
   fun toList(): List<Any?> {
     return listOf(
       packageName,
-      windowHeight,
-      windowWidth,
+      top,
+      bottom,
+      right,
+      left,
     )
   }
   override fun equals(other: Any?): Boolean {
@@ -88,8 +94,10 @@ data class WindowEvent (
       return true
     }
     return packageName == other.packageName
-    && windowHeight == other.windowHeight
-    && windowWidth == other.windowWidth
+    && top == other.top
+    && bottom == other.bottom
+    && right == other.right
+    && left == other.left
   }
 
   override fun hashCode(): Int = toList().hashCode()
@@ -131,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 {
@@ -181,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)

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

@@ -7,6 +7,7 @@ import StreamEventsStreamHandler
 import WindowEvent
 import android.content.Context
 import android.content.Intent
+import android.graphics.Rect
 import android.os.Bundle
 import android.provider.Settings
 import androidx.core.content.ContextCompat.startActivity
@@ -50,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)
     }
   }
 
@@ -84,8 +89,8 @@ class EventListener : StreamEventsStreamHandler(), Receiver {
     eventSink = null
   }
 
-  override fun onChange(packageName: String, windowWidth: Int, windowHeight: Int) {
-    eventSink?.success(WindowEvent(packageName = packageName, windowWidth = windowWidth.toLong(), windowHeight = windowHeight.toLong()))
+  override fun onChange(packageName: String, window: Rect) {
+    eventSink?.success(WindowEvent(packageName = packageName, right = window.right.toLong(), left = window.left.toLong(), bottom = window.bottom.toLong(), top = window.top.toLong()))
   }
 
 }

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

@@ -5,7 +5,6 @@ import android.accessibilityservice.GestureDescription
 import android.accessibilityservice.GestureDescription.StrokeDescription
 import android.graphics.Path
 import android.graphics.Rect
-import android.os.Build
 import android.util.Log
 import android.view.ViewConfiguration
 import android.view.accessibility.AccessibilityEvent
@@ -37,36 +36,29 @@ class AccessibilityService : AccessibilityService(), Listener {
         }
         val currentPackageName = event.packageName.toString()
         val windowSize = getWindowSize()
-        Observable.fromService?.onChange(packageName = currentPackageName, windowHeight = windowSize.bottom, windowWidth = windowSize.right)
+        Observable.fromService?.onChange(packageName = currentPackageName, window = windowSize)
     }
 
     private fun getWindowSize(): Rect {
         val outBounds = Rect()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            rootInActiveWindow.getBoundsInWindow(outBounds)
-        } else {
-            rootInActiveWindow.getBoundsInScreen(outBounds)
-        }
+        rootInActiveWindow?.getBoundsInScreen(outBounds)
         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 && !isKeyUp)
+        gestureBuilder.addStroke(stroke)
+
+        dispatchGesture(gestureBuilder.build(), null, null)
     }
 }

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

@@ -1,14 +1,16 @@
 package de.jonasbark.accessibility
 
+import android.graphics.Rect
+
 object Observable {
     var toService: Listener? = null
     var fromService: Receiver? = null
 }
 
 interface Listener {
-    fun performTouch(x: Double, y: Double)
+    fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
 }
 
 interface Receiver {
-    fun onChange(packageName: String, windowWidth: Int, windowHeight: Int)
-}
+    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);
 }
@@ -15,10 +15,18 @@ enum MediaAction { playPause, next, volumeUp, volumeDown }
 
 class WindowEvent {
   final String packageName;
-  final int windowHeight;
-  final int windowWidth;
+  final int top;
+  final int bottom;
+  final int right;
+  final int left;
 
-  WindowEvent({required this.packageName, required this.windowHeight, required this.windowWidth});
+  WindowEvent({
+    required this.packageName,
+    required this.left,
+    required this.right,
+    required this.top,
+    required this.bottom,
+  });
 }
 
 @EventChannelApi()

accessibility/lib/accessibility.dart

@@ -25,21 +25,29 @@ enum MediaAction {
 class WindowEvent {
   WindowEvent({
     required this.packageName,
-    required this.windowHeight,
-    required this.windowWidth,
+    required this.top,
+    required this.bottom,
+    required this.right,
+    required this.left,
   });
 
   String packageName;
 
-  int windowHeight;
+  int top;
 
-  int windowWidth;
+  int bottom;
+
+  int right;
+
+  int left;
 
   List<Object?> _toList() {
     return <Object?>[
       packageName,
-      windowHeight,
-      windowWidth,
+      top,
+      bottom,
+      right,
+      left,
     ];
   }
 
@@ -50,8 +58,10 @@ class WindowEvent {
     result as List<Object?>;
     return WindowEvent(
       packageName: result[0]! as String,
-      windowHeight: result[1]! as int,
-      windowWidth: result[2]! as int,
+      top: result[1]! as int,
+      bottom: result[2]! as int,
+      right: result[3]! as int,
+      left: result[4]! as int,
     );
   }
 
@@ -66,8 +76,10 @@ class WindowEvent {
     }
     return 
       packageName == other.packageName
-      && windowHeight == other.windowHeight
-      && windowWidth == other.windowWidth;
+      && top == other.top
+      && bottom == other.bottom
+      && right == other.right
+      && left == other.left;
   }
 
   @override
@@ -175,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) {

analysis_options.yaml

@@ -23,6 +23,10 @@ linter:
   rules:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    - require_trailing_commas
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+formatter:
+  page_width: 120
+  trailing_commas: preserve

android/app/build.gradle.kts

@@ -14,7 +14,7 @@ val keystoreProperties = Properties()
 keystoreProperties.load(FileInputStream(keystorePropertiesFile))
 
 android {
-    namespace = "de.jonasbark.swift_play"
+    namespace = "de.jonasbark.swiftcontrol"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = "27.0.12077973"
 
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "de.jonasbark.swift_play"
+        applicationId = "de.jonasbark.swiftcontrol"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 24

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <!-- Allow Bluetooth -->
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
 
+    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
+
     <!-- New Bluetooth permissions in Android 12
     https://developer.android.com/about/versions/12/features/bluetooth-permissions -->
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
@@ -16,7 +18,7 @@
 
 
     <!-- legacy for Android 9 or lower -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="28" tools:replace="android:maxSdkVersion" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <!-- to check if you have the latest version -->

android/app/src/main/kotlin/de/jonasbark/swiftcontrol/MainActivity.kt

@@ -1,4 +1,4 @@
-package de.jonasbark.swift_play
+package de.jonasbark.swiftcontrol
 
 import io.flutter.embedding.android.FlutterActivity
 

android/settings.gradle.kts

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+    id("com.android.application") version "8.7.3" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")

flutter_launcher_icons.yaml

@@ -9,9 +9,9 @@ flutter_launcher_icons:
   # adaptive_icon_foreground: "assets/icon/foreground.png"
   # adaptive_icon_monochrome: "assets/icon/monochrome.png"
 
-  ios: false
+  ios: true
   # image_path_ios: "assets/icon/icon.png"
-  remove_alpha_channel_ios: true
+  remove_alpha_ios: true
   # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
   # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
   # desaturate_tinted_to_grayscale_ios: true

ios/ExportOptions.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>destination</key>
+	<string>export</string>
+	<key>generateAppStoreInformation</key>
+	<false/>
+	<key>manageAppVersionAndBuildNumber</key>
+	<true/>
+	<key>method</key>
+	<string>app-store-connect</string>
+	<key>signingStyle</key>
+	<string>manual</string>
+    <key>provisioningProfiles</key>
+    <dict>
+        <key>de.jonasbark.swiftcontrol.darwin</key>
+        <string>ios app store</string>
+    </dict>
+	<key>stripSwiftSymbols</key>
+	<true/>
+	<key>teamID</key>
+	<string>UZRHKPVWN9</string>
+	<key>testFlightInternalTestingOnly</key>
+	<false/>
+	<key>uploadSymbols</key>
+	<true/>
+</dict>
+</plist>

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+# platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -0,0 +1,91 @@
+PODS:
+  - bluetooth_low_energy_darwin (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - device_info_plus (0.0.1):
+    - Flutter
+  - Flutter (1.0.0)
+  - flutter_local_notifications (0.0.1):
+    - Flutter
+  - image_picker_ios (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
+  - permission_handler_apple (9.3.0):
+    - Flutter
+  - restart (1.0.0):
+    - Flutter
+  - restart_app (0.0.1):
+    - Flutter
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - universal_ble (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_ios (0.0.1):
+    - Flutter
+  - wakelock_plus (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - bluetooth_low_energy_darwin (from `.symlinks/plugins/bluetooth_low_energy_darwin/darwin`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - Flutter (from `Flutter`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - restart (from `.symlinks/plugins/restart/ios`)
+  - restart_app (from `.symlinks/plugins/restart_app/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
+
+EXTERNAL SOURCES:
+  bluetooth_low_energy_darwin:
+    :path: ".symlinks/plugins/bluetooth_low_energy_darwin/darwin"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
+  Flutter:
+    :path: Flutter
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  image_picker_ios:
+    :path: ".symlinks/plugins/image_picker_ios/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
+  restart:
+    :path: ".symlinks/plugins/restart/ios"
+  restart_app:
+    :path: ".symlinks/plugins/restart_app/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  universal_ble:
+    :path: ".symlinks/plugins/universal_ble/darwin"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
+
+SPEC CHECKSUMS:
+  bluetooth_low_energy_darwin: 764d8d1ae5abefbcdb839e812b4b25c0061fcf8b
+  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  restart: b5fe16e6e038f0024b2f3af43768e9d2a1557554
+  restart_app: 806659942bf932f6ce51c5372f91ce5e81c8c14a
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  wakelock_plus: 76957ab028e12bfa4e66813c99e46637f367fc7e
+
+PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
+
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -10,10 +10,12 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		3E50CA021EFA25CF89FE46AB /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C0E42A04700D6B661C7EE82 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		9DEFD285994D09CFCE400F36 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE7ADD07A99710C0FB974A8 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -40,14 +42,20 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0CF32F9ECDBEA4B014717FF8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2C0E42A04700D6B661C7EE82 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		5CE7ADD07A99710C0FB974A8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7D133E5D5548E2EF2879734F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		86D436F6DAF367742EF27F51 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		8AA6D129479129F106E2298A /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -55,19 +63,43 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		5046C8DCA17DB268ED17F005 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3E50CA021EFA25CF89FE46AB /* Pods_RunnerTests.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9DEFD285994D09CFCE400F36 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		31E2F9ED567016937E8AEA3B /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				86D436F6DAF367742EF27F51 /* Pods-Runner.debug.xcconfig */,
+				0CF32F9ECDBEA4B014717FF8 /* Pods-Runner.release.xcconfig */,
+				7D133E5D5548E2EF2879734F /* Pods-Runner.profile.xcconfig */,
+				DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */,
+				8AA6D129479129F106E2298A /* Pods-RunnerTests.release.xcconfig */,
+				EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -76,6 +108,15 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
+		6A38311855DC1CB8C0E2FD04 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5CE7ADD07A99710C0FB974A8 /* Pods_Runner.framework */,
+				2C0E42A04700D6B661C7EE82 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -94,6 +135,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				31E2F9ED567016937E8AEA3B /* Pods */,
+				6A38311855DC1CB8C0E2FD04 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -128,8 +171,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
+				5E1D2B1ED00966C758CA2289 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
+				5046C8DCA17DB268ED17F005 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -145,12 +190,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				AF2FDC69578083D4D16AB4D6 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				EEF1FBDEE98BA93C4FBDB3AE /* [CP] Embed Pods Frameworks */,
+				1F0C44A79AE73641A1C3FF47 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -222,6 +270,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		1F0C44A79AE73641A1C3FF47 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -238,6 +303,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		5E1D2B1ED00966C758CA2289 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -253,6 +340,45 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		AF2FDC69578083D4D16AB4D6 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		EEF1FBDEE98BA93C4FBDB3AE /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -346,7 +472,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -361,16 +487,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 7BL8RUV2K6;
+				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftPlay;
+				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftcontrol.darwin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -379,6 +508,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -396,6 +526,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8AA6D129479129F106E2298A /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -411,6 +542,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -428,7 +560,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -473,7 +605,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -485,7 +617,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -524,7 +656,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -541,16 +673,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 7BL8RUV2K6;
+				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftPlay;
+				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftcontrol.darwin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -564,16 +699,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 7BL8RUV2K6;
+				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftPlay;
+				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftcontrol.darwin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -54,6 +55,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -24,6 +26,17 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>SwiftControl uses Bluetooth to connect to accessories.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>bluetooth-peripheral</string>
+		<string>bluetooth-central</string>
+	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -41,9 +54,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

keypress_simulator/packages/keypress_simulator/.gitignore

@@ -0,0 +1,29 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/

keypress_simulator/packages/keypress_simulator/.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: db747aa1331bd95bc9b3874c842261ca2d302cd5
+  channel: stable
+
+project_type: plugin

keypress_simulator/packages/keypress_simulator/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.2.0
+
+* feat: Convert to federated plugin
+
+## 0.1.0
+
+* First release.

keypress_simulator/packages/keypress_simulator/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2024 LiJianying <lijy91@foxmail.com>
+
+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.

keypress_simulator/packages/keypress_simulator/README-ZH.md

@@ -0,0 +1 @@
+../../README-ZH.md

keypress_simulator/packages/keypress_simulator/README.md

@@ -0,0 +1 @@
+../../README.md

keypress_simulator/packages/keypress_simulator/analysis_options.yaml

@@ -0,0 +1 @@
+include: package:mostly_reasonable_lints/flutter.yaml

keypress_simulator/packages/keypress_simulator/lib/keypress_simulator.dart

@@ -0,0 +1 @@
+export 'src/keypress_simulator.dart';

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

@@ -0,0 +1,58 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/services.dart';
+import 'package:keypress_simulator_platform_interface/keypress_simulator_platform_interface.dart';
+
+class KeyPressSimulator {
+  KeyPressSimulator._();
+
+  /// The shared instance of [KeyPressSimulator].
+  static final KeyPressSimulator instance = KeyPressSimulator._();
+
+  KeyPressSimulatorPlatform get _platform => KeyPressSimulatorPlatform.instance;
+
+  Future<bool> isAccessAllowed() {
+    return _platform.isAccessAllowed();
+  }
+
+  Future<void> requestAccess({bool onlyOpenPrefPane = false}) {
+    return _platform.requestAccess(onlyOpenPrefPane: onlyOpenPrefPane);
+  }
+
+  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.
+  Future<void> simulateKeyDown(PhysicalKeyboardKey? key, [List<ModifierKey> modifiers = const []]) {
+    return _platform.simulateKeyPress(key: key, modifiers: modifiers, keyDown: true);
+  }
+
+  /// Simulate key up.
+  Future<void> simulateKeyUp(PhysicalKeyboardKey? key, [List<ModifierKey> modifiers = const []]) {
+    return _platform.simulateKeyPress(key: key, modifiers: modifiers, keyDown: false);
+  }
+
+  @Deprecated('Please use simulateKeyDown & simulateKeyUp methods.')
+  Future<void> simulateCtrlCKeyPress() async {
+    const key = PhysicalKeyboardKey.keyC;
+    final modifiers = Platform.isMacOS ? [ModifierKey.metaModifier] : [ModifierKey.controlModifier];
+    await simulateKeyDown(key, modifiers);
+    await simulateKeyUp(key, modifiers);
+  }
+
+  @Deprecated('Please use simulateKeyDown & simulateKeyUp methods.')
+  Future<void> simulateCtrlVKeyPress() async {
+    const key = PhysicalKeyboardKey.keyV;
+    final modifiers = Platform.isMacOS ? [ModifierKey.metaModifier] : [ModifierKey.controlModifier];
+    await simulateKeyDown(key, modifiers);
+    await simulateKeyUp(key, modifiers);
+  }
+}
+
+final keyPressSimulator = KeyPressSimulator.instance;

keypress_simulator/packages/keypress_simulator/pubspec.yaml

@@ -0,0 +1,36 @@
+name: keypress_simulator
+description: This plugin allows Flutter desktop apps to simulate key presses.
+version: 0.2.0
+homepage: https://github.com/leanflutter/keypress_simulator
+
+platforms:
+  macos:
+  windows:
+
+environment:
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.3.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  keypress_simulator_macos:
+    path: ../keypress_simulator_macos
+  keypress_simulator_platform_interface:
+    path: ../keypress_simulator_platform_interface
+  keypress_simulator_windows:
+    path: ../keypress_simulator_windows
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  mostly_reasonable_lints: ^0.1.1
+
+flutter:
+  plugin:
+    platforms:
+      macos:
+        default_package: keypress_simulator_macos
+      windows:
+        default_package: keypress_simulator_windows
+

keypress_simulator/packages/keypress_simulator_macos/.gitignore

@@ -0,0 +1,29 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+build/

keypress_simulator/packages/keypress_simulator_macos/.metadata

@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "67457e669f79e9f8d13d7a68fe09775fefbb79f4"
+  channel: "stable"
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+    - platform: macos
+      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

keypress_simulator/packages/keypress_simulator_macos/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.2.0
+
+* First release.

keypress_simulator/packages/keypress_simulator_macos/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2024 LiJianying <lijy91@foxmail.com>
+
+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.

keypress_simulator/packages/keypress_simulator_macos/README.md

@@ -0,0 +1,12 @@
+# keypress_simulator_macos
+
+[![pub version][pub-image]][pub-url]
+
+[pub-image]: https://img.shields.io/pub/v/keypress_simulator_macos.svg
+[pub-url]: https://pub.dev/packages/keypress_simulator_macos
+
+The macOS implementation of [keypress_simulator](https://pub.dev/packages/keypress_simulator).
+
+## License
+
+[MIT](./LICENSE)

keypress_simulator/packages/keypress_simulator_macos/analysis_options.yaml

@@ -0,0 +1 @@
+include: package:mostly_reasonable_lints/flutter.yaml

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

@@ -0,0 +1,117 @@
+import Cocoa
+import FlutterMacOS
+
+public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
+    public static func register(with registrar: FlutterPluginRegistrar) {
+        let channel = FlutterMethodChannel(name: "dev.leanflutter.plugins/keypress_simulator", binaryMessenger: registrar.messenger)
+        let instance = KeypressSimulatorMacosPlugin()
+        registrar.addMethodCallDelegate(instance, channel: channel)
+    }
+
+    public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        switch call.method {
+        case "isAccessAllowed":
+            isAccessAllowed(call, result: result)
+            break
+        case "requestAccess":
+            requestAccess(call, result: result)
+            break
+        case "simulateKeyPress":
+            simulateKeyPress(call, result: result)
+            break
+        case "simulateMouseClick":
+            simulateMouseClick(call, result: result)
+            break
+        default:
+            result(FlutterMethodNotImplemented)
+        }
+    }
+    public func isAccessAllowed(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        result(AXIsProcessTrusted())
+    }
+
+    public func requestAccess(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let args:[String: Any] = call.arguments as! [String: Any]
+        let onlyOpenPrefPane: Bool = args["onlyOpenPrefPane"] as! Bool
+
+        if (!onlyOpenPrefPane) {
+            let options = [kAXTrustedCheckOptionPrompt.takeRetainedValue(): true] as CFDictionary
+            AXIsProcessTrustedWithOptions(options)
+        } else  {
+            let prefpaneUrl = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility")!
+            NSWorkspace.shared.open(prefpaneUrl)
+        }
+        result(true)
+    }
+
+    public func simulateKeyPress(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let args:[String: Any] = call.arguments as! [String: Any]
+
+        let keyCode: Int? = args["keyCode"] as? Int
+        let modifiers: Array<String> = args["modifiers"] as! Array<String>
+        let keyDown: Bool = args["keyDown"] as! Bool
+
+        let event = _createKeyPressEvent(keyCode, modifiers, keyDown);
+        event.post(tap: .cghidEventTap);
+        result(true)
+    }
+
+
+    public func simulateMouseClick(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let args:[String: Any] = call.arguments as! [String: Any]
+
+        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)
+
+        // Move mouse to the point
+        /*let move = CGEvent(mouseEventSource: nil,
+                           mouseType: .mouseMoved,
+                           mouseCursorPosition: point,
+                           mouseButton: .left)
+        move?.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)
+    }
+
+    public func _createKeyPressEvent(_ keyCode: Int?, _ modifiers: Array<String>, _ keyDown: Bool) -> CGEvent {
+        let virtualKey: CGKeyCode = CGKeyCode(UInt32(keyCode ?? 0))
+        var flags: CGEventFlags = CGEventFlags()
+
+        if (modifiers.contains("shiftModifier")) {
+            flags.insert(CGEventFlags.maskShift)
+        }
+        if (modifiers.contains("controlModifier")) {
+            flags.insert(CGEventFlags.maskControl)
+        }
+        if (modifiers.contains("altModifier")) {
+            flags.insert(CGEventFlags.maskAlternate)
+        }
+        if (modifiers.contains("metaModifier")) {
+            flags.insert(CGEventFlags.maskCommand)
+        }
+        if (modifiers.contains("functionModifier")) {
+            flags.insert(CGEventFlags.maskSecondaryFn)
+        }
+        let eventKeyPress = CGEvent(keyboardEventSource: nil, virtualKey: virtualKey, keyDown: keyDown);
+        eventKeyPress!.flags = flags
+        return eventKeyPress!
+    }
+}

keypress_simulator/packages/keypress_simulator_macos/macos/keypress_simulator_macos.podspec

@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint keypress_simulator_macos.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'keypress_simulator_macos'
+  s.version          = '0.0.1'
+  s.summary          = 'A new Flutter plugin project.'
+  s.description      = <<-DESC
+A new Flutter plugin project.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+
+  s.source           = { :path => '.' }
+  s.source_files     = 'Classes/**/*'
+  s.dependency 'FlutterMacOS'
+
+  s.platform = :osx, '10.11'
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+  s.swift_version = '5.0'
+end

keypress_simulator/packages/keypress_simulator_macos/pubspec.yaml

@@ -0,0 +1,27 @@
+name: keypress_simulator_macos
+description: macOS implementation of the keypress_simulator plugin.
+version: 0.2.0
+repository: https://github.com/leanflutter/keypress_simulator/tree/main/packages/keypress_simulator_macos
+
+environment:
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.3.0'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  keypress_simulator_platform_interface:
+    path: ../keypress_simulator_platform_interface
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  mostly_reasonable_lints: ^0.1.1
+
+flutter:
+  plugin:
+    implements: keypress_simulator
+    platforms:
+      macos:
+        pluginClass: KeypressSimulatorMacosPlugin
+

keypress_simulator/packages/keypress_simulator_platform_interface/.gitignore

@@ -0,0 +1,29 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+build/

keypress_simulator/packages/keypress_simulator_platform_interface/.metadata

@@ -0,0 +1,27 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "67457e669f79e9f8d13d7a68fe09775fefbb79f4"
+  channel: "stable"
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+      base_revision: 67457e669f79e9f8d13d7a68fe09775fefbb79f4
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

keypress_simulator/packages/keypress_simulator_platform_interface/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.2.0
+
+* First release.

keypress_simulator/packages/keypress_simulator_platform_interface/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2024 LiJianying <lijy91@foxmail.com>
+
+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.

keypress_simulator/packages/keypress_simulator_platform_interface/README.md

@@ -0,0 +1,16 @@
+# keypress_simulator_platform_interface
+
+[![pub version][pub-image]][pub-url]
+
+[pub-image]: https://img.shields.io/pub/v/keypress_simulator_platform_interface.svg
+[pub-url]: https://pub.dev/packages/keypress_simulator_platform_interface
+
+A common platform interface for the [keypress_simulator](https://pub.dev/packages/keypress_simulator) plugin.
+
+## Usage
+
+To implement a new platform-specific implementation of keypress_simulator, extend `KeyPressSimulatorPlatform` with an implementation that performs the platform-specific behavior, and when you register your plugin, set the default `KeyPressSimulatorPlatform` by calling `KeyPressSimulatorPlatform.instance = MyPlatformKeyPressSimulator()`.
+
+## License
+
+[MIT](./LICENSE)

keypress_simulator/packages/keypress_simulator_platform_interface/analysis_options.yaml

@@ -0,0 +1 @@
+include: package:mostly_reasonable_lints/flutter.yaml

keypress_simulator/packages/keypress_simulator_platform_interface/lib/keypress_simulator_platform_interface.dart

@@ -0,0 +1,4 @@
+library keypress_simulator_platform_interface;
+
+export 'src/keypress_simulator_method_channel.dart';
+export 'src/keypress_simulator_platform_interface.dart';

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

@@ -0,0 +1,64 @@
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:keypress_simulator_platform_interface/src/keypress_simulator_platform_interface.dart';
+import 'package:uni_platform/uni_platform.dart';
+
+/// An implementation of [KeyPressSimulatorPlatform] that uses method channels.
+class MethodChannelKeyPressSimulator extends KeyPressSimulatorPlatform {
+  /// The method channel used to interact with the native platform.
+  @visibleForTesting
+  final methodChannel = const MethodChannel(
+    'dev.leanflutter.plugins/keypress_simulator',
+  );
+
+  @override
+  Future<bool> isAccessAllowed() async {
+    if (UniPlatform.isMacOS) {
+      return await methodChannel.invokeMethod('isAccessAllowed');
+    }
+    return true;
+  }
+
+  @override
+  Future<void> requestAccess({
+    bool onlyOpenPrefPane = false,
+  }) async {
+    if (UniPlatform.isMacOS) {
+      final Map<String, dynamic> arguments = {
+        'onlyOpenPrefPane': onlyOpenPrefPane,
+      };
+      await methodChannel.invokeMethod('requestAccess', arguments);
+    }
+  }
+
+  @override
+  Future<void> simulateKeyPress({
+    KeyboardKey? key,
+    List<ModifierKey> modifiers = const [],
+    bool keyDown = true,
+  }) async {
+    PhysicalKeyboardKey? physicalKey = key is PhysicalKeyboardKey ? key : null;
+    if (key is LogicalKeyboardKey) {
+      physicalKey = key.physicalKey;
+    }
+    if (key != null && physicalKey == null) {
+      throw UnsupportedError('Unsupported key: $key.');
+    }
+    final Map<Object?, Object?> arguments = {
+      'keyCode': physicalKey?.keyCode,
+      'modifiers': modifiers.map((e) => e.name).toList(),
+      'keyDown': keyDown,
+    }..removeWhere((key, value) => value == null);
+    await methodChannel.invokeMethod('simulateKeyPress', arguments);
+  }
+
+  @override
+  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

@@ -0,0 +1,47 @@
+import 'package:flutter/services.dart';
+import 'package:keypress_simulator_platform_interface/src/keypress_simulator_method_channel.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+abstract class KeyPressSimulatorPlatform extends PlatformInterface {
+  /// Constructs a KeyPressSimulatorPlatform.
+  KeyPressSimulatorPlatform() : super(token: _token);
+
+  static final Object _token = Object();
+
+  static KeyPressSimulatorPlatform _instance = MethodChannelKeyPressSimulator();
+
+  /// The default instance of [KeyPressSimulatorPlatform] to use.
+  ///
+  /// Defaults to [MethodChannelKeyPressSimulator].
+  static KeyPressSimulatorPlatform get instance => _instance;
+
+  /// Platform-specific implementations should set this with their own
+  /// platform-specific class that extends [KeyPressSimulatorPlatform] when
+  /// they register themselves.
+  static set instance(KeyPressSimulatorPlatform instance) {
+    PlatformInterface.verifyToken(instance, _token);
+    _instance = instance;
+  }
+
+  Future<bool> isAccessAllowed() {
+    throw UnimplementedError('isAccessAllowed() has not been implemented.');
+  }
+
+  Future<void> requestAccess({
+    bool onlyOpenPrefPane = false,
+  }) {
+    throw UnimplementedError('requestAccess() has not been implemented.');
+  }
+
+  Future<void> simulateKeyPress({
+    KeyboardKey? key,
+    List<ModifierKey> modifiers = const [],
+    bool keyDown = true,
+  }) {
+    throw UnimplementedError('simulateKeyPress() has not been implemented.');
+  }
+
+  Future<void> simulateMouseClick(Offset position, {required bool keyDown}) {
+    throw UnimplementedError('simulateKeyPress() has not been implemented.');
+  }
+}

keypress_simulator/packages/keypress_simulator_platform_interface/pubspec.yaml

@@ -0,0 +1,20 @@
+name: keypress_simulator_platform_interface
+description: A common platform interface for the keypress_simulator plugin.
+version: 0.2.0
+homepage: https://github.com/leanflutter/keypress_simulator/blob/main/packages/keypress_simulator_platform_interface
+
+environment:
+  sdk: '>=3.0.0 <4.0.0'
+  flutter: '>=3.3.0'
+
+dependencies:
+  collection: ^1.18.0
+  flutter:
+    sdk: flutter
+  plugin_platform_interface: ^2.1.8
+  uni_platform: ^0.1.2
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  mostly_reasonable_lints: ^0.1.1

keypress_simulator/packages/keypress_simulator_platform_interface/test/src/keypress_simulator_method_channel_test.dart

@@ -0,0 +1,32 @@
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:keypress_simulator_platform_interface/src/keypress_simulator_method_channel.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  MethodChannelKeyPressSimulator platform = MethodChannelKeyPressSimulator();
+  const MethodChannel channel = MethodChannel(
+    'dev.leanflutter.plugins/keypress_simulator',
+  );
+
+  setUp(() {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(
+      channel,
+      (MethodCall methodCall) async {
+        if (methodCall.method == 'isAccessAllowed') return true;
+        return '42';
+      },
+    );
+  });
+
+  tearDown(() {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
+  });
+
+  test('isAccessAllowed', () async {
+    expect(await platform.isAccessAllowed(), true);
+  });
+}

keypress_simulator/packages/keypress_simulator_windows/pubspec.yaml

@@ -10,7 +10,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  keypress_simulator_platform_interface: ^0.2.0
+  keypress_simulator_platform_interface:
+    path: ../keypress_simulator_platform_interface
 
 dev_dependencies:
   flutter_test:

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.cpp

@@ -2,6 +2,9 @@
 
 // This must be included before many other Windows headers.
 #include <windows.h>
+#include <psapi.h>
+#include <string.h>
+#include <flutter_windows.h>
 
 #include <flutter/method_channel.h>
 #include <flutter/plugin_registrar_windows.h>
@@ -16,6 +19,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,42 +67,164 @@ 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));
 }
 
+void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
+    const flutter::MethodCall<flutter::EncodableValue>& method_call,
+    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
+
+  const EncodableMap& args = std::get<EncodableMap>(*method_call.arguments());
+  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);
+  }
+
+  auto it_y = args.find(EncodableValue("y"));
+  if (it_y != args.end() && std::holds_alternative<double>(it_y->second)) {
+      y = std::get<double>(it_y->second);
+  }
+
+  // Get the monitor containing the target point and its DPI
+  const POINT target_point = {static_cast<LONG>(x), static_cast<LONG>(y)};
+  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
+  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
+  double scale_factor = dpi / 96.0;
+  
+  // Scale the coordinates according to the DPI scaling
+  int scaled_x = static_cast<int>(x * scale_factor);
+  int scaled_y = static_cast<int>(y * scale_factor);
+
+  // Move the mouse to the specified coordinates
+  SetCursorPos(scaled_x, scaled_y);
+
+  // Prepare input for mouse down and up
+  INPUT input = {0};
+  input.type = INPUT_MOUSE;
+
+  if (keyDown) {
+      // Mouse left button down
+      input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
+      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) {
   if (method_call.method_name().compare("simulateKeyPress") == 0) {
     SimulateKeyPress(method_call, std::move(result));
+  } else if (method_call.method_name().compare("simulateMouseClick") == 0) {
+    SimulateMouseClick(method_call, std::move(result));
   } else {
     result->NotImplemented();
   }

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.h

@@ -26,6 +26,12 @@ class KeypressSimulatorWindowsPlugin : public flutter::Plugin {
       const flutter::MethodCall<flutter::EncodableValue>& method_call,
       std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
 
+  void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
+      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,

lib/bluetooth/ble.dart

@@ -1,6 +1,12 @@
-import 'dart:typed_data';
+import 'package:flutter/services.dart';
 
 class BleUuid {
+  static final DEVICE_INFORMATION_SERVICE_UUID = "0000180a-0000-1000-8000-00805f9b34fb".toLowerCase();
+  static final DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION = "00002a26-0000-1000-8000-00805f9b34fb"
+      .toLowerCase();
+
+  static final DEVICE_BATTERY_SERVICE_UUID = "0000180f-0000-1000-8000-00805f9b34fb".toLowerCase();
+  static final DEVICE_INFORMATION_CHARACTERISTIC_BATTERY_LEVEL = "00002a19-0000-1000-8000-00805f9b34fb".toLowerCase();
   static final ZWIFT_CUSTOM_SERVICE_UUID = "00000001-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
   static final ZWIFT_RIDE_CUSTOM_SERVICE_UUID = "0000fc82-0000-1000-8000-00805f9b34fb".toLowerCase();
   static final ZWIFT_ASYNC_CHARACTERISTIC_UUID = "00000002-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
@@ -9,7 +15,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,17 +28,57 @@ 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]);
 
   // these don't actually seem to matter, its just the header has to be 7 bytes RIDEON + 2
   static final REQUEST_START = Uint8List.fromList([0, 9]); //byteArrayOf(1, 2)
   static final RESPONSE_START_CLICK = Uint8List.fromList([1, 3]); // from device
   static final RESPONSE_START_PLAY = Uint8List.fromList([1, 4]); // from device
+  static final RESPONSE_START_CLICK_V2 = Uint8List.fromList([0x02, 0x03]); // from device
+  static final RESPONSE_STOPPED_CLICK_V2 = Uint8List.fromList([
+    0xff,
+    0x05,
+    0x00,
+    0xea,
+    0x05,
+    0x19,
+    0x0a,
+    0x0c,
+    0x35,
+    0x38,
+    0x44,
+    0x31,
+    0x35,
+    0x41,
+    0x42,
+    0x42,
+    0x34,
+    0x33,
+    0x36,
+    0x33,
+    0x10,
+    0x01,
+    0x18,
+    0x84,
+    0x07,
+    0x20,
+    0x08,
+    0x28,
+    0x09,
+    0x30,
+  ]); // from device
 
   // Message types received from device
   static const CONTROLLER_NOTIFICATION_MESSAGE_TYPE = 07;
   static const EMPTY_MESSAGE_TYPE = 21;
   static const BATTERY_LEVEL_TYPE = 25;
+  static const UNKNOWN_CLICKV2_TYPE = 0x3C;
 
   // not figured out the protobuf type this really is, the content is just two varints.
   static const int CLICK_NOTIFICATION_MESSAGE_TYPE = 55;
@@ -45,6 +91,8 @@ class Constants {
 
 enum DeviceType {
   click,
+  clickV2Right,
+  clickV2Left,
   playLeft,
   playRight,
   rideRight,
@@ -60,6 +108,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

@@ -3,7 +3,9 @@ import 'dart:io';
 
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/actions/android.dart';
 import 'package:swift_control/utils/requirements/android.dart';
 import 'package:universal_ble/universal_ble.dart';
 
@@ -13,7 +15,7 @@ import 'messages/notification.dart';
 
 class Connection {
   final devices = <BaseDevice>[];
-  var androidNotificationsSetup = false;
+  var _androidNotificationsSetup = false;
 
   final _connectionQueue = <BaseDevice>[];
   var _handlingConnectionQueue = false;
@@ -22,7 +24,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;
 
@@ -35,11 +37,16 @@ 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}'));
         }
       }
     };
@@ -48,6 +55,7 @@ class Connection {
       final device = devices.firstOrNullWhere((e) => e.device.deviceId == deviceId);
       if (device == null) {
         _actionStreams.add(LogNotification('Device not found: $deviceId'));
+        UniversalBle.disconnect(deviceId);
         return;
       } else {
         device.processCharacteristic(characteristicUuid, value);
@@ -57,11 +65,12 @@ class Connection {
 
   Future<void> performScanning() async {
     isScanning.value = true;
+    _actionStreams.add(LogNotification('Scanning for devices...'));
 
     // does not work on web, may not work on Windows
     if (!kIsWeb && !Platform.isWindows) {
       UniversalBle.getSystemDevices(
-        withServices: [BleUuid.ZWIFT_CUSTOM_SERVICE_UUID, BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID],
+        withServices: BaseDevice.servicesToScan,
       ).then((devices) async {
         final baseDevices = devices.mapNotNull(BaseDevice.fromScanResult).toList();
         if (baseDevices.isNotEmpty) {
@@ -71,8 +80,8 @@ class Connection {
     }
 
     await UniversalBle.startScan(
-      scanFilter: ScanFilter(withServices: [BleUuid.ZWIFT_CUSTOM_SERVICE_UUID, BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID]),
-      platformConfig: PlatformConfig(web: WebOptions(optionalServices: [BleUuid.ZWIFT_CUSTOM_SERVICE_UUID])),
+      scanFilter: ScanFilter(withServices: BaseDevice.servicesToScan),
+      platformConfig: PlatformConfig(web: WebOptions(optionalServices: BaseDevice.servicesToScan)),
     );
     Future.delayed(Duration(seconds: 30)).then((_) {
       if (isScanning.value) {
@@ -90,9 +99,8 @@ class Connection {
     _handleConnectionQueue();
 
     hasDevices.value = devices.isNotEmpty;
-    if (devices.isNotEmpty && !androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
-      androidNotificationsSetup = true;
-      actionHandler.init(null);
+    if (devices.isNotEmpty && !_androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
+      _androidNotificationsSetup = true;
       NotificationRequirement.setup().catchError((e) {
         _actionStreams.add(LogNotification(e.toString()));
       });
@@ -128,11 +136,21 @@ class Connection {
       final actionSubscription = bleDevice.actionStream.listen((data) {
         _actionStreams.add(data);
       });
-      final connectionStateSubscription = UniversalBle.connectionStream(bleDevice.device.deviceId).listen((
-        state,
-      ) async {
-        bleDevice.isConnected = state.isConnected;
+      final connectionStateSubscription = UniversalBle.connectionStream(bleDevice.device.deviceId).listen((state) {
+        bleDevice.isConnected = state;
         _connectionStreams.add(bleDevice);
+        if (!bleDevice.isConnected) {
+          devices.remove(bleDevice);
+          _streamSubscriptions[bleDevice]?.cancel();
+          _streamSubscriptions.remove(bleDevice);
+          _connectionSubscriptions[bleDevice]?.cancel();
+          _connectionSubscriptions.remove(bleDevice);
+          _lastScanResult.clear();
+          // try reconnect
+          if (!isScanning.value) {
+            performScanning();
+          }
+        }
       });
       _connectionSubscriptions[bleDevice] = connectionStateSubscription;
 
@@ -150,6 +168,11 @@ class Connection {
   }
 
   void reset() {
+    _actionStreams.add(LogNotification('Disconnecting all devices'));
+    if (actionHandler is AndroidActions) {
+      AndroidFlutterLocalNotificationsPlugin().stopForegroundService();
+      _androidNotificationsSetup = false;
+    }
     UniversalBle.stopScan();
     isScanning.value = false;
     for (var device in devices) {
@@ -163,4 +186,12 @@ class Connection {
     hasDevices.value = false;
     devices.clear();
   }
+
+  void signalNotification(BaseNotification notification) {
+    _actionStreams.add(notification);
+  }
+
+  void signalChange(BaseDevice baseDevice) {
+    _connectionStreams.add(baseDevice);
+  }
 }

lib/bluetooth/devices/base_device.dart

@@ -1,45 +1,73 @@
 import 'dart:async';
-import 'dart:io';
 
 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_play.dart';
-import 'package:swift_control/bluetooth/devices/zwift_ride.dart';
-import 'package:swift_control/utils/crypto/local_key_provider.dart';
-import 'package:swift_control/utils/crypto/zap_crypto.dart';
+import 'package:swift_control/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_click.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_play.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_ride.dart';
+import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/actions/desktop.dart';
 import 'package:universal_ble/universal_ble.dart';
 
-import '../../utils/crypto/encryption_utils.dart';
+import '../../utils/keymap/buttons.dart';
 import '../messages/notification.dart';
+import 'elite/elite_square.dart';
 
 abstract class BaseDevice {
   final BleDevice scanResult;
-  BaseDevice(this.scanResult);
+  final bool isBeta;
+  final List<ControllerButton> availableButtons;
 
-  final zapEncryption = ZapCrypto(LocalKeyProvider());
+  BaseDevice(this.scanResult, {required this.availableButtons, this.isBeta = false});
 
   bool isConnected = false;
+  int? batteryLevel;
+  String? firmwareVersion;
 
-  bool supportsEncryption = true;
+  Timer? _longPressTimer;
+  Set<ControllerButton> _previouslyPressedButtons = <ControllerButton>{};
 
-  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK;
-  String get customServiceId => BleUuid.ZWIFT_CUSTOM_SERVICE_UUID;
+  static List<String> servicesToScan = [
+    BleUuid.ZWIFT_CUSTOM_SERVICE_UUID,
+    BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
+    SquareConstants.SERVICE_UUID,
+    WahooKickrBikeShiftConstants.SERVICE_UUID,
+  ];
 
   static BaseDevice? fromScanResult(BleDevice scanResult) {
     // Use the name first as the "System Devices" and Web (android sometimes Windows) don't have manufacturer data
-    final device = switch (scanResult.name) {
-      //'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),
-      _ => null,
-    };
+    BaseDevice? device;
+    if (kIsWeb) {
+      device = switch (scanResult.name) {
+        'Zwift Ride' => ZwiftRide(scanResult),
+        'Zwift Play' => ZwiftPlay(scanResult),
+        'Zwift Click' => ZwiftClickV2(scanResult),
+        'SQUARE' => EliteSquare(scanResult),
+        _ => null,
+      };
+
+      if (scanResult.name != null && scanResult.name!.toUpperCase().startsWith('KICKR BIKE SHIFT')) {
+        device = WahooKickrBikeShift(scanResult);
+      }
+    } else {
+      device = switch (scanResult.name) {
+        //'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), special case for Zwift Click v2: we must only connect to the left controller
+        _ => null,
+      };
+    }
 
     if (device != null) {
       return device;
-    } else {
+    } else if (scanResult.services.containsAny([
+      BleUuid.ZWIFT_CUSTOM_SERVICE_UUID,
+      BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
+    ])) {
       // otherwise use the manufacturer data to identify the device
       final manufacturerData = scanResult.manufacturerDataList;
       final data = manufacturerData.firstOrNullWhere((e) => e.companyId == Constants.ZWIFT_MANUFACTURER_ID)?.payload;
@@ -53,10 +81,25 @@ 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,
       };
+    } else if (scanResult.services.contains(SquareConstants.SERVICE_UUID)) {
+      return EliteSquare(scanResult);
+    } else if (scanResult.services.contains(WahooKickrBikeShiftConstants.SERVICE_UUID)) {
+      if (scanResult.name != null && !scanResult.name!.toUpperCase().contains('KICKR BIKE SHIFT')) {
+        return WahooKickrBikeShift(scanResult);
+      } else if (kIsWeb && scanResult.name == null) {
+        // some devices don't broadcast the name, so we must rely on the service UUID
+        return WahooKickrBikeShift(scanResult);
+      } else {
+        return null;
+      }
+    } else {
+      return null;
     }
   }
 
@@ -75,149 +118,110 @@ abstract class BaseDevice {
 
   BleDevice get device => scanResult;
   final StreamController<BaseNotification> actionStreamInternal = StreamController<BaseNotification>.broadcast();
+
   Stream<BaseNotification> get actionStream => actionStreamInternal.stream;
 
   Future<void> connect() async {
+    actionStream.listen((message) {
+      print("Received message: $message");
+    });
+
     await UniversalBle.connect(device.deviceId);
 
-    if (!kIsWeb && Platform.isAndroid) {
-      //await UniversalBle.requestMtu(device.deviceId, 256);
+    if (!kIsWeb) {
+      await UniversalBle.requestMtu(device.deviceId, 517);
     }
 
     final services = await UniversalBle.discoverServices(device.deviceId);
-    await _handleServices(services);
+    await handleServices(services);
   }
 
-  Future<void> _handleServices(List<BleService> services) async {
-    final customService = services.firstOrNullWhere((service) => service.uuid == customServiceId);
+  Future<void> handleServices(List<BleService> services);
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes);
 
-    if (customService == null) {
-      throw Exception(
-        'Custom service $customServiceId not found for device $this ${device.name ?? device.rawName}.\nYou may need to update the firmware in Zwift Companion app.\nWe found: ${services.joinToString(transform: (s) => s.uuid)}',
-      );
-    }
+  Future<void> handleButtonsClicked(List<ControllerButton>? buttonsClicked) async {
+    if (buttonsClicked == null) {
+      // ignore, no changes
+    } else if (buttonsClicked.isEmpty) {
+      actionStreamInternal.add(LogNotification('Buttons released'));
+      _longPressTimer?.cancel();
 
-    final asyncCharacteristic = customService.characteristics.firstOrNullWhere(
-      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_ASYNC_CHARACTERISTIC_UUID,
-    );
-    final syncTxCharacteristic = customService.characteristics.firstOrNullWhere(
-      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID,
-    );
-    final syncRxCharacteristic = customService.characteristics.firstOrNullWhere(
-      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_RX_CHARACTERISTIC_UUID,
-    );
-
-    if (asyncCharacteristic == null || syncTxCharacteristic == null || syncRxCharacteristic == null) {
-      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 _setupHandshake(syncRxCharacteristic);
-  }
-
-  Future<void> _setupHandshake(BleCharacteristic syncRxCharacteristic) async {
-    if (supportsEncryption) {
-      await UniversalBle.writeValue(
-        device.deviceId,
-        customServiceId,
-        syncRxCharacteristic.uuid,
-        Uint8List.fromList([
-          ...Constants.RIDE_ON,
-          ...Constants.REQUEST_START,
-          ...zapEncryption.localKeyProvider.getPublicKeyBytes(),
-        ]),
-        BleOutputProperty.withoutResponse,
-      );
-    } else {
-      await UniversalBle.writeValue(
-        device.deviceId,
-        customServiceId,
-        syncRxCharacteristic.uuid,
-        Constants.RIDE_ON,
-        BleOutputProperty.withoutResponse,
-      );
-    }
-  }
-
-  void processCharacteristic(String characteristic, Uint8List bytes) {
-    if (kDebugMode && false) {
-      print('Received $characteristic: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}');
-      print('Received $characteristic: ${String.fromCharCodes(bytes)}');
-    }
-
-    if (bytes.isEmpty) {
-      return;
-    }
-
-    try {
-      if (bytes.startsWith(startCommand)) {
-        _processDevicePublicKeyResponse(bytes);
-      } else if (bytes.startsWith(Constants.RIDE_ON)) {
-        //print("Empty RideOn response - unencrypted mode");
-      } else if (!supportsEncryption || (bytes.length > Int32List.bytesPerElement + EncryptionUtils.MAC_LENGTH)) {
-        _processData(bytes);
-      } else if (bytes[0] == Constants.DISCONNECT_MESSAGE_TYPE) {
-        //print("Disconnect message");
-      } else {
-        //print("Unprocessed - Data Type: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+      // Handle release events for long press keys
+      final buttonsReleased = _previouslyPressedButtons.toList();
+      final isLongPress =
+          buttonsReleased.singleOrNull != null &&
+          actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
+      if (buttonsReleased.isNotEmpty && isLongPress) {
+        await performRelease(buttonsReleased);
       }
-    } catch (e, stackTrace) {
-      print("Error processing data: $e");
-      print("Stack Trace: $stackTrace");
-      actionStreamInternal.add(LogNotification("$e\n$stackTrace"));
-    }
-  }
-
-  void _processDevicePublicKeyResponse(Uint8List bytes) {
-    final devicePublicKeyBytes = bytes.sublist(Constants.RIDE_ON.length + Constants.RESPONSE_START_CLICK.length);
-    zapEncryption.initialise(devicePublicKeyBytes);
-    if (kDebugMode) {
-      print("Device Public Key - ${devicePublicKeyBytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
-    }
-  }
-
-  void _processData(Uint8List bytes) {
-    int type;
-    Uint8List message;
-
-    if (supportsEncryption) {
-      final counter = bytes.sublist(0, 4); // Int.SIZE_BYTES is 4
-      final payload = bytes.sublist(4);
-
-      final data = zapEncryption.decrypt(counter, payload);
-      type = data[0];
-      message = data.sublist(1);
+      _previouslyPressedButtons.clear();
     } else {
-      type = bytes[0];
-      message = bytes.sublist(1);
-    }
+      // Handle release events for buttons that are no longer pressed
+      final buttonsReleased = _previouslyPressedButtons.difference(buttonsClicked.toSet()).toList();
+      final wasLongPress =
+          buttonsReleased.singleOrNull != null &&
+          actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
+      if (buttonsReleased.isNotEmpty && wasLongPress) {
+        await performRelease(buttonsReleased);
+      }
 
-    switch (type) {
-      case Constants.EMPTY_MESSAGE_TYPE:
-        //print("Empty Message"); // expected when nothing happening
-        break;
-      case Constants.BATTERY_LEVEL_TYPE:
-        //print("Battery level update: $message");
-        break;
-      case Constants.CLICK_NOTIFICATION_MESSAGE_TYPE:
-      case Constants.PLAY_NOTIFICATION_MESSAGE_TYPE:
-      case Constants.RIDE_NOTIFICATION_MESSAGE_TYPE: // untested
-        processClickNotification(message);
-        break;
+      final isLongPress =
+          buttonsClicked.singleOrNull != null &&
+          actionHandler.supportedApp?.keymap.getKeyPair(buttonsClicked.single)?.isLongPress == true;
+
+      if (!isLongPress &&
+          !(buttonsClicked.singleOrNull == ControllerButton.onOffLeft ||
+              buttonsClicked.singleOrNull == ControllerButton.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: 350), (timer) async {
+          performClick(buttonsClicked);
+        });
+      }
+      // Update currently pressed buttons
+      _previouslyPressedButtons = buttonsClicked.toSet();
+
+      if (isLongPress) {
+        return performDown(buttonsClicked);
+      } else {
+        return performClick(buttonsClicked);
+      }
     }
   }
 
-  void processClickNotification(Uint8List message);
+  Future<void> performDown(List<ControllerButton> buttonsClicked) async {
+    for (final action in buttonsClicked) {
+      // For repeated actions, don't trigger key down/up events (useful for long press)
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: true, isKeyUp: false)),
+      );
+    }
+  }
+
+  Future<void> performClick(List<ControllerButton> buttonsClicked) async {
+    for (final action in buttonsClicked) {
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: true, isKeyUp: true)),
+      );
+    }
+  }
+
+  Future<void> performRelease(List<ControllerButton> buttonsReleased) async {
+    for (final action in buttonsReleased) {
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: false, isKeyUp: true)),
+      );
+    }
+  }
+
+  Future<void> disconnect() async {
+    _longPressTimer?.cancel();
+    // Release any held keys in long press mode
+    if (actionHandler is DesktopActions) {
+      await (actionHandler as DesktopActions).releaseAllHeldKeys(_previouslyPressedButtons.toList());
+    }
+    _previouslyPressedButtons.clear();
+    await UniversalBle.disconnect(device.deviceId);
+    isConnected = false;
+  }
 }

lib/bluetooth/devices/elite/elite_square.dart

@@ -0,0 +1,108 @@
+import 'dart:typed_data';
+
+import 'package:dartx/dartx.dart';
+import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../../messages/notification.dart';
+
+class EliteSquare extends BaseDevice {
+  EliteSquare(super.scanResult)
+    : super(
+        availableButtons: SquareConstants.BUTTON_MAPPING.values.toList(),
+        isBeta: true,
+      );
+
+  String? _lastValue;
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstOrNullWhere((e) => e.uuid == SquareConstants.SERVICE_UUID);
+    if (service == null) {
+      throw Exception('Service not found: ${SquareConstants.SERVICE_UUID}');
+    }
+    final characteristic = service.characteristics.firstOrNullWhere(
+      (e) => e.uuid == SquareConstants.CHARACTERISTIC_UUID,
+    );
+    if (characteristic == null) {
+      throw Exception('Characteristic not found: ${SquareConstants.CHARACTERISTIC_UUID}');
+    }
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (characteristic == SquareConstants.CHARACTERISTIC_UUID) {
+      final fullValue = _bytesToHex(bytes);
+      final currentValue = _extractButtonCode(fullValue);
+
+      if (_lastValue != null) {
+        final currentRelevantPart = fullValue.length >= 19
+            ? fullValue.substring(6, fullValue.length - 13)
+            : fullValue.substring(6);
+        final lastRelevantPart = _lastValue!.length >= 19
+            ? _lastValue!.substring(6, _lastValue!.length - 13)
+            : _lastValue!.substring(6);
+
+        if (currentRelevantPart != lastRelevantPart) {
+          final buttonClicked = SquareConstants.BUTTON_MAPPING[currentValue];
+          if (buttonClicked != null) {
+            actionStreamInternal.add(LogNotification('Button pressed: $buttonClicked'));
+          }
+          handleButtonsClicked([
+            if (buttonClicked != null) buttonClicked,
+          ]);
+        }
+      }
+
+      _lastValue = fullValue;
+    }
+  }
+
+  String _extractButtonCode(String hexValue) {
+    if (hexValue.length >= 14) {
+      final buttonCode = hexValue.substring(6, 14);
+      if (SquareConstants.BUTTON_MAPPING.containsKey(buttonCode)) {
+        return buttonCode;
+      }
+    }
+    return hexValue;
+  }
+
+  String _bytesToHex(List<int> bytes) {
+    return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+  }
+}
+
+class SquareConstants {
+  static const String DEVICE_NAME = "SQUARE";
+  static const String CHARACTERISTIC_UUID = "347b0043-7635-408b-8918-8ff3949ce592";
+  static const String SERVICE_UUID = "347b0001-7635-408b-8918-8ff3949ce592";
+  static const int RECONNECT_DELAY = 5; // seconds between reconnection attempts
+
+  // Button mapping https://images.bike24.com/i/mb/c7/36/d9/elite-square-smart-frame-indoor-bike-3-1724305.jpg
+  static const Map<String, ControllerButton> BUTTON_MAPPING = {
+    "00000200": ControllerButton.navigationUp, //"Up",
+    "00000100": ControllerButton.navigationLeft, //"Left",
+    "00000800": ControllerButton.navigationDown, // "Down",
+    "00000400": ControllerButton.navigationRight, //"Right",
+    "00002000": ControllerButton.powerUpLeft, //"X",
+    "00001000": ControllerButton.sideButtonLeft, // "Square",
+    "00008000": ControllerButton.campagnoloLeft, // "Left Campagnolo",
+    "00004000": ControllerButton.onOffLeft, //"Left brake",
+    "00000002": ControllerButton.shiftDownLeft, //"Left shift 1",
+    "00000001": ControllerButton.paddleLeft, // "Left shift 2",
+    "02000000": ControllerButton.y, // "Y",
+    "01000000": ControllerButton.a, //"A",
+    "08000000": ControllerButton.b, // "B",
+    "04000000": ControllerButton.z, // "Z",
+    "20000000": ControllerButton.powerUpRight, // "Circle",
+    "10000000": ControllerButton.sideButtonRight, //"Triangle",
+    "80000000": ControllerButton.campagnoloRight, // "Right Campagnolo",
+    "40000000": ControllerButton.onOffRight, //"Right brake",
+    "00020000": ControllerButton.sideButtonRight, //"Right shift 1",
+    "00010000": ControllerButton.paddleRight, //"Right shift 2",
+  };
+}

lib/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart

@@ -0,0 +1,128 @@
+import 'dart:collection';
+import 'dart:typed_data';
+
+import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+class WahooKickrBikeShift extends BaseDevice {
+  WahooKickrBikeShift(super.scanResult)
+    : super(
+        availableButtons: WahooKickrBikeShiftConstants.prefixToButton.values.toList(),
+        isBeta: true,
+      );
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid == WahooKickrBikeShiftConstants.SERVICE_UUID,
+      orElse: () => throw Exception('Service not found: ${WahooKickrBikeShiftConstants.SERVICE_UUID}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid == WahooKickrBikeShiftConstants.CHARACTERISTIC_UUID,
+      orElse: () => throw Exception('Characteristic not found: ${WahooKickrBikeShiftConstants.CHARACTERISTIC_UUID}'),
+    );
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) {
+    if (characteristic == WahooKickrBikeShiftConstants.CHARACTERISTIC_UUID) {
+      final hex = toHex(bytes);
+
+      // Short-frame detection (hard-coded families)
+      final s = parseShortFrame(hex);
+      if (s != null) {
+        if (s.pressed) {
+          handleButtonsClicked([s.button]);
+        } else {
+          handleButtonsClicked([]);
+        }
+        return Future.value();
+      }
+    }
+    return Future.value();
+  }
+
+  // Deduplicate per (prefix, type) using the 7-bit rolling sequence
+  final Map<String, int> lastSeqByPrefix = HashMap<String, int>();
+
+  String toHex(Uint8List bytes) => bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join().toUpperCase();
+
+  // Parse short frames like "PPQQRR" (e.g., "0001E6", "80005E", "40008F", "010004")
+  ShortFrame? parseShortFrame(String hex) {
+    final re = RegExp(r'^[0-9A-F]{6}$', caseSensitive: false);
+    if (!re.hasMatch(hex)) return null;
+
+    final prefix = hex.substring(0, 4); // PPQQ
+    final rrHex = hex.substring(4, 6); // RR
+    if (!WahooKickrBikeShiftConstants.prefixToButton.containsKey(prefix)) return null;
+
+    final idx = int.parse(rrHex, radix: 16);
+    final type = (idx & 0x80) != 0 ? true : false; // MSB of RR
+    final seq = idx & 0x7F; // rolling counter for dedupe
+
+    return ShortFrame(
+      prefix: prefix,
+      rrHex: rrHex,
+      idx: idx,
+      pressed: type,
+      seq: seq,
+      button: WahooKickrBikeShiftConstants.prefixToButton[prefix]!,
+    );
+  }
+
+  bool isLongFrame(String hex) {
+    final re = RegExp(r'^FF0F01', caseSensitive: false);
+    return re.hasMatch(hex);
+  }
+
+  // Returns true if this (prefix,type,seq) has not been handled yet
+  bool shouldHandleOnce(String prefix, String type, int seq) {
+    final key = '$prefix:$type';
+    final last = lastSeqByPrefix[key];
+    if (last == seq) return false;
+    lastSeqByPrefix[key] = seq;
+    return true;
+  }
+}
+
+class ShortFrame {
+  final String prefix; // PPQQ
+  final String rrHex; // RR
+  final int idx;
+  final bool pressed;
+  final int seq;
+  final ControllerButton button;
+
+  ShortFrame({
+    required this.prefix,
+    required this.rrHex,
+    required this.idx,
+    required this.pressed,
+    required this.seq,
+    required this.button,
+  });
+}
+
+class WahooKickrBikeShiftConstants {
+  static const String SERVICE_UUID = "a026ee0d-0a7d-4ab3-97fa-f1500f9feb8b";
+  static const String CHARACTERISTIC_UUID = "a026e03c-0a7d-4ab3-97fa-f1500f9feb8b";
+
+  // https://support.wahoofitness.com/hc/en-us/articles/22259367275410-Shifter-and-button-configuration-for-KICKR-BIKE-1-2
+  static const Map<String, ControllerButton> prefixToButton = {
+    '0001': ControllerButton.powerUpRight, //'Right Up',
+    '8000': ControllerButton.sideButtonRight, //'Right Down',
+    '0008': ControllerButton.navigationRight, //'Right Steer',
+    '0200': ControllerButton.powerUpLeft, // 'Left Up',
+    '0400': ControllerButton.sideButtonLeft, //'Left Down',
+    '2000': ControllerButton.navigationLeft, //'Left Steer',
+    '0004': ControllerButton.shiftUpRight, // 'Right Shift Up',
+    '0002': ControllerButton.shiftDownRight, // 'Right Shift Down',
+    '1000': ControllerButton.shiftUpLeft, //'Left Shift Up',
+    '0800': ControllerButton.shiftDownLeft, //'Left Shift Down',
+    '4000': ControllerButton.paddleRight, //'Right Brake',
+    '0100': ControllerButton.paddleLeft, //'Left Brake',
+  };
+}

lib/bluetooth/devices/zwift/zwift_click.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/foundation.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_device.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+
+import '../../messages/click_notification.dart';
+
+class ZwiftClick extends ZwiftDevice {
+  ZwiftClick(super.scanResult)
+    : super(availableButtons: [ControllerButton.shiftUpRight, ControllerButton.shiftDownLeft]);
+
+  ClickNotification? _lastClickNotification;
+
+  @override
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message) async {
+    final ClickNotification clickNotification = ClickNotification(message);
+    if (_lastClickNotification == null || _lastClickNotification != clickNotification) {
+      _lastClickNotification = clickNotification;
+
+      if (clickNotification.buttonsClicked.isNotEmpty) {
+        actionStreamInternal.add(clickNotification);
+      }
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
+    }
+  }
+}

lib/bluetooth/devices/zwift/zwift_clickv2.dart

@@ -0,0 +1,71 @@
+import 'dart:typed_data';
+
+import 'package:swift_control/bluetooth/devices/zwift/zwift_ride.dart';
+
+import '../../ble.dart';
+import '../../protocol/zp.pbenum.dart';
+
+class ZwiftClickV2 extends ZwiftRide {
+  ZwiftClickV2(super.scanResult) : super(isBeta: true);
+
+  @override
+  bool get supportsEncryption => false;
+
+  @override
+  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK_V2;
+
+  @override
+  Future<void> setupHandshake() async {
+    super.setupHandshake();
+    await sendCommandBuffer(Uint8List.fromList([0xFF, 0x04, 0x00]));
+  }
+
+  Future<void> test() async {
+    await sendCommand(Opcode.RESET, null);
+    //await sendCommand(Opcode.GET, Get(dataObjectId: VendorDO.PAGE_DEVICE_PAIRING.value)); // 0008 82E0 03
+
+    /*await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_DEV_INFO.value)); // 0008 00
+    await sendCommand(Opcode.LOG_LEVEL_SET, LogLevelSet(logLevel: LogLevel.LOGLEVEL_TRACE)); // 4108 05
+
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value)); // 0008 10
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value)); // 0008 10
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value)); // 0008 10
+
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CONTROLLER_INPUT_CONFIG.value)); // 0008 80 08
+
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.BATTERY_STATE.value)); // 0008 83 06
+
+    // 	Value: FF04 000A 1540 E9D9 C96B 7463 C27F 1B4E 4D9F 1CB1 205D 882E D7CE
+    // 	Value: FF04 000A 15B2 6324 0A31 D6C6 B81F C129 D6A4 E99D FFFC B9FC 418D
+    await sendCommandBuffer(
+      Uint8List.fromList([
+        0xFF,
+        0x04,
+        0x00,
+        0x0A,
+        0x15,
+        0xC2,
+        0x63,
+        0x24,
+        0x0A,
+        0x31,
+        0xD6,
+        0xC6,
+        0xB8,
+        0x1F,
+        0xC1,
+        0x29,
+        0xD6,
+        0xA4,
+        0xE9,
+        0x9D,
+        0xFF,
+        0xFC,
+        0xB9,
+        0xFC,
+        0x41,
+        0x8D,
+      ]),
+    );*/
+  }
+}

lib/bluetooth/devices/zwift/zwift_device.dart

@@ -0,0 +1,214 @@
+import 'dart:async';
+
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:swift_control/bluetooth/ble.dart';
+import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/bluetooth/messages/notification.dart';
+import 'package:swift_control/main.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/keymap/buttons.dart';
+import 'package:swift_control/utils/single_line_exception.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../../../utils/crypto/encryption_utils.dart';
+
+abstract class ZwiftDevice extends BaseDevice {
+  final zapEncryption = ZapCrypto(LocalKeyProvider());
+
+  ZwiftDevice(super.scanResult, {required super.availableButtons, super.isBeta});
+
+  bool supportsEncryption = false;
+
+  BleCharacteristic? syncRxCharacteristic;
+
+  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK;
+  String get customServiceId => BleUuid.ZWIFT_CUSTOM_SERVICE_UUID;
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final customService = services.firstOrNullWhere((service) => service.uuid == customServiceId);
+
+    if (customService == null) {
+      throw Exception(
+        'Custom service $customServiceId not found for device $this ${device.name ?? device.rawName}.\nYou may need to update the firmware in Zwift Companion app.\nWe found: ${services.joinToString(transform: (s) => s.uuid)}',
+      );
+    }
+
+    final deviceInformationService = services.firstOrNullWhere(
+      (service) => service.uuid == BleUuid.DEVICE_INFORMATION_SERVICE_UUID,
+    );
+    final firmwareCharacteristic = deviceInformationService?.characteristics.firstOrNullWhere(
+      (c) => c.uuid == BleUuid.DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION,
+    );
+    if (firmwareCharacteristic != null) {
+      final firmwareData = await UniversalBle.read(
+        device.deviceId,
+        deviceInformationService!.uuid,
+        firmwareCharacteristic.uuid,
+      );
+      firmwareVersion = String.fromCharCodes(firmwareData);
+      connection.signalChange(this);
+    }
+
+    final asyncCharacteristic = customService.characteristics.firstOrNullWhere(
+      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_ASYNC_CHARACTERISTIC_UUID,
+    );
+    final syncTxCharacteristic = customService.characteristics.firstOrNullWhere(
+      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID,
+    );
+    syncRxCharacteristic = customService.characteristics.firstOrNullWhere(
+      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_RX_CHARACTERISTIC_UUID,
+    );
+
+    if (asyncCharacteristic == null || syncTxCharacteristic == null || syncRxCharacteristic == null) {
+      throw Exception('Characteristics not found');
+    }
+
+    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.write(
+        device.deviceId,
+        customServiceId,
+        syncRxCharacteristic!.uuid,
+        Uint8List.fromList([
+          ...Constants.RIDE_ON,
+          ...Constants.REQUEST_START,
+          ...zapEncryption.localKeyProvider.getPublicKeyBytes(),
+        ]),
+        withoutResponse: true,
+      );
+    } else {
+      await UniversalBle.write(
+        device.deviceId,
+        customServiceId,
+        syncRxCharacteristic!.uuid,
+        Constants.RIDE_ON,
+        withoutResponse: true,
+      );
+    }
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (kDebugMode && false) {
+      print(
+        "${DateTime.now().toString().split(" ").last} Received data on $characteristic: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}",
+      );
+    }
+    if (bytes.isEmpty) {
+      return;
+    }
+
+    try {
+      if (bytes.startsWith(startCommand)) {
+        _processDevicePublicKeyResponse(bytes);
+      } else if (!supportsEncryption || (bytes.length > Int32List.bytesPerElement + EncryptionUtils.MAC_LENGTH)) {
+        processData(bytes);
+      }
+    } catch (e, stackTrace) {
+      print("Error processing data: $e");
+      print("Stack Trace: $stackTrace");
+      if (e is SingleLineException) {
+        actionStreamInternal.add(LogNotification(e.message));
+      } else {
+        actionStreamInternal.add(LogNotification("$e\n$stackTrace"));
+      }
+    }
+  }
+
+  void _processDevicePublicKeyResponse(Uint8List bytes) {
+    final devicePublicKeyBytes = bytes.sublist(Constants.RIDE_ON.length + Constants.RESPONSE_START_CLICK.length);
+    if (kDebugMode) {
+      print("Device Public Key - ${devicePublicKeyBytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+    }
+    zapEncryption.initialise(devicePublicKeyBytes);
+  }
+
+  Future<void> processData(Uint8List bytes) async {
+    int type;
+    Uint8List message;
+
+    if (supportsEncryption) {
+      final counter = bytes.sublist(0, 4); // Int.SIZE_BYTES is 4
+      final payload = bytes.sublist(4);
+
+      if (zapEncryption.encryptionKeyBytes == null) {
+        actionStreamInternal.add(
+          LogNotification(
+            'Encryption not initialized, yet. You may need to update the firmware of your device with the Zwift Companion app.',
+          ),
+        );
+        return;
+      }
+
+      final data = zapEncryption.decrypt(counter, payload);
+      type = data[0];
+      message = data.sublist(1);
+    } else {
+      type = bytes[0];
+      message = bytes.sublist(1);
+    }
+
+    switch (type) {
+      case Constants.EMPTY_MESSAGE_TYPE:
+        //print("Empty Message"); // expected when nothing happening
+        break;
+      case Constants.BATTERY_LEVEL_TYPE:
+        if (batteryLevel != message[1]) {
+          batteryLevel = message[1];
+          connection.signalChange(this);
+        }
+        break;
+      case Constants.CLICK_NOTIFICATION_MESSAGE_TYPE:
+      case Constants.PLAY_NOTIFICATION_MESSAGE_TYPE:
+      case Constants.RIDE_NOTIFICATION_MESSAGE_TYPE:
+        processClickNotification(message)
+            .then((buttonsClicked) async {
+              return handleButtonsClicked(buttonsClicked);
+            })
+            .catchError((e) {
+              actionStreamInternal.add(LogNotification(e.toString()));
+            });
+        break;
+    }
+  }
+
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message);
+
+  @override
+  Future<void> performDown(List<ControllerButton> buttonsClicked) async {
+    if (buttonsClicked.any(((e) => e.action == InGameAction.shiftDown || e.action == InGameAction.shiftUp)) &&
+        settings.getVibrationEnabled()) {
+      await _vibrate();
+    }
+    return super.performDown(buttonsClicked);
+  }
+
+  @override
+  Future<void> performClick(List<ControllerButton> buttonsClicked) async {
+    if (buttonsClicked.any(((e) => e.action == InGameAction.shiftDown || e.action == InGameAction.shiftUp)) &&
+        settings.getVibrationEnabled()) {
+      await _vibrate();
+    }
+    return super.performClick(buttonsClicked);
+  }
+
+  Future<void> _vibrate() async {
+    final vibrateCommand = Uint8List.fromList([...Constants.VIBRATE_PATTERN, 0x20]);
+    await UniversalBle.write(
+      device.deviceId,
+      customServiceId,
+      syncRxCharacteristic!.uuid,
+      supportsEncryption ? zapEncryption.encrypt(vibrateCommand) : vibrateCommand,
+      withoutResponse: true,
+    );
+  }
+}

lib/bluetooth/devices/zwift/zwift_play.dart

@@ -0,0 +1,51 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_device.dart';
+import 'package:swift_control/bluetooth/messages/play_notification.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+
+import '../../ble.dart';
+
+class ZwiftPlay extends ZwiftDevice {
+  ZwiftPlay(super.scanResult)
+    : super(
+        availableButtons: [
+          ControllerButton.y,
+          ControllerButton.z,
+          ControllerButton.a,
+          ControllerButton.b,
+          ControllerButton.onOffRight,
+          ControllerButton.sideButtonRight,
+          ControllerButton.paddleRight,
+          ControllerButton.navigationUp,
+          ControllerButton.navigationLeft,
+          ControllerButton.navigationRight,
+          ControllerButton.navigationDown,
+          ControllerButton.onOffLeft,
+          ControllerButton.sideButtonLeft,
+          ControllerButton.paddleLeft,
+        ],
+      );
+
+  PlayNotification? _lastControllerNotification;
+
+  @override
+  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_PLAY;
+
+  @override
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message) async {
+    final PlayNotification clickNotification = PlayNotification(message);
+    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
+      _lastControllerNotification = clickNotification;
+
+      if (clickNotification.buttonsClicked.isNotEmpty) {
+        actionStreamInternal.add(clickNotification);
+      }
+
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
+    }
+  }
+}

lib/bluetooth/devices/zwift/zwift_ride.dart

@@ -0,0 +1,250 @@
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:protobuf/protobuf.dart' as $pb;
+import 'package:swift_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_device.dart';
+import 'package:swift_control/bluetooth/messages/ride_notification.dart';
+import 'package:swift_control/bluetooth/protocol/zp_vendor.pb.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../../../main.dart';
+import '../../ble.dart';
+import '../../messages/notification.dart';
+import '../../protocol/zp.pb.dart';
+
+class ZwiftRide extends ZwiftDevice {
+  /// Minimum absolute analog value (0-100) required to trigger paddle button press.
+  /// Values below this threshold are ignored to prevent accidental triggers from
+  /// analog drift or light touches.
+  static const int analogPaddleThreshold = 25;
+
+  ZwiftRide(super.scanResult, {super.isBeta})
+    : super(
+        availableButtons: [
+          ControllerButton.navigationLeft,
+          ControllerButton.navigationRight,
+          ControllerButton.navigationUp,
+          ControllerButton.navigationDown,
+          ControllerButton.a,
+          ControllerButton.b,
+          ControllerButton.y,
+          ControllerButton.z,
+          ControllerButton.shiftUpLeft,
+          ControllerButton.shiftDownLeft,
+          ControllerButton.shiftUpRight,
+          ControllerButton.shiftDownRight,
+          ControllerButton.powerUpLeft,
+          ControllerButton.powerUpRight,
+          ControllerButton.onOffLeft,
+          ControllerButton.onOffRight,
+          ControllerButton.paddleLeft,
+          ControllerButton.paddleRight,
+        ],
+      );
+
+  @override
+  String get customServiceId => BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID;
+
+  @override
+  bool get supportsEncryption => false;
+
+  RideNotification? _lastControllerNotification;
+
+  @override
+  Future<void> processData(Uint8List bytes) async {
+    Opcode? opcode;
+    Uint8List message;
+
+    if (supportsEncryption) {
+      final counter = bytes.sublist(0, 4); // Int.SIZE_BYTES is 4
+      final payload = bytes.sublist(4);
+
+      if (zapEncryption.encryptionKeyBytes == null) {
+        actionStreamInternal.add(
+          LogNotification(
+            'Encryption not initialized, yet. You may need to update the firmware of your device with the Zwift Companion app.',
+          ),
+        );
+        return;
+      }
+
+      final data = zapEncryption.decrypt(counter, payload);
+      opcode = Opcode.valueOf(data[0]);
+      message = data.sublist(1);
+    } else {
+      opcode = Opcode.valueOf(bytes[0]);
+      message = bytes.sublist(1);
+    }
+
+    if (kDebugMode) {
+      print(
+        '${DateTime.now().toString().split(" ").last} Received $opcode: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')} => ${String.fromCharCodes(bytes)} ',
+      );
+    }
+
+    if (bytes.startsWith(Constants.RESPONSE_STOPPED_CLICK_V2) && this is ZwiftClickV2) {
+      actionStreamInternal.add(
+        LogNotification(
+          'Your Zwift Click V2 no longer sends events. Connect it in the Zwift app once per day. Resetting the device now.',
+        ),
+      );
+      sendCommand(Opcode.RESET, null);
+    }
+
+    switch (opcode) {
+      case Opcode.RIDE_ON:
+        //print("Empty RideOn response - unencrypted mode");
+
+        break;
+      case Opcode.STATUS_RESPONSE:
+        final status = StatusResponse.fromBuffer(message);
+        if (kDebugMode) {
+          print('StatusResponse: ${status.command} status: ${Status.valueOf(status.status)}');
+        }
+        break;
+      case Opcode.GET_RESPONSE:
+        final response = GetResponse.fromBuffer(message);
+        final dataObjectType = DO.valueOf(response.dataObjectId);
+        if (kDebugMode) {
+          print(
+            'GetResponse: ${dataObjectType?.value.toRadixString(16).padLeft(4, '0') ?? response.dataObjectId} $dataObjectType',
+          );
+        }
+
+        switch (dataObjectType) {
+          case DO.PAGE_DEV_INFO:
+            final pageDevInfo = DevInfoPage.fromBuffer(response.dataObjectData);
+            if (kDebugMode) {
+              print('PageDevInfo: $pageDevInfo');
+            }
+            break;
+          case DO.PAGE_DATE_TIME:
+            final pageDateTime = DateTimePage.fromBuffer(response.dataObjectData);
+            if (kDebugMode) {
+              print('PageDateTime: $pageDateTime');
+            }
+            break;
+          case DO.PAGE_CONTROLLER_INPUT_CONFIG:
+            final pageDateTime = ControllerInputConfigPage.fromBuffer(response.dataObjectData);
+            if (kDebugMode) {
+              print('PageDateTime: $pageDateTime');
+            }
+            break;
+          case null:
+            final vendorDO = VendorDO.valueOf(response.dataObjectId);
+            if (kDebugMode) {
+              print('VendorDO: $vendorDO');
+            }
+            switch (vendorDO) {
+              case VendorDO.DEVICE_COUNT:
+                // TODO: Handle this case.
+                break;
+              case VendorDO.NO_CLUE:
+                // TODO: Handle this case.
+                break;
+              case VendorDO.PAGE_DEVICE_PAIRING:
+                final page = DevicePairingDataPage.fromBuffer(response.dataObjectData);
+                if (kDebugMode) {
+                  // this should show the right click device
+                  // pairingStatus = 1 => connected and paired, otherwise it can be paired but not connected
+                  print(
+                    'PageDevicePairing: $page => ${page.pairingDevList.map((e) => e.device.reversed.map((d) => d.toRadixString(16).padLeft(2, '0'))).join(', ')}',
+                  );
+                }
+                break;
+              case VendorDO.PAIRED_DEVICE:
+                // TODO: Handle this case.
+                break;
+              case VendorDO.PAIRING_STATUS:
+                break;
+            }
+            break;
+          default:
+            break;
+        }
+        break;
+      case Opcode.VENDOR_MESSAGE:
+        final vendorOpCode = VendorOpcode.valueOf(message.second);
+        print('VendorOpcode: $vendorOpCode');
+        break;
+      case Opcode.LOG_DATA:
+        final logMessage = LogDataNotification.fromBuffer(message);
+        if (kDebugMode) {
+          actionStreamInternal.add(LogNotification(logMessage.toString()));
+        }
+        break;
+      case Opcode.BATTERY_NOTIF:
+        final notification = BatteryNotification.fromBuffer(message);
+        if (batteryLevel != notification.newPercLevel) {
+          batteryLevel = notification.newPercLevel;
+          connection.signalChange(this);
+        }
+        break;
+      case Opcode.CONTROLLER_NOTIFICATION:
+        processClickNotification(message)
+            .then((buttonsClicked) async {
+              return handleButtonsClicked(buttonsClicked);
+            })
+            .catchError((e) {
+              actionStreamInternal.add(LogNotification(e.toString()));
+            });
+        break;
+      case null:
+        if (bytes[0] == 0x1A) {
+          final batteryStatus = BatteryStatus.fromBuffer(message);
+          if (kDebugMode) {
+            print('BatteryStatus: $batteryStatus');
+          }
+        }
+        break;
+    }
+  }
+
+  @override
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message) async {
+    final RideNotification clickNotification = RideNotification(
+      message,
+      analogPaddleThreshold: analogPaddleThreshold,
+    );
+
+    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
+      _lastControllerNotification = clickNotification;
+
+      if (clickNotification.buttonsClicked.isNotEmpty) {
+        actionStreamInternal.add(clickNotification);
+      }
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
+    }
+  }
+
+  Future<void> sendCommand(Opcode opCode, $pb.GeneratedMessage? message) async {
+    final buffer = Uint8List.fromList([opCode.value, ...message?.writeToBuffer() ?? []]);
+    if (kDebugMode) {
+      print("Sending $opCode: ${buffer.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+    }
+    await UniversalBle.write(
+      device.deviceId,
+      customServiceId,
+      syncRxCharacteristic!.uuid,
+      buffer,
+      withoutResponse: true,
+    );
+    await Future.delayed(Duration(milliseconds: 500));
+  }
+
+  Future<void> sendCommandBuffer(Uint8List buffer) async {
+    if (kDebugMode) {
+      print("Sending ${buffer.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+    }
+    await UniversalBle.write(
+      device.deviceId,
+      customServiceId,
+      syncRxCharacteristic!.uuid,
+      buffer,
+      withoutResponse: true,
+    );
+  }
+}

lib/bluetooth/devices/zwift_click.dart

@@ -1,26 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/main.dart';
-
-import '../messages/click_notification.dart';
-
-class ZwiftClick extends BaseDevice {
-  ZwiftClick(super.scanResult);
-
-  ClickNotification? _lastClickNotification;
-
-  @override
-  void processClickNotification(Uint8List message) {
-    final ClickNotification clickNotification = ClickNotification(message);
-    if (_lastClickNotification == null || _lastClickNotification != clickNotification) {
-      _lastClickNotification = clickNotification;
-      actionStreamInternal.add(clickNotification);
-
-      if (clickNotification.buttonUp) {
-        actionHandler.increaseGear();
-      } else if (clickNotification.buttonDown) {
-        actionHandler.decreaseGear();
-      }
-    }
-  }
-}

lib/bluetooth/devices/zwift_play.dart

@@ -1,44 +0,0 @@
-import 'package:accessibility/accessibility.dart';
-import 'package:flutter/foundation.dart';
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/bluetooth/messages/play_notification.dart';
-
-import '../../main.dart';
-import '../ble.dart';
-
-class ZwiftPlay extends BaseDevice {
-  ZwiftPlay(super.scanResult);
-
-  PlayNotification? _lastControllerNotification;
-
-  @override
-  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_PLAY;
-
-  @override
-  void processClickNotification(Uint8List message) {
-    final PlayNotification clickNotification = PlayNotification(message);
-    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
-      _lastControllerNotification = clickNotification;
-      actionStreamInternal.add(clickNotification);
-
-      if ((clickNotification.rightPad && clickNotification.buttonShift) ||
-          (clickNotification.rightPad && clickNotification.analogLR.abs() == 100)) {
-        actionHandler.increaseGear();
-      } else if ((!clickNotification.rightPad && clickNotification.buttonShift) ||
-          (!clickNotification.rightPad && clickNotification.analogLR.abs() == 100)) {
-        actionHandler.decreaseGear();
-      }
-      if (clickNotification.rightPad) {
-        if (clickNotification.buttonA) {
-          actionHandler.controlMedia(MediaAction.next);
-        } else if (clickNotification.buttonY) {
-          actionHandler.controlMedia(MediaAction.volumeUp);
-        } else if (clickNotification.buttonB) {
-          actionHandler.controlMedia(MediaAction.volumeDown);
-        } else if (clickNotification.buttonZ) {
-          actionHandler.controlMedia(MediaAction.playPause);
-        }
-      }
-    }
-  }
-}

lib/bluetooth/devices/zwift_ride.dart

@@ -1,49 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/bluetooth/messages/ride_notification.dart';
-import 'package:swift_control/main.dart';
-
-import '../ble.dart';
-
-class ZwiftRide extends BaseDevice {
-  ZwiftRide(super.scanResult);
-
-  @override
-  String get customServiceId => BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID;
-
-  @override
-  bool get supportsEncryption => false;
-
-  RideNotification? _lastControllerNotification;
-
-  @override
-  void processClickNotification(Uint8List message) {
-    final RideNotification clickNotification = RideNotification(message);
-    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
-      _lastControllerNotification = clickNotification;
-      actionStreamInternal.add(clickNotification);
-
-      if (clickNotification.buttonShiftDownLeft ||
-          clickNotification.buttonShiftUpLeft ||
-          clickNotification.buttonOnOffLeft ||
-          clickNotification.buttonPowerUpLeft) {
-        actionHandler.decreaseGear();
-      } else if (clickNotification.buttonShiftUpRight ||
-          clickNotification.buttonShiftDownRight ||
-          clickNotification.buttonOnOffRight ||
-          clickNotification.buttonPowerUpRight) {
-        actionHandler.increaseGear();
-      }
-      /*if (clickNotification.buttonA) {
-        actionHandler.controlMedia(MediaAction.next);
-      } else if (clickNotification.buttonY) {
-        actionHandler.controlMedia(MediaAction.volumeUp);
-      } else if (clickNotification.buttonB) {
-        actionHandler.controlMedia(MediaAction.volumeDown);
-      } else if (clickNotification.buttonZ) {
-        actionHandler.controlMedia(MediaAction.playPause);
-      }*/
-    }
-  }
-}

lib/bluetooth/messages/click_notification.dart

@@ -1,21 +1,26 @@
 import 'dart:typed_data';
 
+import 'package:dartx/dartx.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
+
 import '../protocol/zwift.pb.dart';
 import 'notification.dart';
 
 class ClickNotification extends BaseNotification {
-  bool buttonUp = false;
-  bool buttonDown = false;
+  late List<ControllerButton> buttonsClicked;
 
   ClickNotification(Uint8List message) {
     final status = ClickKeyPadStatus.fromBuffer(message);
-    buttonUp = status.buttonPlus == PlayButtonStatus.ON;
-    buttonDown = status.buttonMinus == PlayButtonStatus.ON;
+    buttonsClicked = [
+      if (status.buttonPlus == PlayButtonStatus.ON) ControllerButton.shiftUpRight,
+      if (status.buttonMinus == PlayButtonStatus.ON) ControllerButton.shiftDownLeft,
+    ];
   }
 
   @override
   String toString() {
-    return 'Click: {buttonUp: $buttonUp, buttonDown: $buttonDown}';
+    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name.splitByUpperCase())}';
   }
 
   @override
@@ -23,9 +28,8 @@ class ClickNotification extends BaseNotification {
       identical(this, other) ||
       other is ClickNotification &&
           runtimeType == other.runtimeType &&
-          buttonUp == other.buttonUp &&
-          buttonDown == other.buttonDown;
+          buttonsClicked.contentEquals(other.buttonsClicked);
 
   @override
-  int get hashCode => buttonUp.hashCode ^ buttonDown.hashCode;
+  int get hashCode => buttonsClicked.hashCode;
 }

lib/bluetooth/messages/play_notification.dart

@@ -1,38 +1,42 @@
 import 'dart:typed_data';
 
+import 'package:dartx/dartx.dart';
 import 'package:swift_control/bluetooth/messages/notification.dart';
 import 'package:swift_control/bluetooth/protocol/zwift.pb.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 class PlayNotification extends BaseNotification {
-  late bool rightPad, buttonY, buttonZ, buttonA, buttonB, buttonOn, buttonShift;
-  late int analogLR, analogUD;
+  late List<ControllerButton> buttonsClicked;
 
   PlayNotification(Uint8List message) {
     final status = PlayKeyPadStatus.fromBuffer(message);
 
-    rightPad = status.rightPad == PlayButtonStatus.ON;
-    buttonY = status.buttonYUp == PlayButtonStatus.ON;
-    buttonZ = status.buttonZLeft == PlayButtonStatus.ON;
-    buttonA = status.buttonARight == PlayButtonStatus.ON;
-    buttonB = status.buttonBDown == PlayButtonStatus.ON;
-    buttonOn = status.buttonOn == PlayButtonStatus.ON;
-    buttonShift = status.buttonShift == PlayButtonStatus.ON;
-    analogLR = status.analogLR;
-    analogUD = status.analogUD;
+    buttonsClicked = [
+      if (status.rightPad == PlayButtonStatus.ON) ...[
+        if (status.buttonYUp == PlayButtonStatus.ON) ControllerButton.y,
+        if (status.buttonZLeft == PlayButtonStatus.ON) ControllerButton.z,
+        if (status.buttonARight == PlayButtonStatus.ON) ControllerButton.a,
+        if (status.buttonBDown == PlayButtonStatus.ON) ControllerButton.b,
+        if (status.buttonOn == PlayButtonStatus.ON) ControllerButton.onOffRight,
+        if (status.buttonShift == PlayButtonStatus.ON) ControllerButton.sideButtonRight,
+        if (status.analogLR.abs() == 100) ControllerButton.paddleRight,
+      ],
+      if (status.rightPad == PlayButtonStatus.OFF) ...[
+        if (status.buttonYUp == PlayButtonStatus.ON) ControllerButton.navigationUp,
+        if (status.buttonZLeft == PlayButtonStatus.ON) ControllerButton.navigationLeft,
+        if (status.buttonARight == PlayButtonStatus.ON) ControllerButton.navigationRight,
+        if (status.buttonBDown == PlayButtonStatus.ON) ControllerButton.navigationDown,
+        if (status.buttonOn == PlayButtonStatus.ON) ControllerButton.onOffLeft,
+        if (status.buttonShift == PlayButtonStatus.ON) ControllerButton.sideButtonLeft,
+        if (status.analogLR.abs() == 100) ControllerButton.paddleLeft,
+      ],
+    ];
   }
 
   @override
   String toString() {
-    final allTrueParameters = [
-      //if (rightPad) 'rightPad',
-      if (buttonY) 'buttonY',
-      if (buttonZ) 'buttonZ',
-      if (buttonA) 'buttonA',
-      if (buttonB) 'buttonB',
-      if (buttonOn) 'buttonOn',
-      if (buttonShift) 'buttonShift',
-    ];
-    return '${rightPad ? 'Right' : 'Left'}: {$allTrueParameters, analogLR: $analogLR, analogUD: $analogUD}';
+    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name.splitByUpperCase())}';
   }
 
   @override
@@ -40,25 +44,8 @@ class PlayNotification extends BaseNotification {
       identical(this, other) ||
       other is PlayNotification &&
           runtimeType == other.runtimeType &&
-          rightPad == other.rightPad &&
-          buttonY == other.buttonY &&
-          buttonZ == other.buttonZ &&
-          buttonA == other.buttonA &&
-          buttonB == other.buttonB &&
-          buttonOn == other.buttonOn &&
-          buttonShift == other.buttonShift &&
-          analogLR == other.analogLR &&
-          analogUD == other.analogUD;
+          buttonsClicked.contentEquals(other.buttonsClicked);
 
   @override
-  int get hashCode =>
-      rightPad.hashCode ^
-      buttonY.hashCode ^
-      buttonZ.hashCode ^
-      buttonA.hashCode ^
-      buttonB.hashCode ^
-      buttonOn.hashCode ^
-      buttonShift.hashCode ^
-      analogLR.hashCode ^
-      analogUD.hashCode;
+  int get hashCode => buttonsClicked.hashCode;
 }

lib/bluetooth/messages/ride_notification.dart

@@ -1,7 +1,9 @@
-import 'dart:typed_data';
-
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
 import 'package:swift_control/bluetooth/messages/notification.dart';
 import 'package:swift_control/bluetooth/protocol/zwift.pb.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 enum _RideButtonMask {
   LEFT_BTN(0x00001),
@@ -30,67 +32,74 @@ enum _RideButtonMask {
 }
 
 class RideNotification extends BaseNotification {
-  static const int BTN_PRESSED = 0;
+  late List<ControllerButton> buttonsClicked;
+  late List<ControllerButton> analogButtons;
 
-  late bool buttonLeft, buttonRight, buttonUp, buttonDown;
-  late bool buttonA, buttonB, buttonY, buttonZ;
-  late bool buttonShiftUpLeft, buttonShiftDownLeft;
-  late bool buttonShiftUpRight, buttonShiftDownRight;
-  late bool buttonPowerUpLeft, buttonPowerUpRight;
-  late bool buttonOnOffLeft, buttonOnOffRight;
-
-  int analogLR = 0, analogUD = 0;
-
-  RideNotification(Uint8List message) {
+  RideNotification(Uint8List message, {required int analogPaddleThreshold}) {
     final status = RideKeyPadStatus.fromBuffer(message);
 
-    buttonLeft = status.buttonMap & _RideButtonMask.LEFT_BTN.mask == BTN_PRESSED;
-    buttonRight = status.buttonMap & _RideButtonMask.RIGHT_BTN.mask == BTN_PRESSED;
-    buttonUp = status.buttonMap & _RideButtonMask.UP_BTN.mask == BTN_PRESSED;
-    buttonDown = status.buttonMap & _RideButtonMask.DOWN_BTN.mask == BTN_PRESSED;
-    buttonA = status.buttonMap & _RideButtonMask.A_BTN.mask == BTN_PRESSED;
-    buttonB = status.buttonMap & _RideButtonMask.B_BTN.mask == BTN_PRESSED;
-    buttonY = status.buttonMap & _RideButtonMask.Y_BTN.mask == BTN_PRESSED;
-    buttonZ = status.buttonMap & _RideButtonMask.Z_BTN.mask == BTN_PRESSED;
-    buttonShiftUpLeft = status.buttonMap & _RideButtonMask.SHFT_UP_L_BTN.mask == BTN_PRESSED;
-    buttonShiftDownLeft = status.buttonMap & _RideButtonMask.SHFT_DN_L_BTN.mask == BTN_PRESSED;
-    buttonShiftUpRight = status.buttonMap & _RideButtonMask.SHFT_UP_R_BTN.mask == BTN_PRESSED;
-    buttonShiftDownRight = status.buttonMap & _RideButtonMask.SHFT_DN_R_BTN.mask == BTN_PRESSED;
-    buttonPowerUpLeft = status.buttonMap & _RideButtonMask.POWERUP_L_BTN.mask == BTN_PRESSED;
-    buttonPowerUpRight = status.buttonMap & _RideButtonMask.POWERUP_R_BTN.mask == BTN_PRESSED;
-    buttonOnOffLeft = status.buttonMap & _RideButtonMask.ONOFF_L_BTN.mask == BTN_PRESSED;
-    buttonOnOffRight = status.buttonMap & _RideButtonMask.ONOFF_R_BTN.mask == BTN_PRESSED;
+    // Debug: Log all button mask detections (moved to ZwiftRide.processClickNotification)
 
-    for (final analogue in status.analogButtons.groupStatus) {
-      if (analogue.location == RideAnalogLocation.LEFT || analogue.location == RideAnalogLocation.RIGHT) {
-        analogLR = analogue.analogValue;
-      } else if (analogue.location == RideAnalogLocation.DOWN || analogue.location == RideAnalogLocation.UP) {
-        analogUD = analogue.analogValue;
+    // Process DIGITAL buttons separately
+    buttonsClicked = [
+      if (status.buttonMap & _RideButtonMask.LEFT_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.navigationLeft,
+      if (status.buttonMap & _RideButtonMask.RIGHT_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.navigationRight,
+      if (status.buttonMap & _RideButtonMask.UP_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.navigationUp,
+      if (status.buttonMap & _RideButtonMask.DOWN_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.navigationDown,
+      if (status.buttonMap & _RideButtonMask.A_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.a,
+      if (status.buttonMap & _RideButtonMask.B_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.b,
+      if (status.buttonMap & _RideButtonMask.Y_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.y,
+      if (status.buttonMap & _RideButtonMask.Z_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.z,
+      if (status.buttonMap & _RideButtonMask.SHFT_UP_L_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftUpLeft,
+      if (status.buttonMap & _RideButtonMask.SHFT_DN_L_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftDownLeft,
+      if (status.buttonMap & _RideButtonMask.SHFT_UP_R_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftUpRight,
+      if (status.buttonMap & _RideButtonMask.SHFT_DN_R_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftDownRight,
+      if (status.buttonMap & _RideButtonMask.POWERUP_L_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.powerUpLeft,
+      if (status.buttonMap & _RideButtonMask.POWERUP_R_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.powerUpRight,
+      if (status.buttonMap & _RideButtonMask.ONOFF_L_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.onOffLeft,
+      if (status.buttonMap & _RideButtonMask.ONOFF_R_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.onOffRight,
+    ];
+
+    // Process ANALOG inputs separately - now properly separated from digital
+    // All analog paddles (L0-L3) appear in field 3 as repeated RideAnalogKeyPress
+    analogButtons = [];
+    try {
+      for (final paddle in status.analogPaddles) {
+        if (paddle.hasLocation() && paddle.hasAnalogValue()) {
+          if (paddle.analogValue.abs() >= analogPaddleThreshold) {
+            final button = switch (paddle.location.value) {
+              0 => ControllerButton.paddleLeft, // L0 = left paddle
+              1 => ControllerButton.paddleRight, // L1 = right paddle
+              _ => null, // L2, L3 unused
+            };
+
+            if (button != null) {
+              buttonsClicked.add(button);
+              analogButtons.add(button);
+            }
+          }
+        }
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('Error parsing analog paddle data: $e');
       }
     }
   }
 
   @override
   String toString() {
-    final allTrueParameters = [
-      if (buttonLeft) 'buttonLeft',
-      if (buttonRight) 'buttonRight',
-      if (buttonUp) 'buttonUp',
-      if (buttonDown) 'buttonDown',
-      if (buttonA) 'buttonA',
-      if (buttonB) 'buttonB',
-      if (buttonY) 'buttonY',
-      if (buttonZ) 'buttonZ',
-      if (buttonShiftUpLeft) 'buttonShiftUpLeft',
-      if (buttonShiftDownLeft) 'buttonShiftDownLeft',
-      if (buttonShiftUpRight) 'buttonShiftUpRight',
-      if (buttonShiftDownRight) 'buttonShiftDownRight',
-      if (buttonPowerUpLeft) 'buttonPowerUpLeft',
-      if (buttonPowerUpRight) 'buttonPowerUpRight',
-      if (buttonOnOffLeft) 'buttonOnOffLeft',
-      if (buttonOnOffRight) 'buttonOnOffRight',
-    ];
-    return '{$allTrueParameters, analogLR: $analogLR, analogUD: $analogUD}';
+    final digitalButtons = buttonsClicked.where((b) => !analogButtons.contains(b)).toList();
+    return 'Digital: ${digitalButtons.joinToString(transform: (e) => e.name.splitByUpperCase())} | Analog: ${analogButtons.joinToString(transform: (e) => e.name.splitByUpperCase())}';
   }
 
   @override
@@ -98,43 +107,8 @@ class RideNotification extends BaseNotification {
       identical(this, other) ||
       other is RideNotification &&
           runtimeType == other.runtimeType &&
-          buttonLeft == other.buttonLeft &&
-          buttonRight == other.buttonRight &&
-          buttonUp == other.buttonUp &&
-          buttonDown == other.buttonDown &&
-          buttonA == other.buttonA &&
-          buttonB == other.buttonB &&
-          buttonY == other.buttonY &&
-          buttonZ == other.buttonZ &&
-          buttonShiftUpLeft == other.buttonShiftUpLeft &&
-          buttonShiftDownLeft == other.buttonShiftDownLeft &&
-          buttonShiftUpRight == other.buttonShiftUpRight &&
-          buttonShiftDownRight == other.buttonShiftDownRight &&
-          buttonPowerUpLeft == other.buttonPowerUpLeft &&
-          buttonPowerUpRight == other.buttonPowerUpRight &&
-          buttonOnOffLeft == other.buttonOnOffLeft &&
-          buttonOnOffRight == other.buttonOnOffRight &&
-          analogLR == other.analogLR &&
-          analogUD == other.analogUD;
+          buttonsClicked.contentEquals(other.buttonsClicked);
 
   @override
-  int get hashCode =>
-      buttonLeft.hashCode ^
-      buttonRight.hashCode ^
-      buttonUp.hashCode ^
-      buttonDown.hashCode ^
-      buttonA.hashCode ^
-      buttonB.hashCode ^
-      buttonY.hashCode ^
-      buttonZ.hashCode ^
-      buttonShiftUpLeft.hashCode ^
-      buttonShiftDownLeft.hashCode ^
-      buttonShiftUpRight.hashCode ^
-      buttonShiftDownRight.hashCode ^
-      buttonPowerUpLeft.hashCode ^
-      buttonPowerUpRight.hashCode ^
-      buttonOnOffLeft.hashCode ^
-      buttonOnOffRight.hashCode ^
-      analogLR.hashCode ^
-      analogUD.hashCode;
+  int get hashCode => buttonsClicked.hashCode;
 }