From dbf148c41fb694e5ee23d9040bc96b248fc8c99e Mon Sep 17 00:00:00 2001
From: Jonas Bark <jonas.bark@gmx.de>
Date: Thu, 5 Feb 2026 14:28:15 +0100
Subject: [PATCH] fix messages

---
 CHANGELOG.md           | 7 +++++++
 lib/pages/trainer.dart | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2947830..c4c29e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 4.7.0 (04-02-2026)
+
+**Fixes**:
+- save "Enable Media Key detection" setting across app restarts
+- UI adjustments and fixes in the controller configuration screen
+- iOS: Remote pairing now works again
+
 ### 4.6.0 (28-01-2026)
 
 **Features**:
diff --git a/lib/pages/trainer.dart b/lib/pages/trainer.dart
index 24366c6..c05ae8a 100644
--- a/lib/pages/trainer.dart
+++ b/lib/pages/trainer.dart
@@ -53,7 +53,7 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
       if (core.logic.showForegroundMessage) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           // show snackbar to inform user that the app needs to stay in foreground
-          buildToast(context, title: AppLocalizations.current.touchSimulationForegroundMessage);
+          buildToast(navigatorKey.currentContext!, title: AppLocalizations.current.touchSimulationForegroundMessage);
         });
       }
 
@@ -81,7 +81,7 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
         UniversalBle.getBluetoothAvailabilityState().then((state) {
           if (state == AvailabilityState.poweredOn && mounted) {
             core.remotePairing.reconnect();
-            buildToast(context, title: AppLocalizations.current.touchSimulationForegroundMessage);
+            buildToast(navigatorKey.currentContext!, title: AppLocalizations.current.touchSimulationForegroundMessage);
           }
         });
       }
@@ -202,8 +202,8 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
               ),
             ),
             if (core.settings.getTrainerApp() != null) ...[
-              Gap(22),
               if (recommendedTiles.isNotEmpty) ...[
+                Gap(22),
                 ColoredTitle(text: context.i18n.recommendedConnectionMethods),
                 Gap(12),
               ],
@@ -228,6 +228,7 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
                   child: Accordion(
                     items: [
                       AccordionItem(
+                        expanded: recommendedTiles.isEmpty,
                         trigger: AccordionTrigger(child: ColoredTitle(text: context.i18n.otherConnectionMethods)),
                         content: Column(
                           children: [