implemented relativetime input widget

lib/model/alarm/alarm.dart

@@ -9,12 +9,12 @@ abstract class Alarm {
 
   factory Alarm.fromJson(Map<String, dynamic> json) {
     if (json.containsKey('alarmType')) {
-      switch (json['alarmType'] as String) {
+      switch (AlarmType.fromJson(json['alarmType'])) {
-        case 'timeFixed':
+        case AlarmType.timeFixed:
           return FixedTimeAlarm.fromJson(json);
-        case 'timeRelative':
+        case AlarmType.timeRelative:
           return RelativeTimeAlarm.fromJson(json);
-        case 'location':
+        case AlarmType.location:
           return LocationAlarm.fromJson(json);
       }
     }
@@ -33,4 +33,11 @@ abstract class Alarm {
   int get hashCode => id.hashCode;
 }
 
-enum AlarmType { timeFixed, timeRelative, location }
+enum AlarmType {
+  timeFixed,
+  timeRelative,
+  location;
+
+  String toJson() => name;
+  static AlarmType fromJson(String json) => values.byName(json);
+}

lib/model/alarm/fixed_time_alarm.dart

@@ -24,7 +24,7 @@ class FixedTimeAlarm implements Alarm {
     return {
       'id': id,
       'triggerAt': triggerAt.toIso8601String(),
-      'alarmType': alarmType,
+      'alarmType': alarmType.toJson(),
     };
   }
 }

lib/model/alarm/location_alarm.dart

@@ -32,7 +32,7 @@ class LocationAlarm implements Alarm {
       'id': id,
       'location': location.toJson(),
       'radiusMeters': radiusMeters,
-      'alarmType': alarmType,
+      'alarmType': alarmType.toJson(),
     };
   }
 }

lib/model/alarm/relative_time_alarm.dart

@@ -4,7 +4,7 @@ class RelativeTimeAlarm implements Alarm {
   @override
   final String id;
 
-  final DateTime triggerAt;
+  final Duration triggerAt;
 
   @override
   final AlarmType alarmType;
@@ -15,7 +15,7 @@ class RelativeTimeAlarm implements Alarm {
   factory RelativeTimeAlarm.fromJson(Map<String, dynamic> json) {
     return RelativeTimeAlarm(
       id: json['id'] as String,
-      triggerAt: DateTime.parse(json['triggerAt'] as String),
+      triggerAt: Duration(minutes: json['triggerAt'] as int),
     );
   }
 
@@ -23,8 +23,8 @@ class RelativeTimeAlarm implements Alarm {
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'triggerAt': triggerAt.toIso8601String(),
+      'triggerAt': triggerAt.inMinutes,
-      'alarmType': alarmType,
+      'alarmType': alarmType.toJson(),
     };
   }
 }

lib/model/requests/create_alarm_request.dart

@@ -1,7 +1,9 @@
-import '../alarm/alarm.dart' show AlarmType;
+import '../alarm/alarm.dart' show AlarmType, Alarm;
 
