From b46e693567124fab288afc30f189b797a5e67497 Mon Sep 17 00:00:00 2001 From: Anashuman Singh Date: Mon, 15 Sep 2025 22:35:58 +0530 Subject: [PATCH 1/2] fix: Connect Device screen --- lib/l10n/app_en.arb | 4 ++-- lib/l10n/app_localizations.dart | 4 ++-- lib/l10n/app_localizations_de.dart | 5 +++-- lib/l10n/app_localizations_en.dart | 5 +++-- lib/l10n/app_localizations_es.dart | 5 +++-- lib/l10n/app_localizations_fr.dart | 5 +++-- lib/l10n/app_localizations_he.dart | 5 +++-- lib/l10n/app_localizations_hi.dart | 5 +++-- lib/l10n/app_localizations_id.dart | 5 +++-- lib/l10n/app_localizations_ja.dart | 5 +++-- lib/l10n/app_localizations_nb.dart | 5 +++-- lib/l10n/app_localizations_pt.dart | 5 +++-- lib/l10n/app_localizations_ru.dart | 5 +++-- lib/l10n/app_localizations_uk.dart | 5 +++-- lib/l10n/app_localizations_vi.dart | 5 +++-- lib/l10n/app_localizations_zh.dart | 5 +++-- lib/view/connect_device_screen.dart | 5 ++++- lib/view/widgets/main_scaffold_widget.dart | 14 +++++++++++++- 18 files changed, 63 insertions(+), 34 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index b94ab16f1..d66830ef0 100644 --- 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 index d78edb066..6b718123a 100644 --- 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 index 549aa7626..ffa371a57 100644 --- 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 index bc64c8f82..139599b04 100644 --- 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 index 3faf29db4..35b2070c2 100644 --- 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 index f50fadbcc..3b0019a08 100644 --- 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 index c66310820..89b1dde37 100644 --- 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 index 030f77245..a60fc6fec 100644 --- 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 index 1e2d4de3f..73dbd27d2 100644 --- 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 index 598aedf68..c19b603af 100644 --- 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 index 929245110..59aa857e0 100644 --- 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 index 549cc11f8..92cefd58e 100644 --- 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 index 982ee83ea..9604e5477 100644 --- 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 index d07136796..03282576f 100644 --- 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 index fa9d165f1..e47e2fe0b 100644 --- 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 index d748851fa..1a6287173 100644 --- 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 index 90f33e82b..a3af2facb 100644 --- a/lib/view/connect_device_screen.dart +++ b/lib/view/connect_device_screen.dart @@ -71,7 +71,7 @@ class _HomeScreenState extends State { 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 { 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 index d281aeadd..416f82c12 100644 --- a/lib/view/widgets/main_scaffold_widget.dart +++ b/lib/view/widgets/main_scaffold_widget.dart @@ -177,7 +177,19 @@ class _MainScaffoldState extends State 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, + ); + } }, ); }, From 1c6b7999e77979ba98b8f37a13ebf4cc6dd90957 Mon Sep 17 00:00:00 2001 From: Anashuman Singh Date: Wed, 17 Sep 2025 19:25:30 +0530 Subject: [PATCH 2/2] fix: copy changes --- lib/l10n/app_en.arb | 7 ++++--- lib/l10n/app_localizations.dart | 12 +++++++++--- lib/l10n/app_localizations_de.dart | 11 +++++++---- lib/l10n/app_localizations_en.dart | 11 +++++++---- lib/l10n/app_localizations_es.dart | 11 +++++++---- lib/l10n/app_localizations_fr.dart | 11 +++++++---- lib/l10n/app_localizations_he.dart | 11 +++++++---- lib/l10n/app_localizations_hi.dart | 11 +++++++---- lib/l10n/app_localizations_id.dart | 11 +++++++---- lib/l10n/app_localizations_ja.dart | 11 +++++++---- lib/l10n/app_localizations_nb.dart | 11 +++++++---- lib/l10n/app_localizations_pt.dart | 11 +++++++---- lib/l10n/app_localizations_ru.dart | 11 +++++++---- lib/l10n/app_localizations_uk.dart | 11 +++++++---- lib/l10n/app_localizations_vi.dart | 11 +++++++---- lib/l10n/app_localizations_zh.dart | 11 +++++++---- lib/view/connect_device_screen.dart | 7 +++++++ 17 files changed, 118 insertions(+), 62 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index d66830ef0..637155cb1 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -86,9 +86,10 @@ "deviceConnected": "Device Connected Successfully", "noDeviceFound": "No USB Device Found", "stepsToConnectTitle": "Steps to connect the PSLab Device", - "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", + "step1ConnectMicroUsb": "1. Connect a USB cable to PSLab.", + "step2ConnectOtg": "2. Connect the other end of the USB cable to an OTG.", + "step3ConnectPhone": "3. Connect the OTG to the phone.", + "step4ConnectWireless": "4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.", "bluetoothWifiConnection": "Connect using Bluetooth or Wi-Fi", "bluetooth": "Bluetooth", "wifi": "Wi-Fi", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index 6b718123a..b2564286f 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -645,21 +645,27 @@ abstract class AppLocalizations { /// No description provided for @step1ConnectMicroUsb. /// /// In en, this message translates to: - /// **'1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'** + /// **'1. Connect a USB cable to PSLab.'** String get step1ConnectMicroUsb; /// No description provided for @step2ConnectOtg. /// /// In en, this message translates to: - /// **'2. Connect the other end of the USB cable to an OTG'** + /// **'2. Connect the other end of the USB cable to an OTG.'** String get step2ConnectOtg; /// No description provided for @step3ConnectPhone. /// /// In en, this message translates to: - /// **'3. Connect the OTG to the phone'** + /// **'3. Connect the OTG to the phone.'** String get step3ConnectPhone; + /// No description provided for @step4ConnectWireless. + /// + /// In en, this message translates to: + /// **'4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'** + String get step4ConnectWireless; + /// No description provided for @bluetoothWifiConnection. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index ffa371a57..ec95bd70f 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -293,15 +293,18 @@ class AppLocalizationsDe extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 139599b04..4a3c63996 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -293,15 +293,18 @@ class AppLocalizationsEn extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 35b2070c2..21c4ad98c 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -293,15 +293,18 @@ class AppLocalizationsEs extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index 3b0019a08..bcf9f38cc 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -293,15 +293,18 @@ class AppLocalizationsFr extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_he.dart b/lib/l10n/app_localizations_he.dart index 89b1dde37..fb3f7c75f 100644 --- a/lib/l10n/app_localizations_he.dart +++ b/lib/l10n/app_localizations_he.dart @@ -293,15 +293,18 @@ class AppLocalizationsHe extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_hi.dart b/lib/l10n/app_localizations_hi.dart index a60fc6fec..5f9dd11ea 100644 --- a/lib/l10n/app_localizations_hi.dart +++ b/lib/l10n/app_localizations_hi.dart @@ -293,15 +293,18 @@ class AppLocalizationsHi extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_id.dart b/lib/l10n/app_localizations_id.dart index 73dbd27d2..7194af886 100644 --- a/lib/l10n/app_localizations_id.dart +++ b/lib/l10n/app_localizations_id.dart @@ -293,15 +293,18 @@ class AppLocalizationsId extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index c19b603af..84197430b 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -293,15 +293,18 @@ class AppLocalizationsJa extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_nb.dart b/lib/l10n/app_localizations_nb.dart index 59aa857e0..c7e299840 100644 --- a/lib/l10n/app_localizations_nb.dart +++ b/lib/l10n/app_localizations_nb.dart @@ -293,15 +293,18 @@ class AppLocalizationsNb extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index 92cefd58e..a057e7dd1 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -293,15 +293,18 @@ class AppLocalizationsPt extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index 9604e5477..c49f33be4 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -293,15 +293,18 @@ class AppLocalizationsRu extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 03282576f..94dbc7e9e 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -293,15 +293,18 @@ class AppLocalizationsUk extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_vi.dart b/lib/l10n/app_localizations_vi.dart index e47e2fe0b..77356f10c 100644 --- a/lib/l10n/app_localizations_vi.dart +++ b/lib/l10n/app_localizations_vi.dart @@ -293,15 +293,18 @@ class AppLocalizationsVi extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 1a6287173..e5ed3bc31 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -293,15 +293,18 @@ class AppLocalizationsZh extends AppLocalizations { String get stepsToConnectTitle => 'Steps to connect the PSLab Device'; @override - String get step1ConnectMicroUsb => - '1. Connect an appropriate USB cable to PSLab: Type-C for PSLab V6, Micro-USB (Mini-B) for PSLab V5'; + String get step1ConnectMicroUsb => '1. Connect a USB cable to PSLab.'; @override String get step2ConnectOtg => - '2. Connect the other end of the USB cable to an OTG'; + '2. Connect the other end of the USB cable to an OTG.'; @override - String get step3ConnectPhone => '3. Connect the OTG to the phone'; + String get step3ConnectPhone => '3. Connect the OTG to the phone.'; + + @override + String get step4ConnectWireless => + '4. PSLab can also be connected wirelessly (Bluetooth or Wi-Fi) if the option is present.'; @override String get bluetoothWifiConnection => 'Connect using Bluetooth or Wi-Fi'; diff --git a/lib/view/connect_device_screen.dart b/lib/view/connect_device_screen.dart index a3af2facb..1468f7fea 100644 --- a/lib/view/connect_device_screen.dart +++ b/lib/view/connect_device_screen.dart @@ -106,6 +106,13 @@ class _HomeScreenState extends State { fontSize: 16, ), ), + Text( + appLocalizations.step4ConnectWireless, + textAlign: TextAlign.center, + style: const TextStyle( + fontSize: 16, + ), + ), ], ), ),