Mqtt

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
+</layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
+</layer-list>

android/app/src/main/res/values-night-v31/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values-night/styles.xml

@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -5,7 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -16,4 +19,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -41,4 +41,4 @@
         <image name="LaunchImage" width="1024" height="1024"/>
         <image name="LaunchBackground" width="1" height="1"/>
     </resources>
-</document>
+</document>

ios/Runner/Info.plist

@@ -46,4 +46,4 @@
 		<key>UIStatusBarHidden</key>
 		<false/>
 	</dict>
-</plist>
+</plist>

lib/main.dart

@@ -42,37 +42,37 @@ class MyApp extends StatelessWidget {
           brightness: Brightness.light,
         ),
         textTheme: const TextTheme(
-          headline1: TextStyle(
+          displayLarge: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.bold,
             fontSize: 32,
             color: Color(0xFF464646),
           ),
-          headline2: TextStyle(
+          displayMedium: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w700,
             fontSize: 18,
             color: Color(0xFF464646),
           ),
-          headline3: TextStyle(
+          displaySmall: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 18,
             color: Color(0xFF464646),
           ),
-          headline4: TextStyle(
+          headlineMedium: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 18,
             color: Color(0xFFBDBDBD),
           ),
-          headline5: TextStyle(
+          headlineSmall: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 12,
             color: Color(0xFFBDBDBD),
           ),
-          headline6: TextStyle(
+          titleLarge: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 14,

lib/mqtt/mqtt.dart

@@ -0,0 +1,118 @@
+import 'dart:convert';
+import 'dart:ffi';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt_client/mqtt_server_client.dart';
+
+class MqttHandler with ChangeNotifier {
+  final ValueNotifier<String> data = ValueNotifier<String>("");
+  late MqttServerClient client;
+
+  Future<Object> connect() async {
+    client = MqttServerClient.withPort(
+        'broker.hivemq.com', 'smartpump239834893453920938', 1883);
+    client.logging(on: true);
+    client.onConnected = onConnected;
+    client.onDisconnected = onDisconnected;
+    client.onUnsubscribed = onUnsubscribed;
+    client.onSubscribed = onSubscribed;
+    client.onSubscribeFail = onSubscribeFail;
+    client.pongCallback = pong;
+    client.keepAlivePeriod = 60;
+    client.logging(on: true);
+
+    /// Set the correct MQTT protocol for mosquito
+    client.setProtocolV311();
+
+    final connMessage = MqttConnectMessage()
+        .withWillTopic('willtopic')
+        .withWillMessage('Will message')
+        .startClean()
+        .withWillQos(MqttQos.atLeastOnce);
+
+    print('MQTT_LOGS::Mosquitto client connecting....');
+
+    client.connectionMessage = connMessage;
+    try {
+      await client.connect();
+    } catch (e) {
+      print('Exception: $e');
+      client.disconnect();
+    }
+
+    if (client.connectionStatus!.state == MqttConnectionState.connected) {
+      print('MQTT_LOGS::Mosquitto client connected');
+    } else {
+      print(
+          'MQTT_LOGS::ERROR Mosquitto client connection failed - disconnecting, status is ${client.connectionStatus}');
+      client.disconnect();
+      return -1;
+    }
+
+    //wil be used to determine water tank status
+    print('MQTT_LOGS::Subscribing to the pump/current topic');
+    const topic = 'pump/current';
+    client.subscribe(topic, MqttQos.atMostOnce);
+
+    client.updates!.listen((List<MqttReceivedMessage<MqttMessage?>>? c) {
+      final recMess = c![0].payload as MqttPublishMessage;
+      final pt =
+          MqttPublishPayload.bytesToStringAsString(recMess.payload.message);
+
+      data.value = pt;
+      notifyListeners();
+      print(
+          'MQTT_LOGS:: New data arrived: topic is <${c[0].topic}>, payload is $pt');
+      print('');
+    });
+
+    return client;
+  }
+
+  void onConnected() {
+    print('MQTT_LOGS:: Connected');
+  }
+
+  void onDisconnected() {
+    print('MQTT_LOGS:: Disconnected');
+  }
+
+  void onSubscribed(String topic) {
+    print('MQTT_LOGS:: Subscribed topic: $topic');
+  }
+
+  void onSubscribeFail(String topic) {
+    print('MQTT_LOGS:: Failed to subscribe $topic');
+  }
+
+  void onUnsubscribed(String? topic) {
+    print('MQTT_LOGS:: Unsubscribed topic: $topic');
+  }
+
+  void pong() {
+    print('MQTT_LOGS:: Ping response client callback invoked');
+  }
+
+  void pumpTrigger(bool state) {
+    const pubTopic = 'trigger/pump';
+    final builder = MqttClientPayloadBuilder();
+    builder.addBool(val: state);
+    if (client.connectionStatus?.state == MqttConnectionState.connected) {
+      client.publishMessage(pubTopic, MqttQos.atMostOnce, builder.payload!);
+    }
+  }
+
+  void updateConfig(String nextRun, UnsignedInt duration, bool auto) {
+    const pubTopic = 'update/config';
+    final builder = MqttClientPayloadBuilder();
+    builder.addString(jsonEncode({
+      "next_run": nextRun,
+      "interval": duration,
+      "auto": auto,
+    }));
+    if (client.connectionStatus?.state == MqttConnectionState.connected) {
+      client.publishMessage(pubTopic, MqttQos.atMostOnce, builder.payload!);
+    }
+  }
+}

lib/popups/popup_widgets/popup_filled_button.dart

@@ -14,13 +14,13 @@ class PopupFilledButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return TextButton(
       onPressed: onPressed,
+      style: ButtonStyle(
+        backgroundColor: MaterialStateProperty.all(const Color(0xFF464646)),
+      ),
       child: Text(
         text,
         style: const TextStyle(color: Colors.white),
       ),
-      style: ButtonStyle(
-        backgroundColor: MaterialStateProperty.all(const Color(0xFF464646)),
-      ),
     );
   }
 }

