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

Reviewed-on: #2

lib/app_theme.dart

@@ -3,8 +3,6 @@ import 'package:flutter/material.dart';
 class AppTheme {
   AppTheme._();
 
-  static const double formColumnSpacing = 12.0;
-
   static ThemeData get lightTheme => _baseTheme(
     colorScheme: ColorScheme.fromSeed(
       seedColor: Colors.indigo,

lib/main.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 
 import 'app_theme.dart';
 import 'model/repositories/local_repository.dart';
-import 'pages/locations_overview_page.dart';
 import 'pages/task_edit_page.dart';
 import 'pages/task_overview_page.dart';
 import 'service/controller_scope.dart';
@@ -40,7 +39,6 @@ class MainApp extends StatelessWidget {
       routes: {
         TaskOverviewPage.routeName: (context) => TaskOverviewPage(),
         TaskEditPage.routeName: (context) => TaskEditPage(),
-        LocationsOverviewPage.routeName: (context) => LocationsOverviewPage(),
       },
       initialRoute: TaskOverviewPage.routeName,
     );

lib/model/latlng.dart

@@ -5,15 +5,6 @@ class LatLng {
   LatLng(this.lat, this.lng);
   LatLng.empty() : lat = 0, lng = 0;
 
-  /// must be formatted 'double, double'. For example 35.35217, 89.19659
-  factory LatLng.fromString(String latLng) {
-    final splitString = latLng.split(',');
-    final lat = double.parse(splitString[0].trim());
-    final lng = double.parse(splitString[1].trim());
-
-    return LatLng(lat, lng);
-  }
-
   factory LatLng.fromJson(Map<String, dynamic> json) {
     return LatLng(json['lat'] as double, json['lng'] as double);
   }
@@ -21,18 +12,4 @@ class LatLng {
   Map<String, double> toJson() {
     return {'lat': lat, 'lng': lng};
   }
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! LatLng) return false;
-    return hashCode == other.hashCode;
-  }
-
-  @override
-  int get hashCode => Object.hash(lat, lng);
-
-  @override
-  String toString() {
-    return '${lat.toString()}, ${lng.toString()}';
-  }
 }

lib/model/location.dart

@@ -1,34 +1,19 @@
 import 'latlng.dart';
 
 class Location {
-  final String name;
   final LatLng coordinates;
   final String address;
 
-  Location({required this.name, required this.coordinates, this.address = ''});
+  Location({required this.coordinates, this.address = ''});
 
   factory Location.fromJson(Map<String, dynamic> json) {
     return Location(
-      name: json['name'] as String,
       address: json['address'] as String,
       coordinates: LatLng.fromJson(json['coordinates']),
     );
   }
 
   Map<String, dynamic> toJson() {
-    return {
+    return {'address': address, 'coordinates': coordinates.toJson()};
-      'name': name,
-      'address': address,
-      'coordinates': coordinates.toJson(),
-    };
   }
-
-  @override
-  bool operator ==(Object other) {
-    if (other is! Location) return false;
-    return hashCode == other.hashCode;
-  }
-
-  @override
-  int get hashCode => coordinates.hashCode;
 }

lib/pages/locations_overview_page.dart

@@ -1,74 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../model/extensions/controller_context.dart';
-import '../model/location.dart';
-import '../service/controllers/location_controller.dart';
-import '../widgets/dialogs/create_location_dialog.dart';
-
-class LocationsOverviewPage extends StatefulWidget {
-  static const routeName = '/locations';
-  const LocationsOverviewPage({super.key});
-
-  @override
-  State<LocationsOverviewPage> createState() => _LocationsOverviewPageState();
-}
-
-class _LocationsOverviewPageState extends State<LocationsOverviewPage> {
-  List<Location> locations = [];
-  @override
-  Widget build(BuildContext context) {
-    locations = context.controller<LocationController>().locations;
-
-    return Scaffold(
-      appBar: AppBar(title: Text('Manage Locations')),
-      body: Padding(
-        padding: EdgeInsetsGeometry.symmetric(
-          horizontal: MediaQuery.of(context).size.width * 0.05,
-        ),
-        child: ListView.builder(
-          itemBuilder: listViewBuilder,
-          itemCount: context.controller<LocationController>().locations.length,
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: onAddLocationButtonPressed,
-        child: Icon(Icons.add),
-      ),
-    );
-  }
-
-  Widget listViewBuilder(BuildContext context, int index) {
-    final location = locations.elementAt(index);
-    final String subtitle = location.address.isEmpty
-        ? location.coordinates.toString()
-        : location.address;
-
-    return ListTile(
-      title: Text(location.name),
-      subtitle: Text(subtitle),
-      onTap: () => onEditLocationButtonPressed(location),
-    );
-  }
-
-  void onAddLocationButtonPressed() async {
-    final result = await showDialog<Location?>(
-      context: context,
-      builder: (context) => CreateLocationDialog(),
-      barrierDismissible: false,
-    );
-    if (mounted && result != null) {
-      context.controller<LocationController>().addLocation(result);
-    }
-  }
-
-  void onEditLocationButtonPressed(Location location) async {
-    final result = await showDialog<Location?>(
-      context: context,
-      builder: (context) => CreateLocationDialog(initialLocation: location),
-      barrierDismissible: false,
-    );
-    if (mounted && result != null) {
-      context.controller<LocationController>().updateLocation(location, result);
-    }
-  }
-}

lib/pages/task_edit_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-import '../app_theme.dart';
 import '../model/callback_models/create_task_request.dart';
 import '../model/extensions/controller_context.dart';
 import '../model/task.dart';
@@ -81,7 +80,7 @@ class _TaskEditPageState extends State<TaskEditPage> {
             horizontal: MediaQuery.of(context).size.width * 0.05,
           ),
           child: Column(
-            spacing: AppTheme.formColumnSpacing,
+            spacing: 12,
             children: [
               SizedBox(height: 6),
               TextFormField(
@@ -168,7 +167,7 @@ class _TaskEditPageState extends State<TaskEditPage> {
           ],
         ),
       ).then((result) {
-        if (result != null && result && mounted) {
+        if (result != null && result && context.mounted) {
           Navigator.of(context).pop();
         }
       });

lib/pages/task_overview_page.dart

@@ -6,7 +6,6 @@ import '../model/task.dart';
 import '../service/controllers/task_controller.dart';
 import '../service/tools.dart';
 import '../widgets/task_dismissible.dart';
-import 'locations_overview_page.dart';
 import 'task_edit_page.dart';
 
 class TaskOverviewPage extends StatefulWidget {
@@ -23,20 +22,7 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: Text('Hallo Yannick')),
-        title: Text('Hallo Yannick'),
-        actions: [
-          PopupMenuButton(
-            itemBuilder: (_) => [
-              PopupMenuItem(
-                onTap: onLocationsButtonTapped,
-                child: Text('Locations'),
-              ),
-            ],
-            icon: Icon(Icons.more_vert),
-          ),
-        ],
-      ),
       body: Padding(
         padding: EdgeInsetsGeometry.symmetric(
           horizontal: MediaQuery.of(context).size.width * 0.05,
@@ -98,13 +84,10 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
         await Navigator.of(context).pushNamed(TaskEditPage.routeName)
             as CreateTaskRequest?;
 
-    if (result != null && mounted) {
+    if (result != null && context.mounted) {
       context.controller<TaskController>().saveTask(
         result.toTask(id: generateId()),
       );
     }
   }
-
-  void onLocationsButtonTapped() =>
-      Navigator.of(context).pushNamed(LocationsOverviewPage.routeName);
 }

lib/service/controllers/location_controller.dart

@@ -12,8 +12,6 @@ class LocationController extends ChangeNotifier {
 
   final List<Location> _locations = [];
 
-  List<Location> get locations => _locations;
-
   Future<void> addLocation(Location location) {
     _locations.add(location);
     notifyListeners();
@@ -26,16 +24,6 @@ class LocationController extends ChangeNotifier {
     return _repository.deleteLocation(location);
   }
 
-  Future<void> updateLocation(Location oldLocation, Location newLocation) {
-    final index = _locations.indexOf(oldLocation);
-    _locations.remove(oldLocation);
-    _locations.insert(index, newLocation);
-    notifyListeners();
-    return _repository
-        .deleteLocation(oldLocation)
-        .whenComplete(() => _repository.createLocation(newLocation));
-  }
-
   Future<void> _loadLocations() {
     _locations.clear();
     return _repository.loadLocations().then(

lib/service/validators.dart

@@ -12,17 +12,3 @@ String? dateTimeValidator(String? value) {
 
   return DateTime.tryParse(value) != null ? null : 'Not a date format';
 }
-
-String? coordinatesValidator(String? value) {
-  if (value == null || value.isEmpty) return null;
-
-  if (RegExp(r'^\d+\.?\d*, *\d+\.?\d*$').hasMatch(value)) {
-    return null;
-  }
-  return 'Not a valid coordinate format';
-}
-
-String? notEmptyValidator(String? value) {
-  if (value != null && value.isNotEmpty) return null;
-  return 'Can\'t be empty';
-}

lib/widgets/dialogs/create_location_dialog.dart

@@ -1,93 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../app_theme.dart';
-import '../../model/latlng.dart';
-import '../../model/location.dart';
-import '../../service/validators.dart';
-
-class CreateLocationDialog extends StatefulWidget {
-  const CreateLocationDialog({super.key, this.initialLocation});
-  final Location? initialLocation;
-
-  @override
-  State<CreateLocationDialog> createState() => _CreateLocationDialogState();
-}
-
-class _CreateLocationDialogState extends State<CreateLocationDialog> {
-  final nameController = TextEditingController();
-  final addressController = TextEditingController();
-  final coordinatesController = TextEditingController();
-  final formKey = GlobalKey<FormState>(debugLabel: 'Create Location Form');
-
-  @override
-  void initState() {
-    if (widget.initialLocation != null) {
-      nameController.text = widget.initialLocation!.name;
-      addressController.text = widget.initialLocation!.address;
-      coordinatesController.text = widget.initialLocation!.coordinates
-          .toString();
-    }
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      actions: [
-        TextButton(onPressed: onCancelPressed, child: Text('Cancel')),
-        TextButton(onPressed: onSavePressed, child: Text('Save')),
-      ],
-      title: Text('Create Location'),
-      content: Form(
-        key: formKey,
-        child: Column(
-          spacing: AppTheme.formColumnSpacing,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextFormField(
-              autofocus: true,
-              textInputAction: TextInputAction.next,
-              controller: nameController,
-              keyboardType: TextInputType.text,
-              decoration: InputDecoration(labelText: 'Name'),
-              validator: notEmptyValidator,
-            ),
-            TextFormField(
-              textInputAction: TextInputAction.next,
-              controller: addressController,
-              keyboardType: TextInputType.streetAddress,
-              decoration: InputDecoration(labelText: 'Address (optional)'),
-            ),
-            TextFormField(
-              textInputAction: TextInputAction.done,
-              controller: coordinatesController,
-              onFieldSubmitted: (_) => onSavePressed(),
-              keyboardType: TextInputType.numberWithOptions(),
-              decoration: InputDecoration(
-                labelText: 'Coordinates',
-                hint: Text('25.5892, 50.5051662'),
-              ),
-              validator: (value) {
-                return notEmptyValidator(value) ?? coordinatesValidator(value);
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  void onCancelPressed() => Navigator.of(context).pop();
-
-  void onSavePressed() {
-    if (formKey.currentState!.validate()) {
-      Navigator.of(context).pop(
-        Location(
-          name: nameController.text,
-          coordinates: LatLng.fromString(coordinatesController.text),
-          address: addressController.text,
-        ),
-      );
-    }
-  }
-}

lib/widgets/task_dismissible.dart

@@ -16,10 +16,7 @@ class TaskDismissible extends StatelessWidget {
       key: key!,
       direction: DismissDirection.startToEnd,
       background: Container(
-        decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.error,
-          borderRadius: BorderRadius.circular(12),
-          color: Theme.of(context).colorScheme.error,
-        ),
         child: Align(
           alignment: AlignmentGeometry.centerLeft,
           child: Padding(