handle more cases when decoding analytics devices.

assets/images/completed_done.svg

@@ -1,4 +0,0 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M37.8033 16.3567C37.2313 15.7848 36.3039 15.7847 35.7318 16.3568L21.5532 30.5353L14.2681 23.2504C13.6962 22.6784 12.7686 22.6783 12.1966 23.2505C11.6246 23.8226 11.6246 24.75 12.1966 25.3221L20.5174 33.6427C20.8034 33.9287 21.1783 34.0717 21.5531 34.0717C21.928 34.0717 22.3029 33.9287 22.5888 33.6426L37.8033 18.4283C38.3754 17.8563 38.3754 16.9288 37.8033 16.3567Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M42.6776 7.32236C37.9558 2.60049 31.6776 0 25 0C18.3223 0 12.0442 2.60049 7.32236 7.32236C2.60039 12.0443 0 18.3224 0 25C0 31.6778 2.60039 37.9559 7.32236 42.6777C12.0441 47.3996 18.3223 50 25 50C31.6777 50 37.9558 47.3996 42.6776 42.6777C47.3995 37.9559 50 31.6778 50 25C50 18.3224 47.3995 12.0443 42.6776 7.32236ZM25 47.0703C12.8304 47.0703 2.92969 37.1696 2.92969 25C2.92969 12.8304 12.8304 2.92969 25 2.92969C37.1696 2.92969 47.0703 12.8304 47.0703 25C47.0703 37.1696 37.1696 47.0703 25 47.0703Z" fill="#023DFE" fill-opacity="0.7"/>
-</svg>

lib/pages/analytics/models/analytics_device.dart

@@ -39,8 +39,12 @@ class AnalyticsDevice {
           ? ProductDevice.fromJson(json['productDevice'] as Map<String, dynamic>)
           : null,
       spaceUuid: json['spaceUuid'] as String?,
-      latitude: json['lat'] != null ? double.parse(json['lat'] as String? ?? '0.0') : null,
+      latitude: json['lat'] != null && json['lat'] != ''
-      longitude: json['lon'] != null ? double.parse(json['lon'] as String? ?? '0.0') : null,
+          ? double.tryParse(json['lat']?.toString() ?? '0.0')
+          : null,
+      longitude: json['lon'] != null && json['lon'] != ''
+          ? double.tryParse(json['lon']?.toString() ?? '0.0')
+          : null,
     );
   }
 }

