Feature: dismissible tasks #1

Merged
marco merged 12 commits from development into main 2026-06-19 00:36:43 +02:00
3 changed files with 21 additions and 2 deletions
Showing only changes of commit 82a74a66b5 - Show all commits
+1
View File
@@ -2,6 +2,7 @@ import 'location_alarm.dart';
import 'time_alarm.dart';
abstract class Alarm {
String get id;
String get taskId;
Map<String, dynamic> toJson();
+6
View File
@@ -2,6 +2,9 @@ import 'alarm.dart';
import 'location.dart';
class LocationAlarm implements Alarm {
@override
final String id;
@override
final String taskId;
@@ -10,6 +13,7 @@ class LocationAlarm implements Alarm {
final int radiusMeters;
const LocationAlarm({
required this.id,
required this.taskId,
required this.location,
required this.radiusMeters,
@@ -17,6 +21,7 @@ class LocationAlarm implements Alarm {
factory LocationAlarm.fromJson(Map<String, dynamic> json) {
return LocationAlarm(
id: json['id'] as String,
taskId: json['taskId'] as String,
location: Location.fromJson(json['location'] as Map<String, dynamic>),
radiusMeters: json['radiusMeters'] as int,
@@ -26,6 +31,7 @@ class LocationAlarm implements Alarm {
@override
Map<String, dynamic> toJson() {
return {
'id': id,
'taskId': taskId,
'location': location.toJson(),
'radiusMeters': radiusMeters,
+14 -2
View File
@@ -1,15 +1,23 @@
import 'alarm.dart';
class TimeAlarm implements Alarm {
@override
final String id;
@override
final String taskId;
final DateTime triggerAt;
const TimeAlarm({required this.taskId, required this.triggerAt});
const TimeAlarm({
required this.id,
required this.taskId,
required this.triggerAt,
});
factory TimeAlarm.fromJson(Map<String, dynamic> json) {
return TimeAlarm(
id: json['id'] as String,
taskId: json['taskId'] as String,
triggerAt: DateTime.parse(json['triggerAt'] as String),
);
@@ -17,6 +25,10 @@ class TimeAlarm implements Alarm {
@override
Map<String, dynamic> toJson() {
return {'taskId': taskId, 'triggerAt': triggerAt.toIso8601String()};
return {
'id': id,
'taskId': taskId,
'triggerAt': triggerAt.toIso8601String(),
};
}
}