restore button

Add media key dispatching for Desktop platforms

.github/workflows/build.yml

@@ -119,7 +119,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: macos
-          args: "--dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }}"
+          args: "-- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"
 
       - name: Decode Keystore
         if: inputs.build_android
@@ -133,7 +133,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: android
-          args: "--artifact=apk"
+          args: "--artifact=apk -- --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}"
 
       - name: Build Web
         if: inputs.build_web
@@ -169,7 +169,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: ios
-          args: "--export-options-plist ios/ExportOptions.plist --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }}"
+          args: "--export-options-plist ios/ExportOptions.plist -- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"
 
       - name: Prepare App Store authentication key
         if: inputs.build_ios || inputs.build_mac

.github/workflows/patch.yml

@@ -91,21 +91,21 @@ jobs:
         with:
           platform: macos
           release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
+          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}'
 
       - name: 🚀 Shorebird Patch Android
         uses: shorebirdtech/shorebird-patch@v1
         with:
           platform: android
           release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
+          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}'
 
       - name: 🚀 Shorebird Patch iOS
         uses: shorebirdtech/shorebird-patch@v1
         with:
           platform: ios
           release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
+          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}'
 
       # shorebird struggles with the app from GitHub
       - name: Build macOS

CHANGELOG.md

@@ -6,7 +6,7 @@ BikeControl now offers a free trial period of 5 days for all features, so you ca
 - support for SRAM AXS/eTap
   - only single or double click is supported (no individual button mapping possible, yet)
 - use your phone/tablet for steering by attaching your device on your handlebar!
-- App is now available in Polish (thanks to Wandrocet)
+- App is now available in Polish (thanks to Wandrocek)
 
 **Fixes**:
 - You will now be notified when a connection to your controller is lost

INSTRUCTIONS_MYWHOOSH_LINK.md

@@ -1,11 +1,10 @@
 ## Instructions for using the MyWhoosh "Link" connection method
 *
 1) launch MyWhoosh on the device of your choice
-2) launch MyWhoosh Link, check if the "Link" connection works
-3) **close MyWhoosh Link** - very important! 
-4) open BikeControl, follow on screen instructions
+2) OPTIONAL: launch MyWhoosh Link, confirm the "Link" connection works at all. **close MyWhoosh Link** - very important! 
+3) open BikeControl, follow the on-screen instructions
 
-Once you've confirmed the connection in BikeControl you won't have to repeat step 2 and 3 again in the future. This is just to make sure the connection works in general.
+Once you've confirmed the connection in BikeControl you won't have to do step 2 in the future. This is just to make sure the connection works in general.
 
 And here's a video with a few explanations:
 

README.md

@@ -46,6 +46,7 @@ Best follow our landing page and the "Get Started" button: [bikecontrol.app](htt
 - Shimano Di2
   - Configure your levers to use D-Fly channels with Shimano E-Tube app
 - SRAM AXS/eTap
+  - Configure your levers not to do any action in the "SRAM AXS" app
   - only single or double click is supported (no individual button mapping possible, yet)
 - Wahoo Kickr Bike Shift
 - Wahoo Kickr Bike Pro
@@ -84,16 +85,16 @@ Check the troubleshooting guide [here](TROUBLESHOOTING.md).
 ## How does it work?
 The app connects to your Controller devices (such as Zwift ones) automatically. BikeControl uses different methods of connecting to the trainer app, depending on the trainer app and operating system:
 - Connect to the trainer app on the same device or on another device using Network
-    - available on Android, iOS, macOS, Windows
+    - available on Android, iOS, iPadOS, macOS, Windows
     - supported by e.g. MyWhoosh, Rouvy and Zwift
 - Connect to the trainer app on another device by simulating a Bluetooth device
-  - available on Android, iOS, macOS, Windows
+  - available on Android, iOS, iPadOS, macOS, Windows
   - supported by e.g. Rouvy and Zwift
 - Directly control the trainer app via Accessibility features (simulating touch and keyboard input)
   - available on Android, macOS, Windows
   - supported by all trainer apps
-- Connect to supported trainer app using the [OpenBikeControl](https://openbikecontrol.org) protocol
-  - available on Android, iOS, macOS, Windows
+- Connect to the supported trainer app using the [OpenBikeControl](https://openbikecontrol.org) protocol
+  - available on Android, iOS, iPadOS, macOS, Windows
 
 ## Donate
 Please consider donating to support the development of this app :)

WINDOWS_STORE_VERSION.txt

@@ -1 +1 @@
-4.1.0
+4.2.2

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

@@ -5,10 +5,10 @@ import android.os.Handler
 import android.view.InputDevice
 import android.view.KeyEvent
 import android.view.MotionEvent
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 import org.flame_engine.gamepads_android.GamepadsCompatibleActivity
 
-class MainActivity: FlutterActivity(), GamepadsCompatibleActivity {
+class MainActivity: FlutterFragmentActivity(), GamepadsCompatibleActivity {
     var keyListener: ((KeyEvent) -> Boolean)? = null
     var motionListener: ((MotionEvent) -> Boolean)? = null
 

ios/Podfile.lock

@@ -34,8 +34,22 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
+  - purchases_flutter (9.10.2):
+    - Flutter
+    - PurchasesHybridCommon (= 17.25.0)
+  - purchases_ui_flutter (9.10.2):
+    - Flutter
+    - PurchasesHybridCommonUI (= 17.25.0)
+  - PurchasesHybridCommon (17.25.0):
+    - RevenueCat (= 5.51.1)
+  - PurchasesHybridCommonUI (17.25.0):
+    - PurchasesHybridCommon (= 17.25.0)
+    - RevenueCatUI (= 5.51.1)
   - restart_app (0.0.1):
     - Flutter
+  - RevenueCat (5.51.1)
+  - RevenueCatUI (5.51.1):
+    - RevenueCat (= 5.51.1)
   - sensors_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -66,6 +80,8 @@ DEPENDENCIES:
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`)
+  - purchases_ui_flutter (from `.symlinks/plugins/purchases_ui_flutter/ios`)
   - restart_app (from `.symlinks/plugins/restart_app/ios`)
   - sensors_plus (from `.symlinks/plugins/sensors_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -73,6 +89,13 @@ DEPENDENCIES:
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
+SPEC REPOS:
+  trunk:
+    - PurchasesHybridCommon
+    - PurchasesHybridCommonUI
+    - RevenueCat
+    - RevenueCatUI
+
 EXTERNAL SOURCES:
   bluetooth_low_energy_darwin:
     :path: ".symlinks/plugins/bluetooth_low_energy_darwin/darwin"
@@ -106,6 +129,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  purchases_flutter:
+    :path: ".symlinks/plugins/purchases_flutter/ios"
+  purchases_ui_flutter:
+    :path: ".symlinks/plugins/purchases_ui_flutter/ios"
   restart_app:
     :path: ".symlinks/plugins/restart_app/ios"
   sensors_plus:
@@ -136,7 +163,13 @@ SPEC CHECKSUMS:
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  purchases_flutter: 7cbb87481a018c1bb8b4966b7d446a7c19d96d87
+  purchases_ui_flutter: 1905cebf3f46e03aeefba0f6258000f3cdd32641
+  PurchasesHybridCommon: 6a79a873ab52f777bfa36e9516f3fcd84d3b3428
+  PurchasesHybridCommonUI: 3c1f78addfb3f470713548b4eac8c59254d0efe6
   restart_app: 806659942bf932f6ce51c5372f91ce5e81c8c14a
+  RevenueCat: eab035bbab271faccfef5c36eaff2a1ffef14dc0
+  RevenueCatUI: c6acb3648fa58ccb4f0f178556ed0278b796234f
   sensors_plus: 7229095999f30740798f0eeef5cd120357a8f4f2
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6

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

@@ -38,6 +38,11 @@ class KeyPressSimulator {
     return _platform.simulateKeyPress(key: key, modifiers: modifiers, keyDown: false);
   }
 
+  /// Simulate media key press.
+  Future<void> simulateMediaKey(PhysicalKeyboardKey mediaKey) {
+    return _platform.simulateMediaKey(mediaKey);
+  }
+
   @Deprecated('Please use simulateKeyDown & simulateKeyUp methods.')
   Future<void> simulateCtrlCKeyPress() async {
     const key = PhysicalKeyboardKey.keyC;

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

@@ -22,6 +22,9 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
         case "simulateMouseClick":
             simulateMouseClick(call, result: result)
             break
+        case "simulateMediaKey":
+            simulateMediaKey(call, result: result)
+            break
         default:
             result(FlutterMethodNotImplemented)
         }
@@ -114,4 +117,62 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
         eventKeyPress!.flags = flags
         return eventKeyPress!
     }
+
+    public func simulateMediaKey(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let args:[String: Any] = call.arguments as! [String: Any]
+        let keyIdentifier: String = args["key"] as! String
+
+        // Map string identifier to macOS NX key codes
+        var mediaKeyCode: Int32 = 0
+        switch keyIdentifier {
+        case "playPause":
+            mediaKeyCode = NX_KEYTYPE_PLAY
+        case "stop":
+            // macOS doesn't have a dedicated stop key in its media control API.
+            // Following macOS conventions, we map stop to play/pause which toggles playback.
+            // This matches the behavior of the physical media keys on Mac keyboards.
+            mediaKeyCode = NX_KEYTYPE_PLAY
+        case "next":
+            mediaKeyCode = NX_KEYTYPE_FAST
+        case "previous":
+            mediaKeyCode = NX_KEYTYPE_REWIND
+        case "volumeUp":
+            mediaKeyCode = NX_KEYTYPE_SOUND_UP
+        case "volumeDown":
+            mediaKeyCode = NX_KEYTYPE_SOUND_DOWN
+        default:
+            result(FlutterError(code: "UNSUPPORTED_KEY", message: "Unsupported media key identifier", details: nil))
+            return
+        }
+
+        // Create and post the media key event (key down)
+        let eventDown = NSEvent.otherEvent(
+            with: .systemDefined,
+            location: NSPoint.zero,
+            modifierFlags: NSEvent.ModifierFlags(rawValue: 0xa00),
+            timestamp: 0,
+            windowNumber: 0,
+            context: nil,
+            subtype: 8,
+            data1: Int((mediaKeyCode << 16) | (0xa << 8)),
+            data2: -1
+        )
+        eventDown?.cgEvent?.post(tap: .cghidEventTap)
+
+        // Create and post the media key event (key up)
+        let eventUp = NSEvent.otherEvent(
+            with: .systemDefined,
+            location: NSPoint.zero,
+            modifierFlags: NSEvent.ModifierFlags(rawValue: 0xb00),
+            timestamp: 0,
+            windowNumber: 0,
+            context: nil,
+            subtype: 8,
+            data1: Int((mediaKeyCode << 16) | (0xb << 8)),
+            data2: -1
+        )
+        eventUp?.cgEvent?.post(tap: .cghidEventTap)
+
+        result(true)
+    }
 }

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

@@ -61,4 +61,27 @@ class MethodChannelKeyPressSimulator extends KeyPressSimulatorPlatform {
     };
     await methodChannel.invokeMethod('simulateMouseClick', arguments);
   }
+
+  @override
+  Future<void> simulateMediaKey(PhysicalKeyboardKey mediaKey) async {
+    // Map PhysicalKeyboardKey to string identifier since keyCode is null for media keys
+    final keyMap = {
+      PhysicalKeyboardKey.mediaPlayPause: 'playPause',
+      PhysicalKeyboardKey.mediaStop: 'stop',
+      PhysicalKeyboardKey.mediaTrackNext: 'next',
+      PhysicalKeyboardKey.mediaTrackPrevious: 'previous',
+      PhysicalKeyboardKey.audioVolumeUp: 'volumeUp',
+      PhysicalKeyboardKey.audioVolumeDown: 'volumeDown',
+    };
+
+    final keyIdentifier = keyMap[mediaKey];
+    if (keyIdentifier == null) {
+      throw UnsupportedError('Unsupported media key: $mediaKey');
+    }
+
+    final Map<String, Object?> arguments = {
+      'key': keyIdentifier,
+    };
+    await methodChannel.invokeMethod('simulateMediaKey', arguments);
+  }
 }

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

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

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.cpp

@@ -12,6 +12,7 @@
 
 #include <memory>
 #include <sstream>
+#include <unordered_map>
 
 using flutter::EncodableList;
 using flutter::EncodableMap;
@@ -253,6 +254,49 @@ HWND FindTargetWindow(const std::string& processName, const std::string& windowT
   return data.foundWindow;
 }
 
+void KeypressSimulatorWindowsPlugin::SimulateMediaKey(
+    const flutter::MethodCall<flutter::EncodableValue>& method_call,
+    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
+
+  const EncodableMap& args = std::get<EncodableMap>(*method_call.arguments());
+  std::string keyIdentifier = std::get<std::string>(args.at(EncodableValue("key")));
+
+  // Map string identifier to Windows virtual key codes
+  static const std::unordered_map<std::string, UINT> keyMap = {
+    {"playPause", VK_MEDIA_PLAY_PAUSE},
+    {"stop", VK_MEDIA_STOP},
+    {"next", VK_MEDIA_NEXT_TRACK},
+    {"previous", VK_MEDIA_PREV_TRACK},
+    {"volumeUp", VK_VOLUME_UP},
+    {"volumeDown", VK_VOLUME_DOWN}
+  };
+
+  auto it = keyMap.find(keyIdentifier);
+  if (it == keyMap.end()) {
+    result->Error("UNSUPPORTED_KEY", "Unsupported media key identifier");
+    return;
+  }
+  UINT vkCode = it->second;
+
+  // Send key down event
+  INPUT inputs[2] = {};
+  inputs[0].type = INPUT_KEYBOARD;
+  inputs[0].ki.wVk = static_cast<WORD>(vkCode);
+  inputs[0].ki.dwFlags = 0; // Key down
+
+  // Send key up event
+  inputs[1].type = INPUT_KEYBOARD;
+  inputs[1].ki.wVk = static_cast<WORD>(vkCode);
+  inputs[1].ki.dwFlags = KEYEVENTF_KEYUP;
+
+  UINT eventsSent = SendInput(2, inputs, sizeof(INPUT));
+  if (eventsSent != 2) {
+    result->Error("SEND_INPUT_FAILED", "Failed to send media key input events");
+    return;
+  }
+
+  result->Success(flutter::EncodableValue(true));
+}
 
 
 void KeypressSimulatorWindowsPlugin::HandleMethodCall(
@@ -262,6 +306,8 @@ void KeypressSimulatorWindowsPlugin::HandleMethodCall(
     SimulateKeyPress(method_call, std::move(result));
   } else if (method_call.method_name().compare("simulateMouseClick") == 0) {
     SimulateMouseClick(method_call, std::move(result));
+  } else if (method_call.method_name().compare("simulateMediaKey") == 0) {
+    SimulateMediaKey(method_call, std::move(result));
   } else {
     result->NotImplemented();
   }

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.h

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

lib/bluetooth/connection.dart

@@ -10,8 +10,8 @@ import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
 import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
-import 'package:bike_control/utils/actions/android.dart';
 import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/iap/iap_manager.dart';
 import 'package:bike_control/utils/requirements/android.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
@@ -72,7 +72,8 @@ class Connection {
           }
         });
       } else if (available == AvailabilityState.poweredOff) {
-        reset();
+        disconnectAll();
+        stop();
       }
     };
     UniversalBle.onScanResult = (result) {
@@ -211,14 +212,6 @@ class Connection {
     } else {
       isScanning.value = false;
     }
-
-    if (devices.isNotEmpty && !_androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
-      _androidNotificationsSetup = true;
-      // start foreground service only when app is in foreground
-      NotificationRequirement.addPersistentNotification().catchError((e) {
-        _actionStreams.add(LogNotification(e.toString()));
-      });
-    }
   }
 
   Future<void> startMyWhooshServer() {
@@ -332,9 +325,19 @@ class Connection {
       await device.connect();
       signalChange(device);
 
+      IAPManager.instance.setAttributes();
+
       core.actionHandler.supportedApp?.keymap.addNewButtons(device.availableButtons);
 
       _streamSubscriptions[device] = actionSubscription;
+
+      if (devices.isNotEmpty && !_androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
+        _androidNotificationsSetup = true;
+        // start foreground service only when app is in foreground
+        NotificationRequirement.addPersistentNotification().catchError((e) {
+          _actionStreams.add(LogNotification(e.toString()));
+        });
+      }
     } catch (e, backtrace) {
       _actionStreams.add(LogNotification("$e\n$backtrace"));
       if (kDebugMode) {
@@ -345,31 +348,6 @@ class Connection {
     }
   }
 
-  Future<void> reset() async {
-    _actionStreams.add(LogNotification('Disconnecting all devices'));
-    if (core.actionHandler is AndroidActions) {
-      AndroidFlutterLocalNotificationsPlugin().stopForegroundService();
-      _androidNotificationsSetup = false;
-    }
-    final isBtEnabled = (await UniversalBle.getBluetoothAvailabilityState()) == AvailabilityState.poweredOn;
-    if (isBtEnabled) {
-      UniversalBle.stopScan();
-    }
-    isScanning.value = false;
-    for (var device in bluetoothDevices) {
-      _streamSubscriptions[device]?.cancel();
-      _streamSubscriptions.remove(device);
-      _connectionSubscriptions[device]?.cancel();
-      _connectionSubscriptions.remove(device);
-      UniversalBle.disconnect(device.device.deviceId);
-      signalChange(device);
-    }
-    _gamePadSearchTimer?.cancel();
-    _lastScanResult.clear();
-    hasDevices.value = false;
-    devices.clear();
-  }
-
   void signalNotification(BaseNotification notification) {
     _actionStreams.add(notification);
   }
@@ -417,4 +395,29 @@ class Connection {
 
     signalChange(device);
   }
+
+  Future<void> disconnectAll() async {
+    _actionStreams.add(LogNotification('Disconnecting all devices'));
+    for (var device in bluetoothDevices) {
+      _streamSubscriptions[device]?.cancel();
+      _streamSubscriptions.remove(device);
+      _connectionSubscriptions[device]?.cancel();
+      _connectionSubscriptions.remove(device);
+      device.disconnect();
+      signalChange(device);
+      devices.remove(device);
+    }
+    _gamePadSearchTimer?.cancel();
+    _lastScanResult.clear();
+    hasDevices.value = false;
+  }
+
+  Future<void> stop() async {
+    final isBtEnabled = (await UniversalBle.getBluetoothAvailabilityState()) == AvailabilityState.poweredOn;
+    if (isBtEnabled) {
+      UniversalBle.stopScan();
+    }
+    isScanning.value = false;
+    _androidNotificationsSetup = false;
+  }
 }

lib/bluetooth/devices/base_device.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
 import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart' show LogLevel;
 import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/actions/desktop.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/iap/iap_manager.dart';
@@ -228,7 +229,7 @@ abstract class BaseDevice {
         _getCommandLimitMessage(),
         buttonTitle: AppLocalizations.current.purchase,
         onTap: () {
-          IAPManager.instance.purchaseFullVersion();
+          IAPManager.instance.purchaseFullVersion(navigatorKey.currentContext!);
         },
       ),
     );