lib/pages/device_managment/curtain_module/widgets/accurate_calibrating_dialog.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/device_managment/curtain_module/bloc/curtain_m
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/calibrate_completed_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class AccurteCalibratingDialog extends StatelessWidget {
   final String deviceId;
@@ -18,7 +17,6 @@ class AccurteCalibratingDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
-      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Calibrating',

lib/pages/device_managment/curtain_module/widgets/accurate_calibration_dialog.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_calibrating_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class AccurateCalibrationDialog extends StatelessWidget {
   final String deviceId;
@@ -16,7 +15,6 @@ class AccurateCalibrationDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
-      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Accurate Calibration',

lib/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart

@@ -22,7 +22,6 @@ class AccurateDialogWidget extends StatelessWidget {
       child: Column(
         children: [
           Expanded(
-            flex: 3,
             child: Column(
               children: [
                 Padding(
@@ -44,22 +43,17 @@ class AccurateDialogWidget extends StatelessWidget {
             ),
           ),
           Expanded(
-            flex: 5,
             child: body,
           ),
           Expanded(
-            flex: 2,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
-                const Expanded(child: Divider()),
+                const Divider(),
                 Row(
                   children: [
                     Expanded(
                       child: InkWell(
-                        borderRadius: const BorderRadius.only(
-                          bottomLeft: Radius.circular(26),
-                        ),
                         onTap: leftOnTap,
                         child: Container(
                           height: 40,
@@ -70,9 +64,6 @@ class AccurateDialogWidget extends StatelessWidget {
                                 color: ColorsManager.grayBorder,
                               ),
                             ),
-                            borderRadius: BorderRadius.only(
-                              bottomLeft: Radius.circular(26),
-                            ),
                           ),
                           child: const Text(
                             'Cancel',
@@ -83,9 +74,6 @@ class AccurateDialogWidget extends StatelessWidget {
                     ),
                     Expanded(
                       child: InkWell(
-                        borderRadius: const BorderRadius.only(
-                          bottomRight: Radius.circular(26),
-                        ),
                         onTap: rightOnTap,
                         child: Container(
                           height: 40,
@@ -96,9 +84,6 @@ class AccurateDialogWidget extends StatelessWidget {
                                 color: ColorsManager.grayBorder,
                               ),
                             ),
-                            borderRadius: BorderRadius.only(
-                              bottomRight: Radius.circular(26),
-                            ),
                           ),
                           child: const Text(
                             'Next',

lib/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart

@@ -28,7 +28,7 @@ class NormalTextBodyForDialog extends StatelessWidget {
                 title,
                 style: const TextStyle(
                   color: ColorsManager.grayColor,
-                  fontSize: 15,
+                  fontSize: 17,
                 ),
               ),
             ),
@@ -42,7 +42,7 @@ class NormalTextBodyForDialog extends StatelessWidget {
                 const Text('1. ',
                     style: TextStyle(
                       color: ColorsManager.grayColor,
-                      fontSize: 15,
+                      fontSize: 17,
                     )),
                 SizedBox(
                   width: 450,
@@ -50,7 +50,7 @@ class NormalTextBodyForDialog extends StatelessWidget {
                     step1,
                     style: const TextStyle(
                       color: ColorsManager.grayColor,
-                      fontSize: 15,
+                      fontSize: 17,
                     ),
                   ),
                 ),
@@ -67,13 +67,13 @@ class NormalTextBodyForDialog extends StatelessWidget {
                 const Text('2. ',
                     style: TextStyle(
                       color: ColorsManager.grayColor,
-                      fontSize: 15,
+                      fontSize: 17,
                     )),
                 Text(
                   step2,
                   style: const TextStyle(
                     color: ColorsManager.grayColor,
-                    fontSize: 15,
+                    fontSize: 17,
                   ),
                 ),
               ],

lib/pages/device_managment/curtain_module/widgets/quick_calibrating_dialog.dart

@@ -63,7 +63,6 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
   @override
   Widget build(_) {
     return AlertDialog(
-      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Calibrating',
@@ -72,7 +71,7 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
           children: [
             const Expanded(
               child: Align(
-                alignment: Alignment.topCenter,
+                alignment: Alignment.center,
                 child: Padding(
                   padding: EdgeInsets.only(right: 75),
                   child: Text(
@@ -86,21 +85,17 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
               child: Align(
                 alignment: Alignment.center,
                 child: Container(
-                  width: 130,
+                  width: 110,
                   padding: const EdgeInsets.all(5),
                   decoration: BoxDecoration(
-                    color: ColorsManager.neutralGray.withValues(
+                    color: ColorsManager.whiteColors,
-                      alpha: 0.5,
-                    ),
                     borderRadius: BorderRadius.circular(12),
                   ),
                   child: Row(
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       Expanded(
-                        child: Padding(
+                        child: NumberInputField(controller: _controller),
-                            padding: const EdgeInsetsGeometry.only(left: 5),
-                            child: NumberInputField(controller: _controller)),
                       ),
                       Expanded(
                         child: Text(
@@ -132,7 +127,7 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
               ),
             const Expanded(
               child: Align(
-                alignment: Alignment.bottomCenter,
+                alignment: Alignment.center,
                 child: Text(
                   '2.click Next to Complete the calibration',
                   style: TextStyle(color: ColorsManager.lightGrayColor),

lib/pages/device_managment/curtain_module/widgets/quick_calibration_dialog.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/quick_calibrating_dialog.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class QuickCalibrationDialog extends StatelessWidget {
   final int timControl;
@@ -18,7 +17,6 @@ class QuickCalibrationDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
-      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Quick Calibration',

lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -455,7 +455,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   Future<void> checkEmail(
       CheckEmailEvent event, Emitter<UsersState> emit) async {
     emit(UsersLoadingState());
-    String?  res = await UserPermissionApi().checkEmail(
+    String? res = await UserPermissionApi().checkEmail(
       emailController.text,
     );
     checkEmailValid = res!;

lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart

@@ -34,8 +34,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
               return Dialog(
                   child: Container(
                 decoration: const BoxDecoration(
-                    color: Colors.white,
+                    color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
-                    borderRadius: BorderRadius.all(Radius.circular(20))),
                 width: 900,
                 child: Column(
                   children: [
@@ -64,8 +63,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 children: [
                                   _buildStep1Indicator(1, "Basics", _blocRole),
                                   _buildStep2Indicator(2, "Spaces", _blocRole),
-                                  _buildStep3Indicator(
+                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
-                                      3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -107,32 +105,18 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                           ),
                           InkWell(
                             onTap: () {
-                              final isBasicsStep = currentStep == 1;
-
-                              if (isBasicsStep) {
-                                // Validate the form first
-                                final isValid = _blocRole.formKey.currentState
-                                        ?.validate() ??
-                                    false;
-
-                                if (!isValid)
-                                  return; // Stop if form is not valid
-                              }
                               _blocRole.add(const CheckEmailEvent());
 
                               setState(() {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(const CheckStepStatus(
+                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
-                                        isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole
+                                    _blocRole.add(const CheckSpacesStepStatus());
-                                        .add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole
+                                  _blocRole.add(SendInviteUsers(context: context));
-                                      .add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -140,11 +124,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics ==
+                                              _blocRole.isCompleteBasics == false ||
-                                                  false ||
+                                              _blocRole.isCompleteRolePermissions == false) &&
-                                              _blocRole
-                                                      .isCompleteRolePermissions ==
-                                                  false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
                                       : ColorsManager.secondaryColor),
@@ -162,7 +143,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   Widget _getFormContent() {
     switch (currentStep) {
       case 1:
-        return BasicsView(
+        return const BasicsView(
           userId: '',
         );
       case 2:
@@ -215,12 +196,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -283,12 +260,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -345,12 +318,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -1,12 +1,9 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl_phone_field/countries.dart';
 import 'package:intl_phone_field/country_picker_dialog.dart';
 import 'package:intl_phone_field/intl_phone_field.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
-import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -14,9 +11,7 @@ import 'package:syncrow_web/utils/style.dart';
 
 class BasicsView extends StatelessWidget {
   final String? userId;
-  Timer? _debounce;
+  const BasicsView({super.key, this.userId = ''});
-
-  BasicsView({super.key, this.userId = ''});
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<UsersBloc, UsersState>(builder: (context, state) {
@@ -26,7 +21,6 @@ class BasicsView extends StatelessWidget {
       }
       return Form(
         key: _blocRole.formKey,
-        autovalidateMode: AutovalidateMode.onUserInteraction,
         child: ListView(
           shrinkWrap: true,
           children: [
@@ -214,14 +208,6 @@ class BasicsView extends StatelessWidget {
                           fontSize: 12,
                           color: ColorsManager.textGray),
                     ),
-
-                    onChanged: (value) {
-                      if (_debounce?.isActive ?? false) _debounce!.cancel();
-                      _debounce = Timer(const Duration(milliseconds: 800), () {
-                        _blocRole.add(const CheckEmailEvent());
-                      });
-                    },
-
                     validator: (value) {
                       if (value == null || value.isEmpty) {
                         return 'Enter Email Address';