Merge branch 'flutter' into Search-bar

Author: Yugesh-Kumar-S

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "8.10.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.21" apply false
 }
 
 include ":app"

assets/icons/ic_wifi_connected.png

@@ -3,12 +3,16 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:pslab/communication/commands_proto.dart';
 import 'package:pslab/communication/handler/base.dart';
+import 'package:pslab/communication/socket_client.dart';
 import 'package:pslab/others/logger_service.dart';
+import 'package:pslab/others/science_lab_common.dart';
+import 'package:pslab/providers/locator.dart';
 
 class PacketHandler {
   late Uint8List _buffer;
   late bool _connected;
   late CommunicationHandler _mCommunicationHandler;
+  late SocketClient _socketClient;
   static String version = '';
   late CommandsProto _mCommandsProto;
   int _timeout = 500, versionStringLength = 8;
@@ -18,12 +22,15 @@ class PacketHandler {
     _timeout = timeout;
     _mCommandsProto = CommandsProto();
     _mCommunicationHandler = communicationHandler;
-    _connected = (_mCommunicationHandler.isConnected());
+    _socketClient = getIt.get<SocketClient>();
+    _connected = (getIt.get<ScienceLabCommon>().isWiFiConnected() ||
+        _mCommunicationHandler.isConnected());
     _buffer = Uint8List(10000);
   }
 
   bool isConnected() {
-    _connected = (_mCommunicationHandler.isConnected());
+    _connected = (getIt.get<ScienceLabCommon>().isWiFiConnected() ||
+        _mCommunicationHandler.isConnected());
     return _connected;
   }
 
@@ -145,13 +152,17 @@ class PacketHandler {
     if (_mCommunicationHandler.isConnected()) {
       bytesRead[0] =
           await _mCommunicationHandler.read(_buffer, bytesToRead, _timeout);
+    } else if (getIt.get<ScienceLabCommon>().isWiFiConnected()) {
+      bytesRead[0] = await _socketClient.read(_buffer, bytesToRead, _timeout);
     }
     return bytesRead[0];
   }
 
   void _commonWrite(Uint8List data) {
     if (_mCommunicationHandler.isConnected()) {
       _mCommunicationHandler.write(data, _timeout);
+    } else if (getIt.get<ScienceLabCommon>().isWiFiConnected()) {
+      _socketClient.write(data, _timeout);
     }
   }
 }

assets/icons/icons8_wifi_connected_100.png

@@ -3,7 +3,9 @@ import 'package:flutter/foundation.dart';
 import 'package:pslab/communication/commands_proto.dart';
 import 'package:pslab/communication/handler/base.dart';
 import 'package:pslab/communication/packet_handler.dart';
+import 'package:pslab/communication/socket_client.dart';
 import 'package:pslab/others/logger_service.dart';
+import 'package:pslab/providers/locator.dart';
 
 import 'analogChannel/analog_acquisition_channel.dart';
 import 'analogChannel/analog_constants.dart';
@@ -33,12 +35,14 @@ class ScienceLab {
   List<DigitalChannel> dChannels = [];
 
   late CommunicationHandler mCommunicationHandler;
+  late SocketClient mSocketClient;
   late PacketHandler mPacketHandler;
   late CommandsProto mCommandsProto;
   late AnalogConstants mAnalogConstants;
 
   ScienceLab(CommunicationHandler communicationHandler) {
     mCommunicationHandler = communicationHandler;
+    mSocketClient = getIt.get<SocketClient>();
     mCommandsProto = CommandsProto();
     mAnalogConstants = AnalogConstants();
   }
@@ -57,8 +61,20 @@ class ScienceLab {
     }
   }
 
+  Future<void> connectWiFi() async {
+    try {
+      await mSocketClient.openConnection("192.168.4.1", 80);
+      mPacketHandler = PacketHandler(500, mCommunicationHandler);
+    } catch (e) {
+      logger.e(e);
+    }
+    if (isConnected()) {
+      await _initializeVariables();
+    }
+  }
+
   bool isConnected() {
-    return mCommunicationHandler.isConnected();
+    return (mSocketClient.isConnected() || mCommunicationHandler.isConnected());
   }
 
   bool isDeviceFound() {