lib/popups/popup_widgets/popup_outlined_button.dart

@@ -14,10 +14,6 @@ class PopupOutlinedButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return OutlinedButton(
       onPressed: onPressed,
-      child: Text(
-        text,
-        style: const TextStyle(color: Color(0xFF464646)),
-      ),
       style: ButtonStyle(
         side: MaterialStateProperty.all(
           const BorderSide(
@@ -26,6 +22,10 @@ class PopupOutlinedButton extends StatelessWidget {
           ),
         ),
       ),
+      child: Text(
+        text,
+        style: const TextStyle(color: Color(0xFF464646)),
+      ),
     );
   }
 }

lib/src/screens/about_screen/about_us_screen.dart

@@ -20,10 +20,10 @@ class AboutUs extends StatelessWidget {
           trailing: SvgPicture.asset('assets/icons/svg/info.svg')
           // Icon(Icons.info, color: Colors.black, size: 32,),
         ),
-        Padding(
-          padding: const EdgeInsets.only(top: 12),
+        const Padding(
+          padding: EdgeInsets.only(top: 12),
           child: Center(child: Column(
-            children: const [
+            children: [
               Text('Domus',style: TextStyle(fontFamily: 'Lexend',
                 fontSize: 48,
                 fontWeight: FontWeight.w700

lib/src/screens/edit_profile/components/image_picker.dart

@@ -55,11 +55,11 @@ class _UploadImageState extends State<UploadImage> {
                 getImageFromGallery();
               },
               child: ClipRRect(
+                borderRadius: BorderRadius.circular(35),
                 child: Image.file(
                   _image!,
                   fit: BoxFit.cover,
                 ),
-                borderRadius: BorderRadius.circular(35),
               ),
             ),
     );

lib/src/screens/favourites_screen/components/favourite_tile.dart

@@ -75,7 +75,7 @@ class FavouriteTile extends StatelessWidget {
                   Text(
                     device,
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.headline2!.copyWith(
+                    style: Theme.of(context).textTheme.displayMedium!.copyWith(
                       color: Colors.black,
                       // color: itsOn ? Colors.white : Colors.black,
                     ),
@@ -84,6 +84,7 @@ class FavouriteTile extends StatelessWidget {
                     width: getProportionateScreenWidth(100),
                   ),
                   GestureDetector(
+                    onTap: switchButton,
                     child: Container(
                       width: 48,
                       height: 25.6,
@@ -113,7 +114,6 @@ class FavouriteTile extends StatelessWidget {
                         ],
                       ),
                     ),
-                    onTap: switchButton,
                   ),
                   const SizedBox(width: 15,)
                 ],
@@ -141,7 +141,7 @@ class FavouriteTile extends StatelessWidget {
                   Text(
                     itsOn ? 'On' : 'Off',
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.headline2!.copyWith(
+                    style: Theme.of(context).textTheme.displayMedium!.copyWith(
                       color: Colors.black,
                       // color: itsOn ? Colors.white : Colors.black,
                     ),

lib/src/screens/favourites_screen/favourites_screen.dart

@@ -31,7 +31,7 @@ class _FavouritesState extends State<Favourites> {
             children: [
               Text(
                 'Favourites',
-                style: Theme.of(context).textTheme.headline1,
+                style: Theme.of(context).textTheme.displayLarge,
               ),
               Container(
                 width: 50,