lib/bluetooth/devices/bluetooth_device.dart

@@ -302,7 +302,7 @@ abstract class BluetoothDevice extends BaseDevice {
               ),
             if (firmwareVersion != null)
               DeviceInfo(
-                title: context.i18n.signal,
+                title: context.i18n.firmware,
                 icon: this is ZwiftDevice && firmwareVersion != (this as ZwiftDevice).latestFirmwareVersion
                     ? Icons.warning
                     : Icons.text_fields_sharp,

lib/bluetooth/devices/openbikecontrol/obc_mdns_emulator.dart

@@ -52,7 +52,7 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
       throw 'Could not find network interface';
     }
 
-    _createTcpServer();
+    await _createTcpServer();
 
     if (kDebugMode) {
       enableLogging(LogTopic.calls);

lib/bluetooth/devices/openbikecontrol/protocol_parser.dart

@@ -28,20 +28,19 @@ class OpenBikeProtocolParser {
     0x02: ControllerButton('Shift Down', identifier: 0x02, action: InGameAction.shiftDown),
     0x03: ControllerButton('Gear Set', identifier: 0x03),
     // Navigation (0x10-0x1F)
-    0x10: ControllerButton('Up/Steer Left', identifier: 0x10, action: InGameAction.steerLeft),
-    0x11: ControllerButton('Down/Steer Right', identifier: 0x11, action: InGameAction.steerRight),
+    0x10: ControllerButton('Up', identifier: 0x10, action: InGameAction.up),
+    0x11: ControllerButton('Down', identifier: 0x11, action: InGameAction.down),
     0x12: ControllerButton('Left/Look Left', identifier: 0x12, action: InGameAction.navigateLeft),
     0x13: ControllerButton('Right/Look Right', identifier: 0x13, action: InGameAction.navigateRight),
     0x14: ControllerButton('Select/Confirm', identifier: 0x14, action: InGameAction.select),
     0x15: ControllerButton('Back/Cancel', identifier: 0x15, action: InGameAction.back),
     0x16: ControllerButton('Menu', identifier: 0x16),
     0x17: ControllerButton('Home', identifier: 0x17),
+    0x18: ControllerButton('Steer Left', identifier: 0x18, action: InGameAction.steerLeft),
+    0x19: ControllerButton('Steer Right', identifier: 0x19, action: InGameAction.steerRight),
     // Social/Emotes (0x20-0x2F)
-    0x20: ControllerButton('Wave', identifier: 0x20, action: InGameAction.emote),
-    0x21: ControllerButton('Thumbs Up', identifier: 0x21, action: InGameAction.emote),
-    0x22: ControllerButton('Hammer Time', identifier: 0x22, action: InGameAction.emote),
-    0x23: ControllerButton('Bell', identifier: 0x23),
-    0x24: ControllerButton('Screenshot', identifier: 0x24),
+    0x20: ControllerButton('Emote', identifier: 0x20, action: InGameAction.emote),
+    0x21: ControllerButton('Push to Talk', identifier: 0x21),
     // Training Controls (0x30-0x3F)
     0x30: ControllerButton('ERG Up', identifier: 0x30, action: InGameAction.increaseResistance),
     0x31: ControllerButton('ERG Down', identifier: 0x31, action: InGameAction.decreaseResistance),

lib/bluetooth/devices/sram/sram_axs.dart

@@ -114,6 +114,7 @@ class SramAxs extends BluetoothDevice {
       children: [
         super.showInformation(context),
         Text(
+          "Don't forget to turn off the function of the button you want to use in the SRAM AXS app!\n"
           "Unfortunately, at the moment it's not possible to determine which physical button was pressed on your SRAM AXS device. Let us know if you have a contact at SRAM who can help :)\n\n"
           'So the app exposes two logical buttons:\n'
           '• SRAM Tap, assigned to Shift Up\n'

lib/bluetooth/devices/zwift/ftms_mdns_emulator.dart

@@ -63,7 +63,7 @@ class FtmsMdnsEmulator extends TrainerConnection {
       throw 'Could not find network interface';
     }
 
-    _createTcpServer();
+    await _createTcpServer();
 
     if (kDebugMode) {
       enableLogging(LogTopic.calls);

lib/i10n/intl_de.arb

@@ -13,6 +13,7 @@
   "accessories": "Zubehör",
   "action": "Aktion",
   "adjustControllerButtons": "Controller-Tasten anpassen",
+  "afterDate": "Nach dem {date}",
   "allow": "Erlauben",
   "allowAccessibilityService": "Barrierefreiheitsdienst zulassen",
   "allowBluetoothConnections": "Bluetooth-Verbindungen zulassen",
@@ -20,6 +21,8 @@
   "allowLocationForBluetooth": "Standortzugriff erlauben, damit Bluetooth-Scan funktioniert",
   "allowPersistentNotification": "Benachrichtigungen zulassen",
   "allowsRunningInBackground": "Ermöglicht es BikeControl, im Hintergrund weiterzulaufen.",
+  "alreadyBoughtTheApp": "App bereits gekauft? Dann musst Du BikeControl nicht erneut kaufen. Aus technischen Gründen lässt sich leider nicht feststellen, ob die App früher bereits erworben wurde. \n\nGebe Deine Play Store-Kauf-ID (z.B. GPA.3356-1337-1338-1339) ein, um die Vollversion freizuschalten. Falls Du diese nicht finden kannst, kontaktiere mich bitte direkt.",
+  "alreadyBoughtTheAppPreviously": "App zuvor bereits gekauft?",
   "appIdActions": "{appId} Aktionen",
   "@appIdActions": {
     "placeholders": {
@@ -29,6 +32,7 @@
     }
   },
   "battery": "Batterie",
+  "beforeDate": "Vor dem {date}",
   "bluetoothAdvertiseAccess": "Bluetooth-Zugriff",
   "bluetoothTurnedOn": "Bluetooth ist eingeschaltet",
   "browserNotSupported": "Dieser Browser unterstützt kein Web-Bluetooth und die Plattform wird nicht unterstützt :(",
@@ -252,6 +256,7 @@
     }
   },
   "next": "Nächste",
+  "no": "Nein",
   "noActionAssigned": "Keine Maßnahmen zugewiesen",
   "noActionAssignedForButton": "{button} konnte nicht ausgeführt werden: Keine Aktion zugewiesen",
   "noConnectionMethodIsConnectedOrActive": "Es ist keine Verbindungsmethode verbunden oder aktiv.",
@@ -335,6 +340,7 @@
   "requirement": "Anforderung",
   "reset": "Zurücksetzen",
   "restart": "Neustart",
+  "restorePurchaseInfo": "Klicke auf den Knopf oben und anschließend auf „Kauf wiederherstellen“. Bei Problemen kontaktiere mich bitte direkt.",
   "runAppOnPlatformRemotely": "{appName} auf {platform} laufen lassen und es von diesem Gerät aus fernsteuern via {preferredConnection}.",
   "@runAppOnPlatformRemotely": {
     "placeholders": {
@@ -422,6 +428,7 @@
   },
   "whatsNew": "Was ist neu",
   "whyPermissionNeeded": "Wozu wird diese Berechtigung benötigt?",
+  "yes": "Ja",
   "zwiftControllerAction": "Zwift Controller-Aktion",
   "zwiftControllerDescription": "Ermöglicht es BikeControl, als Zwift-kompatibler Controller zu fungieren."
 }

lib/i10n/intl_en.arb

@@ -13,6 +13,7 @@
   "accessories": "Accessories",
   "action": "Action",
   "adjustControllerButtons": "Adjust Controller Buttons",
+  "afterDate": "After {date}",
   "allow": "Allow",
   "allowAccessibilityService": "Allow Accessibility Service",
   "allowBluetoothConnections": "Allow Bluetooth Connections",
@@ -20,6 +21,8 @@
   "allowLocationForBluetooth": "Allow Location so Bluetooth scan works",
   "allowPersistentNotification": "Allow Notifications",
   "allowsRunningInBackground": "Allows BikeControl to keep running in background",
+  "alreadyBoughtTheApp": "Already bought the app? You don't need to pay for BikeControl, again. Due to technical difficulties, it's not possible to determine if the app was bought already.\n\nEnter your Play Store purchase ID (e.g. GPA.3356-1337-1338-1339) to unlock the full version. If you can't find it, please get in touch with me directly.",
+  "alreadyBoughtTheAppPreviously": "Already bought the app previously?",
   "appIdActions": "{appId} actions",
   "@appIdActions": {
     "placeholders": {
@@ -29,6 +32,7 @@
     }
   },
   "battery": "Battery",
+  "beforeDate": "Before {date}",
   "bluetoothAdvertiseAccess": "Bluetooth Advertise access",
   "bluetoothTurnedOn": "Bluetooth turned on",
   "browserNotSupported": "This Browser does not support Web Bluetooth and platform is not supported :(",
@@ -252,6 +256,7 @@
     }
   },
   "next": "Next",
+  "no": "No",
   "noActionAssigned": "No action assigned",
   "noActionAssignedForButton": "Could not perform {button}: No action assigned",
   "noConnectionMethodIsConnectedOrActive": "No connection method is connected or active.",
@@ -335,6 +340,7 @@
   "requirement": "Requirement",
   "reset": "Reset",
   "restart": "Restart",
+  "restorePurchaseInfo": "Click on the button above, then on \"Restore Purchase\". Please contact me directly if you have any issues.",
   "runAppOnPlatformRemotely": "Run {appName} on {platform} and control it remotely from this device{preferredConnection}.",
   "@runAppOnPlatformRemotely": {
     "placeholders": {
@@ -422,6 +428,7 @@
   },
   "whatsNew": "What's New",
   "whyPermissionNeeded": "Why is this permission needed?",
+  "yes": "Yes",
   "zwiftControllerAction": "Zwift Controller Action",
   "zwiftControllerDescription": "Enables BikeControl to act as a Zwift-compatible controller."
 }

lib/i10n/intl_fr.arb

@@ -13,6 +13,7 @@
   "accessories": "Accessoires",
   "action": "Action",
   "adjustControllerButtons": "Ajuster les boutons de la manette",
+  "afterDate": "Après {date}",
   "allow": "Permettre",
   "allowAccessibilityService": "Autoriser le service d'accessibilité",
   "allowBluetoothConnections": "Autoriser les connexions Bluetooth",
@@ -20,6 +21,8 @@
   "allowLocationForBluetooth": "Autoriser la localisation pour que la recherche Bluetooth fonctionne",
   "allowPersistentNotification": "Autoriser les notifications",
   "allowsRunningInBackground": "Permet à BikeControl de continuer à fonctionner en arrière-plan",
+  "alreadyBoughtTheApp": "Vous avez déjà acheté l'application ? Vous n'avez pas besoin de payer BikeControl une seconde fois. En raison de difficultés techniques, il est impossible de déterminer si l'application a déjà été achetée. \n\nSaisissez votre identifiant d'achat Play Store (par exemple : GPA.3356-1337-1338-1339) pour débloquer la version complète. Si vous ne le trouvez pas, veuillez me contacter directement.",
+  "alreadyBoughtTheAppPreviously": "Vous avez déjà acheté l'application ?",
   "appIdActions": "{appId} actions",
   "@appIdActions": {
     "placeholders": {
@@ -29,6 +32,7 @@
     }
   },
   "battery": "Batterie",
+  "beforeDate": "Avant {date}",
   "bluetoothAdvertiseAccess": "Accès à la publicité Bluetooth",
   "bluetoothTurnedOn": "Bluetooth activé",
   "browserNotSupported": "Ce navigateur ne prend pas en charge Web Bluetooth et la plateforme n'est pas prise en charge :(",
@@ -252,6 +256,7 @@
     }
   },
   "next": "Suivant",
+  "no": "Non",
   "noActionAssigned": "Aucune action assignée",
   "noActionAssignedForButton": "Impossible d'effectuer {button}: Aucune action assignée",
   "noConnectionMethodIsConnectedOrActive": "Aucune méthode de connexion n'est établie ou active.",
@@ -335,6 +340,7 @@
   "requirement": "Exigence",
   "reset": "Réinitialiser",
   "restart": "Redémarrage",
+  "restorePurchaseInfo": "Cliquez sur le bouton ci-dessus, puis sur « Restaurer l’achat ». Veuillez me contacter directement en cas de problème.",
   "runAppOnPlatformRemotely": "Exécutez {appName} sur {platform} et contrôlez-le à distance depuis cet appareil{preferredConnection}.",
   "@runAppOnPlatformRemotely": {
     "placeholders": {
@@ -422,6 +428,7 @@
   },
   "whatsNew": "Quoi de neuf",
   "whyPermissionNeeded": "Pourquoi cette autorisation est-elle nécessaire ?",
+  "yes": "Oui",
   "zwiftControllerAction": "Action du contrôleur Zwift",
   "zwiftControllerDescription": "Permet à BikeControl de fonctionner comme une manette compatible avec Zwift."
 }

lib/i10n/intl_it.arb

