Skip to content

fix: Connect Device screen #2923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: flutter
Choose a base branch
from
Open

fix: Connect Device screen #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5a3854
fix: Connect Device screen
AsCress Sep 15, 2025
431d370
fix: copy changes
AsCress Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@
"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",
"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",
Expand Down
12 changes: 9 additions & 3 deletions lib/l10n/app_localizations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,21 +645,27 @@ 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 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 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.
///
/// 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:
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_de.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_en.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_es.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_fr.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_he.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_hi.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_id.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_ja.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_nb.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_pt.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_ru.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_uk.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_vi.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
10 changes: 7 additions & 3 deletions lib/l10n/app_localizations_zh.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ 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 a USB cable to PSLab.';

@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';
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';
Expand Down
12 changes: 11 additions & 1 deletion lib/view/connect_device_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -87,18 +87,28 @@ 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,
),
),
Text(
appLocalizations.step4ConnectWireless,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 16,
),
Expand Down
Loading