-class CreateAlarmRequest {
+abstract class CreateAlarmRequest {
   const CreateAlarmRequest({required this.alarmType});
 
   final AlarmType alarmType;
+
+  Alarm toAlarm(String id);
 }

lib/model/requests/create_fixed_time_alarm_request.dart

@@ -12,6 +12,7 @@ class CreateFixedTimeAlarmRequest extends CreateAlarmRequest {
     : triggerAt = alarm.triggerAt,
       super(alarmType: AlarmType.timeFixed);
 
-  FixedTimeAlarm toFixedTimeAlarm(String id) =>
+  @override
+  FixedTimeAlarm toAlarm(String id) =>
       FixedTimeAlarm(id: id, triggerAt: triggerAt!);
 }

lib/model/requests/create_location_alarm_request.dart

@@ -16,6 +16,7 @@ class CreateLocationAlarmRequest extends CreateAlarmRequest {
       radiusMeters = alarm.radiusMeters,
       super(alarmType: AlarmType.location);
 
-  LocationAlarm toLocationAlarm(String id) =>
+  @override
+  LocationAlarm toAlarm(String id) =>
       LocationAlarm(id: id, location: location!, radiusMeters: radiusMeters!);
 }

lib/model/requests/create_relative_time_alarm_request.dart

@@ -3,7 +3,7 @@ import '../alarm/relative_time_alarm.dart';
 import 'create_alarm_request.dart';
 
 class CreateRelativeTimeAlarmRequest extends CreateAlarmRequest {
-  final DateTime? triggerAt;
+  final Duration? triggerAt;
 
   const CreateRelativeTimeAlarmRequest({this.triggerAt})
     : super(alarmType: AlarmType.timeRelative);
@@ -12,6 +12,7 @@ class CreateRelativeTimeAlarmRequest extends CreateAlarmRequest {
     : triggerAt = alarm.triggerAt,
       super(alarmType: AlarmType.timeRelative);
 
-  RelativeTimeAlarm toRelativeTimeAlarm(String id) =>
+  @override
+  RelativeTimeAlarm toAlarm(String id) =>
       RelativeTimeAlarm(id: id, triggerAt: triggerAt!);
 }

lib/pages/task_edit_page.dart

@@ -2,9 +2,13 @@ import 'package:flutter/material.dart';
 
 import '../app_theme.dart';
 import '../model/alarm/alarm.dart';
+import '../model/alarm/fixed_time_alarm.dart';
+import '../model/alarm/location_alarm.dart';
+import '../model/alarm/relative_time_alarm.dart';
 import '../model/requests/create_alarm_request.dart';
 import '../model/requests/create_fixed_time_alarm_request.dart';
 import '../model/requests/create_location_alarm_request.dart';
+import '../model/requests/create_relative_time_alarm_request.dart';
 import '../model/requests/create_task_request.dart';
 import '../model/extensions/controller_context.dart';
 import '../model/task.dart';
@@ -37,7 +41,7 @@ class _TaskEditPageState extends State<TaskEditPage> {
   final formKey = GlobalKey<FormState>(debugLabel: 'taskEditFormKey');
   bool didFormChange = false;
   bool isDueTimeEnabled = false;
-  final List<CreateAlarmRequest> alarms = [];
+  final List<CreateAlarmRequest> alarmRequests = [];
 
   @override
   void didChangeDependencies() {
@@ -56,6 +60,18 @@ class _TaskEditPageState extends State<TaskEditPage> {
         isDueTimeEnabled = true;
       }
       isInitialized = true;
+      alarmRequests.addAll(
+        task!.alarms.map((alarm) {
+          if (alarm is FixedTimeAlarm) {
+            return CreateFixedTimeAlarmRequest.fromAlarm(alarm);
+          } else if (alarm is RelativeTimeAlarm) {
+            return CreateRelativeTimeAlarmRequest.fromAlarm(alarm);
+          } else if (alarm is LocationAlarm) {
+            return CreateLocationAlarmRequest.fromAlarm(alarm);
+          }
+          throw TypeError();
+        }),
+      );
       pageTitle = task!.title;
     }
   }
@@ -151,15 +167,28 @@ class _TaskEditPageState extends State<TaskEditPage> {
                       label: Text('Location'),
                       icon: Icon(Icons.location_on),
                     ),
-                    for (final (index, alarm) in alarms.indexed)
+                    for (final (index, alarmRequest) in alarmRequests.indexed)
-                      AlarmForm(
+                      Row(
-                        request: alarm,
+                        children: [
-                        onChanged: (updated) {
+                          Expanded(
-                          setState(() {
+                            child: AlarmForm(
-                            alarms[index] = updated;
+                              request: alarmRequest,
-                          });
+                              onChanged: (updated) {
-                        },
+                                setState(() {
+                                  alarmRequests[index] = updated;
+                                });
+                              },
+                            ),
+                          ),
+                          IconButton(
+                            onPressed: () => setState(() {
+                              alarmRequests.removeAt(index);
+                            }),
+                            icon: Icon(Icons.close),
+                          ),
+                        ],
                       ),
+                    SizedBox(height: 120),
                   ],
                 ),
               ],
