refactored project structure

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';

lib/model/alarm/location_alarm.dart

@@ -1,5 +1,5 @@
 import 'alarm.dart';
-import 'location.dart';
+import '../location.dart';
 
 class LocationAlarm implements Alarm {
   @override

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});

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 {

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';
 

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 {

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/alarm/alarm.dart';
-import '../model/callback_models/create_alarm_request.dart';
+import '../model/requests/create_alarm_request.dart';
-import '../model/callback_models/create_fixed_time_alarm_request.dart';
+import '../model/requests/create_fixed_time_alarm_request.dart';
-import '../model/callback_models/create_location_alarm_request.dart';
+import '../model/requests/create_location_alarm_request.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';

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';

lib/repositories/interfaces/alarm_repository.dart

@@ -1,4 +1,4 @@
-import '../../alarm.dart';
+import '../../model/alarm/alarm.dart';
 
 abstract class AlarmRepository {
   // Create

lib/repositories/interfaces/location_repository.dart

@@ -1,4 +1,4 @@
-import '../../location.dart';
+import '../../model/location.dart';
 
 abstract class LocationRepository {
   // Create

lib/repositories/interfaces/task_repository.dart

@@ -1,4 +1,4 @@
-import '../../task.dart';
+import '../../model/task.dart';
 
 abstract class TaskRepository {
   // Create

lib/repositories/local_repository.dart

@@ -2,9 +2,9 @@ import 'dart:convert';
 
 import 'package:shared_preferences/shared_preferences.dart';
 
-import '../alarm.dart';
+import '../model/alarm/alarm.dart';
-import '../location.dart';
+import '../model/location.dart';
-import '../task.dart';
+import '../model/task.dart';
 import 'interfaces/alarm_repository.dart';
 import 'interfaces/location_repository.dart';
 import 'interfaces/task_repository.dart';

lib/service/controllers/alarm_controller.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../model/alarm.dart';
+import '../../model/alarm/alarm.dart';
-import '../../model/repositories/interfaces/alarm_repository.dart';
+import '../../repositories/interfaces/alarm_repository.dart';
 
 class AlarmController extends ChangeNotifier {
   AlarmController(AlarmRepository repository) : _repository = repository {

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 {

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 {

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/alarm/alarm.dart' show AlarmType;
-import '../../model/callback_models/create_alarm_request.dart';
+import '../../model/requests/create_alarm_request.dart';
-import '../../model/callback_models/create_fixed_time_alarm_request.dart';
+import '../../model/requests/create_fixed_time_alarm_request.dart';
-import '../../model/callback_models/create_location_alarm_request.dart';
+import '../../model/requests/create_location_alarm_request.dart';
-import '../../model/callback_models/create_relative_time_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';

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/requests/create_alarm_request.dart';
-import '../../model/callback_models/create_fixed_time_alarm_request.dart';
+import '../../model/requests/create_fixed_time_alarm_request.dart';
 
 class FixedTimeAlarmForm extends StatelessWidget {
   const FixedTimeAlarmForm({

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/requests/create_alarm_request.dart';
-import '../../model/callback_models/create_location_alarm_request.dart';
+import '../../model/requests/create_location_alarm_request.dart';
 
 class LocationAlarmForm extends StatelessWidget {
   const LocationAlarmForm({

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/requests/create_alarm_request.dart';
-import '../../model/callback_models/create_relative_time_alarm_request.dart';
+import '../../model/requests/create_relative_time_alarm_request.dart';
 
 class RelativeTimeAlarmForm extends StatelessWidget {
   const RelativeTimeAlarmForm({