bug fixes and read sensors states

ios/Podfile.lock

@@ -177,6 +177,8 @@ PODS:
   - PromisesObjC (2.3.1)
   - PromisesSwift (2.3.1):
     - PromisesObjC (= 2.3.1)
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -196,6 +198,7 @@ DEPENDENCIES:
   - onesignal_flutter (from `.symlinks/plugins/onesignal_flutter/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -237,6 +240,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
@@ -269,6 +274,7 @@ SPEC CHECKSUMS:
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
+  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812

lib/features/auth/bloc/auth_cubit.dart

@@ -208,6 +208,7 @@ class AuthCubit extends Cubit<AuthState> {
 
   sendOtp() async {
     try {
+      emit(AuthLoading());
       await AuthenticationAPI.sendOtp(body: {'email': email, 'type': 'VERIFICATION'});
       emit(AuthSignUpSuccess());
     } catch (_) {
@@ -217,6 +218,7 @@ class AuthCubit extends Cubit<AuthState> {
 
   reSendOtp() async {
     try {
+      emit(AuthLoading());
       await AuthenticationAPI.sendOtp(body: {'email': email, 'type': 'VERIFICATION'});
       emit(ResendOtpSuccess());
     } catch (_) {

lib/features/auth/view/login_view.dart

@@ -1,5 +1,7 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/auth/bloc/auth_cubit.dart';
@@ -35,8 +37,7 @@ class LoginView extends StatelessWidget {
       },
       builder: (context, state) {
         return Scaffold(
-          body: SafeArea(
+          body: Stack(
-            child: Stack(
             children: [
               Container(
                 width: MediaQuery.sizeOf(context).width,
@@ -61,7 +62,8 @@ class LoginView extends StatelessWidget {
                   ),
                 ),
               ),
-                Padding(
+              SafeArea(
+                child: Padding(
                   padding: const EdgeInsets.only(
                     right: Constants.defaultPadding,
                     left: Constants.defaultPadding,
@@ -100,10 +102,10 @@ class LoginView extends StatelessWidget {
                       ),
                     ),
                   ),
+                ),
               )
             ],
           ),
-          ),
         );
       },
     );

lib/features/auth/view/otp_view.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -116,7 +117,9 @@ class _OtpViewState extends State<OtpView> {
     return BlocConsumer<AuthCubit, AuthState>(
       listener: (context, state) {
         if (state is AuthOtpSuccess) {
-          Navigator.pushNamedAndRemoveUntil(context, Routes.homeRoute, (value) => false);
+          Navigator.of(context).pop();
+          Navigator.of(context).pop();
+          Navigator.popAndPushNamed(context, Routes.homeRoute);
         }
         if (state is ResendOtpSuccess) {
           startTimer(30);
@@ -124,8 +127,7 @@ class _OtpViewState extends State<OtpView> {
       },
       builder: (context, state) {
         return Scaffold(
-          body: SafeArea(
+          body: Stack(
-            child: Stack(
             children: [
               Container(
                 width: MediaQuery.sizeOf(context).width,
@@ -150,7 +152,8 @@ class _OtpViewState extends State<OtpView> {
                   ),
                 ),
               ),
-                Padding(
+              SafeArea(
+                child: Padding(
                   padding: const EdgeInsets.only(
                     right: Constants.defaultPadding,
                     left: Constants.defaultPadding,
@@ -181,7 +184,11 @@ class _OtpViewState extends State<OtpView> {
                           const SizedBox(
                             height: 20,
                           ),
-                          RichText(
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.of(context).pop();
+                            },
+                            child: RichText(
                               text: TextSpan(
                                   text:
                                       'We have sent the verification codeWe have sent the verification code to',
@@ -209,6 +216,7 @@ class _OtpViewState extends State<OtpView> {
                                     ),
                                   ]),
                             ),
+                          ),
                           Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
@@ -326,7 +334,7 @@ class _OtpViewState extends State<OtpView> {
                                           return;
                                         }
                                         if ((state is! AuthLoading)) {
-                                          await AuthCubit.get(context).sendOtp();
+                                          await AuthCubit.get(context).reSendOtp();
                                           FocusScope.of(context).unfocus();
                                         }
                                       },
@@ -340,10 +348,10 @@ class _OtpViewState extends State<OtpView> {
                       ),
                     ),
                   ),
+                ),
               )
             ],
           ),
-          ),
         );
       },
     );

lib/features/auth/view/sign_up_view.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_app/features/auth/bloc/auth_cubit.dart';
@@ -21,13 +22,13 @@ class SignUpView extends StatelessWidget {
     return BlocConsumer<AuthCubit, AuthState>(
       listener: (context, state) {
         if (state is AuthSignUpSuccess) {
-          Navigator.popAndPushNamed(context, Routes.otpRoute);
+          Navigator.pushNamed(context, Routes.otpRoute);
+          // Navigator.popAndPushNamed(context, Routes.otpRoute);
         }
       },
       builder: (context, state) {
         return Scaffold(
-          body: SafeArea(
+          body: Stack(
-            child: Stack(
             children: [
               Container(
                 width: MediaQuery.sizeOf(context).width,
@@ -53,7 +54,8 @@ class SignUpView extends StatelessWidget {
                   ),
                 ),
               ),
-                Padding(
+              SafeArea(
+                child: Padding(
                   padding: const EdgeInsets.only(
                     right: Constants.defaultPadding,
                     left: Constants.defaultPadding,
@@ -125,6 +127,7 @@ class SignUpView extends StatelessWidget {
                                     keyboardType: TextInputType.text,
                                     scrollPadding: EdgeInsets.zero,
                                     autocorrect: false,
+                                    enableSuggestions: false,
                                     autofillHints: const [AutofillHints.email],
                                     validator: AuthCubit.get(context).emailAddressValidator,
                                     onTapOutside: (event) {
@@ -170,6 +173,7 @@ class SignUpView extends StatelessWidget {
                                     keyboardType: TextInputType.text,
                                     scrollPadding: EdgeInsets.zero,
                                     autocorrect: false,
+                                    enableSuggestions: false,
                                     autofillHints: const [AutofillHints.password],
                                     onChanged: (value) {},
                                     validator: AuthCubit.get(context).reEnterPasswordCheck,
@@ -220,10 +224,10 @@ class SignUpView extends StatelessWidget {
                       ),
                     ),
                   ),
+                ),
               )
             ],
           ),
-          ),
         );
       },
     );

lib/features/devices/bloc/devices_cubit.dart

@@ -23,7 +23,8 @@ part 'devices_state.dart';
 
 class DevicesCubit extends Cubit<DevicesState> {
   DevicesCubit._() : super(DevicesInitial()) {
-    if (HomeCubit.getInstance().selectedSpace != null) {
+    if (HomeCubit.getInstance().selectedSpace != null &&
+        HomeCubit.getInstance().spaces!.isNotEmpty) {
       // fetchGroups(HomeCubit.getInstance().selectedSpace!.id!);
       for (var room in HomeCubit.getInstance().selectedSpace!.rooms!) {
         fetchDevicesByRoomId(room.id!);

lib/features/devices/view/widgets/ACs/ac_interface.dart

@@ -5,7 +5,6 @@ import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface_controls.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface_temp_unit.dart';
-import 'package:syncrow_app/generated/assets.dart';
 
 class AcInterface extends StatelessWidget {
   const AcInterface({super.key, required this.ac});
@@ -31,19 +30,7 @@ class AcInterface extends StatelessWidget {
             //   extendBodyBehindAppBar: true,
             //   extendBody: true,
             //   body:
-            Container(
+            SingleChildScrollView(
-          width: MediaQuery.sizeOf(context).width,
-          height: MediaQuery.sizeOf(context).height,
-          decoration: const BoxDecoration(
-            image: DecorationImage(
-              image: AssetImage(
-                Assets.assetsImagesBackground,
-              ),
-              fit: BoxFit.cover,
-              opacity: 0.4,
-            ),
-          ),
-          child: SingleChildScrollView(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
@@ -68,7 +55,6 @@ class AcInterface extends StatelessWidget {
               ),
             ],
           ),
-          ),
         );
         // );
       },

lib/features/devices/view/widgets/ACs/acs_view.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_event.dart';
@@ -8,9 +9,11 @@ import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface.dart'
 import 'package:syncrow_app/features/devices/view/widgets/ACs/acs_list.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/category_view_app_bar.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 import 'package:syncrow_app/generated/assets.dart';
+import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 
 class ACsView extends StatelessWidget {
   final DeviceModel? deviceModel;
@@ -27,17 +30,28 @@ class ACsView extends StatelessWidget {
           // if (DevicesCubit.getInstance().getSelectedDevice() is DeviceModel) {
           //   selectedAC = DevicesCubit.getInstance().getSelectedDevice() as DeviceModel;
           // }
-          return Scaffold(
+          return AnnotatedRegion(
-            backgroundColor: ColorsManager.backgroundColor,
+            value: SystemUiOverlayStyle(
-            // extendBodyBehindAppBar: true,
+              statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
-            // extendBody: true,
+              statusBarIconBrightness: Brightness.light,
-            appBar: CategoryViewAppBar(
-              title: deviceModel?.name ?? '',
             ),
-            body: SafeArea(
+            child: Scaffold(
-              child: Container(
+              backgroundColor: ColorsManager.backgroundColor,
+              extendBodyBehindAppBar: true,
+              extendBody: true,
+              appBar: AppBar(
+                backgroundColor: Colors.transparent,
+                centerTitle: true,
+                title: BodyLarge(
+                  text: deviceModel?.name ?? "",
+                  fontColor: ColorsManager.primaryColor,
+                  fontWeight: FontsManager.bold,
+                ),
+              ),
+              body: Container(
                 width: MediaQuery.sizeOf(context).width,
                 height: MediaQuery.sizeOf(context).height,
+                padding: const EdgeInsets.all(Constants.defaultPadding),
                 decoration: const BoxDecoration(
                   image: DecorationImage(
                     image: AssetImage(
@@ -47,23 +61,18 @@ class ACsView extends StatelessWidget {
                     opacity: 0.4,
                   ),
                 ),
-                child: Padding(
-                  padding: const EdgeInsets.only(
-                    top: Constants.defaultPadding,
-                    left: Constants.defaultPadding,
-                    right: Constants.defaultPadding,
-                  ),
                 child: state is AcsLoadingState
                     ? const Center(
                         child: DefaultContainer(
                             width: 50, height: 50, child: CircularProgressIndicator()),
                       )
-                      : SizedBox.expand(
+                    : Container(
+                        padding: const EdgeInsets.only(top: 25),
+                        alignment: AlignmentDirectional.center,
                         child: deviceModel != null ? AcInterface(ac: deviceModel!) : ACsList(),
                       ),
               ),
             ),
-            ),
           );
         },
       ),

lib/features/devices/view/widgets/ACs/universal_ac_temp.dart

@@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
-import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/utils/context_extension.dart';

lib/features/devices/view/widgets/ceiling_sensor/ceiling_sensor_interface.dart

@@ -20,8 +20,6 @@ import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 
-import '../wall_sensor/wall_sensor_interface.dart';
-
 class CeilingSensorInterface extends StatelessWidget {
   const CeilingSensorInterface({super.key, required this.ceilingSensor});
   final DeviceModel ceilingSensor;
@@ -47,7 +45,6 @@ class CeilingSensorInterface extends StatelessWidget {
             statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
             statusBarIconBrightness: Brightness.light,
           ),
-          child: SafeArea(
           child: Scaffold(
             backgroundColor: ColorsManager.backgroundColor,
             extendBodyBehindAppBar: true,
@@ -61,11 +58,7 @@ class CeilingSensorInterface extends StatelessWidget {
                 fontWeight: FontsManager.bold,
               ),
             ),
-              body: state is LoadingInitialState
+            body: Container(
-                  ? const Center(
-                      child: RefreshProgressIndicator(),
-                    )
-                  : Container(
                 width: MediaQuery.sizeOf(context).width,
                 height: MediaQuery.sizeOf(context).height,
                 padding: const EdgeInsets.all(Constants.defaultPadding),
@@ -78,52 +71,60 @@ class CeilingSensorInterface extends StatelessWidget {
                     opacity: 0.4,
                   ),
                 ),
+                child: state is LoadingInitialState
+                    ? const Center(
+                        child: RefreshProgressIndicator(),
+                      )
+                    : SafeArea(
                         child: Column(
                           children: [
                             const Spacer(),
                             Column(
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: [
-                              InkWell(
+                                // InkWell(
-                                onTap: () {
+                                //   onTap: () {
-                                  if ((ceilingSensor.isOnline ?? false) == false) {
+                                //     if ((ceilingSensor.isOnline ?? false) == false) {
-                                    ScaffoldMessenger.of(context).showSnackBar(
+                                //       ScaffoldMessenger.of(context).showSnackBar(
-                                      const SnackBar(
+                                //         const SnackBar(
-                                        content: Text(
+                                //           content: Text(
-                                          'Device is offline',
+                                //             'Device is offline',
-                                        ),
+                                //           ),
-                                        backgroundColor: Colors.red,
+                                //           backgroundColor: Colors.red,
-                                      ),
+                                //         ),
-                                    );
+                                //       );
-                                    return;
+                                //       return;
-                                  }
+                                //     }
-                                  String controlCode = 'sensitivity';
+                                //     String controlCode = 'sensitivity';
-                                  showDialog(
+                                //     showDialog(
-                                    context: context,
+                                //       context: context,
-                                    builder: (context) => ParameterControlDialog(
+                                //       builder: (context) => ParameterControlDialog(
-                                      title: 'Sensitivity',
+                                //         title: 'Sensitivity',
-                                      sensor: ceilingSensor,
+                                //         sensor: ceilingSensor,
-                                      controlCode: controlCode,
+                                //         controlCode: controlCode,
-                                      value: ceilingSensor.status
+                                //         value: ceilingSensor.status
-                                          .firstWhere((element) => element.code == controlCode)
+                                //             .firstWhere((element) => element.code == controlCode)
-                                          .value as int,
+                                //             .value as int,
-                                      min: ceilingSensor.functions
+                                //         min: ceilingSensor.functions
-                                              .firstWhere((element) => element.code == controlCode)
+                                //                 .firstWhere((element) => element.code == controlCode)
-                                              .values
+                                //                 .values
-                                              ?.min ??
+                                //                 ?.min ??
-                                          0,
+                                //             0,
-                                      max: ceilingSensor.functions
+                                //         max: ceilingSensor.functions
-                                              .firstWhere((element) => element.code == controlCode)
+                                //                 .firstWhere((element) => element.code == controlCode)
-                                              .values
+                                //                 .values
-                                              ?.max ??
+                                //                 ?.max ??
-                                          0,
+                                //             0,
-                                    ),
+                                //       ),
-                                  );
+                                //     );
-                                },
+                                //   },
-                                child: SvgPicture.asset(
+                                //   child:
-                                  state == 'presence'
+                                // ),
-                                      ? Assets.assetsIconsPresenceSensorAssetsPresence
+
-                                      : Assets.assetsIconsPresenceSensorAssetsPresenceSensorMotion,
+                                SvgPicture.asset(
+                                  ceilingSensorModel.presenceState.toLowerCase() == 'motion'
+                                      ? Assets.assetsIconsPresenceSensorAssetsPresenceSensorMotion
+                                      : Assets.assetsIconsPresenceSensorAssetsPresence,
                                   width: 100,
                                   height: 100,
                                   // colorFilter: ColorFilter.mode(
@@ -133,7 +134,6 @@ class CeilingSensorInterface extends StatelessWidget {
                                   //   BlendMode.srcIn,
                                   // ),
                                 ),
-                              ),
                                 const SizedBox(
                                   height: 10,
                                 ),
@@ -279,8 +279,8 @@ class CeilingSensorInterface extends StatelessWidget {
                               ),
                             ),
                           ],
-                      )),
                         ),
+                      )),
           ),
         );
       }),

lib/features/devices/view/widgets/smart_door/door_grid.dart

@@ -15,10 +15,8 @@ class DoorLockGrid extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ConstrainedBox(
+    return GridView.builder(
-      constraints: const BoxConstraints(maxHeight: 270),
+      shrinkWrap: true,
-      child: GridView.builder(
-        // shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
       gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
         crossAxisCount: 2,
@@ -63,7 +61,6 @@ class DoorLockGrid extends StatelessWidget {
           ],
         ),
       ),
-      ),
     );
   }
 }

lib/features/devices/view/widgets/smart_door/door_interface.dart

@@ -9,7 +9,6 @@ import 'package:syncrow_app/features/devices/model/smart_door_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_button.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_grid.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_status_bar.dart';
-import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
@@ -65,7 +64,6 @@ class DoorInterface extends StatelessWidget {
             statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
             statusBarIconBrightness: Brightness.light,
           ),
-          child: SafeArea(
           child: Scaffold(
             backgroundColor: ColorsManager.backgroundColor,
             extendBodyBehindAppBar: true,
@@ -79,12 +77,7 @@ class DoorInterface extends StatelessWidget {
                 fontWeight: FontsManager.bold,
               ),
             ),
-              body: state is LoadingInitialState
+            body: Container(
-                  ? const Center(
-                      child: DefaultContainer(
-                          width: 50, height: 50, child: CircularProgressIndicator()),
-                    )
-                  : Container(
               width: MediaQuery.sizeOf(context).width,
               height: MediaQuery.sizeOf(context).height,
               decoration: const BoxDecoration(
@@ -96,13 +89,18 @@ class DoorInterface extends StatelessWidget {
                   opacity: 0.4,
                 ),
               ),
+              child: SafeArea(
                 child: Padding(
                     padding: EdgeInsets.only(
                       top: Constants.appBarHeight,
                       left: Constants.defaultPadding,
                       right: Constants.defaultPadding,
                     ),
-                          child: Column(
+                    child: state is LoadingInitialState
+                        ? const Center(
+                            child: RefreshProgressIndicator(),
+                          )
+                        : Column(
                             children: [
                               DoorLockStatusBar(
                                 smartDoorModel: smartDoorModel,

lib/features/devices/view/widgets/three_gang/three_gang_interface.dart

@@ -20,7 +20,6 @@ class ThreeGangInterface extends StatelessWidget {
         statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
         statusBarIconBrightness: Brightness.light,
       ),
-      child: SafeArea(
       child: Scaffold(
         backgroundColor: ColorsManager.backgroundColor,
         extendBodyBehindAppBar: true,
@@ -46,6 +45,7 @@ class ThreeGangInterface extends StatelessWidget {
               opacity: 0.4,
             ),
           ),
+          child: SafeArea(
             child: Padding(
               padding: EdgeInsets.only(
                 top: Constants.appBarHeight,

lib/features/devices/view/widgets/wall_sensor/presence_indicator.dart

@@ -15,9 +15,9 @@ class PresenceIndicator extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           SvgPicture.asset(
-            state == 'presence'
+            state.toLowerCase() == 'motion'
-                ? Assets.assetsIconsPresenceSensorAssetsPresence
+                ? Assets.assetsIconsPresenceSensorAssetsPresenceSensorMotion
-                : Assets.assetsIconsPresenceSensorAssetsPresenceSensorMotion,
+                : Assets.assetsIconsPresenceSensorAssetsPresence,
             width: 100,
             height: 100,
           ),

lib/features/devices/view/widgets/wall_sensor/wall_sensor_interface.dart

@@ -52,7 +52,6 @@ class WallMountedInterface extends StatelessWidget {
             statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
             statusBarIconBrightness: Brightness.light,
           ),
-          child: SafeArea(
           child: Scaffold(
             backgroundColor: ColorsManager.backgroundColor,
             extendBodyBehindAppBar: true,
@@ -83,7 +82,8 @@ class WallMountedInterface extends StatelessWidget {
                   ? const Center(
                       child: RefreshProgressIndicator(),
                     )
-                    : Column(
+                  : SafeArea(
+                      child: Column(
                         children: [
                           PresenceIndicator(
                             state: wallSensorModel.presenceState,

lib/features/menu/bloc/manage_unit_bloc/manage_unit_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/menu/bloc/manage_unit_bloc/manage_unit_event.dart';
 import 'package:syncrow_app/features/menu/bloc/manage_unit_bloc/manage_unit_state.dart';
@@ -101,6 +102,7 @@ class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
         final roomsList = await SpacesAPI.getRoomsBySpaceId(event.unitId);
         allDevices = await HomeManagementAPI.fetchDevicesByUserId();
         emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
+        await HomeCubit.getInstance().fetchUnitsByUserId();
       } else {
         emit(const ErrorState(message: 'Something went wrong'));
       }

lib/features/menu/view/widgets/manage_home/home_settings.dart

@@ -40,8 +40,9 @@ class HomeSettingsView extends StatelessWidget {
                     Flexible(
                       child: TextField(
                         textAlign: TextAlign.end,
+                        readOnly: true,
                         decoration: InputDecoration(
-                          hintText: 'Enter Name',
+                          hintText: space?.name ?? 'Enter Name',
                           hintStyle: context.bodyMedium.copyWith(color: Colors.grey),
                           border: InputBorder.none,
                         ),
@@ -55,15 +56,16 @@ class HomeSettingsView extends StatelessWidget {
                   height: 1,
                   color: ColorsManager.greyColor,
                 ),
-                Container(
+                GestureDetector(
-                  width: MediaQuery.sizeOf(context).width,
-                  child: GestureDetector(
                   onTap: () {
                     Navigator.of(context).push(CustomPageRoute(
                         builder: (context) => RoomsView(
                               unitId: space?.id ?? '',
                             )));
                   },
+                  child: Container(
+                    width: MediaQuery.sizeOf(context).width,
+                    padding: const EdgeInsets.all(4),
                     child: const Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [

lib/services/api/http_interceptor.dart

@@ -21,19 +21,16 @@ class HTTPInterceptor extends InterceptorsWrapper {
     if (await validateResponse(response)) {
       super.onResponse(response, handler);
     } else {
-      handler.reject(DioException(
+      handler.reject(DioException(requestOptions: response.requestOptions, response: response));
-          requestOptions: response.requestOptions, response: response));
     }
   }
 
   @override
-  void onRequest(
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) async {
-      RequestOptions options, RequestInterceptorHandler handler) async {
     var storage = const FlutterSecureStorage();
     var token = await storage.read(key: Token.loginAccessTokenKey);
     if (checkHeaderExclusionListOfAddedParameters(options.path)) {
-      options.headers
+      options.headers.putIfAbsent(HttpHeaders.authorizationHeader, () => "Bearer $token");
-          .putIfAbsent(HttpHeaders.authorizationHeader, () => "Bearer $token");
     }
     // options.headers['Authorization'] = 'Bearer ${'${token!}123'}';
     super.onRequest(options, handler);
@@ -42,12 +39,13 @@ class HTTPInterceptor extends InterceptorsWrapper {
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) async {
     ServerFailure failure = ServerFailure.fromDioError(err);
+    if (failure.toString().isNotEmpty) {
       CustomSnackBar.displaySnackBar(failure.toString());
+    }
     var storage = const FlutterSecureStorage();
     var token = await storage.read(key: Token.loginAccessTokenKey);
     if (err.response?.statusCode == 401 && token != null) {
-      await AuthCubit.get(NavigationService.navigatorKey.currentContext!)
+      await AuthCubit.get(NavigationService.navigatorKey.currentContext!).logout();
-          .logout();
     }
     super.onError(err, handler);
   }

lib/services/api/network_exception.dart

@@ -31,8 +31,8 @@ class ServerFailure extends Failure {
         {
           // var document = parser.parse(dioError.response!.data.toString());
           // var message = document.body!.text;
-          return ServerFailure.fromResponse(dioError.response!.statusCode!,
+          return ServerFailure.fromResponse(
-              dioError.response?.data['message'] ?? "Error");
+              dioError.response!.statusCode!, dioError.response?.data['message'] ?? "Error");
         }
       case DioExceptionType.cancel:
         return ServerFailure("The request to ApiServer was canceled");
@@ -64,7 +64,7 @@ class ServerFailure extends Failure {
         }
         return ServerFailure(errors.join('\n'));
       case 404:
-        return ServerFailure("Your request not found, Please try later!");
+        return ServerFailure("");
       case 500:
         return ServerFailure(responseMessage);
       default:

pubspec.yaml

@@ -4,7 +4,7 @@ description: This is the mobile application project, developed with Flutter for
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.2+4
+version: 1.0.4+6
 
 environment:
   sdk: ">=3.0.6 <4.0.0"