fix(ui): display selected device name when add devices in DetailGroupScreen

lib/feature/inter_family/group_detail/add_device_to_group_dialog.dart

@@ -21,8 +21,11 @@ addDeviceDialog(BuildContext context, DetailGroupBloc detailGroupBloc,
   showDialog(
     context: context,
     builder: (dialogContext) {
+      return StatefulBuilder(
+        builder: (context, setState) {
           return AlertDialog(
-          title: Center(child: Text(appLocalization(context).add_device_title)),
+            title:
+                Center(child: Text(appLocalization(context).add_device_title)),
             content: DropdownButtonFormField2<String>(
               isExpanded: true,
               decoration: InputDecoration(
@@ -36,24 +39,30 @@ addDeviceDialog(BuildContext context, DetailGroupBloc detailGroupBloc,
                 style: const TextStyle(fontSize: 14),
               ),
               items: ownerDevices
-                .map((item) => DropdownMenuItem<String>(
+                  .map(
+                    (item) => DropdownMenuItem<String>(
                       value: item.thingId,
-                    child: StatefulBuilder(builder: (context, menuSetState) {
+                      enabled: false,
-                      final isSelected = selectedItems.contains(item.thingId);
+                      child: StatefulBuilder(
-                      final isNameSelected = selectedItems.contains(item.name);
+                        builder: (context, menuSetState) {
-
+                          final isSelected =
+                              selectedItems.contains(item.thingId);
                           return InkWell(
                             onTap: () {
-                          isSelected
+                              if (isSelected) {
-                              ? selectedItems.remove(item.thingId)
+                                selectedItems.remove(item.thingId);
-                              : selectedItems.add(item.thingId!);
+                              } else {
-                          isNameSelected
+                                selectedItems.add(item.thingId!);
-                              ? selectedDevices.remove(item.name)
+                              }
-                              : selectedDevices.add(item.name!);
+                              selectedDevices =
+                                  getDevices(ownerDevices, selectedItems);
+                              setState(() {});
                               menuSetState(() {});
                             },
-                        child: SizedBox(
+                            child: Container(
                               height: double.infinity,
+                              padding:
+                                  const EdgeInsets.symmetric(horizontal: 16.0),
                               child: Row(
                                 children: [
                                   if (isSelected)
@@ -65,28 +74,29 @@ addDeviceDialog(BuildContext context, DetailGroupBloc detailGroupBloc,
                                     child: Text(
                                       item.name!,
                                       style: const TextStyle(fontSize: 14),
-                              ))
+                                    ),
+                                  ),
                                 ],
                               ),
                             ),
                           );
-                    })))
+                        },
+                      ),
+                    ),
+                  )
                   .toList(),
+              value: selectedItems.isEmpty ? null : selectedItems.last,
               buttonStyleData: const ButtonStyleData(
                 padding: EdgeInsets.only(right: 8),
               ),
-            onChanged: (value) {
+              onChanged: (value) {},
-              // thingID = value!;
-              // setState(() {});
-            },
               onSaved: (value) {},
               selectedItemBuilder: (context) {
-              return selectedDevices.map(
+                return ownerDevices.map((device) {
-                (item) {
                   return Container(
                     alignment: AlignmentDirectional.center,
                     child: Text(
-                      item,
+                      selectedDevices.join(', '),
                       style: const TextStyle(
                         fontSize: 14,
                         overflow: TextOverflow.ellipsis,
@@ -94,8 +104,7 @@ addDeviceDialog(BuildContext context, DetailGroupBloc detailGroupBloc,
                       maxLines: 1,
                     ),
                   );
-                },
+                }).toList();
-              ).toList();
               },
               iconStyleData: IconStyleData(
                   icon: IconConstants.instance
@@ -105,9 +114,6 @@ addDeviceDialog(BuildContext context, DetailGroupBloc detailGroupBloc,
                   borderRadius: BorderRadius.circular(15),
                 ),
               ),
-            menuItemStyleData: const MenuItemStyleData(
-              padding: EdgeInsets.symmetric(horizontal: 16),
-            ),
             ),
             actions: <Widget>[
               TextButton(
@@ -126,9 +132,22 @@ addDeviceDialog(BuildContext context, DetailGroupBloc detailGroupBloc,
                         context, groupID, device);
                     await detailGroupBloc.getGroupDetail(groupID);
                   }
+
+                  Navigator.of(dialogContext).pop();
                 },
-                child: Text(appLocalization(context).add_device_title))
+                child: Text(appLocalization(context).add_device_title),
+              ),
             ],
           );
-      });
+        },
+      );
+    },
+  );
+}
+
+List<String> getDevices(List<Device> devices, List<String> selectedDevices) {
+  return devices
+      .where((device) => selectedDevices.contains(device.thingId))
+      .map((device) => device.name ?? '')
+      .toList();
 }

lib/feature/main/main_screen.dart

@@ -62,8 +62,10 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
     }
     if (theme == AppThemes.LIGHT.name) {
       isLight = true;
-    } else {
+    } else if (theme == AppThemes.DARK.name) {
       isLight = false;
+    } else {
+      isLight = true;
     }
     mainBloc.sinkIsVNIcon.add(isVN);
     mainBloc.sinkThemeMode.add(isLight);
@@ -325,7 +327,7 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
             controller: controller,
             screens: _buildScreens(),
             items: _navBarsItems(),
-            handleAndroidBackButtonPress: true,
+            handleAndroidBackButtonPress: false,
             resizeToAvoidBottomInset: true,
             stateManagement: true,
             backgroundColor:

lib/feature/map/map_screen.dart

@@ -246,8 +246,6 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
       }
     }
     
-    // log("Has state = 1: $hasStateOne, Has other state: $hasOtherState");
-
     if (hasStateOne) {
       return true; // flameIcon
     } else if (hasOtherState) {

lib/product/constant/app/app_constants.dart

@@ -23,4 +23,6 @@ class ApplicationConstants {
   static const DEVICE_NOTIFICATIONS_SETTINGS = "/device-notifications-settings";
   static const OWNER_GROUP = "owner";
   static const PARTICIPANT_GROUP = "participant";
+  static const NO_DATA = "no_data";
+  static const LOADING = "loading";
 }

lib/product/utils/device_utils.dart

@@ -136,9 +136,12 @@ class DeviceUtils {
   List<Device> sortDeviceByState(List<Device> devices) {
     List<Device> sortedDevices = List.from(devices);
     sortedDevices.sort((a, b) {
-      int stateOrder = [2, 1, 3, 0, -1, 3].indexOf(a.state!) -
+      int stateOrder = [2, 1, 3, 0, -1].indexOf(a.state!) -
-          [2, 1, 3, 0, -1, 3].indexOf(b.state!);
+          [2, 1, 3, 0, -1].indexOf(b.state!);
+      if (stateOrder != 0) {
         return stateOrder;
+      }
+      return a.name!.compareTo(b.name!);
     });
 
     return sortedDevices;

lib/product/utils/response_status_utils.dart

@@ -21,3 +21,5 @@ void showSnackBarResponseByStatusCodeNoIcon(BuildContext context, int statusCode
     showNoIconTopSnackBar(context, failedMessage, Colors.red, Colors.white);
   }
 }
+
+