Skip to content

Commit fcc7e0b

Browse files
committed
feat: added layout for Multimeter
1 parent 94a5480 commit fcc7e0b

File tree

4 files changed

+33
-0
lines changed

4 files changed

+33
-0
lines changed

lib/constants.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ List<String> channelEntries = [
8686
'MIC',
8787
];
8888

89+
String multimeter = 'Multimeter';
8990
String connectDevice = 'Connect Device';
9091
String deviceConnected = 'Device Connected Successfully';
9192
String noDeviceFound = 'No USB Device Found';

lib/main.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:pslab/view/faq_screen.dart';
88
import 'package:pslab/view/gyroscope_screen.dart';
99
import 'package:pslab/view/instruments_screen.dart';
1010
import 'package:pslab/view/luxmeter_screen.dart';
11+
import 'package:pslab/view/multimeter_screen.dart';
1112
import 'package:pslab/view/oscilloscope_screen.dart';
1213
import 'package:pslab/view/robotic_arm_screen.dart';
1314
import 'package:pslab/view/settings_screen.dart';
@@ -48,6 +49,7 @@ class MyApp extends StatelessWidget {
4849
routes: {
4950
'/': (context) => const InstrumentsScreen(),
5051
'/oscilloscope': (context) => const OscilloscopeScreen(),
52+
'/multimeter': (context) => const MultimeterScreen(),
5153
'/connectDevice': (context) => const ConnectDeviceScreen(),
5254
'/faq': (context) => const FAQScreen(),
5355
'/settings': (context) => const SettingsScreen(),

lib/view/instruments_screen.dart

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,19 @@ class _InstrumentsScreenState extends State<InstrumentsScreen> {
2727
(route) => route.isFirst,
2828
);
2929
}
30+
break;
31+
case 1:
32+
if (Navigator.canPop(context) &&
33+
ModalRoute.of(context)?.settings.name == '/multimeter') {
34+
Navigator.popUntil(context, ModalRoute.withName('/multimeter'));
35+
} else {
36+
Navigator.pushNamedAndRemoveUntil(
37+
context,
38+
'/multimeter',
39+
(route) => route.isFirst,
40+
);
41+
}
42+
break;
3043
case 7:
3144
if (Navigator.canPop(context) &&
3245
ModalRoute.of(context)?.settings.name == '/accelerometer') {

lib/view/multimeter_screen.dart

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:pslab/constants.dart';
3+
import 'package:pslab/view/widgets/common_scaffold_widget.dart';
4+
5+
class MultimeterScreen extends StatefulWidget {
6+
const MultimeterScreen({super.key});
7+
8+
@override
9+
State<StatefulWidget> createState() => _MultimeterScreenState();
10+
}
11+
12+
class _MultimeterScreenState extends State<MultimeterScreen> {
13+
@override
14+
Widget build(BuildContext context) {
15+
return CommonScaffold(title: multimeter, body: Scaffold());
16+
}
17+
}

0 commit comments

Comments
 (0)