@@ -0,0 +1,434 @@
+{
+  "accessibilityDescription": "BikeControl necessita dell'autorizzazione di accessibilità per controllare le tue app di allenamento.",
+  "accessibilityDisclaimer": "BikeControl accederà al tuo schermo solo per eseguire i gesti da te configurati. Non accederà ad altre funzioni di accessibilità o a informazioni personali.",
+  "accessibilityReasonControl": "• Per consentirti di controllare app come MyWhoosh, IndieVelo e altre utilizzando i tuoi dispositivi Zwift",
+  "accessibilityReasonTouch": "• Per simulare i gesti touch sullo schermo per controllare le app di allenamento",
+  "accessibilityReasonWindow": "• Per rilevare quale finestra dell'app di allenamento è attualmente attiva",
+  "accessibilityServiceExplanation": "Per funzionare correttamente, BikeControl deve utilizzare l'API AccessibilityService di Android.",
+  "accessibilityServiceNotRunning": "Il servizio di accessibilità non è in esecuzione. Seguire le istruzioni su",
+  "accessibilityServicePermissionRequired": "Autorizzazione al servizio di accessibilità richiesta",
+  "accessibilityUsageGestures": "• Quando premi i pulsanti sui tuoi dispositivi Zwift Click, Zwift Ride o Zwift Play, BikeControl simula i gesti touch in posizioni specifiche dello schermo",
+  "accessibilityUsageMonitor": "• L'applicazione monitora quale finestra dell'app di allenamento è attiva per garantire che i gesti vengano inviati all'app corretta",
+  "accessibilityUsageNoData": "• Nessun dato personale viene raccolto o consultato tramite questo servizio",
+  "accessories": "Accessori",
+  "action": "Azione",
+  "adjustControllerButtons": "Regola i pulsanti del controller",
+  "afterDate": "Dopo il {date}",
+  "allow": "Consentire",
+  "allowAccessibilityService": "Consenti servizio di accessibilità",
+  "allowBluetoothConnections": "Consenti connessioni Bluetooth",
+  "allowBluetoothScan": "Consenti scansione Bluetooth",
+  "allowLocationForBluetooth": "Consentire in modo che la scansione Bluetooth funzioni",
+  "allowPersistentNotification": "Consenti notifiche",
+  "allowsRunningInBackground": "Consente a BikeControl di continuare a funzionare in background",
+  "alreadyBoughtTheApp": "Hai già acquistato l'app? Non devi più pagare per BikeControl. A causa di problemi tecnici, non è possibile determinare se l'app è già stata acquistata.\n\nInserisci il tuo ID di acquisto sul Play Store (ad esempio GPA.3356-1337-1338-1339) per sbloccare la versione completa. Se non riesci a trovarlo, contattami direttamente.",
+  "alreadyBoughtTheAppPreviously": "Hai già acquistato l'app in precedenza?",
+  "appIdActions": "{appId} azioni",
+  "@appIdActions": {
+    "placeholders": {
+      "appId": {
+        "type": "String"
+      }
+    }
+  },
+  "battery": "Batteria",
+  "beforeDate": "Prima del {date}",
+  "bluetoothAdvertiseAccess": "Accesso pubblicitario Bluetooth",
+  "bluetoothTurnedOn": "Bluetooth attivato",
+  "browserNotSupported": "Questo browser non supporta il Web Bluetooth e la piattaforma non è supportata :(",
+  "button": "pulsante.",
+  "cancel": "Cancella",
+  "changelog": "Registro delle modifiche",
+  "checkMyWhooshConnectionScreen": "Controlla la schermata di connessione in MyWhoosh per vedere se è connesso.",
+  "chooseAnotherScreenshot": "Scegli un altro screenshot",
+  "chooseBikeControlInConnectionScreen": "Selezionare BikeControl nella schermata di connessione.",
+  "clickAButtonOnYourController": "Fai clic su un pulsante del controller per modificarne l'azione oppure tocca l'icona di modifica.",
+  "clickV2EventInfo": "Il tuo Click V2 potrebbe non inviare più eventi tramite i pulsanti. Verifica toccando alcuni pulsanti e verifica se sono visibili in BikeControl.",
+  "clickV2Instructions": "Per far funzionare al meglio il tuo Zwift Click V2, dovresti collegarlo all'app Zwift prima di ogni sessione di allenamento. In caso contrario, il Click V2 smetterà di funzionare dopo un minuto. \n1. Apri l'app Zwift \n2. Accedi (non richiesto un abbonamento attivo) e apri la schermata di connessione del dispositivo \n3. Collega il tuo trainer, quindi collega lo Zwift Click V2, verifica che i comandi del controller funzionino \n4. Chiudi nuovamente l'app Zwift e riconnettiti a BikeControl",
+  "close": "Chiudi",
+  "commandsRemainingToday": "{commandsRemainingToday}/{dailyCommandLimit} comandi rimanenti oggi",
+  "configuration": "Configurazione",
+  "connectControllerToPreview": "Collega un dispositivo controller per visualizzare in anteprima e personalizzare la mappa dei tasti.",
+  "connectControllers": "Connetti i controller",
+  "connectDirectlyOverNetwork": "Connettiti direttamente tramite la rete",
+  "connectToTrainerApp": "Connettiti all'app di allenamento",
+  "connectUsingBluetooth": "Connettiti tramite Bluetooth",
+  "connectUsingMyWhooshLink": "Connettiti tramite MyWhoosh \"Link\"",
+  "connected": "Connesso",
+  "connectedControllers": "Controller connessi",
+  "connectedTo": "Connesso a{appId}",
+  "@connectedTo": {
+    "placeholders": {
+      "appId": {
+        "type": "String"
+      }
+    }
+  },
+  "connection": "Connessione",
+  "continueAction": "Continua",
+  "controlAppUsingModes": "Controllare{appName} usando{modes}",
+  "@controlAppUsingModes": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      },
+      "modes": {
+        "type": "String"
+      }
+    }
+  },
+  "controllers": "Controller",
+  "couldNotPerformButtonnamesplitbyuppercaseNoKeymapSet": "Non è stato possibile eseguire{button} : Nessuna mappa dei tasti impostata",
+  "create": "Crea",
+  "createNewKeymap": "Crea una nuova mappa dei tasti",
+  "createNewProfileByDuplicating": "Crea un nuovo profilo personalizzato duplicando \"{profileName}\"",
+  "@createNewProfileByDuplicating": {
+    "placeholders": {
+      "profileName": {
+        "type": "String"
+      }
+    }
+  },
+  "createdNewCustomProfile": "Creato un nuovo profilo personalizzato:{profileName}",
+  "@createdNewCustomProfile": {
+    "placeholders": {
+      "profileName": {
+        "type": "String"
+      }
+    }
+  },
+  "customizeControllerButtons": "Personalizza i pulsanti del controller per{appName}",
+  "@customizeControllerButtons": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "customizeKeymapHint": "Personalizza la mappa dei tasti, se riscontri problemi (ad esempio, output della tastiera errato o posizionamenti del tocco non allineati)",
+  "dailyCommandLimitReachedNotification": "Limite giornaliero di comandi raggiunto per oggi. Esegui l'upgrade per sbloccare la versione completa con comandi illimitati.",
+  "dailyLimitReached": "Limite giornaliero raggiunto ({dailyCommandCount} /{dailyCommandLimit} usato)",
+  "delete": "Cancella",
+  "deleteProfile": "Elimina profilo",
+  "deleteProfileConfirmation": "Sei sicuro di voler eliminare \"{profileName}\" ? Questa azione non può essere annullata.",
+  "@deleteProfileConfirmation": {
+    "placeholders": {
+      "profileName": {
+        "type": "String"
+      }
+    }
+  },
+  "deny": "Nega",
+  "deviceButton": "{deviceName}pulsante",
+  "@deviceButton": {
+    "placeholders": {
+      "deviceName": {
+        "type": "String"
+      }
+    }
+  },
+  "disconnectDevices": "Dispositivi disconnessi",
+  "disconnected": "Disconnesso",
+  "donateByBuyingFromPlayStore": "acquistando l'app dal Play Store",
+  "donateViaCreditCard": "tramite carta di credito, Google Pay, Apple Pay e altri",
+  "donateViaPaypal": "tramite PayPal",
+  "download": "Download",
+  "dragToReposition": "Trascina per riposizionare",
+  "duplicate": "Duplica",
+  "enableAutoRotation": "Abilita la rotazione automatica sul tuo dispositivo per assicurarti che l'app funzioni correttamente.",
+  "enableBluetooth": "Abilita Bluetooth",
+  "enableKeyboardAccessMessage": "Abilita l'accesso tramite tastiera nella schermata seguente per BikeControl. Se BikeControl non è presente, aggiungilo manualmente.",
+  "enableKeyboardMouseControl": "Abilita il controllo della tastiera e del mouse per una migliore interazione con{appName} Una volta attivo, non sono necessarie ulteriori azioni o connessioni. BikeControl invierà direttamente l'input del mouse o della tastiera a{appName} .",
+  "@enableKeyboardMouseControl": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "enableMediaKeyDetection": "Abilita rilevamento tasti multimediali",
+  "enablePairingProcess": "Abilita processo di associazione",
+  "enablePermissions": "Abilita autorizzazioni",
+  "enableSteeringWithPhone": "Abilita i sensori dei telefoni per abilitare ad esempio lo sterzo",
+  "enableVibrationFeedback": "Abilita il feedback delle vibrazioni durante il cambio marcia",
+  "enableZwiftControllerBluetooth": "Abilita il controller Zwift (Bluetooth)",
+  "enableZwiftControllerNetwork": "Abilita Zwift Controller (rete)",
+  "errorStartingMyWhooshLink": "Errore durante l'avvio del server MyWhoosh Link. Assicurati che l'app \"MyWhoosh Link\" non sia già in esecuzione su questo dispositivo.",
+  "errorStartingOpenBikeControlBluetoothServer": "Errore durante l'avvio del server Bluetooth OpenBikeControl.",
+  "errorStartingOpenBikeControlServer": "Errore durante l'avvio del server OpenBikeControl.",
+  "exportAction": "Esporta",
+  "failedToImportProfile": "Impossibile importare il profilo. Formato non valido.",
+  "failedToUpdate": "Aggiornamento non riuscito:{error}",
+  "@failedToUpdate": {
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+  "firmware": "Firmware",
+  "forceCloseToUpdate": "Forza la chiusura dell'app per utilizzare la nuova versione",
+  "fullVersion": "Versione completa",
+  "fullVersionDescription": "La versione completa include: \n- Comandi illimitati al giorno \n- Accesso a tutti gli aggiornamenti futuri \n- Nessun abbonamento! Solo un canone una tantum :)",
+  "getSupport": "Ottieni supporto",
+  "gotIt": "Fatto!",
+  "grant": "Concedi",
+  "granted": "Concesso",
+  "helpRequested": "Aiuto richiesto per BikeControl v{version}",
+  "@helpRequested": {
+    "placeholders": {
+      "version": {
+        "type": "String"
+      }
+    }
+  },
+  "howBikeControlUsesPermission": "In che modo BikeControl utilizza questa autorizzazione?",
+  "ignoredDevices": "Dispositivi ignorati",
+  "importAction": "Importa",
+  "importProfile": "Importa profilo",
+  "instructions": "Istruzioni",
+  "jsonData": "Dati JSON",
+  "keyboardAccess": "Accesso tramite tastiera",
+  "latestVersion": "ultima:{version}",
+  "@latestVersion": {
+    "placeholders": {
+      "version": {
+        "type": "String"
+      }
+    }
+  },
+  "leaveAReview": "Lascia una recensione",
+  "letsAppConnectOverBluetooth": "Lascia che {appName} si connetta a BikeControl tramite Bluetooth.",
+  "@letsAppConnectOverBluetooth": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "letsAppConnectOverNetwork": "Lascia che {appName} si connetta direttamente tramite la rete. Seleziona BikeControl nella schermata di connessione.",
+  "@letsAppConnectOverNetwork": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "license": "Licenza",
+  "licenseStatus": "Stato della licenza",
+  "loadScreenshotForPlacement": "Carica lo screenshot del gioco per il posizionamento",
+  "logViewer": "Visualizzatore di registri",
+  "logs": "Registri",
+  "logsAreAlsoAt": "I registri sono anche a",
+  "logsHaveBeenCopiedToClipboard": "I registri sono stati copiati negli appunti",
+  "longPress": "pressione prolungata",
+  "longPressMode": "Modalità pressione prolungata (rispetto alla ripetizione)",
+  "mailSupportExplanation": "Fornire supporto individuale via email è un impegno notevole per me. \n\nVi invito a utilizzare Reddit, Facebook o GitHub per domande e problemi, in modo che l'intera comunità possa trarne beneficio.",
+  "manageIgnoredDevices": "Gestisci dispositivi ignorati",
+  "manageProfile": "Gestisci profilo",
+  "manualyControllingButton": "Controlla {trainerApp} manualmente!",
+  "mediaKeyDetectionTooltip": "Abilita questa opzione per consentire a BikeControl di rilevare i telecomandi Bluetooth. \nPer fare ciò, BikeControl deve funzionare come lettore multimediale.",
+  "miuiDeviceDetected": "Dispositivo MIUI rilevato",
+  "miuiDisableBatteryOptimization": "• Disattivare l'ottimizzazione della batteria per BikeControl",
+  "miuiEnableAutostart": "• Abilita l'avvio automatico per BikeControl",
+  "miuiEnsureProperWorking": "Per garantire il corretto funzionamento di BikeControl:",
+  "miuiLockInRecentApps": "• Blocca l'app nelle app recenti",
+  "miuiWarningDescription": "Il tuo dispositivo utilizza MIUI, che è noto per disattivare in modo aggressivo i servizi in background e i servizi di accessibilità.",
+  "moreInformation": "Ulteriori informazioni",
+  "mustChooseAllowOrDeny": "Per continuare, devi scegliere se consentire o negare questa autorizzazione.",
+  "myWhooshDirectConnectAction": "Azione MyWhoosh \"Link\"",
+  "myWhooshDirectConnection": " ad esempio utilizzando MyWhoosh \"Link\"",
+  "myWhooshLinkConnected": "MyWhoosh \"Link\" connesso",
+  "myWhooshLinkDescriptionLocal": "Collegati direttamente a MyWhoosh tramite il metodo \"Link\". Le azioni supportate includono cambio, emoji, indicazioni di svolta, tra le altre. L'app complementare MyWhoosh Link NON deve essere in esecuzione contemporaneamente.",
+  "myWhooshLinkInfo": "In caso di problemi, consulta la sezione relativa alla risoluzione dei problemi. Presto sarà disponibile un metodo di connessione molto più affidabile!",
+  "needHelpClickHelp": "Hai bisogno di aiuto? Clicca sul",
+  "needHelpDontHesitate": "pulsante in alto e non esitare a contattarci.",
+  "newConnectionMethodAnnouncement": "{trainerApp}supporterà presto metodi di connessione molto migliori e affidabili: restate sintonizzati per gli aggiornamenti!",
+  "newCustomProfile": "Nuovo profilo personalizzato",
+  "newProfileName": "Nuovo nome del profilo",
+  "newVersionAvailable": "Nuova versione disponibile",
+  "newVersionAvailableWithVersion": "Nuova versione disponibile:{version}",
+  "@newVersionAvailableWithVersion": {
+    "placeholders": {
+      "version": {
+        "type": "String"
+      }
+    }
+  },
+  "next": "Successivo",
+  "no": "No",
+  "noActionAssigned": "Nessuna azione assegnata",
+  "noActionAssignedForButton": "Non è stato possibile eseguire{button} : Nessuna azione assegnata",
+  "noConnectionMethodIsConnectedOrActive": "Nessun metodo di connessione è connesso o attivo.",
+  "noConnectionMethodSelected": "Nessun metodo di connessione selezionato",
+  "noControllerConnected": "Nessuno connesso",
+  "noControllerUseCompanionMode": "Non hai un controller? Usa la Companion Mode",
+  "noIgnoredDevices": "Nessun dispositivo ignorato.",
+  "noTrainerSelected": "Nessun Trainer selezionato",
+  "notConnected": "Non connesso",
+  "notificationDescription": "In questo modo l'app rimane attiva in background e ti aggiorna quando cambia la connessione ai tuoi dispositivi.",
+  "ok": "Ok",
+  "openBikeControlActions": "Azioni OpenBikeControl",
+  "openBikeControlAnnouncement": "Ottime notizie -{trainerApp} supporta il protocollo OpenBikeControl, così avrai la migliore esperienza possibile!",
+  "openBikeControlConnection": " ad esempio utilizzando la connessione OpenBikeControl",
+  "otherConnectionMethods": "Altri metodi di connessione",
+  "pairingDescription": "L'associazione consente la personalizzazione completa, ma potrebbe non funzionare su tutti i dispositivi.",
+  "pairingInstructions": "Sul tuo{targetName} Accedi alle impostazioni Bluetooth e cerca BikeControl o il nome del tuo dispositivo. L'associazione è necessaria se vuoi utilizzare la funzione di controllo remoto.",
+  "@pairingInstructions": {
+    "placeholders": {
+      "targetName": {
+        "type": "String"
+      }
+    }
+  },
+  "pairingInstructionsIOS": "Sul tuo iPad, vai su Impostazioni > Accessibilità > Tocco > Assistenza Tocco > Dispositivi di puntamento > Dispositivi e associa il tuo dispositivo. Assicurati che Assistenza Tocco sia abilitato.",
+  "pasteExportedJsonData": "Incolla i dati JSON esportati qui sotto:",
+  "pathCopiedToClipboard": "Il percorso è stato copiato negli appunti",
+  "permissionsRequired": "Per consentire a BikeControl di cercare i dispositivi nelle vicinanze e di aggiornarti quando cambia la connessione, abilita le seguenti autorizzazioni:",
+  "platformNotSupported": "Questo{platform} non è supportato :(",
+  "@platformNotSupported": {
+    "placeholders": {
+      "platform": {
+        "type": "String"
+      }
+    }
+  },
+  "platformRestrictionNotSupported": "A causa delle restrizioni della piattaforma, questo scenario non è supportato.",
+  "platformRestrictionOtherDevicesOnly": "A causa delle restrizioni della piattaforma, solo il controllo{appName} su altri dispositivi è supportato.",
+  "@platformRestrictionOtherDevicesOnly": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "playPause": "Riproduci/Pausa",
+  "pleaseSelectAConnectionMethodFirst": "Per prima cosa seleziona un metodo di connessione nelle impostazioni del Trainer.",
+  "predefinedAction": "Predefinito{appName} azione",
+  "@predefinedAction": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "pressButtonOnClickDevice": "Premi un pulsante sul tuo dispositivo Click",
+  "pressKeyToAssign": "Premi un tasto sulla tastiera per assegnarlo a{buttonName}",
+  "@pressKeyToAssign": {
+    "placeholders": {
+      "buttonName": {
+        "type": "String"
+      }
+    }
+  },
+  "previous": "Precedente",
+  "profileExportedToClipboard": "Profilo \"{profileName}\" esportato negli appunti",
+  "@profileExportedToClipboard": {
+    "placeholders": {
+      "profileName": {
+        "type": "String"
+      }
+    }
+  },
+  "profileImportedSuccessfully": "Profilo importato con successo",
+  "profileName": "Nome del profilo",
+  "purchase": "Acquista",
+  "recommendedConnectionMethods": "Metodi di connessione consigliati",
+  "removeFromIgnoredList": "Rimuovi dall'elenco degli ignorati",
+  "rename": "Rinomina",
+  "renameProfile": "Rinomina profilo",
+  "requirement": "Requisiti",
+  "reset": "Reset",
+  "restart": "Riavvia",
+  "restorePurchaseInfo": "Clicca sul pulsante qui sopra, poi su \"Ripristina acquisto\". In caso di problemi, contattami direttamente.",
+  "runAppOnPlatformRemotely": "Avvia {appName} su{platform} e controllarlo da remoto da questo dispositivo{preferredConnection} .",
+  "@runAppOnPlatformRemotely": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      },
+      "platform": {
+        "type": "String"
+      },
+      "preferredConnection": {
+        "type": "String"
+      }
+    }
+  },
+  "runAppOnThisDevice": "Avvia {appName} su questo dispositivo.",
+  "@runAppOnThisDevice": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "save": "Salva",
+  "scan": "Scansione",
+  "scanningForDevices": "Ricerca dispositivi in corso... Assicurarsi che siano accesi e nel raggio d'azione e che non siano connessi a un altro dispositivo.",
+  "selectKeymap": "Seleziona la mappa dei tasti",
+  "selectTargetWhereAppRuns": "Seleziona la destinazione dove{appName} è in esecuzione",
+  "@selectTargetWhereAppRuns": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "selectTrainerApp": "Seleziona l'app Trainer",
+  "selectTrainerAppAndTarget": "Seleziona l'app Trainer e il dispositivo di destinazione",
+  "selectTrainerAppPlaceholder": "Seleziona l'app Trainer",
+  "setting": "Impostazioni",
+  "setupTrainer": "Impostazioni Trainer",
+  "share": "Condividi",
+  "showDonation": "Mostra il tuo apprezzamento donando",
+  "showSupportedControllers": "Mostra controller supportati",
+  "showTroubleshootingGuide": "Mostra Guida alla risoluzione dei problemi",
+  "signal": "Segnale",
+  "simulateButtons": "Controlli del Trainer",
+  "simulateKeyboardShortcut": "Simula scorciatoia da tastiera",
+  "simulateMediaKey": "Simula il tasto multimediale",
+  "simulateTouch": "Simula il tocco",
+  "stop": "Stop",
+  "targetOtherDevice": "Altro dispositivo",
+  "targetThisDevice": "Questo dispositivo",
+  "theFollowingPermissionsRequired": "Sono richieste le seguenti autorizzazioni:",
+  "touchAreaInstructions": "1. Crea uno screenshot in-game della tua app (ad esempio all'interno di MyWhoosh) in orientamento orizzontale \n2. Carica lo screenshot con il pulsante qui sotto \n3. L'app viene automaticamente impostata in orientamento orizzontale per una mappatura accurata \n4. Premi un pulsante sul tuo dispositivo Click per creare un'area touch \n5. Trascina le aree touch nella posizione desiderata sullo screenshot \n6. Salva e chiudi questa schermata",
+  "touchSimulationForegroundMessage": "Per simulare i tocchi, l'app deve rimanere in primo piano.",
+  "trainer": "Trainer",
+  "trialDaysRemaining": "{trialDaysRemaining}giorni rimanenti",
+  "trialExpired": "Prova scaduta. Comandi limitati a{dailyCommandLimit} al giorno.",
+  "trialPeriodActive": "Periodo di prova attivo -{trialDaysRemaining} giorni rimanenti",
+  "trialPeriodDescription": "Goditi comandi illimitati durante il periodo di prova. Dopo la prova, i comandi saranno limitati a{dailyCommandLimit} al giorno.",
+  "troubleshootingGuide": "Guida alla risoluzione dei problemi",
+  "tryingToConnectAgain": "Sto provando a connettermi di nuovo...",
+  "unassignAction": "Annulla assegnazione azione",
+  "unlockFullVersion": "Sblocca la versione completa",
+  "update": "Aggiorna",
+  "useCustomKeymapForButton": "Utilizzare una mappa dei tasti personalizzata per supportare",
+  "version": "Versione{version}",
+  "@version": {
+    "placeholders": {
+      "version": {
+        "type": "String"
+      }
+    }
+  },
+  "viewDetailedInstructions": "Visualizza le istruzioni dettagliate",
+  "volumeDown": "Abbassa il volume",
+  "volumeUp": "Aumenta il volume",
+  "waiting": "In attesa...",
+  "waitingForConnectionKickrBike": "In attesa di connessione. Scegli KICKR BIKE PRO in{appName} menu di associazione del controller.",
+  "@waitingForConnectionKickrBike": {
+    "placeholders": {
+      "appName": {
+        "type": "String"
+      }
+    }
+  },
+  "whatsNew": "Novità",
+  "whyPermissionNeeded": "Perché è necessaria questa autorizzazione?",
+  "yes": "SÌ",
+  "zwiftControllerAction": "Azione del controller Zwift",
+  "zwiftControllerDescription": "Consente a BikeControl di funzionare come controller compatibile con Zwift."
+}

