Merge pull request 'Added app theming' (#2) from development into main

Reviewed-on: #2

lib/app_theme.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  AppTheme._();
+
+  static ThemeData get lightTheme => _baseTheme(
+    colorScheme: ColorScheme.fromSeed(
+      seedColor: Colors.indigo,
+      brightness: Brightness.light,
+    ),
+  );
+
+  static ThemeData get darkTheme => _baseTheme(
+    colorScheme: ColorScheme.fromSeed(
+      seedColor: Colors.indigo,
+      brightness: Brightness.dark,
+    ),
+  );
+
+  static ThemeData _baseTheme({required ColorScheme colorScheme}) {
+    final theme = ThemeData(useMaterial3: true, colorScheme: colorScheme);
+    final universalBorderRadius = BorderRadius.circular(12);
+
+    return theme.copyWith(
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(borderRadius: universalBorderRadius),
+      ),
+
+      listTileTheme: ListTileThemeData(
+        shape: RoundedRectangleBorder(
+          borderRadius: universalBorderRadius,
+          side: BorderSide(color: colorScheme.secondaryContainer, width: 2),
+        ),
+      ),
+    );
+  }
+}

lib/main.dart

@@ -1,10 +1,13 @@
 import 'package:flutter/material.dart';
 
+import 'app_theme.dart';
 import 'model/repositories/local_repository.dart';
 import 'pages/task_edit_page.dart';
 import 'pages/task_overview_page.dart';
 import 'service/controller_scope.dart';
