Merge branch 'gas_sensor_mq-135' of https://github.com/rahul31124/pslab-android into gas_sensor_mq-135

Author: rahul31124

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/view/logged_data_screen.dart

@@ -23,6 +23,7 @@ import '../providers/locator.dart';
 import 'accelerometer_screen.dart';
 import 'compass_screen.dart';
 import 'package:pslab/view/thermometer_screen.dart';
+import 'package:pslab/view/robotic_arm_screen.dart';
 
 class LoggedDataScreen extends StatefulWidget {
   final List<String> instrumentNames;
@@ -330,7 +331,7 @@ class _LoggedDataScreenState extends State<LoggedDataScreen> {
           'xDataColumnIndex': 0,
           'yDataColumnIndex': 2,
         };
-      case 'soundmeter':
+      case 'sound meter':
         return {
           'xAxisLabel': appLocalizations.timeAxisLabel,
           'yAxisLabel': appLocalizations.db,
@@ -370,7 +371,15 @@ class _LoggedDataScreenState extends State<LoggedDataScreen> {
     final data = await _dataService.readDataFromFile(file);
     if (mounted) {
       if (instrumentName.toLowerCase() == 'robotic arm') {
-        Navigator.pop(context, data);
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (_) => RoboticArmScreen(
+              importedData: data,
+            ),
+          ),
+        );
+        return;
       } else {
         final config = _getChartConfig(instrumentName);
         Navigator.push(

lib/view/robotic_arm_screen.dart

@@ -15,7 +15,12 @@ import 'package:pslab/view/widgets/guide_widget.dart';
 import 'widgets/servo_card.dart';
 
 class RoboticArmScreen extends StatefulWidget {
-  const RoboticArmScreen({super.key});
+  final List<List<dynamic>>? importedData;
+
+  const RoboticArmScreen({
+    super.key,
+    this.importedData,
+  });
 
   @override
   State<RoboticArmScreen> createState() => _RoboticArmScreenState();
@@ -39,6 +44,11 @@ class _RoboticArmScreenState extends State<RoboticArmScreen> {
     ];
     provider = RoboticArmStateProvider();
     provider.initialize();
+    if (widget.importedData != null) {
+      WidgetsBinding.instance.addPostFrameCallback((_) async {
+        await provider.importTimelineData(widget.importedData!);
+      });
+    }
 
     provider.onPlaybackEnd = () {
       showDialog(

pubspec.lock

@@ -117,10 +117,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "62ffa266d9a23b79fb3fcbc206afc00bb979417ba57b1324c546b5aab95ba057"
+      sha256: cad0e811a289ea2a941119dc483c204ec1684cbb9a8fc7351fe4a230b8313160
       url: "https://pub.dev"
     source: hosted
-    version: "7.1.1"
+    version: "7.2.0"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -816,10 +816,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "4bf625947f6c7713ee242296a682e23e44823c09cf9d79e4f1238923c92db852"
+      sha256: f5c435dc0e0d461e5b32471a870f769b6a1cc46930637efe24fbc535314e78ad
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.2.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1064,18 +1064,18 @@ packages:
     dependency: "direct main"
     description:
       name: sensors_plus
-      sha256: "56e8cd4260d9ed8e00ecd8da5d9fdc8a1b2ec12345a750dfa51ff83fcf12e3fa"
+      sha256: "31182c626623de79d3f7e1f9b43028f940821ee012c092f68f165fe55b867822"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.1.0"
   sensors_plus_platform_interface:
     dependency: transitive
     description:
       name: sensors_plus_platform_interface
-      sha256: "58815d2f5e46c0c41c40fb39375d3f127306f7742efe3b891c0b1c87e2b5cd5d"
+      sha256: "9e12a92569bf14ae04b2f086c3e087177a47e527b7666ae1bbe5f70f8450ab19"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   serial:
     dependency: "direct main"
     description:
@@ -1088,10 +1088,10 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: a857d8b1479250aff6b57a51b2c02d31ca05848d441817c43f1640c885c286c0
+      sha256: "9eee8283462d91a7a1c8bdb67d08874abd75a2f8fae3bc0ca033035e375fb3d8"
       url: "https://pub.dev"
     source: hosted
-    version: "13.1.0"
+    version: "13.2.0"
   share_plus_platform_interface:
     dependency: transitive
     description:

pubspec.yaml

@@ -6,7 +6,7 @@ version: 1.0.0+1
 
 environment:
   sdk: ^3.5.4
-  flutter: '3.44.2'
+  flutter: '3.44.4'
 
 dependencies:
   flutter:
@@ -30,17 +30,17 @@ dependencies:
   logger: ^2.7.0
   url_launcher: ^6.3.2
   font_awesome_flutter: ^11.0.0
-  package_info_plus: ^10.1.0
-  sensors_plus: ^7.0.0
+  package_info_plus: ^10.2.0
+  sensors_plus: ^7.1.0
   sleek_circular_slider: ^2.1.0
   gauge_indicator: ^0.6.0
   light: ^5.0.0
-  connectivity_plus: ^7.1.1
+  connectivity_plus: ^7.2.0
   carousel_slider: ^5.1.1
   vibration: ^3.2.0
   shared_preferences: ^2.5.5
   csv: ^8.0.0
-  share_plus: ^13.1.0
+  share_plus: ^13.2.0
   path_provider: ^2.1.6
   file_picker: ^12.0.0-beta.7
   flutter_screenutil: ^5.9.3