lib/i10n/intl_pl.arb

@@ -13,6 +13,7 @@
   "accessories": "Akcesoria",
   "action": "Działanie",
   "adjustControllerButtons": "Dostosuj przyciski kontrolera",
+  "afterDate": "Po {date}",
   "allow": "Zezwól",
   "allowAccessibilityService": "Zezwól na usługę ułatwień dostępu",
   "allowBluetoothConnections": "Zezwól na połączenia Bluetooth",
@@ -20,6 +21,8 @@
   "allowLocationForBluetooth": "Zezwól na dostęp do lokalizacji, aby umożliwić skanowanie Bluetooth",
   "allowPersistentNotification": "Zezwól na powiadomienia",
   "allowsRunningInBackground": "Umożliwia działanie BikeControl w tle",
+  "alreadyBoughtTheApp": "Kupiłeś już aplikację? Nie musisz płacić za BikeControl. Z powodu problemów technicznych nie można ustalić, czy aplikacja została już zakupiona. \n\nWprowadź swój identyfikator zakupu w Sklepie Play (np. GPA.3356-1337-1338-1339), aby odblokować pełną wersję. Jeśli nie możesz jej znaleźć, skontaktuj się ze mną bezpośrednio.",
+  "alreadyBoughtTheAppPreviously": "Już wcześniej kupiłeś aplikację?",
   "appIdActions": "{appId} działania",
   "@appIdActions": {
     "placeholders": {
@@ -29,6 +32,7 @@
     }
   },
   "battery": "Bateria",
+  "beforeDate": "Zanim {date}",
   "bluetoothAdvertiseAccess": "Dostęp do reklamy Bluetooth",
   "bluetoothTurnedOn": "Włączono Bluetooth",
   "browserNotSupported": "Ta przeglądarka nie obsługuje technologii Web Bluetooth i platforma nie jest obsługiwana :(",
@@ -239,7 +243,7 @@
   "myWhooshLinkInfo": "W razie napotkania błędów prosimy o sprawdzenie sekcji rozwiązywania problemów. Wkrótce pojawi się znacznie bardziej niezawodna metoda połączenia!",
   "needHelpClickHelp": "Potrzebujesz pomocy? Kliknij",
   "needHelpDontHesitate": "przycisk na górze i prosimy o kontakt.",
-  "newConnectionMethodAnnouncement": "{trainerApp} już wkrótce będziemy wspierać znacznie lepsze i bardziej niezawodne metody połączeń — bądźcie na bieżąco z aktualizacjami!",
+  "newConnectionMethodAnnouncement": "{trainerApp} już wkrótce będzie wspierać znacznie lepsze i bardziej niezawodne metody połączeń — bądź na bieżąco z aktualizacjami!",
   "newCustomProfile": "Nowy profil niestandardowy",
   "newProfileName": "Nowa nazwa profilu",
   "newVersionAvailable": "Dostępna jest nowa wersja",
@@ -252,6 +256,7 @@
     }
   },
   "next": "Dalej",
+  "no": "Nie",
   "noActionAssigned": "Brak przypisanej akcji",
   "noActionAssignedForButton": "Nie można wykonać {button}: Brak przypisanej akcji",
   "noConnectionMethodIsConnectedOrActive": "Żadna metoda połączenia nie jest podłączona lub aktywna.",
@@ -259,7 +264,7 @@
   "noControllerConnected": "Brak połączenia",
   "noControllerUseCompanionMode": "Nie masz kontrolera? Użyj Companion Mode.",
   "noIgnoredDevices": "Brak ignorowanych urządzeń.",
-  "noTrainerSelected": "Nie wybrano aplikacji treningowej",
+  "noTrainerSelected": "Nie wybrano trenażera",
   "notConnected": "Nie połączono",
   "notificationDescription": "Dzięki temu aplikacja działa w tle i powiadamia Cię o każdej zmianie połączenia z Twoim urządzeniem.",
   "ok": "OK",
@@ -298,7 +303,7 @@
     }
   },
   "playPause": "Start/Pauza",
