Skip to content

feat: add pin layouts #2937

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

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

feat: add pin layouts #2937

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
ce1c9ab
feat: add pin layouts
AsCress Sep 24, 2025
9a9a29d
Merge branch 'flutter' into pin_layouts
marcnause Oct 6, 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
Binary file added assets/images/pslab_v6_bottom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pslab_v6_bottom_colormap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pslab_v6_top.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pslab_v6_top_colormap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 12 additions & 0 deletions lib/l10n/app_localizations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_de.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_en.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_es.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_fr.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_he.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_hi.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_id.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_ja.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_nb.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_pt.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_ru.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_uk.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_vi.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 6 additions & 0 deletions lib/l10n/app_localizations_zh.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
14 changes: 14 additions & 0 deletions lib/view/pin_layout_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import 'package:flutter/material.dart';

class PinLayoutScreen extends StatefulWidget {
const PinLayoutScreen({super.key});
@override
State<StatefulWidget> createState() => _PinLayoutScreenState();
}

class _PinLayoutScreenState extends State<PinLayoutScreen> {
@override
Widget build(BuildContext context) {
return Container();
}
}
26 changes: 17 additions & 9 deletions lib/view/widgets/main_scaffold_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -81,6 +83,7 @@ class _MainScaffoldState extends State<MainScaffold>

@override
Widget build(BuildContext context) {
AppLocalizations appLocalizations = getIt.get<AppLocalizations>();
return Scaffold(
backgroundColor: Theme.of(context).colorScheme.surface,
resizeToAvoidBottomInset: true,
Expand Down Expand Up @@ -194,15 +197,20 @@ class _MainScaffoldState extends State<MainScaffold>
);
},
),
IconButton(
icon: Icon(
Icons.more_vert,
color: appBarContentColor,
),
onPressed: () {
/**/
},
),
PopupMenuButton<String>(
icon: Icon(Icons.more_vert, color: appBarContentColor),
onSelected: (value) {},
itemBuilder: (BuildContext context) => [
PopupMenuItem<String>(
value: appLocalizations.pinLayoutFront,
child: Text(appLocalizations.pinLayoutFront),
),
PopupMenuItem<String>(
value: appLocalizations.pinLayoutBack,
child: Text(appLocalizations.pinLayoutBack),
),
],
)
],
),
body: widget.body,
Expand Down
Loading