diff --git a/assets/images/pslab_v6_bottom.png b/assets/images/pslab_v6_bottom.png new file mode 100644 index 000000000..1c65ebea2 Binary files /dev/null and b/assets/images/pslab_v6_bottom.png differ diff --git a/assets/images/pslab_v6_bottom_colormap.png b/assets/images/pslab_v6_bottom_colormap.png new file mode 100644 index 000000000..8c07a0d47 Binary files /dev/null and b/assets/images/pslab_v6_bottom_colormap.png differ diff --git a/assets/images/pslab_v6_top.png b/assets/images/pslab_v6_top.png new file mode 100644 index 000000000..d4d7412e6 Binary files /dev/null and b/assets/images/pslab_v6_top.png differ diff --git a/assets/images/pslab_v6_top_colormap.png b/assets/images/pslab_v6_top_colormap.png new file mode 100644 index 000000000..df054ecca Binary files /dev/null and b/assets/images/pslab_v6_top_colormap.png differ diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 89c646d0a..05580320d 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -515,6 +515,8 @@ "noLocationDataAvailable": "No location data available", "share": "Share", "loggedData": "Logged Data", + "pinLayoutFront": "Pin Layout Front", + "pinLayoutBack": "Pin Layout Back", "oscilloscopeConfigs": "Oscilloscope Configurations", "automatedMeasurementsInfo": "Automatically measures and displays waveform characteristics such as Amplitude, Frequency, Period, etc.", "multimeterConfigs": "Multimeter Configurations", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index 1e7d78ab2..c79b9f57a 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -3208,6 +3208,18 @@ abstract class AppLocalizations { /// **'Logged Data'** String get loggedData; + /// No description provided for @pinLayoutFront. + /// + /// In en, this message translates to: + /// **'Pin Layout Front'** + String get pinLayoutFront; + + /// No description provided for @pinLayoutBack. + /// + /// In en, this message translates to: + /// **'Pin Layout Back'** + String get pinLayoutBack; + /// No description provided for @oscilloscopeConfigs. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index 0aaf83864..7799797bd 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsDe extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 87be82ce9..6ef5ee2e7 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsEn extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index b8e9c8af0..43c63d879 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsEs extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index f9eb670d5..08554e3f2 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsFr extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_he.dart b/lib/l10n/app_localizations_he.dart index f92fd94fb..ee28fe84a 100644 --- a/lib/l10n/app_localizations_he.dart +++ b/lib/l10n/app_localizations_he.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsHe extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_hi.dart b/lib/l10n/app_localizations_hi.dart index ce10ef9d7..e187f515a 100644 --- a/lib/l10n/app_localizations_hi.dart +++ b/lib/l10n/app_localizations_hi.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsHi extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_id.dart b/lib/l10n/app_localizations_id.dart index ddf3a4b3b..1f86bd982 100644 --- a/lib/l10n/app_localizations_id.dart +++ b/lib/l10n/app_localizations_id.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsId extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index a78a7cf4c..edd9dd5f6 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsJa extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_nb.dart b/lib/l10n/app_localizations_nb.dart index 9673b798e..ee186f46d 100644 --- a/lib/l10n/app_localizations_nb.dart +++ b/lib/l10n/app_localizations_nb.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsNb extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index 9cbbb629a..59013cf3e 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsPt extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index a18304cb8..4a629297f 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsRu extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 4b68ab5b0..f3c025f84 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsUk extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_vi.dart b/lib/l10n/app_localizations_vi.dart index 108d08d96..6a8bf1ec4 100644 --- a/lib/l10n/app_localizations_vi.dart +++ b/lib/l10n/app_localizations_vi.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsVi extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index e88630fa2..6095f3b6f 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -1671,6 +1671,12 @@ class AppLocalizationsZh extends AppLocalizations { @override String get loggedData => 'Logged Data'; + @override + String get pinLayoutFront => 'Pin Layout Front'; + + @override + String get pinLayoutBack => 'Pin Layout Back'; + @override String get oscilloscopeConfigs => 'Oscilloscope Configurations'; diff --git a/lib/view/pin_layout_screen.dart b/lib/view/pin_layout_screen.dart new file mode 100644 index 000000000..1acc7d00c --- /dev/null +++ b/lib/view/pin_layout_screen.dart @@ -0,0 +1,14 @@ +import 'package:flutter/material.dart'; + +class PinLayoutScreen extends StatefulWidget { + const PinLayoutScreen({super.key}); + @override + State createState() => _PinLayoutScreenState(); +} + +class _PinLayoutScreenState extends State { + @override + Widget build(BuildContext context) { + return Container(); + } +} diff --git a/lib/view/widgets/main_scaffold_widget.dart b/lib/view/widgets/main_scaffold_widget.dart index 416f82c12..80124ab30 100644 --- a/lib/view/widgets/main_scaffold_widget.dart +++ b/lib/view/widgets/main_scaffold_widget.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; +import 'package:pslab/l10n/app_localizations.dart'; import 'package:pslab/providers/board_state_provider.dart'; +import 'package:pslab/providers/locator.dart'; import '../../theme/colors.dart'; import 'navigation_drawer.dart'; @@ -81,6 +83,7 @@ class _MainScaffoldState extends State @override Widget build(BuildContext context) { + AppLocalizations appLocalizations = getIt.get(); return Scaffold( backgroundColor: Theme.of(context).colorScheme.surface, resizeToAvoidBottomInset: true, @@ -194,15 +197,20 @@ class _MainScaffoldState extends State ); }, ), - IconButton( - icon: Icon( - Icons.more_vert, - color: appBarContentColor, - ), - onPressed: () { - /**/ - }, - ), + PopupMenuButton( + icon: Icon(Icons.more_vert, color: appBarContentColor), + onSelected: (value) {}, + itemBuilder: (BuildContext context) => [ + PopupMenuItem( + value: appLocalizations.pinLayoutFront, + child: Text(appLocalizations.pinLayoutFront), + ), + PopupMenuItem( + value: appLocalizations.pinLayoutBack, + child: Text(appLocalizations.pinLayoutBack), + ), + ], + ) ], ), body: widget.body,