UI_HOTEL_NAME_ALIGN

lib/Screens/itnerary/accomodations.dart

@@ -653,7 +653,7 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
             isDesktop: isDesktop,
             width:
                 isDesktop
-                    ? MediaQuery.of(context).size.width * 0.34
+                    ? MediaQuery.of(context).size.width * 0.35
                     : null, //MediaQuery.of(context).size.width * 0.66,
             child: SizedBox(
               height: 40,
@@ -720,6 +720,8 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
                     items: allItems,
                     selectedItem: _hotelNameController.text,
                     popupProps: PopupProps.menu(
+                      fit: FlexFit.loose,
+                      constraints: BoxConstraints(maxHeight: 220),
                       menuProps: const MenuProps(backgroundColor: Colors.white),
                       showSearchBox: true,
                       itemBuilder:
@@ -738,6 +740,7 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
                           ),
                       searchFieldProps: TextFieldProps(
                         controller: _hotelNameController,
+                        style: TextStyle(fontSize: 11),
                         decoration: InputDecoration(
                           labelText: "Enter/ Search Hotel Name",
                           labelStyle: GoogleFonts.poppins(fontSize: 11),
@@ -751,8 +754,28 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
                           border: OutlineInputBorder(),
                         ),
                       ),
-                      fit: FlexFit.loose,
                     ),
+                    dropdownBuilder: (context, selectedItem) {
+                      if (selectedItem == null || selectedItem.isEmpty) {
+                        return Text(
+                          "Select ",
+                          style: GoogleFonts.poppins(
+                            color: Colors.grey,
+                            fontSize: 12,
+                            fontWeight: FontWeight.w400,
+                          ),
+                        );
+                      }
+                      return Text(
+                        selectedItem ?? '',
+                        semanticsLabel: "hotelName",
+                        style: GoogleFonts.roboto(
+                          fontSize: 11,
+                          fontWeight: FontWeight.w400,
+                          color: Colors.black,
+                        ),
+                      );
+                    },
 
                     dropdownDecoratorProps: DropDownDecoratorProps(
                       dropdownSearchDecoration: InputDecoration(
@@ -778,7 +801,7 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
                         enabledBorder: OutlineInputBorder(
                           borderSide: BorderSide(
                             color:
-                                (_CategoryFocused ?? false)
+                                (_isHotelNameFocused ?? false)
                                     ? layoutColor
                                     : Colors.white,
                             // : const Color(0xFFD6D5E6),
@@ -949,7 +972,7 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
                       return Text(
                         selectedItem['dropdown_value'] ?? '',
                         style: GoogleFonts.poppins(
-                          fontSize: 12,
+                          fontSize: 11,
                           // color: Colors.red,
                           color: Colors.black,
                         ),
@@ -1470,7 +1493,7 @@ class _AccomodationScreenState extends State<AccomodationScreen> {
             isDesktop: isDesktop,
             width:
                 isDesktop
-                    ? MediaQuery.of(context).size.width * 0.34
+                    ? MediaQuery.of(context).size.width * 0.35
                     : null, // MediaQuery.of(context).size.width * 0.66,
             child: SizedBox(
               height: 40,

lib/Screens/itnerary/bus.dart

@@ -650,7 +650,7 @@ class _BusScreenState extends State<BusScreen> {
           CustomTextFieldItnerarySubWrapper(
             isFocused: _commentsFocus, // Dropdown doesn't use focus
             isDesktop: isDesktop,
-            width: isDesktop ? MediaQuery.of(context).size.width * 0.34 : null,
+            width: isDesktop ? MediaQuery.of(context).size.width * 0.35 : null,
             child: SizedBox(
               height: 40,
               child: TextField(

lib/Screens/itnerary/taxi.dart

@@ -519,10 +519,14 @@ class _TaxiScreenState extends State<TaxiScreen> {
                               setState(() {
                                 selectedCarType = newValue as String?;
                               });
-                          print("Updating form data:  -> ${newValue ?? ""}");
+                              print(
+                                "Updating form data:  -> ${newValue ?? ""}",
+                              );
                             }
                             : null,
-              ),),),
+                  ),
+                ),
+              ),
             ),
           ),
         ],
@@ -602,8 +606,8 @@ class _TaxiScreenState extends State<TaxiScreen> {
         padding: const EdgeInsets.symmetric(horizontal: 0),
         width:
             isDesktop
-                ? MediaQuery.of(context).size.width * 0.34
+                ? MediaQuery.of(context).size.width * 0.35
-                : null,//MediaQuery.of(context).size.width * 0.66,
+                : null, //MediaQuery.of(context).size.width * 0.66,
         child: SizedBox(
           height: 40,
           width: double.infinity,
@@ -683,12 +687,18 @@ class _TaxiScreenState extends State<TaxiScreen> {
                   if (selectedItem == null || selectedItem.isEmpty) {
                     return Text(
                       "Select ",
-                  style: GoogleFonts.poppins(color: Colors.grey, fontSize: 13),
+                      style: GoogleFonts.poppins(
+                        color: Colors.grey,
+                        fontSize: 13,
+                      ),
                     );
                   }
                   return Text(
                     selectedItem['dropdown_value'] ?? '',
-                style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+                    style: GoogleFonts.poppins(
+                      fontSize: 12,
+                      color: Colors.black,
+                    ),
                   );
                 },
                 onChanged:
@@ -700,7 +710,9 @@ class _TaxiScreenState extends State<TaxiScreen> {
                           print("Updating form data:  -> ${newValue ?? ""}");
                         }
                         : null,
-          ),),),
+              ),
+            ),
+          ),
         ),
       ),
     ];