-  "pleaseSelectAConnectionMethodFirst": "Najpierw wybierz metodę połączenia w ustawieniach aplikacji treningowej.",
+  "pleaseSelectAConnectionMethodFirst": "Najpierw wybierz metodę połączenia w ustawieniach trenażera.",
   "predefinedAction": "Predefiniowana akcja {appName}",
   "@predefinedAction": {
     "placeholders": {
@@ -335,6 +340,7 @@
   "requirement": "Wymóg",
   "reset": "Reset",
   "restart": "Uruchom ponownie",
+  "restorePurchaseInfo": "Kliknij przycisk powyżej, a następnie „Przywróć zakup”. W razie jakichkolwiek problemów skontaktuj się ze mną bezpośrednio.",
   "runAppOnPlatformRemotely": "Uruchom {appName} na {platform} i steruj nim zdalnie z tego urządzenia {preferredConnection}.",
   "@runAppOnPlatformRemotely": {
     "placeholders": {
@@ -422,6 +428,7 @@
   },
   "whatsNew": "Co nowego",
   "whyPermissionNeeded": "Dlaczego to uprawnienie jest potrzebne?",
+  "yes": "Tak",
   "zwiftControllerAction": "Akcja kontrolera Zwift",
   "zwiftControllerDescription": "Umożliwia BikeControl działanie jako kontroler kompatybilny ze Zwift."
 }

lib/main.dart

@@ -11,8 +11,6 @@ import 'package:bike_control/widgets/menu.dart';
 import 'package:bike_control/widgets/testbed.dart';
 import 'package:bike_control/widgets/ui/colors.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_localizations/flutter_localizations.dart'
-    show GlobalMaterialLocalizations, GlobalWidgetsLocalizations;
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 import 'pages/navigation.dart';
@@ -180,9 +178,8 @@ class BikeControlApp extends StatelessWidget {
       menuHandler: PopoverOverlayHandler(),
       popoverHandler: PopoverOverlayHandler(),
       localizationsDelegates: [
-        ...GlobalMaterialLocalizations.delegates,
-        GlobalWidgetsLocalizations.delegate,
-        ShadcnLocalizations.delegate,
+        ...ShadcnLocalizations.localizationsDelegates,
+        OtherLocalizationsDelegate(),
         AppLocalizations.delegate,
       ],
       supportedLocales: AppLocalizations.delegate.supportedLocales,
@@ -220,3 +217,19 @@ class BikeControlApp extends StatelessWidget {
     );
   }
 }
+
+class OtherLocalizationsDelegate extends LocalizationsDelegate<ShadcnLocalizations> {
+  const OtherLocalizationsDelegate();
+
+  @override
+  bool isSupported(Locale locale) =>
+      AppLocalizations.delegate.supportedLocales.map((e) => e.languageCode).contains(locale.languageCode);
+
+  @override
+  Future<ShadcnLocalizations> load(Locale locale) async {
+    return SynchronousFuture<ShadcnLocalizations>(lookupShadcnLocalizations(Locale('en')));
+  }
+
+  @override
+  bool shouldReload(covariant LocalizationsDelegate<ShadcnLocalizations> old) => false;
+}

lib/pages/button_edit.dart

@@ -269,7 +269,7 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                             builder: (c) => DropdownMenu(
                               children: [
                                 MenuButton(
-                                  child: Text(context.i18n.playPause),
+                                  leading: Icon(Icons.play_arrow_outlined),
                                   onPressed: (c) {
                                     _keyPair.physicalKey = PhysicalKeyboardKey.mediaPlayPause;
                                     _keyPair.logicalKey = null;
@@ -277,9 +277,10 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                                     setState(() {});
                                     widget.onUpdate();
                                   },
+                                  child: Text(context.i18n.playPause),
                                 ),
                                 MenuButton(
-                                  child: Text(context.i18n.stop),
+                                  leading: Icon(Icons.stop_outlined),
                                   onPressed: (c) {
                                     _keyPair.physicalKey = PhysicalKeyboardKey.mediaStop;
                                     _keyPair.logicalKey = null;
@@ -287,10 +288,10 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                                     setState(() {});
                                     widget.onUpdate();
                                   },
+                                  child: Text(context.i18n.stop),
                                 ),
                                 MenuButton(
-                                  child: Text(context.i18n.previous),
-
+                                  leading: Icon(Icons.skip_previous_outlined),
                                   onPressed: (c) {
                                     _keyPair.physicalKey = PhysicalKeyboardKey.mediaTrackPrevious;
                                     _keyPair.logicalKey = null;
@@ -298,9 +299,10 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                                     setState(() {});
                                     widget.onUpdate();
                                   },
+                                  child: Text(context.i18n.previous),
                                 ),
                                 MenuButton(
-                                  child: Text(context.i18n.next),
+                                  leading: Icon(Icons.skip_next_outlined),
                                   onPressed: (c) {
                                     _keyPair.physicalKey = PhysicalKeyboardKey.mediaTrackNext;
                                     _keyPair.logicalKey = null;
@@ -308,8 +310,10 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                                     setState(() {});
                                     widget.onUpdate();
                                   },
+                                  child: Text(context.i18n.next),
                                 ),
                                 MenuButton(
+                                  leading: Icon(Icons.volume_up_outlined),
                                   onPressed: (c) {
                                     _keyPair.physicalKey = PhysicalKeyboardKey.audioVolumeUp;
                                     _keyPair.logicalKey = null;
@@ -320,6 +324,7 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                                   child: Text(context.i18n.volumeUp),
                                 ),
                                 MenuButton(
+                                  leading: Icon(Icons.volume_down_outlined),
                                   child: Text(context.i18n.volumeDown),
                                   onPressed: (c) {
                                     _keyPair.physicalKey = PhysicalKeyboardKey.audioVolumeDown;
@@ -434,6 +439,8 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
             title: Text(action.title),
             subtitle: (action.possibleValues != null && action == _keyPair.inGameAction)
                 ? Text(_keyPair.inGameActionValue!.toString())
+                : action.alternativeTitle != null
+                ? Text(action.alternativeTitle!)
                 : null,
             isActive: _keyPair.inGameAction == action && supportedActions.contains(_keyPair.inGameAction),
             onPressed: () {

lib/pages/button_simulator.dart

@@ -86,6 +86,7 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
   InGameAction? _pressedAction;
 
   DateTime? _lastDown;
+  final ScrollController _scrollController = ScrollController();
 
   @override
   void initState() {
@@ -98,6 +99,7 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
   @override
   void dispose() {
     _focusNode.dispose();
+    _scrollController.dispose();
     super.dispose();
   }
 
@@ -200,7 +202,9 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
           ),
         ],
         child: Scrollbar(
+          controller: _scrollController,
           child: SingleChildScrollView(
+            controller: _scrollController,
             padding: EdgeInsets.all(16),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -473,7 +477,7 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
       );
       return;
     } else {
-      if (!down && _lastDown != null) {
+      if (!down && _lastDown != null && action.isLongPress) {
         final timeSinceLastDown = DateTime.now().difference(_lastDown!);
         if (timeSinceLastDown < Duration(milliseconds: 400)) {
           // wait a bit so actions actually get applied correctly for some trainer apps

lib/pages/device.dart

@@ -20,7 +20,7 @@ class DevicePage extends StatefulWidget {
   State<DevicePage> createState() => _DevicePageState();
 }
 
-class _DevicePageState extends State<DevicePage> with WidgetsBindingObserver {
+class _DevicePageState extends State<DevicePage> {
   late StreamSubscription<BaseDevice> _connectionStateSubscription;
 
   @override

lib/pages/navigation.dart

@@ -51,6 +51,13 @@ class _NavigationState extends State<Navigation> {
   bool _isMobile = false;
   late BCPage _selectedPage;
 
+  final Map<BCPage, Key> _pageKeys = {
+    BCPage.devices: Key('devices_page'),
+    BCPage.trainer: Key('trainer_page'),
+    BCPage.customization: Key('customization_page'),
+    BCPage.logs: Key('logs_page'),
+  };
+
   @override
   void initState() {
     super.initState();
@@ -162,6 +169,7 @@ class _NavigationState extends State<Navigation> {
                 duration: Duration(milliseconds: 200),
                 child: switch (_selectedPage) {
                   BCPage.devices => DevicePage(
+                    key: _pageKeys[BCPage.devices],
                     onUpdate: () {
                       setState(() {
                         _selectedPage = BCPage.trainer;
@@ -169,6 +177,7 @@ class _NavigationState extends State<Navigation> {
                     },
                   ),
                   BCPage.trainer => TrainerPage(
+                    key: _pageKeys[BCPage.trainer],
                     onUpdate: () {
                       setState(() {});
                     },
@@ -178,8 +187,12 @@ class _NavigationState extends State<Navigation> {
                       });
                     },
                   ),
-                  BCPage.customization => CustomizePage(),
-                  BCPage.logs => LogViewer(),
+                  BCPage.customization => CustomizePage(
+                    key: _pageKeys[BCPage.customization],
+                  ),
+                  BCPage.logs => LogViewer(
+                    key: _pageKeys[BCPage.logs],
+                  ),
                 },
               ),
             ),

lib/utils/actions/android.dart

@@ -4,7 +4,6 @@ import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/iap/iap_manager.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
-import 'package:bike_control/widgets/keymap_explanation.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/services.dart';
 
@@ -83,7 +82,7 @@ class AndroidActions extends BaseActions {
             : "up"}",
       );
     }
-    return NotHandled('No action assigned for ${button.toString().splitByUpperCase()}');
+    return NotHandled('No action assigned for ${button.name}');
   }
 
   void ignoreHidDevices() {

lib/utils/actions/base_actions.dart

@@ -176,11 +176,11 @@ abstract class BaseActions {
 class StubActions extends BaseActions {
   StubActions({super.supportedModes = const []});
 
-  final List<ControllerButton> performedActions = [];
+  final List<(ControllerButton button, bool isDown, bool isUp)> performedActions = [];
 
   @override
   Future<ActionResult> performAction(ControllerButton button, {bool isKeyDown = true, bool isKeyUp = false}) async {
-    performedActions.add(button);
+    performedActions.add((button, isKeyDown, isKeyUp));
     return Future.value(Ignored('${button.name.splitByUpperCase()} clicked'));
   }
 }

lib/utils/actions/desktop.dart

@@ -20,6 +20,18 @@ class DesktopActions extends BaseActions {
     final keyPair = supportedApp!.keymap.getKeyPair(button)!;
 
     if (core.settings.getLocalEnabled()) {
+      // Handle media keys
+      if (keyPair.isSpecialKey) {
+        try {
+          await keyPressSimulator.simulateMediaKey(keyPair.physicalKey!);
+          // Increment command count after successful execution
+          await IAPManager.instance.incrementCommandCount();
+          return Success('Media key pressed: $keyPair');
+        } catch (e) {
+          return Error('Failed to simulate media key: $e');
+        }
+      }
+      
       if (keyPair.physicalKey != null) {
         // Increment command count after successful execution
         await IAPManager.instance.incrementCommandCount();

lib/utils/core.dart

@@ -77,6 +77,7 @@ class Permissions {
     } else if (Platform.isWindows) {
       list = [
         BluetoothTurnedOn(),
+        NotificationRequirement(),
       ];
     } else if (Platform.isAndroid) {
       final deviceInfoPlugin = DeviceInfoPlugin();

lib/utils/iap/iap_manager.dart

@@ -3,7 +3,9 @@ import 'dart:io';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/iap/iap_service.dart';
+import 'package:bike_control/utils/iap/revenuecat_service.dart';
 import 'package:bike_control/utils/iap/windows_iap_service.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
@@ -17,6 +19,7 @@ class IAPManager {
 
   static int dailyCommandLimit = 15;
   IAPService? _iapService;
+  RevenueCatService? _revenueCatService;
   WindowsIAPService? _windowsIapService;
   ValueNotifier<bool> isPurchased = ValueNotifier<bool>(false);
 
@@ -33,9 +36,21 @@ class IAPManager {
 
     try {
       if (Platform.isWindows) {
+        // Keep Windows using the existing windows_iap implementation
         _windowsIapService = WindowsIAPService(prefs);
         await _windowsIapService!.initialize();
       } else if (Platform.isIOS || Platform.isMacOS || Platform.isAndroid) {
+        // Use RevenueCat for supported platforms when API key is available
+        _revenueCatService = RevenueCatService(
+          prefs,
+          isPurchasedNotifier: isPurchased,
+          getDailyCommandLimit: () => dailyCommandLimit,
+          setDailyCommandLimit: (limit) => dailyCommandLimit = limit,
+        );
+        await _revenueCatService!.initialize();
+      } else {
+        // Fall back to legacy IAP service
+        debugPrint('Using legacy IAP service (no RevenueCat key)');
         _iapService = IAPService(prefs);
         await _iapService!.initialize();
       }
@@ -46,7 +61,9 @@ class IAPManager {
 
   /// Check if the trial period has started
   bool get hasTrialStarted {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      return _revenueCatService!.hasTrialStarted;
+    } else if (_iapService != null) {
       return _iapService!.hasTrialStarted;
     } else if (_windowsIapService != null) {
       return _windowsIapService!.hasTrialStarted;
@@ -56,14 +73,18 @@ class IAPManager {
 
   /// Start the trial period
   Future<void> startTrial() async {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      await _revenueCatService!.startTrial();
+    } else if (_iapService != null) {
       await _iapService!.startTrial();
     }
   }
 
   /// Get the number of days remaining in the trial
   int get trialDaysRemaining {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      return _revenueCatService!.trialDaysRemaining;
+    } else if (_iapService != null) {
       return _iapService!.trialDaysRemaining;
     } else if (_windowsIapService != null) {
       return _windowsIapService!.trialDaysRemaining;
@@ -73,7 +94,9 @@ class IAPManager {
 
   /// Check if the trial has expired
   bool get isTrialExpired {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      return _revenueCatService!.isTrialExpired;
+    } else if (_iapService != null) {
       return _iapService!.isTrialExpired;
     } else if (_windowsIapService != null) {
       return _windowsIapService!.isTrialExpired;
@@ -84,9 +107,11 @@ class IAPManager {
   /// Check if the user can execute a command
   bool get canExecuteCommand {
     // If IAP is not initialized or not available, allow commands
-    if (_iapService == null && _windowsIapService == null) return true;
+    if (_revenueCatService == null && _iapService == null && _windowsIapService == null) return true;
 
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      return _revenueCatService!.canExecuteCommand;
+    } else if (_iapService != null) {
       return _iapService!.canExecuteCommand;
     } else if (_windowsIapService != null) {
       return _windowsIapService!.canExecuteCommand;
@@ -96,7 +121,9 @@ class IAPManager {
 
   /// Get the number of commands remaining today (for free tier after trial)
   int get commandsRemainingToday {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      return _revenueCatService!.commandsRemainingToday;
+    } else if (_iapService != null) {
       return _iapService!.commandsRemainingToday;
     } else if (_windowsIapService != null) {
       return _windowsIapService!.commandsRemainingToday;
@@ -106,7 +133,9 @@ class IAPManager {
 
   /// Get the daily command count
   int get dailyCommandCount {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      return _revenueCatService!.dailyCommandCount;
+    } else if (_iapService != null) {
       return _iapService!.dailyCommandCount;
     } else if (_windowsIapService != null) {
       return _windowsIapService!.dailyCommandCount;
@@ -116,7 +145,9 @@ class IAPManager {
 
   /// Increment the daily command count
   Future<void> incrementCommandCount() async {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      await _revenueCatService!.incrementCommandCount();
+    } else if (_iapService != null) {
       await _iapService!.incrementCommandCount();
     } else if (_windowsIapService != null) {
       await _windowsIapService!.incrementCommandCount();
@@ -129,7 +160,7 @@ class IAPManager {
     if (IAPManager.instance.isPurchased.value) {
       return AppLocalizations.current.fullVersion;
     } else if (!hasTrialStarted) {
-      return '${_iapService?.trialDaysRemaining ?? _windowsIapService?.trialDaysRemaining} day trial available';
+      return '${_revenueCatService?.trialDaysRemaining ?? _iapService?.trialDaysRemaining ?? _windowsIapService?.trialDaysRemaining} day trial available';
     } else if (!isTrialExpired) {
       return AppLocalizations.current.trialDaysRemaining(trialDaysRemaining);
     } else {
@@ -138,8 +169,10 @@ class IAPManager {
   }
 
   /// Purchase the full version
-  Future<void> purchaseFullVersion() async {
-    if (_iapService != null) {
+  Future<void> purchaseFullVersion(BuildContext context) async {
+    if (_revenueCatService != null) {
+      return await _revenueCatService!.purchaseFullVersion(context);
+    } else if (_iapService != null) {
       return await _iapService!.purchaseFullVersion();
     } else if (_windowsIapService != null) {
       return await _windowsIapService!.purchaseFullVersion();
@@ -148,20 +181,40 @@ class IAPManager {
 
   /// Restore previous purchases
   Future<void> restorePurchases() async {
-    if (_iapService != null) {
+    if (_revenueCatService != null) {
+      await _revenueCatService!.restorePurchases();
+    } else if (_iapService != null) {
       await _iapService!.restorePurchases();
     }
     // Windows doesn't have a separate restore mechanism in the stub
   }
 
+  /// Check if RevenueCat is being used
+  bool get isUsingRevenueCat => _revenueCatService != null;
+
   /// Dispose the manager
   void dispose() {
+    _revenueCatService?.dispose();
     _iapService?.dispose();
     _windowsIapService?.dispose();
   }
 
-  void reset(bool fullReset) {
+  Future<void> reset(bool fullReset) async {
+    isPurchased.value = false;
     _windowsIapService?.reset();
-    _iapService?.reset(fullReset);
+    await _revenueCatService?.reset(fullReset);
+    await _iapService?.reset(fullReset);
+  }
+
+  Future<void> redeem(String purchaseId) async {
+    if (_revenueCatService != null) {
+      await _revenueCatService!.redeem(purchaseId);
+    } else if (_iapService != null) {
+      await _iapService!.redeem();
+    }
+  }
+
+  void setAttributes() {
+    _revenueCatService?.setAttributes();
   }
 }

lib/utils/iap/iap_service.dart

@@ -7,10 +7,11 @@ import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/iap/iap_manager.dart';
-import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
+import 'package:intl/intl.dart';
 import 'package:ios_receipt/ios_receipt.dart';
 import 'package:version/version.dart';
 
@@ -22,6 +23,8 @@ class IAPService {
   static const String _purchaseStatusKey = 'iap_purchase_status';
   static const String _dailyCommandCountKey = 'iap_daily_command_count';
   static const String _lastCommandDateKey = 'iap_last_command_date';
+  static const String _lastPurchaseCheckKey = 'iap_last_purchase_check';
+  static const String _hasPurchasedKey = 'iap_has_purchased';
 
   final InAppPurchase _inAppPurchase = InAppPurchase.instance;
   final FlutterSecureStorage _prefs;
@@ -71,6 +74,8 @@ class IAPService {
       );
 
       _trialStartDate = await _prefs.read(key: _trialStartDateKey);
+      core.connection.signalNotification(LogNotification('Trial start date: $_trialStartDate => $trialDaysRemaining'));
+
       _lastCommandDate = await _prefs.read(key: _lastCommandDateKey);
 
       final commandCount = await _prefs.read(key: _dailyCommandCountKey) ?? '0';
@@ -99,11 +104,25 @@ class IAPService {
   Future<void> _checkExistingPurchase() async {
     // First check if we have a stored purchase status
     final storedStatus = await _prefs.read(key: _purchaseStatusKey);
+    final lastPurchaseCheck = await _prefs.read(key: _lastPurchaseCheckKey);
+    final hasPurchased = await _prefs.read(key: _hasPurchasedKey);
+
+    String todayDate = DateFormat('yyyy-MM-dd').format(DateTime.now());
+
     if (storedStatus == "true") {
-      IAPManager.instance.isPurchased.value = true;
+      if (Platform.isAndroid) {
+        if (lastPurchaseCheck == todayDate || hasPurchased == null) {
+          // hasPurchased means it was redeemed manually, so we skip the daily check
+          IAPManager.instance.isPurchased.value = true;
+        }
+      } else {
+        IAPManager.instance.isPurchased.value = true;
+      }
       return;
     }
 
+    await _prefs.write(key: _lastPurchaseCheckKey, value: todayDate);
+
     // Platform-specific checks for existing paid app purchases
     if (Platform.isIOS || Platform.isMacOS) {
       // On iOS/macOS, check if the app was previously purchased (has a receipt)
@@ -125,14 +144,14 @@ class IAPService {
       final receiptContent = await IosReceipt.getAppleReceipt();
       if (receiptContent != null) {
         debugPrint('Existing Apple user detected - validating receipt $receiptContent');
-        final sharedSecret =
-            Platform.environment['VERIFYING_SHARED_SECRET'] ?? String.fromEnvironment("VERIFYING_SHARED_SECRET");
+        var sharedSecret =
+            Platform.environment['VERIFYING_SHARED_SECRET'] ?? const String.fromEnvironment("VERIFYING_SHARED_SECRET");
 
         if (sharedSecret.isEmpty) {
           core.connection.signalNotification(AlertNotification(LogLevel.LOGLEVEL_ERROR, 'Shared Secret is empty'));
         }
         core.connection.signalNotification(
-          LogNotification('Using shared secret: ${sharedSecret.characters.take(15).join()}'),
+          LogNotification('Using shared secret: ${sharedSecret.characters.take(10).join()}'),
         );
         await validateReceipt(
           base64Receipt: receiptContent,
@@ -142,6 +161,7 @@ class IAPService {
         debugPrint('No Apple receipt found');
       }
     } catch (e) {
+      core.connection.signalNotification(LogNotification('There was an error checking Apple receipt: ${e.toString()}'));
       debugPrint('Error checking Apple receipt: $e');
     }
   }
@@ -195,13 +215,18 @@ class IAPService {
       core.connection.signalNotification(
         LogNotification('Apple receipt validated for version: $purchasedVersion'),
       );
-      IAPManager.instance.isPurchased.value = Version.parse(purchasedVersion) < Version(4, 2, 0);
+
+      final purchasedVersionAsInt = int.tryParse(purchasedVersion.toString()) ?? 0;
+
+      IAPManager.instance.isPurchased.value = purchasedVersionAsInt < (Platform.isMacOS ? 61 : 58);
       if (IAPManager.instance.isPurchased.value) {
         debugPrint('Apple receipt validation successful - granting full access');
         await _prefs.write(key: _purchaseStatusKey, value: "true");
       } else {
         debugPrint('Apple receipt validation failed - no full access');
       }
+    } catch (e) {
+      rethrow;
     } finally {
       client.close();
     }
@@ -215,6 +240,7 @@ class IAPService {
       // while the app is still paid. Only users who downloaded the paid version will have
       // a last_seen_version. After changing the app to free, new users won't have this set.
       final lastSeenVersion = core.settings.getLastSeenVersion();
+      core.connection.signalNotification(LogNotification('Android last seen version: $lastSeenVersion'));
       if (lastSeenVersion != null && lastSeenVersion.isNotEmpty) {
         Version lastVersion = Version.parse(lastSeenVersion);
         // If they had a previous version, they're an existing paid user
@@ -248,10 +274,12 @@ class IAPService {
   Future<void> _onPurchaseUpdate(List<PurchaseDetails> purchaseDetailsList) async {
     for (final purchase in purchaseDetailsList) {
       core.connection.signalNotification(
-        LogNotification('Purchase found: ${purchase.productID} - ${purchase.status}'),
+        LogNotification('Purchase found: ${purchase.purchaseID} ${purchase.productID} - ${purchase.status}'),
       );
       if (purchase.status == PurchaseStatus.purchased || purchase.status == PurchaseStatus.restored) {
-        IAPManager.instance.isPurchased.value = !kDebugMode;
+        IAPManager.instance.isPurchased.value = true;
+
+        await _prefs.write(key: _hasPurchasedKey, value: "true");
         await _prefs.write(key: _purchaseStatusKey, value: IAPManager.instance.isPurchased.value.toString());
         debugPrint('Purchase successful or restored');
       }
@@ -273,6 +301,9 @@ class IAPService {
       final available = await _inAppPurchase.isAvailable();
       if (!available) {
         debugPrint('IAP not available');
+        core.connection.signalNotification(
+          AlertNotification(LogLevel.LOGLEVEL_INFO, 'IAP is not available on this platform.'),
+        );
         return;
       }
 
@@ -282,11 +313,25 @@ class IAPService {
       final response = await _inAppPurchase.queryProductDetails({productId});
       if (response.error != null) {
         debugPrint('Error querying products: ${response.error}');
+        if (response.error!.code == 'storekit_no_response') {
+          _trialStartDate = DateTime.now().toIso8601String();
+          core.connection.signalNotification(
+            AlertNotification(
+              LogLevel.LOGLEVEL_WARNING,
+              'Unlock will be available, soon! Trial days have been extended.',
+            ),
+          );
+        } else {
+          core.connection.signalNotification(
+            AlertNotification(LogLevel.LOGLEVEL_INFO, 'IAP issue: ${response.error!.toString()}'),
+          );
+        }
         return;
       }
 
       if (response.productDetails.isEmpty) {
         debugPrint('Product not found: $productId');
+        core.connection.signalNotification(AlertNotification(LogLevel.LOGLEVEL_INFO, 'IAP issue: Product not found.'));
         return;
       }
 
@@ -294,6 +339,7 @@ class IAPService {
       final purchaseParam = PurchaseParam(productDetails: product);
 
       await _inAppPurchase.buyNonConsumable(purchaseParam: purchaseParam);
+      await restorePurchases();
     } catch (e, s) {
       debugPrint('Error purchasing: $e');
       recordError(e, s, context: 'Error purchasing');
@@ -386,13 +432,18 @@ class IAPService {
     _subscription?.cancel();
   }
 
-  void reset(bool fullReset) {
+  Future<void> reset(bool fullReset) async {
     if (fullReset) {
-      _prefs.deleteAll();
+      await _prefs.deleteAll();
     } else {
-      _prefs.delete(key: _purchaseStatusKey);
+      await _prefs.delete(key: _purchaseStatusKey);
       _isInitialized = false;
-      initialize();
+      await initialize();
     }
   }
+
+  Future<void> redeem() async {
+    IAPManager.instance.isPurchased.value = true;
+    await _prefs.write(key: _purchaseStatusKey, value: IAPManager.instance.isPurchased.value.toString());
+  }
 }

lib/utils/iap/revenuecat_service.dart

@@ -0,0 +1,361 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart' as zp;
+import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/main.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/widgets/ui/toast.dart';
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
+import 'package:purchases_ui_flutter/purchases_ui_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+/// RevenueCat-based IAP service for iOS, macOS, and Android
+class RevenueCatService {
+  static const int trialDays = 5;
+
+  static const String _trialStartDateKey = 'iap_trial_start_date';
+  static const String _purchaseStatusKey = 'iap_purchase_status';
+  static const String _dailyCommandCountKey = 'iap_daily_command_count';
+  static const String _lastCommandDateKey = 'iap_last_command_date';
+
+  // RevenueCat entitlement identifier
+  static const String fullVersionEntitlement = 'Full Version';
+
+  final FlutterSecureStorage _prefs;
+  final ValueNotifier<bool> isPurchasedNotifier;
+  final int Function() getDailyCommandLimit;
+  final void Function(int limit) setDailyCommandLimit;
+
+  bool _isInitialized = false;
+  String? _trialStartDate;
+  String? _lastCommandDate;
+  int? _dailyCommandCount;
+  StreamSubscription<CustomerInfo>? _customerInfoSubscription;
+
+  RevenueCatService(
+    this._prefs, {
+    required this.isPurchasedNotifier,
+    required this.getDailyCommandLimit,
+    required this.setDailyCommandLimit,
+  });
+
+  /// Initialize the RevenueCat service
+  Future<void> initialize() async {
+    if (_isInitialized) return;
+
+    try {
+      // Skip RevenueCat initialization on web or unsupported platforms
+      if (kIsWeb) {
+        debugPrint('RevenueCat not supported on web');
+        _isInitialized = true;
+        return;
+      }
+
+      // Get API key from environment variable
+      final String apiKey;
+
+      if (Platform.isAndroid) {
+        apiKey =
+            Platform.environment['REVENUECAT_API_KEY_ANDROID'] ??
+            const String.fromEnvironment('REVENUECAT_API_KEY_ANDROID', defaultValue: '');
+      } else if (Platform.isIOS || Platform.isMacOS) {
+        apiKey =
+            Platform.environment['REVENUECAT_API_KEY_IOS'] ??
+            const String.fromEnvironment('REVENUECAT_API_KEY_IOS', defaultValue: '');
+      } else {
+        apiKey = '';
+      }
+
+      if (apiKey.isEmpty) {
+        debugPrint('RevenueCat API key not found in environment');
+        core.connection.signalNotification(
+          LogNotification('RevenueCat API key not configured'),
+        );
+        isPurchasedNotifier.value = false;
+        _isInitialized = true;
+        return;
+      }
+
+      // Configure RevenueCat
+      final configuration = PurchasesConfiguration(apiKey);
+
+      // Enable debug logs in debug mode
+      if (kDebugMode) {
+        await Purchases.setLogLevel(LogLevel.debug);
+      }
+
+      await Purchases.configure(configuration);
+
+      debugPrint('RevenueCat initialized successfully');
+      core.connection.signalNotification(
+        LogNotification('RevenueCat initialized'),
+      );
+
+      // Listen for customer info updates
+      Purchases.addCustomerInfoUpdateListener((customerInfo) {
+        _handleCustomerInfoUpdate(customerInfo);
+      });
+
+      _trialStartDate = await _prefs.read(key: _trialStartDateKey);
+      core.connection.signalNotification(
+        LogNotification('Trial start date: $_trialStartDate => $trialDaysRemaining'),
+      );
+
+      _lastCommandDate = await _prefs.read(key: _lastCommandDateKey);
+      final commandCount = await _prefs.read(key: _dailyCommandCountKey) ?? '0';
+      _dailyCommandCount = int.tryParse(commandCount);
+
+      // Check existing purchase status
+      await _checkExistingPurchase();
+
+      _isInitialized = true;
+
+      if (!isTrialExpired && Platform.isAndroid) {
+        setDailyCommandLimit(80);
+      }
+    } catch (e, s) {
+      recordError(e, s, context: 'Initializing RevenueCat Service');
+      core.connection.signalNotification(
+        AlertNotification(
+          zp.LogLevel.LOGLEVEL_ERROR,
+          'There was an error initializing RevenueCat. Please check your configuration.',
+        ),
+      );
+      debugPrint('Failed to initialize RevenueCat: $e');
+      isPurchasedNotifier.value = false;
+      _isInitialized = true;
+    }
+  }
+
+  /// Check if the user has an active entitlement
+  Future<void> _checkExistingPurchase() async {
+    try {
+      // Check current entitlement status from RevenueCat
+      final customerInfo = await Purchases.getCustomerInfo();
+      await _handleCustomerInfoUpdate(customerInfo);
+    } catch (e, s) {
+      debugPrint('Error checking existing purchase: $e');
+      recordError(e, s, context: 'Checking existing purchase');
+    }
+  }
+
+  /// Handle customer info updates from RevenueCat
+  Future<bool> _handleCustomerInfoUpdate(CustomerInfo customerInfo) async {
+    final hasEntitlement = customerInfo.entitlements.active.containsKey(fullVersionEntitlement);
+
+    final userId = await Purchases.appUserID;
+    core.connection.signalNotification(LogNotification('User ID: $userId at ${customerInfo.requestDate}'));
+    core.connection.signalNotification(LogNotification('Full Version entitlement: $hasEntitlement'));
+
+    if (!hasEntitlement) {
+      // purchased before IAP migration
+      if (Platform.isAndroid) {
+        final storedStatus = await _prefs.read(key: _purchaseStatusKey);
+        if (storedStatus == "true") {
+          core.connection.signalNotification(LogNotification('Setting full version based on stored status'));
+          await Purchases.setAttributes({_purchaseStatusKey: "true"});
+          isPurchasedNotifier.value = true;
+        }
+      } else {
+        final purchasedVersion = customerInfo.originalApplicationVersion;
+        core.connection.signalNotification(LogNotification('Apple receipt validated for version: $purchasedVersion'));
+        final purchasedVersionAsInt = int.tryParse(purchasedVersion.toString()) ?? 0;
+        isPurchasedNotifier.value = purchasedVersionAsInt < (Platform.isMacOS ? 61 : 58);
+      }
+    } else {
+      isPurchasedNotifier.value = hasEntitlement;
+    }
+    return isPurchasedNotifier.value;
+  }
+
+  /// Present the RevenueCat paywall
+  Future<void> presentPaywall() async {
+    try {
+      if (!_isInitialized) {
+        await initialize();
+      }
+
+      final paywallResult = await RevenueCatUI.presentPaywall(displayCloseButton: true);
+
+      debugPrint('Paywall result: $paywallResult');
+
+      // The customer info listener will handle the purchase update
+    } catch (e, s) {
+      debugPrint('Error presenting paywall: $e');
+      recordError(e, s, context: 'Presenting paywall');
+      core.connection.signalNotification(
+        AlertNotification(
+          zp.LogLevel.LOGLEVEL_ERROR,
+          'There was an error displaying the paywall. Please try again.',
+        ),
+      );
+    }
+  }
+
+  /// Restore previous purchases
+  Future<void> restorePurchases() async {
+    try {
+      final customerInfo = await Purchases.restorePurchases();
+      final result = await _handleCustomerInfoUpdate(customerInfo);
+
+      if (result) {
+        core.connection.signalNotification(
+          AlertNotification(zp.LogLevel.LOGLEVEL_INFO, 'Purchase restored'),
+        );
+      }
+    } catch (e, s) {
+      core.connection.signalNotification(
+        AlertNotification(
+          zp.LogLevel.LOGLEVEL_ERROR,
+          'There was an error restoring purchases. Please try again.',
+        ),
+      );
+      recordError(e, s, context: 'Restore Purchases');
+      debugPrint('Error restoring purchases: $e');
+    }
+  }
+
+  /// Purchase the full version (use paywall instead)
+  Future<void> purchaseFullVersion(BuildContext context) async {
+    // Direct the user to the paywall for a better experience
+    if (Platform.isMacOS) {
+      try {
+        final offerings = await Purchases.getOfferings();
+        final purchaseParams = PurchaseParams.package(offerings.current!.availablePackages.first);
+        PurchaseResult result = await Purchases.purchase(purchaseParams);
+        core.connection.signalNotification(
+          LogNotification('Purchase result: $result'),
+        );
+      } on PlatformException catch (e) {
+        var errorCode = PurchasesErrorHelper.getErrorCode(e);
+        if (errorCode != PurchasesErrorCode.purchaseCancelledError) {
+          buildToast(context, title: e.message);
+        }
+      }
+    } else {
+      await presentPaywall();
+    }
+  }
+
+  /// Check if the trial period has started
+  bool get hasTrialStarted {
+    return _trialStartDate != null;
+  }
+
+  /// Start the trial period
+  Future<void> startTrial() async {
+    if (!hasTrialStarted) {
+      await _prefs.write(key: _trialStartDateKey, value: DateTime.now().toIso8601String());
+    }
+  }
+
+  /// Get the number of days remaining in the trial
+  int get trialDaysRemaining {
+    if (isPurchasedNotifier.value) return 0;
+
+    final trialStart = _trialStartDate;
+    if (trialStart == null) return trialDays;
+
+    final startDate = DateTime.parse(trialStart);
+    final now = DateTime.now();
+    final daysPassed = now.difference(startDate).inDays;
+    final remaining = trialDays - daysPassed;
+
+    return remaining > 0 ? remaining : 0;
+  }
+
+  /// Check if the trial has expired
+  bool get isTrialExpired {
+    return (!isPurchasedNotifier.value && hasTrialStarted && trialDaysRemaining <= 0);
+  }
+
+  /// Get the number of commands executed today
+  int get dailyCommandCount {
+    final lastDate = _lastCommandDate;
+    final today = DateTime.now().toIso8601String().split('T')[0];
+
+    if (lastDate != today) {
+      // Reset counter for new day
+      _lastCommandDate = today;
+      _dailyCommandCount = 0;
+    }
+
+    return _dailyCommandCount ?? 0;
+  }
+
+  /// Increment the daily command count
+  Future<void> incrementCommandCount() async {
+    final today = DateTime.now().toIso8601String().split('T')[0];
+    final lastDate = await _prefs.read(key: _lastCommandDateKey);
+
+    if (lastDate != today) {
+      // Reset counter for new day
+      _lastCommandDate = today;
+      _dailyCommandCount = 1;
+      await _prefs.write(key: _lastCommandDateKey, value: today);
+      await _prefs.write(key: _dailyCommandCountKey, value: '1');
+    } else {
+      final count = _dailyCommandCount ?? 0;
+      _dailyCommandCount = count + 1;
+      await _prefs.write(key: _dailyCommandCountKey, value: _dailyCommandCount.toString());
+    }
+  }
+
+  /// Check if the user can execute a command
+  bool get canExecuteCommand {
+    if (isPurchasedNotifier.value) return true;
+    if (!isTrialExpired && !Platform.isAndroid) return true;
+    return dailyCommandCount < getDailyCommandLimit();
+  }
+
+  /// Get the number of commands remaining today (for free tier after trial)
+  int get commandsRemainingToday {
+    if (isPurchasedNotifier.value || (!isTrialExpired && !Platform.isAndroid)) return -1; // Unlimited
+    final remaining = getDailyCommandLimit() - dailyCommandCount;
+    return remaining > 0 ? remaining : 0; // Never return negative
+  }
+
+  /// Dispose the service
+  void dispose() {
+    _customerInfoSubscription?.cancel();
+  }
+
+  Future<void> reset(bool fullReset) async {
+    if (fullReset) {
+      await _prefs.deleteAll();
+    } else {
+      await _prefs.delete(key: _purchaseStatusKey);
+      _isInitialized = false;
+      Purchases.invalidateCustomerInfoCache();
+      await initialize();
+      _checkExistingPurchase();
+    }
+  }
+
+  Future<void> redeem(String purchaseId) async {
+    await Purchases.setAttributes({"purchase_id": purchaseId});
+    core.connection.signalNotification(LogNotification('Redeemed purchase ID: $purchaseId'));
+    Purchases.invalidateCustomerInfoCache();
+    _checkExistingPurchase();
+    isPurchasedNotifier.value = true;
+  }
+
+  Future<void> setAttributes() async {
+    // attributes are fully anonymous
+    await Purchases.setAttributes({
+      "bikecontrol_trainer": core.settings.getTrainerApp()?.name ?? '-',
+      "bikecontrol_target": core.settings.getLastTarget()?.name ?? '-',
+      if (core.connection.controllerDevices.isNotEmpty)
+        'bikecontrol_controllers': core.connection.controllerDevices.joinToString(
+          transform: (d) => d.name,
+          separator: ',',
+        ),
+      'bikecontrol_keymap': core.settings.getKeyMap()?.name ?? '-',
+    });
+  }
+}

lib/utils/iap/windows_iap_service.dart

@@ -1,7 +1,10 @@
 import 'dart:async';
 
+import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/main.dart';
+import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/iap/iap_manager.dart';
+import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:windows_iap/windows_iap.dart';
@@ -14,7 +17,7 @@ class WindowsIAPService {
   static const int trialDays = 7;
   static const int dailyCommandLimit = 15;
 
-  static const String _purchaseStatusKey = 'iap_purchase_status';
+  static const String _purchaseStatusKey = 'iap_purchase_status_2';
   static const String _dailyCommandCountKey = 'iap_daily_command_count';
   static const String _lastCommandDateKey = 'iap_last_command_date';
 
@@ -51,13 +54,25 @@ class WindowsIAPService {
   Future<void> _checkExistingPurchase() async {
     // First check if we have a stored purchase status
     final storedStatus = await _prefs.read(key: _purchaseStatusKey);
+    core.connection.signalNotification(LogNotification('Is purchased status: $storedStatus'));
     if (storedStatus == "true") {
       IAPManager.instance.isPurchased.value = true;
       return;
     }
     final trial = await _windowsIapPlugin.getTrialStatusAndRemainingDays();
-    trialDaysRemaining = trial.remainingDays;
-    if (!trial.isTrial && trial.remainingDays <= 0) {
+    core.connection.signalNotification(LogNotification('Trial status: $trial'));
+    final trialEndDate = trial.remainingDays;
+    if (trial.isTrial && trialEndDate.isNotEmpty && !trialEndDate.contains("?")) {
+      try {
+        trialDaysRemaining = DateTime.parse(trialEndDate).difference(DateTime.now()).inDays;
+      } catch (e) {
+        core.connection.signalNotification(LogNotification('Error parsing trial end date: $e'));
+        trialDaysRemaining = 0;
+      }
+    } else {
+      trialDaysRemaining = 0;
+    }
+    if (trial.isActive && !trial.isTrial && trialDaysRemaining <= 0) {
       IAPManager.instance.isPurchased.value = true;
       await _prefs.write(key: _purchaseStatusKey, value: "true");
     } else {
@@ -71,11 +86,12 @@ class WindowsIAPService {
     try {
       final status = await _windowsIapPlugin.makePurchase(productId);
       if (status == StorePurchaseStatus.succeeded || status == StorePurchaseStatus.alreadyPurchased) {
-        /*buildToast(
+        IAPManager.instance.isPurchased.value = true;
+        buildToast(
           navigatorKey.currentContext!,
           title: 'Purchase Successful',
           subtitle: 'Thank you for your purchase! You now have unlimited access.',
-        );*/
+        );
       }
     } catch (e, s) {
       recordError(e, s, context: 'Purchasing on Windows');

lib/utils/keymap/buttons.dart

@@ -33,7 +33,11 @@ enum InGameAction {
 
   // headwind
   headwindSpeed('Headwind Speed', possibleValues: [0, 25, 50, 75, 100]),
-  headwindHeartRateMode('Headwind HR Mode');
+  headwindHeartRateMode('Headwind HR Mode'),
+
+  // openbikecontrol
+  up('Up', icon: RadixIcons.arrowUp),
+  down('Down', icon: RadixIcons.arrowDown);
 
   final String title;
   final bool isLongPress;

lib/utils/keymap/keymap.dart

@@ -130,15 +130,18 @@ class KeyPair {
 
   IconData? get icon {
     return switch (physicalKey) {
+      _ when isSpecialKey && core.actionHandler.supportedModes.contains(SupportedMode.media) => switch (physicalKey) {
+        PhysicalKeyboardKey.mediaPlayPause => Icons.play_arrow_outlined,
+        PhysicalKeyboardKey.mediaStop => Icons.stop,
+        PhysicalKeyboardKey.mediaTrackPrevious => Icons.skip_previous,
+        PhysicalKeyboardKey.mediaTrackNext => Icons.skip_next,
+        PhysicalKeyboardKey.audioVolumeUp => Icons.volume_up,
+        PhysicalKeyboardKey.audioVolumeDown => Icons.volume_down,
+        _ => Icons.keyboard,
+      },
       //_ when inGameAction != null && core.logic.emulatorEnabled => Icons.link,
       _ when inGameAction != null && inGameAction!.icon != null => inGameAction!.icon,
 
-      PhysicalKeyboardKey.mediaPlayPause ||
-      PhysicalKeyboardKey.mediaStop ||
-      PhysicalKeyboardKey.mediaTrackPrevious ||
-      PhysicalKeyboardKey.mediaTrackNext ||
-      PhysicalKeyboardKey.audioVolumeUp ||
-      PhysicalKeyboardKey.audioVolumeDown => Icons.music_note_outlined,
       _ when physicalKey != null && core.actionHandler.supportedModes.contains(SupportedMode.keyboard) =>
         RadixIcons.keyboard,
       _

lib/utils/requirements/android.dart

@@ -3,14 +3,19 @@ import 'dart:isolate';
 import 'dart:ui';
 
 import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/actions/android.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/requirements/platform.dart';
 import 'package:bike_control/widgets/accessibility_disclosure_dialog.dart';
+import 'package:bike_control/widgets/ui/toast.dart';
+import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class AccessibilityRequirement extends PlatformRequirement {
   AccessibilityRequirement()
@@ -120,21 +125,35 @@ class NotificationRequirement extends PlatformRequirement {
           .resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()
           ?.requestNotificationsPermission();
     } else if (Platform.isIOS) {
-      await core.flutterLocalNotificationsPlugin
+      final result = await core.flutterLocalNotificationsPlugin
           .resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()
           ?.requestPermissions(
             alert: true,
             badge: false,
             sound: false,
           );
+      if (result == false) {
+        buildToast(
+          navigatorKey.currentContext!,
+          title: 'Enable notifications for BikeControl in System Preferences → Notifications → Bike Control',
+        );
+        launchUrlString('x-apple.systempreferences:com.apple.preference.notifications');
+      }
     } else if (Platform.isMacOS) {
-      await core.flutterLocalNotificationsPlugin
+      final result = await core.flutterLocalNotificationsPlugin
           .resolvePlatformSpecificImplementation<MacOSFlutterLocalNotificationsPlugin>()
           ?.requestPermissions(
             alert: true,
             badge: false,
             sound: false,
           );
+      if (result == false) {
+        buildToast(
+          navigatorKey.currentContext!,
+          title: 'Enable notifications for BikeControl in System Preferences → Notifications → Bike Control',
+        );
+        launchUrlString('x-apple.systempreferences:com.apple.preference.notifications');
+      }
     }
     await getStatus();
     return;
@@ -182,6 +201,11 @@ class NotificationRequirement extends PlatformRequirement {
         macOS: DarwinInitializationSettings(
           requestAlertPermission: false,
         ),
+        windows: WindowsInitializationSettings(
+          appName: 'BikeControl',
+          appUserModelId: 'OpenBikeControl.BikeControl',
+          guid: UUID.short(0x12).toString(),
+        ),
       ),
       onDidReceiveBackgroundNotificationResponse: notificationTapBackground,
       onDidReceiveNotificationResponse: (n) {
@@ -222,8 +246,14 @@ class NotificationRequirement extends PlatformRequirement {
         'Keep Alive',
         actions: [
           AndroidNotificationAction(
+            'disconnect',
             AppLocalizations.current.disconnectDevices,
-            AppLocalizations.current.disconnectDevices,
+            cancelNotification: true,
+            showsUserInterface: false,
+          ),
+          AndroidNotificationAction(
+            'close',
+            AppLocalizations.current.close,
             cancelNotification: true,
             showsUserInterface: false,
           ),
@@ -234,9 +264,18 @@ class NotificationRequirement extends PlatformRequirement {
     final receivePort = ReceivePort();
     IsolateNameServer.registerPortWithName(receivePort.sendPort, '_backgroundChannelKey');
     final backgroundMessagePort = receivePort.asBroadcastStream();
-    backgroundMessagePort.listen((_) {
-      UniversalBle.onAvailabilityChange = null;
-      core.connection.reset();
+    backgroundMessagePort.listen((message) {
+      if (message == 'disconnect' || message == 'close') {
+        UniversalBle.onAvailabilityChange = null;
+        core.connection.disconnectAll();
+      }
+      if (message == 'close') {
+        core.connection.stop();
+        SystemNavigator.pop();
+        AndroidFlutterLocalNotificationsPlugin().stopForegroundService();
+        AndroidFlutterLocalNotificationsPlugin().cancelAll();
+      }
+
       //exit(0);
     });
   }
@@ -246,7 +285,7 @@ class NotificationRequirement extends PlatformRequirement {
 void notificationTapBackground(NotificationResponse notificationResponse) {
   if (notificationResponse.actionId != null) {
     final sendPort = IsolateNameServer.lookupPortByName('_backgroundChannelKey');
-    sendPort?.send('notificationResponse');
+    sendPort?.send(notificationResponse.actionId);
     //exit(0);
   }
 }

lib/utils/settings/settings.dart

@@ -181,6 +181,7 @@ class Settings {
   Future<void> setLastTarget(Target target) async {
     await prefs.setString('last_target', target.name);
     initializeActions(target.connectionType);
+    IAPManager.instance.setAttributes();
   }
 
   Future<void> setLastSeenVersion(String version) async {

lib/widgets/changelog_dialog.dart

@@ -1,8 +1,8 @@
+import 'package:bike_control/main.dart';
+import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_md/flutter_md.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
-import 'package:bike_control/main.dart';
-import 'package:bike_control/utils/i18n_extension.dart';
 
 class ChangelogDialog extends StatelessWidget {
   final Markdown entry;
@@ -26,8 +26,10 @@ class ChangelogDialog extends StatelessWidget {
         ],
       ),
       content: Container(
-        constraints: BoxConstraints(minWidth: 460),
-        child: MarkdownWidget(markdown: latestVersion),
+        constraints: BoxConstraints(minWidth: 460, maxHeight: 500),
+        child: Scrollbar(
+          child: SingleChildScrollView(child: MarkdownWidget(markdown: latestVersion)),
+        ),
       ),
       actions: [
         TextButton(

lib/widgets/iap_status_widget.dart

@@ -1,11 +1,19 @@
+import 'dart:convert';
 import 'dart:io';
 
+import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/utils/iap/iap_manager.dart';
+import 'package:bike_control/widgets/ui/loading_widget.dart';
 import 'package:bike_control/widgets/ui/small_progress_indicator.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
+import 'package:http/http.dart' as http;
+import 'package:intl/intl.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 /// Widget to display IAP status and allow purchases
 class IAPStatusWidget extends StatefulWidget {
@@ -16,9 +24,19 @@ class IAPStatusWidget extends StatefulWidget {
   State<IAPStatusWidget> createState() => _IAPStatusWidgetState();
 }
 
+final _normalDate = DateTime(2026, 1, 15, 0, 0, 0, 0, 0);
+final _iapDate = DateTime(2025, 12, 21, 0, 0, 0, 0, 0);
+
+enum AlreadyBoughtOption { fullPurchase, iap, no }
+
 class _IAPStatusWidgetState extends State<IAPStatusWidget> {
   bool _isPurchasing = false;
   bool _isSmall = false;
+  AlreadyBoughtOption? _alreadyBoughtQuestion;
+
+  final _purchaseIdField = const TextFieldKey(#purchaseId);
+
+  bool _isLoading = false;
 
   @override
   void initState() {
@@ -54,7 +72,15 @@ class _IAPStatusWidgetState extends State<IAPStatusWidget> {
                 _isSmall = false;
               });
             }
-          : _handlePurchase,
+          : () {
+              if (Platform.isAndroid) {
+                if (_alreadyBoughtQuestion == AlreadyBoughtOption.iap) {
+                  _handlePurchase(context);
+                }
+              } else {
+                _handlePurchase(context);
+              }
+            },
       style: ButtonStyle.card().withBackgroundColor(
         color: Theme.of(context).colorScheme.muted,
         hoverColor: Theme.of(context).colorScheme.primaryForeground,
@@ -161,30 +187,254 @@ class _IAPStatusWidgetState extends State<IAPStatusWidget> {
                     ),
                   ),
                 ],
-                if (!IAPManager.instance.isPurchased.value && !_isSmall) ...[
-                  const SizedBox(height: 16),
-                  Padding(
-                    padding: const EdgeInsets.only(left: 42.0),
-                    child: PrimaryButton(
-                      onPressed: _isPurchasing ? null : _handlePurchase,
-                      leading: Icon(Icons.star),
-                      child: _isPurchasing
-                          ? Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              mainAxisSize: MainAxisSize.min,
+                if (!isPurchased && !_isSmall) ...[
+                  if (Platform.isAndroid)
+                    Padding(
+                      padding: const EdgeInsets.only(left: 42.0, top: 16.0),
+                      child: Column(
+                        spacing: 8,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Divider(),
+                          const SizedBox(),
+                          if (_alreadyBoughtQuestion == null && DateTime.now().isBefore(_normalDate)) ...[
+                            Text(AppLocalizations.of(context).alreadyBoughtTheAppPreviously).small,
+                            Row(
                               children: [
-                                SmallProgressIndicator(),
+                                Builder(
+                                  builder: (context) {
+                                    return OutlineButton(
+                                      child: Text(AppLocalizations.of(context).yes),
+                                      onPressed: () {
+                                        showDropdown(
+                                          context: context,
+                                          builder: (c) => DropdownMenu(
+                                            children: [
+                                              MenuButton(
+                                                child: Text(
+                                                  AppLocalizations.of(
+                                                    context,
+                                                  ).beforeDate(DateFormat.yMMMd().format(_iapDate)),
+                                                ),
+                                                onPressed: (c) {
+                                                  setState(() {
+                                                    _alreadyBoughtQuestion = AlreadyBoughtOption.fullPurchase;
+                                                  });
+                                                },
+                                              ),
+                                              MenuButton(
+                                                child: Text(
+                                                  AppLocalizations.of(
+                                                    context,
+                                                  ).afterDate(DateFormat.yMMMd().format(_iapDate)),
+                                                ),
+                                                onPressed: (c) {
+                                                  setState(() {
+                                                    _alreadyBoughtQuestion = AlreadyBoughtOption.iap;
+                                                  });
+                                                },
+                                              ),
+                                            ],
+                                          ),
+                                        );
+                                      },
+                                    );
+                                  },
+                                ),
                                 const SizedBox(width: 8),
-                                Text('Processing...'),
+                                OutlineButton(
+                                  child: Text(AppLocalizations.of(context).no),
+                                  onPressed: () {
+                                    setState(() {
+                                      _alreadyBoughtQuestion = AlreadyBoughtOption.no;
+                                    });
+                                  },
+                                ),
                               ],
-                            )
-                          : Text(AppLocalizations.of(context).unlockFullVersion),
+                            ),
+                          ] else if (_alreadyBoughtQuestion == AlreadyBoughtOption.fullPurchase) ...[
+                            Text(
+                              AppLocalizations.of(context).alreadyBoughtTheApp,
+                            ).small,
+                            Form(
+                              onSubmit: (context, values) async {
+                                String purchaseId = _purchaseIdField[values]!.trim();
+                                setState(() {
+                                  _isLoading = true;
+                                });
+                                final redeemed = await _redeemPurchase(
+                                  purchaseId: purchaseId,
+                                  supabaseAnonKey:
+                                      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBpa3JjeXlub3Zkdm9ncmxkZm53Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NjYwNjMyMzksImV4cCI6MjA4MTYzOTIzOX0.oxJovYahRiZ6XvCVR-qww6OQ5jY6cjOyUiFHJsW9MVk',
+                                  supabaseUrl: 'https://pikrcyynovdvogrldfnw.supabase.co',
+                                );
+                                if (redeemed) {
+                                  await IAPManager.instance.redeem(purchaseId);
+                                  buildToast(context, title: 'Success', subtitle: 'Purchase redeemed successfully!');
+                                  setState(() {
+                                    _isLoading = false;
+                                  });
+                                } else {
+                                  setState(() {
+                                    _isLoading = false;
+                                  });
+                                  if (mounted) {
+                                    showDialog(
+                                      context: context,
+                                      builder: (context) {
+                                        return AlertDialog(
+                                          title: Text('Error'),
+                                          content: Text(
+                                            'Failed to redeem purchase. Please check your Purchase ID and try again or contact me directly. Sorry about that!',
+                                          ),
+                                          actions: [
+                                            OutlineButton(
+                                              child: Text(context.i18n.getSupport),
+                                              onPressed: () async {
+                                                final appUserId = await Purchases.appUserID;
+                                                launchUrlString(
+                                                  'mailto:jonas@bikecontrol.app?subject=Bike%20Control%20Purchase%20Redemption%20Help%20for%20$appUserId',
+                                                );
+                                              },
+                                            ),
+                                            TextButton(
+                                              onPressed: () {
+                                                Navigator.of(context).pop();
+                                              },
+                                              child: Text('OK'),
+                                            ),
+                                          ],
+                                        );
+                                      },
+                                    );
+                                  }
+                                }
+                              },
+                              child: Row(
+                                spacing: 8,
+                                crossAxisAlignment: CrossAxisAlignment.end,
+                                children: [
+                                  Expanded(
+                                    child: FormField(
+                                      showErrors: {
+                                        FormValidationMode.submitted,
+                                        FormValidationMode.changed,
+                                      },
+                                      key: _purchaseIdField,
+                                      label: Text('Purchase ID'),
+                                      validator: RegexValidator(
+                                        RegExp(r'GPA.[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{5}'),
+                                        message: 'Please enter a valid Purchase ID.',
+                                      ),
+                                      child: TextField(
+                                        placeholder: Text('GPA.****-****-****-*****'),
+                                      ),
+                                    ),
+                                  ),
+                                  FormErrorBuilder(
+                                    builder: (context, errors, child) {
+                                      return PrimaryButton(
+                                        onPressed: errors.isEmpty ? () => context.submitForm() : null,
+                                        child: _isLoading
+                                            ? SmallProgressIndicator(color: Colors.black)
+                                            : const Text('Submit'),
+                                      );
+                                    },
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ] else if (_alreadyBoughtQuestion == AlreadyBoughtOption.no) ...[
+                            PrimaryButton(
+                              onPressed: _isPurchasing ? null : () => _handlePurchase(context),
+                              leading: Icon(Icons.star),
+                              child: _isPurchasing
+                                  ? Row(
+                                      mainAxisAlignment: MainAxisAlignment.center,
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        SmallProgressIndicator(),
+                                        const SizedBox(width: 8),
+                                        Text('Processing...'),
+                                      ],
+                                    )
+                                  : Text(AppLocalizations.of(context).unlockFullVersion),
+                            ),
+                            Text(AppLocalizations.of(context).fullVersionDescription).xSmall,
+                          ] else if (_alreadyBoughtQuestion == AlreadyBoughtOption.iap) ...[
+                            PrimaryButton(
+                              onPressed: _isPurchasing ? null : () => _handlePurchase(context),
+                              leading: Icon(Icons.star),
+                              child: _isPurchasing
+                                  ? Row(
+                                      mainAxisAlignment: MainAxisAlignment.center,
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        SmallProgressIndicator(),
+                                        const SizedBox(width: 8),
+                                        Text('Processing...'),
+                                      ],
+                                    )
+                                  : Text(AppLocalizations.of(context).unlockFullVersion),
+                            ),
+                            Text(
+                              AppLocalizations.of(context).restorePurchaseInfo,
+                            ).xSmall,
+                            OutlineButton(
+                              child: Text(context.i18n.getSupport),
+                              onPressed: () async {
+                                final appUserId = await Purchases.appUserID;
+                                launchUrlString(
+                                  'mailto:jonas@bikecontrol.app?subject=Bike%20Control%20Purchase%20Redemption%20Help%20for%20$appUserId',
+                                );
+                              },
+                            ),
+                          ],
+                        ],
+                      ),
+                    )
+                  else ...[
+                    const SizedBox(height: 16),
+                    Padding(
+                      padding: const EdgeInsets.only(left: 42.0),
+                      child: Builder(
+                        builder: (context) {
+                          return PrimaryButton(
+                            onPressed: _isPurchasing ? null : () => _handlePurchase(context),
+                            leading: Icon(Icons.star),
+                            child: _isPurchasing
+                                ? Row(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      SmallProgressIndicator(),
+                                      const SizedBox(width: 8),
+                                      Text('Processing...'),
+                                    ],
+                                  )
+                                : Text(AppLocalizations.of(context).unlockFullVersion),
+                          );
+                        },
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(left: 42.0, top: 8.0),
-                    child: Text(AppLocalizations.of(context).fullVersionDescription).xSmall,
-                  ),
+                    if (Platform.isMacOS)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 42.0, top: 8.0, bottom: 8),
+                        child: LoadingWidget(
+                          futureCallback: () async {
+                            await IAPManager.instance.restorePurchases();
+                          },
+                          renderChild: (isLoading, tap) => LinkButton(
+                            onPressed: tap,
+                            child: isLoading ? SmallProgressIndicator() : const Text('Restore Purchase').small,
+                          ),
+                        ),
+                      ),
+                    Padding(
+                      padding: const EdgeInsets.only(left: 42.0, top: 8.0),
+                      child: Text(AppLocalizations.of(context).fullVersionDescription).xSmall,
+                    ),
+                  ],
                 ],
               ],
             );
@@ -194,13 +444,14 @@ class _IAPStatusWidgetState extends State<IAPStatusWidget> {
     );
   }
 
-  Future<void> _handlePurchase() async {
+  Future<void> _handlePurchase(BuildContext context) async {
     setState(() {
       _isPurchasing = true;
     });
 
     try {
-      await IAPManager.instance.purchaseFullVersion();
+      // Use RevenueCat paywall if available, otherwise fall back to legacy
+      await IAPManager.instance.purchaseFullVersion(context);
     } catch (e) {
       if (mounted) {
         buildToast(
@@ -217,4 +468,37 @@ class _IAPStatusWidgetState extends State<IAPStatusWidget> {
       }
     }
   }
+
+  Future<bool> _redeemPurchase({
+    required String supabaseUrl,
+    required String supabaseAnonKey,
+    required String purchaseId,
+  }) async {
+    final uri = Uri.parse('$supabaseUrl/functions/v1/redeem-purchase');
+
+    final appUserId = await Purchases.appUserID;
+
+    final response = await http.post(
+      uri,
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': 'Bearer $supabaseAnonKey',
+      },
+      body: jsonEncode({
+        'purchaseId': purchaseId,
+        'userId': appUserId,
+      }),
+    );
+
+    if (response.statusCode != 200) {
+      return false;
+    }
+
+    final body = response.body;
+    final decoded = jsonDecode(body) as Map<String, dynamic>;
+
+    core.connection.signalNotification(LogNotification(body));
+
+    return decoded['success'] == true;
+  }
 }

lib/widgets/menu.dart

@@ -250,6 +250,7 @@ class BKMenuButton extends StatelessWidget {
               MenuButton(
                 child: Text(context.i18n.continueAction),
                 onPressed: (c) {
+                  IAPManager.instance.purchaseFullVersion(context);
                   core.connection.addDevices([
                     ZwiftClickV2(
                         BleDevice(

lib/widgets/testbed.dart

@@ -49,7 +49,7 @@ class Testbed extends StatefulWidget {
   State<Testbed> createState() => _TestbedState();
 }
 
-class _TestbedState extends State<Testbed> with SingleTickerProviderStateMixin {
+class _TestbedState extends State<Testbed> with SingleTickerProviderStateMixin, WidgetsBindingObserver {
   late final Ticker _ticker;
   late StreamSubscription<BaseNotification> _actionSubscription;
 
@@ -67,6 +67,8 @@ class _TestbedState extends State<Testbed> with SingleTickerProviderStateMixin {
 
   Offset? _lastMove;
 
+  bool _isInBackground = false;
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -74,13 +76,19 @@ class _TestbedState extends State<Testbed> with SingleTickerProviderStateMixin {
     _isMobile = MediaQuery.sizeOf(context).width < 600;
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    _isInBackground = state == AppLifecycleState.paused || state == AppLifecycleState.hidden;
+  }
+
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
 
     _focusNode = FocusNode(debugLabel: 'TestbedFocus', canRequestFocus: true, skipTraversal: true);
     _actionSubscription = core.connection.actionStream.listen((data) async {
-      if (!mounted) {
+      if (!mounted || (_isInBackground && data is! AlertNotification)) {
         return;
       }
       if (data is ButtonNotification && data.buttonsClicked.isNotEmpty) {
@@ -162,6 +170,7 @@ class _TestbedState extends State<Testbed> with SingleTickerProviderStateMixin {
   void dispose() {
     _ticker.dispose();
     _focusNode.dispose();
+    WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
 

lib/widgets/title.dart

@@ -113,7 +113,7 @@ class _AppTitleState extends State<AppTitle> {
 
       final body = res.body;
       final regex = RegExp(
-        r'whats-new__latest__version">Version ([0-9]{1,2}\.[0-9]{1,2}.[0-9]{1,2})</p>',
+        r'>Version ([0-9]{1,2}\.[0-9]{1,2}.[0-9]{1,2})</h4>',
         dotAll: true,
       );
       final match = regex.firstMatch(body);
@@ -158,11 +158,11 @@ class _AppTitleState extends State<AppTitle> {
       title: AppLocalizations.current.forceCloseToUpdate,
       closeTitle: AppLocalizations.current.restart,
       onClose: () {
+        core.connection.disconnectAll();
+        core.connection.stop();
         if (Platform.isIOS) {
-          core.connection.reset();
           Restart.restartApp(delayBeforeRestart: 1000);
         } else {
-          core.connection.reset();
           exit(0);
         }
       },

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -19,6 +19,7 @@ import media_key_detector_macos
 import nsd_macos
 import package_info_plus
 import path_provider_foundation
+import purchases_flutter
 import screen_retriever_macos
 import shared_preferences_foundation
 import universal_ble
@@ -41,6 +42,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   NsdMacosPlugin.register(with: registry.registrar(forPlugin: "NsdMacosPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  PurchasesFlutterPlugin.register(with: registry.registrar(forPlugin: "PurchasesFlutterPlugin"))
   ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UniversalBlePlugin.register(with: registry.registrar(forPlugin: "UniversalBlePlugin"))

macos/Podfile.lock

@@ -32,6 +32,12 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - purchases_flutter (9.10.2):
+    - FlutterMacOS
+    - PurchasesHybridCommon (= 17.25.0)
+  - PurchasesHybridCommon (17.25.0):
+    - RevenueCat (= 5.51.1)
+  - RevenueCat (5.51.1)
   - screen_retriever_macos (0.0.1):
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -63,6 +69,7 @@ DEPENDENCIES:
   - nsd_macos (from `Flutter/ephemeral/.symlinks/plugins/nsd_macos/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
+  - purchases_flutter (from `Flutter/ephemeral/.symlinks/plugins/purchases_flutter/macos`)
   - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
   - universal_ble (from `Flutter/ephemeral/.symlinks/plugins/universal_ble/darwin`)
@@ -70,6 +77,11 @@ DEPENDENCIES:
   - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
   - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)
 
+SPEC REPOS:
+  trunk:
+    - PurchasesHybridCommon
+    - RevenueCat
+
 EXTERNAL SOURCES:
   bluetooth_low_energy_darwin:
     :path: Flutter/ephemeral/.symlinks/plugins/bluetooth_low_energy_darwin/darwin
@@ -101,6 +113,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
   path_provider_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
+  purchases_flutter:
+    :path: Flutter/ephemeral/.symlinks/plugins/purchases_flutter/macos
   screen_retriever_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos
   shared_preferences_foundation:
@@ -130,6 +144,9 @@ SPEC CHECKSUMS:
   nsd_macos: 1a38a38a33adbb396b4c6f303bc076073514cadc
   package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
   path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba
+  purchases_flutter: 777401787df16312c7b8b53b2d7144d26b6da0f0
+  PurchasesHybridCommon: 6a79a873ab52f777bfa36e9516f3fcd84d3b3428
+  RevenueCat: eab035bbab271faccfef5c36eaff2a1ffef14dc0
   screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6

macos/Runner/Release.entitlements

@@ -10,6 +10,8 @@
 	<true/>
 	<key>com.apple.security.network.client</key>
 	<true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
     <key>com.apple.security.files.user-selected.read-only</key>
     <true/>
     <key>keychain-access-groups</key>

pubspec.lock

@@ -289,6 +289,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  equatable:
+    dependency: transitive
+    description:
+      name: equatable
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.7"
   expressions:
     dependency: transitive
     description:
@@ -1258,6 +1266,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.7"
+  purchases_flutter:
+    dependency: "direct main"
+    description:
+      name: purchases_flutter
+      sha256: "0a8ce3855dacb8c28e1e8de99cfe5592be2cb350c1210259d6fa4d9d0b152f89"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.10.2"
+  purchases_ui_flutter:
+    dependency: "direct main"
+    description:
+      name: purchases_ui_flutter
+      sha256: cb9eac034536fa2c62beb0c4a9e921a09e505ee7fbe304370a6764044ed9aef2
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.10.2"
   quiver:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: bike_control
 description: "BikeControl - Control your virtual riding"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 4.2.1+60
+version: 4.2.4+71
 
 environment:
   sdk: ^3.9.0
@@ -36,6 +36,8 @@ dependencies:
     path: ios_receipt
   flutter_secure_storage: ^10.0.0
   in_app_purchase: ^3.2.1
+  purchases_flutter: ^9.10.2
+  purchases_ui_flutter: ^9.10.2
   windows_iap:
     path: windows_iap
   window_manager: ^0.5.1

test/screenshot_test.dart

@@ -123,7 +123,7 @@ Future<void> main() async {
                   required Widget child,
                 }) => CustomFrame(
                   platform: size.type,
-                  title: 'BikeControl connects to any controller',
+                  title: 'Control your favorite trainer app using ANY controller',
                   device: device,
                   child: child,
                 ),

test/shimano_di2_test.dart

@@ -1,11 +1,12 @@
 import 'dart:typed_data';
 
-import 'package:flutter_test/flutter_test.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:bike_control/bluetooth/devices/shimano/shimano_di2.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/apps/openbikecontrol.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 Future<void> main() async {
@@ -38,5 +39,37 @@ Future<void> main() async {
       );
       expect(stubActions.performedActions.isEmpty, false);
     });
+
+    test('should transmit all events', () async {
+      final instance = ShimanoDi2(BleDevice(name: 'Di2', deviceId: ''));
+      await instance.processCharacteristic(
+        ShimanoDi2Constants.D_FLY_CHANNEL_UUID,
+        Uint8List.fromList([0x21, 0x13, 0xF0, 0xF0]),
+      );
+
+      expect(stubActions.performedActions.isEmpty, true);
+
+      await instance.processCharacteristic(
+        ShimanoDi2Constants.D_FLY_CHANNEL_UUID,
+        Uint8List.fromList([0x21, 0x13, 0xF0, 0xF0]),
+      );
+      expect(stubActions.performedActions.isEmpty, true);
+
+      await instance.processCharacteristic(
+        ShimanoDi2Constants.D_FLY_CHANNEL_UUID,
+        Uint8List.fromList([0x21, 0x14, 0xF0, 0xF0]),
+      );
+      final button = ControllerButton('D-Fly Channel 1');
+      expect(stubActions.performedActions, equals([(button, true, false), (button, false, true)]));
+
+      await instance.processCharacteristic(
+        ShimanoDi2Constants.D_FLY_CHANNEL_UUID,
+        Uint8List.fromList([0x21, 0x15, 0xF0, 0xF0]),
+      );
+      expect(
+        stubActions.performedActions,
+        equals([(button, true, false), (button, false, true), (button, true, false), (button, false, true)]),
+      );
+    });
   });
 }

windows_iap/lib/models/trial.dart

@@ -1,6 +1,18 @@
 class Trial {
   final bool isTrial;
-  final int remainingDays;
+  final String remainingDays;
+  final bool isActive;
+  final bool isTrialOwnedByThisUser;
 
-  Trial({required this.isTrial, required this.remainingDays});
+  Trial({
+    required this.isTrial,
+    required this.remainingDays,
+    required this.isActive,
+    required this.isTrialOwnedByThisUser,
+  });
+
+  @override
+  String toString() {
+    return 'Trial{isTrial: $isTrial, remainingDays: $remainingDays, isActive: $isActive, isTrialOwnedByThisUser: $isTrialOwnedByThisUser}';
+  }
 }

windows_iap/lib/windows_iap_method_channel.dart

@@ -22,7 +22,8 @@ const _escapeMap = {
 };
 
 /// A [RegExp] that matches whitespace characters that should be escaped.
-var _escapeRegExp = RegExp('[\\x00-\\x07\\x0E-\\x1F${_escapeMap.keys.map(_getHexLiteral).join()}]');
+var _escapeRegExp = RegExp(
+    '[\\x00-\\x07\\x0E-\\x1F${_escapeMap.keys.map(_getHexLiteral).join()}]');
 
 /// Returns [str] with all whitespace characters represented as their escape
 /// sequences.
@@ -51,7 +52,8 @@ class MethodChannelWindowsIap extends WindowsIapPlatform {
 
   @override
   Future<StorePurchaseStatus?> makePurchase(String storeId) async {
-    final result = await methodChannel.invokeMethod<int>('makePurchase', {'storeId': storeId});
+    final result = await methodChannel
+        .invokeMethod<int>('makePurchase', {'storeId': storeId});
     if (result == null) {
       return null;
     }
@@ -72,9 +74,12 @@ class MethodChannelWindowsIap extends WindowsIapPlatform {
 
   @override
   Stream<List<Product>> productsStream() {
-    return const EventChannel('windows_iap_event_products').receiveBroadcastStream().map((event) {
+    return const EventChannel('windows_iap_event_products')
+        .receiveBroadcastStream()
+        .map((event) {
       if (event is String) {
-        return parseListNotNull(json: jsonDecode(escape(event)), fromJson: Product.fromJson);
+        return parseListNotNull(
+            json: jsonDecode(escape(event)), fromJson: Product.fromJson);
       } else {
         return [];
       }
@@ -87,21 +92,28 @@ class MethodChannelWindowsIap extends WindowsIapPlatform {
     if (result == null) {
       return [];
     }
-    return parseListNotNull(json: jsonDecode(escape(result)), fromJson: Product.fromJson);
+    return parseListNotNull(
+        json: jsonDecode(escape(result)), fromJson: Product.fromJson);
   }
 
   @override
   Future<bool> checkPurchase({required String storeId}) async {
-    final result = await methodChannel.invokeMethod<bool>('checkPurchase', {'storeId': storeId});
+    final result = await methodChannel
+        .invokeMethod<bool>('checkPurchase', {'storeId': storeId});
     return result ?? false;
   }
 
   @override
   Future<Trial> getTrialStatusAndRemainingDays() async {
-    final result = await methodChannel.invokeMethod<Map>('getTrialStatusAndRemainingDays');
+    final result =
+        await methodChannel.invokeMethod<Map>('getTrialStatusAndRemainingDays');
     return Trial(
       isTrial: result?['isTrial'] as bool? ?? false,
-      remainingDays: result?['remainingDays'] as int? ?? 0,
+      isActive: result?['isActive'] as bool? ?? false,
+      isTrialOwnedByThisUser:
+          result?['isTrialOwnedByThisUser'] as bool? ?? false,
+      remainingDays: result?['remainingDays'] as String? ??
+          DateTime.now().add(Duration(days: 7)).toString(),
     );
   }
 
@@ -111,6 +123,7 @@ class MethodChannelWindowsIap extends WindowsIapPlatform {
     if (result == null) {
       return {};
     }
-    return result.map((key, value) => MapEntry(key.toString(), StoreLicense.fromJson(jsonDecode(value))));
+    return result.map((key, value) =>
+        MapEntry(key.toString(), StoreLicense.fromJson(jsonDecode(value))));
   }
 }

windows_iap/windows/windows_iap_plugin.cpp

@@ -15,6 +15,8 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include <shobjidl.h>
 
+#include <chrono>
+#include <iomanip>
 #include <flutter/event_sink.h>
 #include <flutter/event_channel.h>
 #include <flutter/event_stream_handler.h>
@@ -27,54 +29,63 @@ using namespace Windows::Services::Store;
 using namespace Windows::Foundation::Collections;
 namespace foundation = Windows::Foundation;
 
-namespace windows_iap {
+namespace windows_iap
+{
 
 	//////////////////////////////////////////////////////////////////////// BEGIN OF MY CODE //////////////////////////////////////////////////////////////
-	flutter::PluginRegistrarWindows* _registrar;
+	flutter::PluginRegistrarWindows *_registrar;
 
-	HWND GetRootWindow(flutter::FlutterView* view) {
+	HWND GetRootWindow(flutter::FlutterView *view)
+	{
 		return ::GetAncestor(view->GetNativeWindow(), GA_ROOT);
 	}
 
-	StoreContext getStore() {
+	StoreContext getStore()
+	{
 		StoreContext store = StoreContext::GetDefault();
 		auto initWindow = store.try_as<IInitializeWithWindow>();
-		if (initWindow != nullptr) {
+		if (initWindow != nullptr)
+		{
 			initWindow->Initialize(GetRootWindow(_registrar->GetView()));
 		}
 		return store;
 	}
 
-	std::wstring s2ws(const std::string& s)
+	std::wstring s2ws(const std::string &s)
 	{
 		int len;
 		int slength = (int)s.length() + 1;
 		len = MultiByteToWideChar(CP_ACP, 0, s.c_str(), slength, 0, 0);
-		wchar_t* buf = new wchar_t[len];
+		wchar_t *buf = new wchar_t[len];
 		MultiByteToWideChar(CP_ACP, 0, s.c_str(), slength, buf, len);
 		std::wstring r(buf);
 		delete[] buf;
 		return r;
 	}
 
-	std::string debugString(std::vector<std::string> vt) {
+	std::string debugString(std::vector<std::string> vt)
+	{
 
 		std::stringstream ss;
 		ss << "( ";
-		for (auto t : vt) {
+		for (auto t : vt)
+		{
 			ss << t << ", ";
 		}
 		ss << " )\n";
 		return ss.str();
 	}
 
-	std::string getExtendedErrorString(winrt::hresult error) {
+	std::string getExtendedErrorString(winrt::hresult error)
+	{
 		const HRESULT IAP_E_UNEXPECTED = 0x803f6107L;
 		std::string message;
-		if (error.value == IAP_E_UNEXPECTED) {
+		if (error.value == IAP_E_UNEXPECTED)
+		{
 			message = "This Product has not been properly configured.";
 		}
-		else {
+		else
+		{
 			message = "ExtendedError: " + std::to_string(error.value);
 		}
 		return message;
@@ -84,12 +95,14 @@ namespace windows_iap {
 	{
 		StorePurchaseResult result = co_await getStore().RequestPurchaseAsync(storeId);
 
-		if (result.ExtendedError().value != S_OK) {
+		if (result.ExtendedError().value != S_OK)
+		{
 			resultCallback->Error(std::to_string(result.ExtendedError().value), getExtendedErrorString(result.ExtendedError().value));
 			co_return;
 		}
 		int32_t returnCode;
-		switch (result.Status()) {
+		switch (result.Status())
+		{
 		case StorePurchaseStatus::AlreadyPurchased:
 			returnCode = 1;
 			break;
@@ -111,7 +124,7 @@ namespace windows_iap {
 			break;
 
 		default:
-			auto status = reinterpret_cast<int32_t*>(result.Status());
+			auto status = reinterpret_cast<int32_t *>(result.Status());
 			resultCallback->Error(std::to_string(*status), "Product was not purchased due to an unknown error.");
 			co_return;
 			break;
@@ -120,10 +133,12 @@ namespace windows_iap {
 		resultCallback->Success(flutter::EncodableValue(returnCode));
 	}
 
-	std::string productsToString(std::vector<StoreProduct> products) {
+	std::string productsToString(std::vector<StoreProduct> products)
+	{
 		std::stringstream ss;
 		ss << "[";
-		for (int i = 0; i < products.size(); i++) {
+		for (int i = 0; i < products.size(); i++)
+		{
 			auto product = products.at(i);
 			ss << "{";
 			ss << "\"title\":\"" << to_string(product.Title()) << "\",";
@@ -133,7 +148,8 @@ namespace windows_iap {
 			ss << "\"productKind\":\"" << to_string(product.ProductKind()) << "\",";
 			ss << "\"storeId\":\"" << to_string(product.StoreId()) << "\"";
 			ss << "}";
-			if (i != products.size() - 1) {
+			if (i != products.size() - 1)
+			{
 				ss << ",";
 			}
 		}
@@ -142,16 +158,19 @@ namespace windows_iap {
 		return ss.str();
 	}
 
-	foundation::IAsyncAction getProducts(std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback) {
-		auto result = co_await getStore().GetAssociatedStoreProductsAsync({ L"Consumable", L"Durable", L"UnmanagedConsumable" });
-		if (result.ExtendedError().value != S_OK) {
+	foundation::IAsyncAction getProducts(std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback)
+	{
+		auto result = co_await getStore().GetAssociatedStoreProductsAsync({L"Consumable", L"Durable", L"UnmanagedConsumable"});
+		if (result.ExtendedError().value != S_OK)
+		{
 			resultCallback->Error(std::to_string(result.ExtendedError().value), getExtendedErrorString(result.ExtendedError()));
 		}
-		else if (result.Products().Size() == 0) {
+		else if (result.Products().Size() == 0)
+		{
 			resultCallback->Success(flutter::EncodableValue("[]"));
-
 		}
-		else {
+		else
+		{
 			std::vector<StoreProduct> products;
 			for (IKeyValuePair<hstring, StoreProduct> addOn : result.Products())
 			{
@@ -163,7 +182,8 @@ namespace windows_iap {
 		}
 	}
 
-	std::string getStoreLicenseString(StoreLicense license) {
+	std::string getStoreLicenseString(StoreLicense license)
+	{
 		std::stringstream ss;
 		ss << "{";
 		ss << "\"isActive\":" << (license.IsActive() ? "true" : "false") << ",";
@@ -175,7 +195,8 @@ namespace windows_iap {
 		return ss.str();
 	}
 
-	foundation::IAsyncAction getAddonLicenses(std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback) {
+	foundation::IAsyncAction getAddonLicenses(std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback)
+	{
 		auto result = co_await getStore().GetAppLicenseAsync();
 		auto addonLicenses = result.AddOnLicenses();
 
@@ -192,10 +213,12 @@ namespace windows_iap {
 	/// <summary>
 	///  need to test in real app on store
 	/// </summary>
-	foundation::IAsyncAction checkPurchase(std::string storeId, std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback) {
+	foundation::IAsyncAction checkPurchase(std::string storeId, std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback)
+	{
 		auto result = co_await getStore().GetAppLicenseAsync();
 
-		if (result.IsActive()) {
+		if (result.IsActive())
+		{
 
 			auto addonLicenses = result.AddOnLicenses();
 
@@ -203,69 +226,93 @@ namespace windows_iap {
 			{
 				StoreLicense license = addonLicense.Value();
 
-				if (storeId.compare("") == 0) {
+				if (storeId.compare("") == 0)
+				{
 					// Truong hop storeId empty => bat ky Add-on nao co IsActive = true deu return true
-					if (license.IsActive()) {
+					if (license.IsActive())
+					{
 						resultCallback->Success(flutter::EncodableValue(true));
 						co_return;
 					}
 				}
-				else {
+				else
+				{
 					// Truong hop storeId not empty => check key = storeId
 					auto key = to_string(addonLicense.Key());
-					if (key.compare(storeId) == 0) {
+					if (key.compare(storeId) == 0)
+					{
 						resultCallback->Success(flutter::EncodableValue(license.IsActive()));
 						co_return;
 					}
 				}
-
 			}
 			// truong hop duyet het add-on license nhung vang khong tim thay IsActive = true thi return false
 			resultCallback->Success(flutter::EncodableValue(false));
 		}
-		else {
+		else
+		{
 			resultCallback->Success(flutter::EncodableValue(false));
 		}
 	}
 
-    /// <summary>
-/// need to test in real app on store
-/// </summary>
-    /// <summary>
-/// need to test in real app on store
-/// </summary>
-    foundation::IAsyncAction getTrialStatusAndRemainingDays(
-            std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback)
-    {
-        auto license = co_await getStore().GetAppLicenseAsync();
+	/// <summary>
+	/// need to test in real app on store
+	/// </summary>
+	/// <summary>
+	/// need to test in real app on store
+	/// </summary>
+	foundation::IAsyncAction getTrialStatusAndRemainingDays(
+		std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> resultCallback)
+	{
+		auto store = getStore();
+		auto license = co_await store.GetAppLicenseAsync();
 
-        flutter::EncodableMap result;
-        result[flutter::EncodableValue("isTrial")] = flutter::EncodableValue(false);
-        result[flutter::EncodableValue("remainingDays")] = flutter::EncodableValue(0);
+		flutter::EncodableMap result;
+		result[flutter::EncodableValue("isTrial")] = flutter::EncodableValue(true);
+		result[flutter::EncodableValue("remainingDays")] = flutter::EncodableValue("");
+		result[flutter::EncodableValue("isActive")] = flutter::EncodableValue(license.IsActive());
+		result[flutter::EncodableValue("isTrialOwnedByThisUser")] = flutter::EncodableValue(license.IsTrialOwnedByThisUser());
+		
 
-        if (!license.IsActive()) {
-            resultCallback->Success(flutter::EncodableValue(result));
-            co_return;
-        }
+		if (!license.IsActive())
+		{
+			resultCallback->Success(flutter::EncodableValue(result));
+			co_return;
+		}
 
-        if (license.IsTrial()) {
-            result[flutter::EncodableValue("isTrial")] = flutter::EncodableValue(true);
+		if (license.IsTrial())
+		{
+			result[flutter::EncodableValue("isTrial")] = flutter::EncodableValue(true);
 
-			winrt::Windows::Foundation::TimeSpan expiration = license.TrialTimeRemaining();
-			const auto inDays = std::chrono::duration_cast<std::chrono::hours>(expiration).count() / 24.0;
-			
-	        result[flutter::EncodableValue("remainingDays")] = flutter::EncodableValue(inDays);
-        }
+			auto expirationDate = license.ExpirationDate();
 
-        resultCallback->Success(flutter::EncodableValue(result));
-    }
+			// dt is your winrt::Windows::Foundation::DateTime
+			std::time_t t = winrt::clock::to_time_t(expirationDate);  // Convert to time_t (UTC seconds since 1970)
+			std::tm tm_buf;
+			localtime_s(&tm_buf, &t);  // Safe version
 
+			std::wstringstream wss;
+			wss << std::put_time(&tm_buf, L"%Y-%m-%d %H:%M:%S");  // Custom format
 
-    //////////////////////////////////////////////////////////////////////// END OF MY CODE //////////////////////////////////////////////////////////////
+			winrt::hstring readable = winrt::hstring{ wss.str() };
+			std::string utf8 = winrt::to_string(readable);  // Converts hstring to UTF-8 std::string
 
-// static
+			result[flutter::EncodableValue("remainingDays")] = flutter::EncodableValue(utf8);
+		}
+		else {
+			result[flutter::EncodableValue("isTrial")] = flutter::EncodableValue(false);
+
+		}
+
+		resultCallback->Success(flutter::EncodableValue(result));
+	}
+
+	//////////////////////////////////////////////////////////////////////// END OF MY CODE //////////////////////////////////////////////////////////////
+
+	// static
 	void WindowsIapPlugin::RegisterWithRegistrar(
-		flutter::PluginRegistrarWindows* registrar) {
+		flutter::PluginRegistrarWindows *registrar)
+	{
 		_registrar = registrar;
 
 		auto channel =
@@ -276,9 +323,10 @@ namespace windows_iap {
 		auto plugin = std::make_unique<WindowsIapPlugin>();
 
 		channel->SetMethodCallHandler(
-			[plugin_pointer = plugin.get()](const auto& call, auto result) {
-			plugin_pointer->HandleMethodCall(call, std::move(result));
-		});
+			[plugin_pointer = plugin.get()](const auto &call, auto result)
+			{
+				plugin_pointer->HandleMethodCall(call, std::move(result));
+			});
 
 		registrar->AddPlugin(std::move(plugin));
 	}
@@ -288,30 +336,37 @@ namespace windows_iap {
 	WindowsIapPlugin::~WindowsIapPlugin() {}
 
 	void WindowsIapPlugin::HandleMethodCall(
-		const flutter::MethodCall<flutter::EncodableValue>& method_call,
-		std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
-		if (method_call.method_name().compare("makePurchase") == 0) {
+		const flutter::MethodCall<flutter::EncodableValue> &method_call,
+		std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result)
+	{
+		if (method_call.method_name().compare("makePurchase") == 0)
+		{
 			auto args = std::get<flutter::EncodableMap>(*method_call.arguments());
 			auto storeId = std::get<std::string>(args[flutter::EncodableValue("storeId")]);
 			makePurchase(to_hstring(storeId), std::move(result));
 		}
-		else if (method_call.method_name().compare("getProducts") == 0) {
+		else if (method_call.method_name().compare("getProducts") == 0)
+		{
 			getProducts(std::move(result));
 		}
-		else if (method_call.method_name().compare("checkPurchase") == 0) {
+		else if (method_call.method_name().compare("checkPurchase") == 0)
+		{
 			auto args = std::get<flutter::EncodableMap>(*method_call.arguments());
 			auto storeId = std::get<std::string>(args[flutter::EncodableValue("storeId")]);
 			checkPurchase(storeId, std::move(result));
 		}
-		else if (method_call.method_name().compare("getAddonLicenses") == 0) {
+		else if (method_call.method_name().compare("getAddonLicenses") == 0)
+		{
 			getAddonLicenses(std::move(result));
 		}
-		else if (method_call.method_name().compare("getTrialStatusAndRemainingDays") == 0) {
-            getTrialStatusAndRemainingDays(std::move(result));
+		else if (method_call.method_name().compare("getTrialStatusAndRemainingDays") == 0)
+		{
+			getTrialStatusAndRemainingDays(std::move(result));
 		}
-		else {
+		else
+		{
 			result->NotImplemented();
 		}
 	}
 
-}  // namespace windows_iap
+} // namespace windows_iap