extracted timeselectorwidget

lib/pages/task_edit_page.dart

@@ -6,6 +6,7 @@ import '../model/task.dart';
 import '../service/task_controller.dart';
 import '../service/tools.dart';
 import '../service/validators.dart';
+import '../widgets/time_selector.dart';
 
 class TaskEditPage extends StatefulWidget {
   static const routeName = '/edit';
@@ -96,69 +97,12 @@ class _TaskEditPageState extends State<TaskEditPage> {
                 minLines: 3,
                 maxLines: 10,
               ),
-              Flex(
-                direction: Axis.horizontal,
-
-                children: [
-                  Flexible(
-                    flex: 3,
-                    child: TextFormField(
-                      focusNode: dueDateFocusNode,
-                      controller: dueDateController,
-                      onChanged: maybeEnableDueTime,
-                      onFieldSubmitted: (_) {
-                        isDueTimeEnabled
-                            ? dueDateFocusNode.nextFocus()
-                            : categoryFocusNode.requestFocus();
-                      },
-                      decoration: InputDecoration(
-                        label: Text('Due Date'),
-                        suffixIcon: IconButton(
-                          onPressed: () async {
-                            final result = await onOpenCalendarPickerPressed();
-                            if (result != null) {
-                              final dateString = getIsoDateString(result);
-                              dueDateController.text = dateString;
-                              maybeEnableDueTime(dateString);
-                              formKey.currentState?.validate();
-                              dueTimeFocusNode.requestFocus();
-                            }
-                          },
-                          icon: Icon(Icons.calendar_month),
-                        ),
-                      ),
-                      validator: dateTimeValidator,
-                      keyboardType: TextInputType.datetime,
-                      textInputAction: TextInputAction.next,
-                    ),
-                  ),
-                  Padding(padding: EdgeInsetsGeometry.only(left: 10)),
-                  Flexible(
-                    flex: 2,
-                    child: TextFormField(
-                      focusNode: dueTimeFocusNode,
-                      onFieldSubmitted: (_) => dueTimeFocusNode.nextFocus(),
-                      controller: dueTimeController,
-                      enabled: isDueTimeEnabled,
-                      decoration: InputDecoration(
-                        label: Text('Due Time'),
-                        suffixIcon: IconButton(
-                          onPressed: () async {
-                            final result = await onOpenTimePickerPressed();
-                            if (result != null && context.mounted) {
-                              dueTimeController.text = result.format(context);
-                              categoryFocusNode.requestFocus();
-                            }
-                          },
-                          icon: Icon(Icons.schedule),
-                        ),
-                      ),
-                      validator: timeValidator,
-                      keyboardType: TextInputType.text,
-                      textInputAction: TextInputAction.next,
-                    ),
-                  ),
-                ],
+              TimeSelector(
+                initialDueDateTime: task?.due,
+                nextFocusNode: categoryFocusNode,
+                dueDateController: dueDateController,
+                dueTimeController: dueTimeController,
+                formKey: formKey,
               ),
               TextFormField(
                 focusNode: categoryFocusNode,
@@ -184,27 +128,6 @@ class _TaskEditPageState extends State<TaskEditPage> {
     );
   }
 
-  Future<DateTime?> onOpenCalendarPickerPressed() {
-    return showDialog<DateTime?>(
-      context: context,
-      builder: (context) => DatePickerDialog(
-        firstDate: DateTime(DateTime.now().year - 100),
-        lastDate: DateTime(DateTime.now().year + 100),
-        initialDate:
-            DateTime.tryParse(dueDateController.text) ?? DateTime.now(),
-      ),
-    );
-  }
-
-  Future<TimeOfDay?> onOpenTimePickerPressed() {
-    return showDialog<TimeOfDay?>(
-      context: context,
-      builder: (context) => TimePickerDialog(
-        initialTime: TimeOfDay.fromDateTime(task?.due ?? DateTime.now()),
-      ),
-    );
-  }
-
   void onSavePressed() {
     Navigator.of(context).pop(
       CreateTaskRequest(
@@ -251,18 +174,4 @@ class _TaskEditPageState extends State<TaskEditPage> {
       });
     }
   }
-
-  void maybeEnableDueTime(String value) {
-    if (value.isNotEmpty &&
-        dateTimeValidator(value) == null &&
-        !isDueTimeEnabled) {
-      setState(() {
-        isDueTimeEnabled = true;
-      });
-    } else if (isDueTimeEnabled) {
-      setState(() {
-        isDueTimeEnabled = false;
-      });
-    }
-  }
 }