Skip to content

feat: added Settings screen #2696

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.

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

Merged
merged 3 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 3 additions & 0 deletions lib/colors.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import 'dart:ui';

Color primaryRed = const Color(0xFFD32F2F);
9 changes: 9 additions & 0 deletions lib/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,12 @@ String bluetooth = 'BLUETOOTH';
String wifi = 'WIFI';
String whatisPslab = 'What is PSLab Device?';
String pslabUrl = 'https://pslab.io';

String settings = 'Settings';
String start = 'Auto Start';
String autoStartText = 'Auto start app when PSLab device is connected';
String export = 'Export Data Format';
String txtFormat = 'TXT Format';
String csvFormat = 'CSV Format';
String cancel = 'CANCEL';
String currentFormat = 'Current format is ';
2 changes: 2 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:pslab/view/connect_device_screen.dart';
import 'package:pslab/view/faq_screen.dart';
import 'package:pslab/view/instruments_screen.dart';
import 'package:pslab/view/oscilloscope_screen.dart';
import 'package:pslab/view/settings_screen.dart';

import 'constants.dart';

Expand Down Expand Up @@ -43,6 +44,7 @@ class MyApp extends StatelessWidget {
'/oscilloscope': (context) => const OscilloscopeScreen(),
'/connectDevice': (context) => const ConnectDeviceScreen(),
'/faq': (context) => const FAQScreen(),
'/settings': (context) => const SettingsScreen(),
},
);
}
Expand Down
33 changes: 19 additions & 14 deletions lib/providers/board_state_provider.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:pslab/communication/science_lab.dart';
import 'package:pslab/constants.dart';
import 'package:pslab/others/logger_service.dart';
import 'package:pslab/providers/locator.dart';
import 'package:usb_serial/usb_serial.dart';
Expand All @@ -12,6 +13,8 @@ class BoardStateProvider extends ChangeNotifier {
bool hasPermission = false;
late ScienceLabCommon scienceLabCommon;
String pslabVersionID = 'Not Connected';
String exportFormat = txtFormat;
bool autoStart = true;

BoardStateProvider() {
scienceLabCommon = getIt.get<ScienceLabCommon>();
Expand All @@ -21,21 +24,23 @@ class BoardStateProvider extends ChangeNotifier {
await scienceLabCommon.initialize();
pslabIsConnected = await scienceLabCommon.openDevice();
setPSLabVersionIDs();
UsbSerial.usbEventStream?.listen(
(UsbEvent usbEvent) async {
if (usbEvent.event == UsbEvent.ACTION_USB_ATTACHED) {
if (await attemptToConnectPSLab()) {
pslabIsConnected = await scienceLabCommon.openDevice();
setPSLabVersionIDs();
if (autoStart) {
UsbSerial.usbEventStream?.listen(
(UsbEvent usbEvent) async {
if (usbEvent.event == UsbEvent.ACTION_USB_ATTACHED) {
if (await attemptToConnectPSLab()) {
pslabIsConnected = await scienceLabCommon.openDevice();
setPSLabVersionIDs();
}
} else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED) {
scienceLabCommon.setConnected(false);
pslabIsConnected = false;
pslabVersionID = 'Not Connected';
notifyListeners();
}
} else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED) {
scienceLabCommon.setConnected(false);
pslabIsConnected = false;
pslabVersionID = 'Not Connected';
notifyListeners();
}
},
);
},
);
}
}

Future<void> setPSLabVersionIDs() async {
Expand Down
123 changes: 123 additions & 0 deletions lib/view/settings_screen.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:pslab/colors.dart';
import 'package:pslab/providers/board_state_provider.dart';
import 'package:pslab/view/widgets/main_scaffold_widget.dart';
import 'package:pslab/constants.dart';

class SettingsScreen extends StatefulWidget {
const SettingsScreen({super.key});

@override
State<StatefulWidget> createState() => _SettingsScreenState();
}

class _SettingsScreenState extends State<SettingsScreen> {
bool isTxtFormatSelected =
(GetIt.instance.get<BoardStateProvider>().exportFormat == txtFormat);
bool isCsvFormatSelected =
(GetIt.instance.get<BoardStateProvider>().exportFormat == csvFormat);

void _showExportFormatDialog() {
showDialog(
context: context,
builder: (BuildContext context) {
return SimpleDialog(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.zero,
),
backgroundColor: Colors.white,
title: Text(export,
style:
const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
children: [
RadioListTile<bool>(
title: Text(txtFormat),
value: true,
groupValue: isTxtFormatSelected,
activeColor: primaryRed,
onChanged: (bool? value) {
setState(
() {
isTxtFormatSelected = true;
isCsvFormatSelected = false;
GetIt.instance.get<BoardStateProvider>().exportFormat =
txtFormat;
Navigator.of(context).pop();
},
);
},
),
RadioListTile<bool>(
title: Text(csvFormat),
value: true,
groupValue: isCsvFormatSelected,
activeColor: primaryRed,
onChanged: (bool? value) {
setState(
() {
isTxtFormatSelected = false;
isCsvFormatSelected = true;
GetIt.instance.get<BoardStateProvider>().exportFormat =
csvFormat;
Navigator.of(context).pop();
},
);
},
),
Align(
alignment: Alignment.bottomRight,
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Padding(
padding: const EdgeInsets.only(right: 20, bottom: 5),
child: Text(
cancel,
style: const TextStyle(fontWeight: FontWeight.w500),
),
),
),
)
],
);
},
);
}

@override
Widget build(BuildContext context) {
return MainScaffold(
title: settings,
index: 4,
body: SafeArea(
child: ListView(
children: [
const SizedBox(height: 10),
CheckboxListTile(
title: Text(start),
subtitle: Text(autoStartText),
value: GetIt.instance.get<BoardStateProvider>().autoStart,
onChanged: (bool? value) {
setState(() {
GetIt.instance.get<BoardStateProvider>().autoStart = value!;
});
},
activeColor: primaryRed,
),
const SizedBox(height: 10),
ListTile(
title: Text(export),
subtitle: Text(currentFormat +
GetIt.instance.get<BoardStateProvider>().exportFormat),
onTap: () {
_showExportFormatDialog();
},
),
],
),
),
);
}
}
11 changes: 10 additions & 1 deletion lib/view/widgets/navigation_drawer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,16 @@ class _NavDrawerState extends State<NavDrawer> {
),
),
onTap: () {
/**/
if (Navigator.canPop(context) &&
ModalRoute.of(context)?.settings.name == '/settings') {
Navigator.popUntil(context, ModalRoute.withName('/settings'));
} else {
Navigator.pushNamedAndRemoveUntil(
context,
'/settings',
(route) => route.isFirst,
);
}
},
),
const Divider(),
Expand Down