-import 'service/task_controller.dart';
+import 'service/controllers/alarm_controller.dart';
+import 'service/controllers/location_controller.dart';
+import 'service/controllers/task_controller.dart';
 
 void main() async {
   final repository = LocalRepository();
@@ -13,9 +16,15 @@ void main() async {
 
   runApp(
     ControllerScope(
+      controller: LocationController(repository),
+      child: ControllerScope(
+        controller: AlarmController(repository),
+        child: ControllerScope(
           controller: TaskController(repository),
           child: const MainApp(),
         ),
+      ),
+    ),
   );
 }
 
@@ -25,6 +34,8 @@ class MainApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      theme: AppTheme.lightTheme,
+      darkTheme: AppTheme.darkTheme,
       routes: {
         TaskOverviewPage.routeName: (context) => TaskOverviewPage(),
         TaskEditPage.routeName: (context) => TaskEditPage(),

lib/model/callback_models/create_task_request.dart

@@ -1,4 +1,3 @@
-import '../location.dart';
 import '../task.dart';
 
 class CreateTaskRequest {

lib/model/repositories/local_repository.dart

@@ -22,7 +22,12 @@ class LocalRepository
     if (_prefs == null) {
       await SharedPreferencesWithCache.create(
         cacheOptions: const SharedPreferencesWithCacheOptions(
-          allowList: <String>{_tasksKey, _taskOrderKey},
+          allowList: <String>{
+            _tasksKey,
+            _taskOrderKey,
+            _alarmsKey,
+            _locationsKey,
+          },
         ),
       ).then((value) => _prefs = value);
     }

lib/pages/task_edit_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import '../model/callback_models/create_task_request.dart';
 import '../model/extensions/controller_context.dart';
 import '../model/task.dart';
-import '../service/task_controller.dart';
+import '../service/controllers/task_controller.dart';
 import '../service/tools.dart';
 import '../widgets/time_selector.dart';
 
@@ -80,7 +80,9 @@ class _TaskEditPageState extends State<TaskEditPage> {
             horizontal: MediaQuery.of(context).size.width * 0.05,
           ),
           child: Column(
+            spacing: 12,
             children: [
+              SizedBox(height: 6),
               TextFormField(
                 autofocus: true,
                 controller: titleController,

lib/pages/task_overview_page.dart

@@ -3,8 +3,9 @@ import 'package:flutter/material.dart';
 import '../model/callback_models/create_task_request.dart';
 import '../model/extensions/controller_context.dart';
 import '../model/task.dart';
-import '../service/task_controller.dart';
+import '../service/controllers/task_controller.dart';
 import '../service/tools.dart';
+import '../widgets/task_dismissible.dart';
 import 'task_edit_page.dart';
 
 class TaskOverviewPage extends StatefulWidget {
@@ -21,12 +22,17 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(),
+      appBar: AppBar(title: Text('Hallo Yannick')),
-      body: ReorderableListView.builder(
+      body: Padding(
+        padding: EdgeInsetsGeometry.symmetric(
+          horizontal: MediaQuery.of(context).size.width * 0.05,
+        ),
+        child: ReorderableListView.builder(
           itemBuilder: itemBuilder,
           itemCount: tasks.length,
           onReorderItem: context.controller<TaskController>().reorderTask,
         ),
+      ),
       floatingActionButton: FloatingActionButton(
         onPressed: onCreateTaskTapped,
         child: Icon(Icons.add),
@@ -37,8 +43,14 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
   Widget itemBuilder(BuildContext context, int index) {
     final task = tasks.elementAt(index);
 
-    return ListTile(
+    return Padding(
       key: Key(task.id),
+      padding: const EdgeInsets.only(bottom: 12),
+      child: TaskDismissible(
+        key: Key(task.id),
+        onDismissedRight: () =>
+            context.controller<TaskController>().deleteTask(task),
+        child: ListTile(
           title: Text(task.title),
           subtitle: task.description.isNotEmpty ? Text(task.description) : null,
           trailing: Checkbox(
@@ -55,6 +67,8 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
               );
             }
           },
+        ),
+      ),
     );
   }
 

lib/service/controllers/alarm_controller.dart

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

lib/service/controllers/location_controller.dart

@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+
+import '../../model/location.dart';
+import '../../model/repositories/interfaces/location_repository.dart';
+
+class LocationController extends ChangeNotifier {
+  LocationController(LocationRepository repository) : _repository = repository {
+    _loadLocations();
+  }
+
+  final LocationRepository _repository;
+
+  final List<Location> _locations = [];
+
+  Future<void> addLocation(Location location) {
+    _locations.add(location);
+    notifyListeners();
+    return _repository.createLocation(location);
+  }
+
+  Future<void> deleteLocation(Location location) {
+    _locations.remove(location);
+    notifyListeners();
+    return _repository.deleteLocation(location);
+  }
+
+  Future<void> _loadLocations() {
+    _locations.clear();
+    return _repository.loadLocations().then(
+      (value) => _locations.addAll(value),
+    );
+  }
+}

lib/service/controllers/task_controller.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart' show ChangeNotifier;
 
-import '../model/repositories/interfaces/task_repository.dart';
+import '../../model/repositories/interfaces/task_repository.dart';
-import '../model/task.dart';
+import '../../model/task.dart';
 
 class TaskController extends ChangeNotifier {
   TaskController(TaskRepository repository) : _repository = repository {

lib/widgets/task_dismissible.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+
+class TaskDismissible extends StatelessWidget {
+  const TaskDismissible({
+    required super.key,
+    this.onDismissedRight,
+    required this.child,
+  });
+
+  final VoidCallback? onDismissedRight;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return Dismissible(
+      key: key!,
+      direction: DismissDirection.startToEnd,
+      background: Container(
+        color: Theme.of(context).colorScheme.error,
+        child: Align(
+          alignment: AlignmentGeometry.centerLeft,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            child: Icon(
+              Icons.delete,
+              color: Theme.of(context).colorScheme.onError,
+            ),
+          ),
+        ),
+      ),
+      onDismissed: onDismissed,
+      child: child,
+    );
+  }
+
+  void onDismissed(DismissDirection direction) {
+    if (direction == DismissDirection.startToEnd && onDismissedRight != null) {
+      onDismissedRight!();
+    }
+  }
+}