@@ -175,21 +204,34 @@ class _TaskEditPageState extends State<TaskEditPage> {
   }
 
   void onSavePressed() {
-    Navigator.of(context).pop(
+    if (formKey.currentState!.validate()) {
-      CreateTaskRequest(
+      Navigator.of(context).pop(
-        title: titleController.text,
+        CreateTaskRequest(
-        description: descriptionController.text,
+          title: titleController.text,
-        start: null,
+          description: descriptionController.text,
-        due: DateTime.tryParse(
+          start: null,
-          '${dueDateController.text} ${dueTimeController.text}'.trim(),
+          due: DateTime.tryParse(
+            '${dueDateController.text} ${dueTimeController.text}'.trim(),
+          ),
+          isCompleted: false,
+          category: categoryController.text,
+          subtasks: [],
+          url: urlController.text,
+          alarms: alarmRequests.map<Alarm>((e) {
+            if (e is CreateFixedTimeAlarmRequest) {
+              return e.toAlarm(generateId());
+            }
+            if (e is CreateRelativeTimeAlarmRequest) {
+              return e.toAlarm(generateId());
+            }
+            if (e is LocationAlarm) {
+              return e.toAlarm(generateId());
+            }
+            throw TypeError();
+          }).toList(),
         ),
-        isCompleted: false,
+      );
-        category: categoryController.text,
+    }
-        subtasks: [],
-        url: urlController.text,
-        alarms: [],
-      ),
-    );
   }
 
   void onPopInvoked(bool didPop, Object? result) {
@@ -223,12 +265,11 @@ class _TaskEditPageState extends State<TaskEditPage> {
   void onAddAlarmPressed(AlarmType alarmType) {
     switch (alarmType) {
       case AlarmType.location:
-        alarms.add(CreateLocationAlarmRequest());
+        alarmRequests.add(CreateLocationAlarmRequest());
       case AlarmType.timeFixed:
-        alarms.add(CreateFixedTimeAlarmRequest());
+        alarmRequests.add(CreateFixedTimeAlarmRequest());
-
       case AlarmType.timeRelative:
-        alarms.add(CreateFixedTimeAlarmRequest());
+        alarmRequests.add(CreateRelativeTimeAlarmRequest());
     }
     setState(() {});
   }

lib/widgets/alarm_widgets/fixed_time_alarm_form.dart

@@ -26,17 +26,26 @@ class _FixedTimeAlarmFormState extends State<FixedTimeAlarmForm> {
   bool isDueTimeEnabled = false;
 
   @override
-  void initState() {
+  void didChangeDependencies() {
+    if (widget.request.triggerAt != null) {
+      dueDateController.text = getIsoDateString(widget.request.triggerAt!);
+      dueTimeController.text = TimeOfDay.fromDateTime(
+        widget.request.triggerAt!,
+      ).format(context);
+      isDueTimeEnabled = true;
+    }
+
     dueDateController.addListener(onDueDateChanged);
     dueTimeController.addListener(onDueTimeChanged);
 
-    super.initState();
+    super.didChangeDependencies();
   }
 
   @override
   Widget build(BuildContext context) {
     return Flex(
       direction: Axis.horizontal,
+      spacing: AppTheme.formColumnSpacing,
       children: [
         Flexible(
           flex: 3,
@@ -61,14 +70,13 @@ class _FixedTimeAlarmFormState extends State<FixedTimeAlarmForm> {
                 icon: Icon(Icons.calendar_month),
               ),
             ),
-            validator: dateTimeValidator,
+            validator: (value) {
+              return notEmptyValidator(value) ?? dateTimeValidator(value);
+            },
             keyboardType: TextInputType.datetime,
             textInputAction: TextInputAction.next,
           ),
         ),
-        Padding(
-          padding: EdgeInsetsGeometry.only(left: AppTheme.formColumnSpacing),
-        ),
         Flexible(
           flex: 2,
           child: TextFormField(

lib/widgets/alarm_widgets/relative_time_alarm_form.dart

@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 
+import '../../app_theme.dart';
 import '../../model/requests/create_alarm_request.dart';
 import '../../model/requests/create_relative_time_alarm_request.dart';
+import '../../service/validators.dart';
 
-class RelativeTimeAlarmForm extends StatelessWidget {
+class RelativeTimeAlarmForm extends StatefulWidget {
   const RelativeTimeAlarmForm({
     super.key,
     required this.request,
@@ -12,8 +14,134 @@ class RelativeTimeAlarmForm extends StatelessWidget {
   final CreateRelativeTimeAlarmRequest request;
   final ValueChanged<CreateAlarmRequest> onChanged;
 
+  @override
+  State<RelativeTimeAlarmForm> createState() => _RelativeTimeAlarmFormState();
+}
+
+class _RelativeTimeAlarmFormState extends State<RelativeTimeAlarmForm> {
+  final timeController = TextEditingController();
+
+  static const List<DropdownMenuEntry<TimeUnit>> timeUnitOptions = [
+    DropdownMenuEntry<TimeUnit>(value: TimeUnit.minute, label: 'Minutes'),
+    DropdownMenuEntry<TimeUnit>(value: TimeUnit.hour, label: 'Hours'),
+    DropdownMenuEntry<TimeUnit>(value: TimeUnit.day, label: 'Days'),
+  ];
+
+  static const List<DropdownMenuEntry<TimeRelation>> timeRelationOptions = [
+    DropdownMenuEntry<TimeRelation>(
+      value: TimeRelation.before,
+      label: 'Before',
+    ),
+    DropdownMenuEntry<TimeRelation>(value: TimeRelation.after, label: 'After'),
+  ];
+
+  late TimeUnit selectedTimeUnit;
+  late TimeRelation selectedTimeRelation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    if (widget.request.triggerAt == null) {
+      selectedTimeUnit = TimeUnit.minute;
+      selectedTimeRelation = TimeRelation.before;
+      return;
+    }
+
+    final duration = widget.request.triggerAt!;
+
+    selectedTimeRelation = duration.isNegative
+        ? TimeRelation.before
+        : TimeRelation.after;
+
+    final absDuration = duration.abs();
+
+    if (absDuration.inMinutes <= 99 && absDuration.inMinutes % 60 != 0) {
+      selectedTimeUnit = TimeUnit.minute;
+      timeController.text = absDuration.inMinutes.toString();
+    } else if (absDuration.inHours <= 99 && absDuration.inHours % 24 != 0) {
+      selectedTimeUnit = TimeUnit.hour;
+      timeController.text = absDuration.inHours.toString();
+    } else {
+      selectedTimeUnit = TimeUnit.day;
+      timeController.text = absDuration.inDays.toString();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    return const Placeholder();
+    return Flex(
+      direction: Axis.horizontal,
+      spacing: AppTheme.formColumnSpacing,
+      children: [
+        Flexible(
+          flex: 7,
+          child: TextFormField(
+            controller: timeController,
+            maxLength: 2,
+            onChanged: onTimeChanged,
+            validator: (value) =>
+                notEmptyValidator(value) ?? wholeNumberValidator(value),
+            keyboardType: TextInputType.number,
+            textInputAction: TextInputAction.next,
+            decoration: InputDecoration(label: Text('Time'), counterText: ''),
+          ),
+        ),
+        Flexible(
+          flex: 10,
+          child: DropdownMenuFormField<TimeUnit>(
+            dropdownMenuEntries: timeUnitOptions,
+            initialSelection: selectedTimeUnit,
+            showTrailingIcon: false,
+            onSelected: (value) {
+              selectedTimeUnit = value!;
+              onTimeChanged(timeController.text);
+            },
+          ),
+        ),
+        Flexible(
+          flex: 10,
+          child: DropdownMenuFormField<TimeRelation>(
+            dropdownMenuEntries: timeRelationOptions,
+            initialSelection: selectedTimeRelation,
+            showTrailingIcon: false,
+            onSelected: (value) {
+              selectedTimeRelation = value!;
+              onTimeChanged(timeController.text);
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  void onTimeChanged(String value) {
+    int? time = int.tryParse(value);
+    if (wholeNumberValidator(value) != null || time == null) return;
+    Duration duration;
+    int signedTime = selectedTimeRelation.apply(time);
+
+    switch (selectedTimeUnit) {
+      case TimeUnit.minute:
+        duration = Duration(minutes: signedTime);
+      case TimeUnit.hour:
+        duration = Duration(hours: signedTime);
+      case TimeUnit.day:
+        duration = Duration(days: signedTime);
+    }
+
+    widget.onChanged(CreateRelativeTimeAlarmRequest(triggerAt: duration));
   }
 }
+
+enum TimeRelation {
+  before,
+  after;
+
+  int apply(int value) => switch (this) {
+    TimeRelation.before => -value,
+    TimeRelation.after => value,
+  };
+}
+
+enum TimeUnit { minute, hour, day }