1 files changed, 26 insertions, 34 deletions

diff --git a/lib/Buttons/ac_on_face.dart b/lib/Buttons/ac_on_face.dart
index f0c0f41..9d8ded3 100644
--- a/lib/Buttons/ac_on_face.dart
+++ b/lib/Buttons/ac_on_face.dart
@@ -5,19 +5,18 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg_provider/flutter_svg_provider.dart';
-import 'package:flutter_hvac/kuksa-server/vehicle-provider.dart';
+import 'package:flutter_hvac/vehicle-signals/vehicle_ac_status_provider.dart';
+import 'package:flutter_hvac/vehicle-signals/vss_provider.dart';
+import 'package:flutter_hvac/vehicle-signals/vss_path.dart';
 
-import '../kuksa-server/vehicle-class.dart';
-import '../kuksa-server/vehicle_methods.dart';
 import '../size.dart';
 
 class AcOnFace extends ConsumerStatefulWidget {
   final String img;
-  WebSocket socket;
+
   AcOnFace({
     Key? key,
     required this.img,
-    required this.socket,
   }) : super(key: key);
 
   @override
@@ -45,26 +44,20 @@ class _AcOnFaceState extends ConsumerState<AcOnFace>
     _controller.addListener(() {});
 
     _controller.addStatusListener((status) {
+      String direction = "";
       if (status == AnimationStatus.completed) {
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row1.Left.AirDistribution", 'up');
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row1.Right.AirDistribution", 'up');
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row2.Left.AirDistribution", 'up');
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row2.Right.AirDistribution", 'up');
+        direction = "MIDDLE";
+      } else if (status == AnimationStatus.dismissed) {
+        direction = "DOWN";
       }
-
-      if (status == AnimationStatus.dismissed) {
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row1.Left.AirDistribution", 'middle');
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row1.Right.AirDistribution", 'middle');
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row2.Left.AirDistribution", 'middle');
-        VISS.set(widget.socket,ref,
-            "Vehicle.Cabin.HVAC.Station.Row2.Right.AirDistribution", 'middle');
+      if (direction.isNotEmpty) {
+        var vss = ref.read(vssClientProvider);
+        if (vss != null) {
+          vss.setString(VSSPath.vehicleFrontLeftAirDistribution, direction, true);
+          vss.setString(VSSPath.vehicleFrontRightAirDistribution, direction, true);
+          vss.setString(VSSPath.vehicleRearLeftAirDistribution, direction, true);
+          vss.setString(VSSPath.vehicleRearRightAirDistribution, direction, true);
+        }
       }
     });
   }
@@ -78,8 +71,9 @@ class _AcOnFaceState extends ConsumerState<AcOnFace>
 
   @override
   Widget build(BuildContext context) {
-    vehicle vehicledata = ref.watch(vehicleProvider);
-    if (vehicledata.isAcDirectionUp == false) {
+    bool isAcDirectionUp = ref.watch(vehicleAcStatusProvider.select((p) => p.isAcDirectionUp));
+    bool isAcDirectionDown = ref.watch(vehicleAcStatusProvider.select((p) => p.isAcDirectionDown));
+    if (isAcDirectionUp == false) {
       _controller.reverse();
     }
 
@@ -95,7 +89,7 @@ class _AcOnFaceState extends ConsumerState<AcOnFace>
 
 
               decoration: BoxDecoration(
-                gradient: vehicledata.isAcDirectionUp
+                gradient: isAcDirectionUp
                     ? RadialGradient(
                         colors: [Colors.black, Colors.lightBlue],
                         radius: 2,
@@ -122,18 +116,16 @@ class _AcOnFaceState extends ConsumerState<AcOnFace>
               ),
             ),
             onTap: () {
-              if (vehicledata.isAcDirectionDown) {
+              if (isAcDirectionDown) {
                 ref
-                    .watch(vehicleProvider.notifier)
-                    .update(isAcDirectionDown: !vehicledata.isAcDirectionDown);
+                    .watch(vehicleAcStatusProvider.notifier)
+                    .update(isAcDirectionDown: !isAcDirectionDown);
               }
               Future.delayed(Duration(milliseconds: 500),(){
-                vehicledata.isAcDirectionUp
-                    ? _controller.reverse()
-                    : _controller.forward();
+                isAcDirectionUp ? _controller.reverse() : _controller.forward();
 
-                ref.watch(vehicleProvider.notifier).update(
-                  isAcDirectionUp: !vehicledata.isAcDirectionUp,
+                ref.watch(vehicleAcStatusProvider.notifier).update(
+                  isAcDirectionUp: !isAcDirectionUp,
                 );
               });