fix: sciencelab instance mgmt (#2627)

Author: adityastic

lib/others/science_lab_common.dart

@@ -3,24 +3,40 @@ import 'package:pslab/communication/science_lab.dart';
 import 'package:pslab/others/logger_service.dart';
 
 class ScienceLabCommon {
-  static late ScienceLab scienceLab;
-  bool connected = false;
+  static late ScienceLab _scienceLab;
+  static late CommunicationHandler communicationHandler;
 
-  ScienceLabCommon._privateConstructor();
-
-  static final ScienceLabCommon _instance =
-      ScienceLabCommon._privateConstructor();
+  ScienceLabCommon(CommunicationHandler communicationHandler) {
+    communicationHandler = communicationHandler;
+    _scienceLab = ScienceLab(communicationHandler);
+  }
 
-  factory ScienceLabCommon() => _instance;
+  ScienceLab getScienceLab() {
+    return _scienceLab;
+  }
 
-  Future<bool> openDevice(CommunicationHandler communicationHandler) async {
-    scienceLab = ScienceLab(communicationHandler);
-    await scienceLab.connect();
-    if (!scienceLab.isConnected()) {
+  Future<bool> openDevice() async {
+    await _scienceLab.connect();
+    if (!_scienceLab.isConnected()) {
       logger.d("Error in connection");
       return false;
     }
-    connected = true;
     return true;
   }
+
+  Future<void> initialize() {
+    return communicationHandler.initialize();
+  }
+
+  void setConnected() {
+    communicationHandler.connected = true;
+  }
+
+  bool isConnected() {
+    return communicationHandler.isConnected();
+  }
+
+  bool isDeviceFound() {
+    return communicationHandler.isDeviceFound();
+  }
 }

lib/providers/board_state_provider.dart

@@ -1,34 +1,34 @@
 import 'package:flutter/cupertino.dart';
-import 'package:get_it/get_it.dart';
-import 'package:pslab/communication/handler/base.dart';
+import 'package:pslab/communication/science_lab.dart';
 import 'package:pslab/others/logger_service.dart';
+import 'package:pslab/providers/locator.dart';
 import 'package:usb_serial/usb_serial.dart';
 
-import '../others/science_lab_common.dart';
+import 'package:pslab/others/science_lab_common.dart';
 
 class BoardStateProvider extends ChangeNotifier {
   bool initialisationStatus = false;
   bool pslabIsConnected = false;
   bool hasPermission = false;
-  late CommunicationHandler communicationHandler;
   late ScienceLabCommon scienceLabCommon;
   String pslabVersionID = 'Not Connected';
 
+  BoardStateProvider() {
+    scienceLabCommon = getIt.get<ScienceLabCommon>();
+  }
+
   Future<void> initialize() async {
-    scienceLabCommon = ScienceLabCommon();
-    communicationHandler = GetIt.instance.get<CommunicationHandler>();
-    await communicationHandler.initialize();
-    pslabIsConnected = await scienceLabCommon.openDevice(communicationHandler);
+    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(communicationHandler);
+          pslabIsConnected = await scienceLabCommon.openDevice();
           setPSLabVersionIDs();
         }
       } else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED) {
-        communicationHandler.connected = false;
+        scienceLabCommon.setConnected();
         pslabIsConnected = false;
         pslabVersionID = 'Not Connected';
         notifyListeners();
@@ -37,18 +37,16 @@ class BoardStateProvider extends ChangeNotifier {
   }
 
   Future<void> setPSLabVersionIDs() async {
-    pslabVersionID = await ScienceLabCommon.scienceLab.getVersion();
+    pslabVersionID = await getIt.get<ScienceLab>().getVersion();
     notifyListeners();
   }
 
   Future<bool> attemptToConnectPSLab() async {
-    scienceLabCommon = ScienceLabCommon();
-    if (communicationHandler.isConnected()) {
+    if (scienceLabCommon.isConnected()) {
       logger.d("Device Connected Successfully");
     } else {
-      communicationHandler = CommunicationHandler();
-      await communicationHandler.initialize();
-      if (communicationHandler.isDeviceFound()) {
+      await scienceLabCommon.initialize();
+      if (scienceLabCommon.isDeviceFound()) {
         return true;
       }
     }

lib/providers/locator.dart

@@ -4,6 +4,8 @@ import 'package:get_it/get_it.dart';
 import 'package:pslab/communication/handler/android_comms_handler.dart';
 import 'package:pslab/communication/handler/base.dart';
 import 'package:pslab/communication/handler/ios_comms_handler.dart';
+import 'package:pslab/communication/science_lab.dart';
+import 'package:pslab/others/science_lab_common.dart';
 import 'package:pslab/providers/board_state_provider.dart';
 
 final GetIt getIt = GetIt.instance;
@@ -16,5 +18,9 @@ void setupLocator() {
       return IosNoOpCommunicationHandler();
     }
   });
+  getIt.registerLazySingleton<ScienceLabCommon>(
+      () => ScienceLabCommon(getIt.get<CommunicationHandler>()));
+  getIt.registerLazySingleton<ScienceLab>(
+      () => getIt.get<ScienceLabCommon>().getScienceLab());
   getIt.registerLazySingleton<BoardStateProvider>(() => BoardStateProvider());
 }

lib/providers/oscilloscope_state_provider.dart

@@ -6,7 +6,7 @@ import 'package:data/data.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:pslab/others/logger_service.dart';
-import 'package:pslab/others/science_lab_common.dart';
+import 'package:pslab/providers/locator.dart';
 
 import '../communication/analytics_class.dart';
 import '../communication/science_lab.dart';
@@ -118,7 +118,7 @@ class OscilloscopeStateProvider extends ChangeNotifier {
     _channelIndexMap[CHANNEL.ch3.toString()] = 3;
     _channelIndexMap[CHANNEL.mic.toString()] = 4;
 
-    _scienceLab = ScienceLabCommon.scienceLab;
+    _scienceLab = getIt.get<ScienceLab>();
     triggerChannel = CHANNEL.ch1.toString();
     _trigger = 0;
     timebase = 875;