From 02469faf5266c5453be03cd575da8708dd087c0f Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 17 Jul 2026 17:08:31 +0200 Subject: [PATCH] refactored project structure --- lib/main.dart | 2 +- lib/model/{ => alarm}/alarm.dart | 0 lib/model/{ => alarm}/fixed_time_alarm.dart | 0 lib/model/{ => alarm}/location_alarm.dart | 2 +- lib/model/{ => alarm}/relative_time_alarm.dart | 0 .../create_alarm_request.dart | 2 +- .../create_fixed_time_alarm_request.dart | 2 +- .../create_location_alarm_request.dart | 2 +- .../create_relative_time_alarm_request.dart | 2 +- .../create_task_request.dart | 0 lib/pages/task_edit_page.dart | 10 +++++----- lib/pages/task_overview_page.dart | 2 +- .../repositories/interfaces/alarm_repository.dart | 2 +- .../repositories/interfaces/location_repository.dart | 2 +- .../repositories/interfaces/task_repository.dart | 2 +- lib/{model => }/repositories/local_repository.dart | 6 +++--- lib/service/controllers/alarm_controller.dart | 4 ++-- lib/service/controllers/location_controller.dart | 2 +- lib/service/controllers/task_controller.dart | 2 +- lib/widgets/alarm_widgets/alarm_form_widget.dart | 10 +++++----- lib/widgets/alarm_widgets/fixed_time_alarm_form.dart | 4 ++-- lib/widgets/alarm_widgets/location_alarm_form.dart | 4 ++-- .../alarm_widgets/relative_time_alarm_form.dart | 4 ++-- 23 files changed, 33 insertions(+), 33 deletions(-) rename lib/model/{ => alarm}/alarm.dart (100%) rename lib/model/{ => alarm}/fixed_time_alarm.dart (100%) rename lib/model/{ => alarm}/location_alarm.dart (97%) rename lib/model/{ => alarm}/relative_time_alarm.dart (100%) rename lib/model/{callback_models => requests}/create_alarm_request.dart (71%) rename lib/model/{callback_models => requests}/create_fixed_time_alarm_request.dart (88%) rename lib/model/{callback_models => requests}/create_location_alarm_request.dart (86%) rename lib/model/{callback_models => requests}/create_relative_time_alarm_request.dart (83%) rename lib/model/{callback_models => requests}/create_task_request.dart (100%) rename lib/{model => }/repositories/interfaces/alarm_repository.dart (86%) rename lib/{model => }/repositories/interfaces/location_repository.dart (88%) rename lib/{model => }/repositories/interfaces/task_repository.dart (93%) rename lib/{model => }/repositories/local_repository.dart (97%) diff --git a/lib/main.dart b/lib/main.dart index 6836f33..7b8dd67 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'app_theme.dart'; -import 'model/repositories/local_repository.dart'; +import 'repositories/local_repository.dart'; import 'pages/locations_overview_page.dart'; import 'pages/task_edit_page.dart'; import 'pages/task_overview_page.dart'; diff --git a/lib/model/alarm.dart b/lib/model/alarm/alarm.dart similarity index 100% rename from lib/model/alarm.dart rename to lib/model/alarm/alarm.dart diff --git a/lib/model/fixed_time_alarm.dart b/lib/model/alarm/fixed_time_alarm.dart similarity index 100% rename from lib/model/fixed_time_alarm.dart rename to lib/model/alarm/fixed_time_alarm.dart diff --git a/lib/model/location_alarm.dart b/lib/model/alarm/location_alarm.dart similarity index 97% rename from lib/model/location_alarm.dart rename to lib/model/alarm/location_alarm.dart index 695c6e7..68f3dce 100644 --- a/lib/model/location_alarm.dart +++ b/lib/model/alarm/location_alarm.dart @@ -1,5 +1,5 @@ import 'alarm.dart'; -import 'location.dart'; +import '../location.dart'; class LocationAlarm implements Alarm { @override diff --git a/lib/model/relative_time_alarm.dart b/lib/model/alarm/relative_time_alarm.dart similarity index 100% rename from lib/model/relative_time_alarm.dart rename to lib/model/alarm/relative_time_alarm.dart diff --git a/lib/model/callback_models/create_alarm_request.dart b/lib/model/requests/create_alarm_request.dart similarity index 71% rename from lib/model/callback_models/create_alarm_request.dart rename to lib/model/requests/create_alarm_request.dart index dff36b8..6e438d9 100644 --- a/lib/model/callback_models/create_alarm_request.dart +++ b/lib/model/requests/create_alarm_request.dart @@ -1,4 +1,4 @@ -import '../alarm.dart' show AlarmType; +import '../alarm/alarm.dart' show AlarmType; class CreateAlarmRequest { const CreateAlarmRequest({required this.alarmType}); diff --git a/lib/model/callback_models/create_fixed_time_alarm_request.dart b/lib/model/requests/create_fixed_time_alarm_request.dart similarity index 88% rename from lib/model/callback_models/create_fixed_time_alarm_request.dart rename to lib/model/requests/create_fixed_time_alarm_request.dart index 7bdeb06..e9825b4 100644 --- a/lib/model/callback_models/create_fixed_time_alarm_request.dart +++ b/lib/model/requests/create_fixed_time_alarm_request.dart @@ -1,4 +1,4 @@ -import '../alarm.dart'; +import '../alarm/alarm.dart'; import 'create_alarm_request.dart'; class CreateFixedTimeAlarmRequest extends CreateAlarmRequest { diff --git a/lib/model/callback_models/create_location_alarm_request.dart b/lib/model/requests/create_location_alarm_request.dart similarity index 86% rename from lib/model/callback_models/create_location_alarm_request.dart rename to lib/model/requests/create_location_alarm_request.dart index 8e0c868..c6ae001 100644 --- a/lib/model/callback_models/create_location_alarm_request.dart +++ b/lib/model/requests/create_location_alarm_request.dart @@ -1,4 +1,4 @@ -import '../alarm.dart' show AlarmType; +import '../alarm/alarm.dart' show AlarmType; import '../location.dart'; import 'create_alarm_request.dart'; diff --git a/lib/model/callback_models/create_relative_time_alarm_request.dart b/lib/model/requests/create_relative_time_alarm_request.dart similarity index 83% rename from lib/model/callback_models/create_relative_time_alarm_request.dart rename to lib/model/requests/create_relative_time_alarm_request.dart index 93ea8fb..8b7d522 100644 --- a/lib/model/callback_models/create_relative_time_alarm_request.dart +++ b/lib/model/requests/create_relative_time_alarm_request.dart @@ -1,4 +1,4 @@ -import '../alarm.dart' show AlarmType; +import '../alarm/alarm.dart' show AlarmType; import 'create_alarm_request.dart'; class CreateRelativeTimeAlarmRequest extends CreateAlarmRequest { diff --git a/lib/model/callback_models/create_task_request.dart b/lib/model/requests/create_task_request.dart similarity index 100% rename from lib/model/callback_models/create_task_request.dart rename to lib/model/requests/create_task_request.dart diff --git a/lib/pages/task_edit_page.dart b/lib/pages/task_edit_page.dart index 91bea9f..d225b61 100644 --- a/lib/pages/task_edit_page.dart +++ b/lib/pages/task_edit_page.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import '../app_theme.dart'; -import '../model/alarm.dart'; -import '../model/callback_models/create_alarm_request.dart'; -import '../model/callback_models/create_fixed_time_alarm_request.dart'; -import '../model/callback_models/create_location_alarm_request.dart'; -import '../model/callback_models/create_task_request.dart'; +import '../model/alarm/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_task_request.dart'; import '../model/extensions/controller_context.dart'; import '../model/task.dart'; import '../service/controllers/task_controller.dart'; diff --git a/lib/pages/task_overview_page.dart b/lib/pages/task_overview_page.dart index 43aa664..12de216 100644 --- a/lib/pages/task_overview_page.dart +++ b/lib/pages/task_overview_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../model/callback_models/create_task_request.dart'; +import '../model/requests/create_task_request.dart'; import '../model/extensions/controller_context.dart'; import '../model/task.dart'; import '../service/controllers/task_controller.dart'; diff --git a/lib/model/repositories/interfaces/alarm_repository.dart b/lib/repositories/interfaces/alarm_repository.dart similarity index 86% rename from lib/model/repositories/interfaces/alarm_repository.dart rename to lib/repositories/interfaces/alarm_repository.dart index 7518a9b..d376a42 100644 --- a/lib/model/repositories/interfaces/alarm_repository.dart +++ b/lib/repositories/interfaces/alarm_repository.dart @@ -1,4 +1,4 @@ -import '../../alarm.dart'; +import '../../model/alarm/alarm.dart'; abstract class AlarmRepository { // Create diff --git a/lib/model/repositories/interfaces/location_repository.dart b/lib/repositories/interfaces/location_repository.dart similarity index 88% rename from lib/model/repositories/interfaces/location_repository.dart rename to lib/repositories/interfaces/location_repository.dart index 04db6b1..b0c0053 100644 --- a/lib/model/repositories/interfaces/location_repository.dart +++ b/lib/repositories/interfaces/location_repository.dart @@ -1,4 +1,4 @@ -import '../../location.dart'; +import '../../model/location.dart'; abstract class LocationRepository { // Create diff --git a/lib/model/repositories/interfaces/task_repository.dart b/lib/repositories/interfaces/task_repository.dart similarity index 93% rename from lib/model/repositories/interfaces/task_repository.dart rename to lib/repositories/interfaces/task_repository.dart index 703a4de..e18925e 100644 --- a/lib/model/repositories/interfaces/task_repository.dart +++ b/lib/repositories/interfaces/task_repository.dart @@ -1,4 +1,4 @@ -import '../../task.dart'; +import '../../model/task.dart'; abstract class TaskRepository { // Create diff --git a/lib/model/repositories/local_repository.dart b/lib/repositories/local_repository.dart similarity index 97% rename from lib/model/repositories/local_repository.dart rename to lib/repositories/local_repository.dart index de6ab1a..3e77884 100644 --- a/lib/model/repositories/local_repository.dart +++ b/lib/repositories/local_repository.dart @@ -2,9 +2,9 @@ import 'dart:convert'; import 'package:shared_preferences/shared_preferences.dart'; -import '../alarm.dart'; -import '../location.dart'; -import '../task.dart'; +import '../model/alarm/alarm.dart'; +import '../model/location.dart'; +import '../model/task.dart'; import 'interfaces/alarm_repository.dart'; import 'interfaces/location_repository.dart'; import 'interfaces/task_repository.dart'; diff --git a/lib/service/controllers/alarm_controller.dart b/lib/service/controllers/alarm_controller.dart index 985ae25..55775da 100644 --- a/lib/service/controllers/alarm_controller.dart +++ b/lib/service/controllers/alarm_controller.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../model/alarm.dart'; -import '../../model/repositories/interfaces/alarm_repository.dart'; +import '../../model/alarm/alarm.dart'; +import '../../repositories/interfaces/alarm_repository.dart'; class AlarmController extends ChangeNotifier { AlarmController(AlarmRepository repository) : _repository = repository { diff --git a/lib/service/controllers/location_controller.dart b/lib/service/controllers/location_controller.dart index cba76c1..9d8a49d 100644 --- a/lib/service/controllers/location_controller.dart +++ b/lib/service/controllers/location_controller.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import '../../model/location.dart'; -import '../../model/repositories/interfaces/location_repository.dart'; +import '../../repositories/interfaces/location_repository.dart'; class LocationController extends ChangeNotifier { LocationController(LocationRepository repository) : _repository = repository { diff --git a/lib/service/controllers/task_controller.dart b/lib/service/controllers/task_controller.dart index 2e9bba6..032a0f6 100644 --- a/lib/service/controllers/task_controller.dart +++ b/lib/service/controllers/task_controller.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart' show ChangeNotifier; -import '../../model/repositories/interfaces/task_repository.dart'; +import '../../repositories/interfaces/task_repository.dart'; import '../../model/task.dart'; class TaskController extends ChangeNotifier { diff --git a/lib/widgets/alarm_widgets/alarm_form_widget.dart b/lib/widgets/alarm_widgets/alarm_form_widget.dart index b684560..4303df4 100644 --- a/lib/widgets/alarm_widgets/alarm_form_widget.dart +++ b/lib/widgets/alarm_widgets/alarm_form_widget.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import '../../model/alarm.dart' show AlarmType; -import '../../model/callback_models/create_alarm_request.dart'; -import '../../model/callback_models/create_fixed_time_alarm_request.dart'; -import '../../model/callback_models/create_location_alarm_request.dart'; -import '../../model/callback_models/create_relative_time_alarm_request.dart'; +import '../../model/alarm/alarm.dart' show AlarmType; +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 'fixed_time_alarm_form.dart'; import 'location_alarm_form.dart'; import 'relative_time_alarm_form.dart'; diff --git a/lib/widgets/alarm_widgets/fixed_time_alarm_form.dart b/lib/widgets/alarm_widgets/fixed_time_alarm_form.dart index ac4be9e..6f34537 100644 --- a/lib/widgets/alarm_widgets/fixed_time_alarm_form.dart +++ b/lib/widgets/alarm_widgets/fixed_time_alarm_form.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../model/callback_models/create_alarm_request.dart'; -import '../../model/callback_models/create_fixed_time_alarm_request.dart'; +import '../../model/requests/create_alarm_request.dart'; +import '../../model/requests/create_fixed_time_alarm_request.dart'; class FixedTimeAlarmForm extends StatelessWidget { const FixedTimeAlarmForm({ diff --git a/lib/widgets/alarm_widgets/location_alarm_form.dart b/lib/widgets/alarm_widgets/location_alarm_form.dart index 45f94a7..6124583 100644 --- a/lib/widgets/alarm_widgets/location_alarm_form.dart +++ b/lib/widgets/alarm_widgets/location_alarm_form.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../model/callback_models/create_alarm_request.dart'; -import '../../model/callback_models/create_location_alarm_request.dart'; +import '../../model/requests/create_alarm_request.dart'; +import '../../model/requests/create_location_alarm_request.dart'; class LocationAlarmForm extends StatelessWidget { const LocationAlarmForm({ diff --git a/lib/widgets/alarm_widgets/relative_time_alarm_form.dart b/lib/widgets/alarm_widgets/relative_time_alarm_form.dart index c382860..f5cd82b 100644 --- a/lib/widgets/alarm_widgets/relative_time_alarm_form.dart +++ b/lib/widgets/alarm_widgets/relative_time_alarm_form.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../../model/callback_models/create_alarm_request.dart'; -import '../../model/callback_models/create_relative_time_alarm_request.dart'; +import '../../model/requests/create_alarm_request.dart'; +import '../../model/requests/create_relative_time_alarm_request.dart'; class RelativeTimeAlarmForm extends StatelessWidget { const RelativeTimeAlarmForm({