merge with dev

lib/pages/common/hour_picker_dialog.dart

@@ -1,7 +1,10 @@
+
+
 import 'package:flutter/material.dart';
 
 class HourPickerDialog extends StatefulWidget {
   final TimeOfDay initialTime;
+
   const HourPickerDialog({super.key, required this.initialTime});
 
   @override
@@ -9,70 +12,50 @@ class HourPickerDialog extends StatefulWidget {
 }
 
 class _HourPickerDialogState extends State<HourPickerDialog> {
-  late int _selectedHour;
-  bool _isPm = false;
+  late String selectedHour;
 
   @override
   void initState() {
     super.initState();
-    _selectedHour = widget.initialTime.hour > 12
-        ? widget.initialTime.hour - 12
-        : widget.initialTime.hour;
-    _isPm = widget.initialTime.period == DayPeriod.pm;
+    // Initialize the selectedHour with the initial time passed to the dialog
+    selectedHour = widget.initialTime.hour.toString().padLeft(2, '0') + ':00';
   }
 
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
       title: const Text('Select Hour'),
-      content: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          DropdownButton<int>(
-            value: _selectedHour,
-            items: List.generate(12, (index) {
-              int displayHour = index + 1;
-              return DropdownMenuItem(
-                value: displayHour,
-                child: Text(displayHour.toString()),
-              );
-            }),
-            onChanged: (value) {
-              setState(() {
-                _selectedHour = value!;
-              });
-            },
-          ),
-          SizedBox(width: 16.0),
-          DropdownButton<bool>(
-            value: _isPm,
-            items: const [
-              DropdownMenuItem(
-                value: false,
-                child: Text('AM'),
-              ),
-              DropdownMenuItem(
-                value: true,
-                child: Text('PM'),
-              ),
-            ],
-            onChanged: (value) {
-              setState(() {
-                _isPm = value!;
-              });
-            },
-          ),
-        ],
+      content: DropdownButton<String>(
+        value: selectedHour, // Show the currently selected hour
+        items: List.generate(24, (index) {
+          String hour = index.toString().padLeft(2, '0');
+          return DropdownMenuItem<String>(
+            value: '$hour:00',
+            child: Text('$hour:00'),
+          );
+        }),
+        onChanged: (String? newValue) {
+          if (newValue != null) {
+            setState(() {
+              selectedHour = newValue; // Update the selected hour without closing the dialog
+            });
+          }
+        },
       ),
       actions: [
         TextButton(
-          onPressed: () => Navigator.of(context).pop(null),
+          onPressed: () => Navigator.of(context).pop(null), // Close the dialog without selection
           child: const Text('Cancel'),
         ),
         TextButton(
           onPressed: () {
-            int hour = _isPm ? _selectedHour + 12 : _selectedHour;
-            Navigator.of(context).pop(TimeOfDay(hour: hour, minute: 0));
+            // Close the dialog and return the selected time
+            Navigator.of(context).pop(
+              TimeOfDay(
+                hour: int.parse(selectedHour.split(':')[0]),
+                minute: 0,
+              ),
+            );
           },
           child: const Text('OK'),
         ),
@@ -86,6 +69,7 @@ Future<TimeOfDay?> showHourPicker({
   required TimeOfDay initialTime,
 }) {
   return showDialog<TimeOfDay>(
+    barrierDismissible: false,
     context: context,
     builder: (context) => HourPickerDialog(initialTime: initialTime),
   );