fix: Connect Device screen

AsCress · marcnause · commit f5179d58c4e0 · 2025-09-19T09:40:41.000+02:00
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -86,8 +86,8 @@
     "deviceConnected": "Device Connected Successfully",
     "noDeviceFound": "No USB Device Found",
     "stepsToConnectTitle": "Steps to connect the PSLab Device",
-    "step1ConnectMicroUsb": "1. Connect a micro USB(Mini B) to PSLab",
-    "step2ConnectOtg": "2. Connect the other end of the micro USB cable to a OTG",
+    "step1ConnectMicroUsb": "1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5",
+    "step2ConnectOtg": "2. Connect the other end of the USB cable to an OTG",
     "step3ConnectPhone": "3. Connect the OTG to the phone",
     "bluetoothWifiConnection": "Connect using Bluetooth or Wi-Fi",
     "bluetooth": "Bluetooth",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -645,13 +645,13 @@ abstract class AppLocalizations {
   /// No description provided for @step1ConnectMicroUsb.
   ///
   /// In en, this message translates to:
-  /// **'1. Connect a micro USB(Mini B) to PSLab'**
+  /// **'1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'**
   String get step1ConnectMicroUsb;
 
   /// No description provided for @step2ConnectOtg.
   ///
   /// In en, this message translates to:
-  /// **'2. Connect the other end of the micro USB cable to a OTG'**
+  /// **'2. Connect the other end of the USB cable to an OTG'**
   String get step2ConnectOtg;
 
   /// No description provided for @step3ConnectPhone.
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
@@ -293,11 +293,12 @@ class AppLocalizationsDe extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
@@ -293,11 +293,12 @@ class AppLocalizationsEn extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
@@ -293,11 +293,12 @@ class AppLocalizationsEs extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
@@ -293,11 +293,12 @@ class AppLocalizationsFr extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_he.dart b/lib/l10n/app_localizations_he.dart
@@ -293,11 +293,12 @@ class AppLocalizationsHe extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_hi.dart b/lib/l10n/app_localizations_hi.dart
@@ -293,11 +293,12 @@ class AppLocalizationsHi extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_id.dart b/lib/l10n/app_localizations_id.dart
@@ -293,11 +293,12 @@ class AppLocalizationsId extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
@@ -293,11 +293,12 @@ class AppLocalizationsJa extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_nb.dart b/lib/l10n/app_localizations_nb.dart
@@ -293,11 +293,12 @@ class AppLocalizationsNb extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
@@ -293,11 +293,12 @@ class AppLocalizationsPt extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
@@ -293,11 +293,12 @@ class AppLocalizationsRu extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
@@ -293,11 +293,12 @@ class AppLocalizationsUk extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_vi.dart b/lib/l10n/app_localizations_vi.dart
@@ -293,11 +293,12 @@ class AppLocalizationsVi extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
@@ -293,11 +293,12 @@ class AppLocalizationsZh extends AppLocalizations {
   String get stepsToConnectTitle => 'Steps to connect the PSLab Device';
 
   @override
-  String get step1ConnectMicroUsb => '1. Connect a micro USB(Mini B) to PSLab';
+  String get step1ConnectMicroUsb =>
+      '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5';
 
   @override
   String get step2ConnectOtg =>
-      '2. Connect the other end of the micro USB cable to a OTG';
+      '2. Connect the other end of the USB cable to an OTG';
 
   @override
   String get step3ConnectPhone => '3. Connect the OTG to the phone';
diff --git a/lib/view/connect_device_screen.dart b/lib/view/connect_device_screen.dart
@@ -71,7 +71,7 @@ class _HomeScreenState extends State<ConnectDeviceScreen> {
                         margin: const EdgeInsets.only(
                             left: 40, right: 40, bottom: 20),
                         child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.center,
                           children: [
                             Center(
                               child: Text(
@@ -87,18 +87,21 @@ class _HomeScreenState extends State<ConnectDeviceScreen> {
                             const SizedBox(height: 20),
                             Text(
                               appLocalizations.step1ConnectMicroUsb,
+                              textAlign: TextAlign.center,
                               style: const TextStyle(
                                 fontSize: 16,
                               ),
                             ),
                             Text(
                               appLocalizations.step2ConnectOtg,
+                              textAlign: TextAlign.center,
                               style: const TextStyle(
                                 fontSize: 16,
                               ),
                             ),
                             Text(
                               appLocalizations.step3ConnectPhone,
+                              textAlign: TextAlign.center,
                               style: const TextStyle(
                                 fontSize: 16,
                               ),
diff --git a/lib/view/widgets/main_scaffold_widget.dart b/lib/view/widgets/main_scaffold_widget.dart
@@ -177,7 +177,19 @@ class _MainScaffoldState extends State<MainScaffold>
                         height: 24,
                       ),
                       onPressed: () {
-                        /**/
+                        provider.initialize();
+                        if (Navigator.canPop(context) &&
+                            ModalRoute.of(context)?.settings.name ==
+                                '/connectDevice') {
+                          Navigator.popUntil(
+                              context, ModalRoute.withName('/connectDevice'));
+                        } else {
+                          Navigator.pushNamedAndRemoveUntil(
+                            context,
+                            '/connectDevice',
+                            (route) => route.isFirst,
+                          );
+                        }
                       },
                     );
                   },