@@ -1024,8 +1036,8 @@ class _TaxiScreenState extends State<TaxiScreen> {
             isDesktop: isDesktop,
             width:
                 isDesktop
-                    ? MediaQuery.of(context).size.width * 0.34
+                    ? MediaQuery.of(context).size.width * 0.35
-                    : null,//MediaQuery.of(context).size.width * 0.66,
+                    : null, //MediaQuery.of(context).size.width * 0.66,
 
             child: SizedBox(
               height: 40,

lib/Screens/itnerary_list/accomodation_list.dart

@@ -315,7 +315,9 @@ class _AccomodationListWidgetState extends State<AccomodationListWidget> {
                 Row(
                   // mainAxisAlignment: MainAxisAlignment.end,
                   children: [
-                    Text(
+                    Expanded(
+                      flex: 1,
+                      child: Text(
                         item["hotel_name"]!,
                         style: GoogleFonts.poppins(
                           fontSize: 14,
@@ -324,6 +326,7 @@ class _AccomodationListWidgetState extends State<AccomodationListWidget> {
                           color: !isDesktop ? Colors.black : Color(0xFF575A74),
                         ),
                       ),
+                    ),
                     Spacer(),
                     GestureDetector(
                       onTap: () => widget.onOpen(true, item, "Accomodation"),

lib/Screens/userManagement/create_user/create_user.dart

@@ -831,6 +831,12 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
     }
   }
 
+  void closeLoaderIfOpen() {
+    if (mounted) {
+      Navigator.of(context, rootNavigator: true).pop();
+    }
+  }
+
   void handleSubmit() async {
     print("USR Detail Submit");
     // printFormData();
@@ -852,6 +858,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
       if (!await isValidData(data)) {
         print("USERDETAILS : $userDetials");
         print("Validation Failed: Required fields are missing.");
+        closeLoaderIfOpen();
         setState(() {});
         return; // Stop execution if validation fails
       } else {
@@ -864,6 +871,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
       print("isValid- $isValid");
       if (!isValid) {
         print("Validation failed. Please check the inputs.");
+        closeLoaderIfOpen();
         setState(() {});
         return; // ❌ STOP execution here if not valid
       }
@@ -967,6 +975,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
       if (!await isValidData(data) && !await isValidDataTwo(data)) {
         print("USERDETAILS : $userDetials");
         print("Validation Failed: Required fields are missing.");
+        closeLoaderIfOpen();
         setState(() {});
         return; // Stop execution if validation fails
       } else {