19 Commits
Author SHA1 Message Date
marco 3ceb0896a4 created alram form widget placeholders 2026-07-17 16:58:05 +02:00
marco c7ff39e55c refactored alarm models 2026-07-17 16:57:55 +02:00
marco a33c4bbb12 changed theme 2026-07-16 16:45:18 +02:00
marco 5fc290dbcb added alarm type 2026-07-16 16:45:01 +02:00
marco 463a2c8fda added alarmtype enum 2026-07-16 16:44:45 +02:00
marco dcae40497d removed required fields 2026-07-16 16:15:33 +02:00
marco a440c29043 made fields nullable 2026-07-16 16:13:25 +02:00
marco e1eafdca59 added validator for whole numbers 2026-07-16 16:10:33 +02:00
marco 4af3683b73 changed dropdownmenu and button theme 2026-07-16 16:10:22 +02:00
marco 505aff4232 added create models for alarms 2026-07-16 16:10:02 +02:00
marco 21ef9c4ab5 added location overview screen 2026-06-19 14:03:05 +02:00
marco 9d0cb7668d added updateLocation function 2026-06-19 14:02:35 +02:00
marco 383de6a33b added from string constructor 2026-06-19 14:02:11 +02:00
marco 9e950a1767 added validators 2026-06-19 14:01:58 +02:00
marco 20a7c88d2f fixed warning 2026-06-19 13:48:55 +02:00
marco e8057a8cc6 added getter for locations 2026-06-19 13:21:23 +02:00
marco a71cc454eb extended location and latlng models 2026-06-19 13:21:08 +02:00
marco f1c1578620 added const for formColumnSpacing 2026-06-19 13:20:46 +02:00
marco 5ef22c7b50 added border radius to background 2026-06-19 01:43:14 +02:00
24 changed files with 616 additions and 61 deletions
+22
View File
@@ -3,6 +3,8 @@ 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,
@@ -32,6 +34,26 @@ class AppTheme {
side: BorderSide(color: colorScheme.secondaryContainer, width: 2),
),
),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(
minimumSize: WidgetStatePropertyAll(Size(0, 56)),
shape: WidgetStateOutlinedBorder.resolveWith(
(states) =>
RoundedRectangleBorder(borderRadius: universalBorderRadius),
),
),
),
dropdownMenuTheme: DropdownMenuThemeData(
inputDecorationTheme: InputDecorationThemeData(
border: OutlineInputBorder(borderRadius: universalBorderRadius),
),
menuStyle: MenuStyle(
shape: WidgetStateOutlinedBorder.resolveWith(
(states) =>
RoundedRectangleBorder(borderRadius: universalBorderRadius),
),
),
),
);
}
}
+2
View File
@@ -2,6 +2,7 @@ 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';
@@ -39,6 +40,7 @@ class MainApp extends StatelessWidget {
routes: {
TaskOverviewPage.routeName: (context) => TaskOverviewPage(),
TaskEditPage.routeName: (context) => TaskEditPage(),
LocationsOverviewPage.routeName: (context) => LocationsOverviewPage(),
},
initialRoute: TaskOverviewPage.routeName,
);
+14 -7
View File
@@ -1,18 +1,23 @@
import 'fixed_time_alarm.dart';
import 'location_alarm.dart';
import 'time_alarm.dart';
import 'relative_time_alarm.dart';
abstract class Alarm {
String get id;
String get taskId;
AlarmType get alarmType;
Map<String, dynamic> toJson();
factory Alarm.fromJson(Map<String, dynamic> json) {
if (json.containsKey('triggerAt')) {
return TimeAlarm.fromJson(json);
}
if (json.containsKey('location')) {
return LocationAlarm.fromJson(json);
if (json.containsKey('alarmType')) {
switch (json['alarmType'] as String) {
case 'timeFixed':
return FixedTimeAlarm.fromJson(json);
case 'timeRelative':
return RelativeTimeAlarm.fromJson(json);
case 'location':
return LocationAlarm.fromJson(json);
}
}
throw ArgumentError('Unknown alarm type');
@@ -28,3 +33,5 @@ abstract class Alarm {
@override
int get hashCode => taskId.hashCode;
}
enum AlarmType { timeFixed, timeRelative, location }
@@ -0,0 +1,7 @@
import '../alarm.dart' show AlarmType;
class CreateAlarmRequest {
const CreateAlarmRequest({required this.alarmType});
final AlarmType alarmType;
}
@@ -0,0 +1,9 @@
import '../alarm.dart';
import 'create_alarm_request.dart';
class CreateFixedTimeAlarmRequest extends CreateAlarmRequest {
final DateTime? triggerAt;
CreateFixedTimeAlarmRequest({this.triggerAt})
: super(alarmType: AlarmType.timeFixed);
}
@@ -0,0 +1,12 @@
import '../alarm.dart' show AlarmType;
import '../location.dart';
import 'create_alarm_request.dart';
class CreateLocationAlarmRequest extends CreateAlarmRequest {
final Location? location;
final int? radiusMeters;
const CreateLocationAlarmRequest({this.location, this.radiusMeters})
: super(alarmType: AlarmType.location);
}
@@ -0,0 +1,9 @@
import '../alarm.dart' show AlarmType;
import 'create_alarm_request.dart';
class CreateRelativeTimeAlarmRequest extends CreateAlarmRequest {
final DateTime? triggerAt;
CreateRelativeTimeAlarmRequest({this.triggerAt})
: super(alarmType: AlarmType.timeRelative);
}
@@ -1,6 +1,6 @@
import 'alarm.dart';
class TimeAlarm implements Alarm {
class FixedTimeAlarm implements Alarm {
@override
final String id;
@@ -9,14 +9,17 @@ class TimeAlarm implements Alarm {
final DateTime triggerAt;
const TimeAlarm({
@override
final AlarmType alarmType;
const FixedTimeAlarm({
required this.id,
required this.taskId,
required this.triggerAt,
});
}) : alarmType = AlarmType.timeFixed;
factory TimeAlarm.fromJson(Map<String, dynamic> json) {
return TimeAlarm(
factory FixedTimeAlarm.fromJson(Map<String, dynamic> json) {
return FixedTimeAlarm(
id: json['id'] as String,
taskId: json['taskId'] as String,
triggerAt: DateTime.parse(json['triggerAt'] as String),
@@ -29,6 +32,7 @@ class TimeAlarm implements Alarm {
'id': id,
'taskId': taskId,
'triggerAt': triggerAt.toIso8601String(),
'alarmType': alarmType,
};
}
}
+23
View File
@@ -5,6 +5,15 @@ 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);
}
@@ -12,4 +21,18 @@ 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()}';
}
}
+17 -2
View File
@@ -1,19 +1,34 @@
import 'latlng.dart';
class Location {
final String name;
final LatLng coordinates;
final String address;
Location({required this.coordinates, this.address = ''});
Location({required this.name, 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 {'address': address, 'coordinates': coordinates.toJson()};
return {
'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;
}
+5 -1
View File
@@ -12,12 +12,15 @@ class LocationAlarm implements Alarm {
final int radiusMeters;
@override
final AlarmType alarmType;
const LocationAlarm({
required this.id,
required this.taskId,
required this.location,
required this.radiusMeters,
});
}) : alarmType = AlarmType.location;
factory LocationAlarm.fromJson(Map<String, dynamic> json) {
return LocationAlarm(
@@ -35,6 +38,7 @@ class LocationAlarm implements Alarm {
'taskId': taskId,
'location': location.toJson(),
'radiusMeters': radiusMeters,
'alarmType': alarmType,
};
}
}
+38
View File
@@ -0,0 +1,38 @@
import 'alarm.dart';
class RelativeTimeAlarm implements Alarm {
@override
final String id;
@override
final String taskId;
final DateTime triggerAt;
@override
final AlarmType alarmType;
const RelativeTimeAlarm({
required this.id,
required this.taskId,
required this.triggerAt,
}) : alarmType = AlarmType.timeRelative;
factory RelativeTimeAlarm.fromJson(Map<String, dynamic> json) {
return RelativeTimeAlarm(
id: json['id'] as String,
taskId: json['taskId'] as String,
triggerAt: DateTime.parse(json['triggerAt'] as String),
);
}
@override
Map<String, dynamic> toJson() {
return {
'id': id,
'taskId': taskId,
'triggerAt': triggerAt.toIso8601String(),
'alarmType': alarmType,
};
}
}
+74
View File
@@ -0,0 +1,74 @@
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);
}
}
}
+99 -41
View File
@@ -1,10 +1,16 @@
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/extensions/controller_context.dart';
import '../model/task.dart';
import '../service/controllers/task_controller.dart';
import '../service/tools.dart';
import '../widgets/alarm_widgets/alarm_form_widget.dart';
import '../widgets/time_selector.dart';
class TaskEditPage extends StatefulWidget {
@@ -31,6 +37,7 @@ class _TaskEditPageState extends State<TaskEditPage> {
final formKey = GlobalKey<FormState>(debugLabel: 'taskEditFormKey');
bool didFormChange = false;
bool isDueTimeEnabled = false;
final List<CreateAlarmRequest> alarms = [];
@override
void didChangeDependencies() {
@@ -79,46 +86,84 @@ class _TaskEditPageState extends State<TaskEditPage> {
padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.05,
),
child: Column(
spacing: 12,
children: [
SizedBox(height: 6),
TextFormField(
autofocus: true,
controller: titleController,
decoration: InputDecoration(label: Text('Title')),
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
),
TextFormField(
controller: descriptionController,
decoration: InputDecoration(label: Text('Description')),
keyboardType: TextInputType.multiline,
textInputAction: TextInputAction.newline,
minLines: 3,
maxLines: 10,
),
TimeSelector(
initialDueDateTime: task?.due,
nextFocusNode: categoryFocusNode,
dueDateController: dueDateController,
dueTimeController: dueTimeController,
formKey: formKey,
),
TextFormField(
focusNode: categoryFocusNode,
controller: categoryController,
decoration: InputDecoration(label: Text('Category')),
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
),
TextFormField(
controller: urlController,
decoration: InputDecoration(label: Text('Url')),
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
),
],
child: SingleChildScrollView(
child: Column(
spacing: AppTheme.formColumnSpacing,
children: [
SizedBox(height: 6),
TextFormField(
autofocus: true,
controller: titleController,
decoration: InputDecoration(label: Text('Title')),
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
),
TextFormField(
controller: descriptionController,
decoration: InputDecoration(label: Text('Description')),
keyboardType: TextInputType.multiline,
textInputAction: TextInputAction.newline,
minLines: 3,
maxLines: 10,
),
TimeSelector(
initialDueDateTime: task?.due,
nextFocusNode: categoryFocusNode,
dueDateController: dueDateController,
dueTimeController: dueTimeController,
formKey: formKey,
),
TextFormField(
focusNode: categoryFocusNode,
controller: categoryController,
decoration: InputDecoration(label: Text('Category')),
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
),
TextFormField(
controller: urlController,
decoration: InputDecoration(label: Text('Url')),
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
),
Text(
'Alarms',
style: Theme.of(context).textTheme.headlineLarge,
),
Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
spacing: AppTheme.formColumnSpacing,
children: [
ElevatedButton.icon(
onPressed: () => onAddAlarmPressed(AlarmType.timeFixed),
label: Text('Fixed Time'),
icon: Icon(Icons.alarm_add),
),
ElevatedButton.icon(
onPressed: () =>
onAddAlarmPressed(AlarmType.timeRelative),
label: Text('Relative Time'),
icon: Icon(Icons.timer_outlined),
),
ElevatedButton.icon(
onPressed: () => onAddAlarmPressed(AlarmType.location),
label: Text('Location'),
icon: Icon(Icons.location_on),
),
for (final (index, alarm) in alarms.indexed)
AlarmForm(
request: alarm,
onChanged: (updated) {
setState(() {
alarms[index] = updated;
});
},
),
],
),
],
),
),
),
),
@@ -167,10 +212,23 @@ class _TaskEditPageState extends State<TaskEditPage> {
],
),
).then((result) {
if (result != null && result && context.mounted) {
if (result != null && result && mounted) {
Navigator.of(context).pop();
}
});
}
}
void onAddAlarmPressed(AlarmType alarmType) {
switch (alarmType) {
case AlarmType.location:
alarms.add(CreateLocationAlarmRequest());
case AlarmType.timeFixed:
alarms.add(CreateFixedTimeAlarmRequest());
case AlarmType.timeRelative:
alarms.add(CreateFixedTimeAlarmRequest());
}
setState(() {});
}
}
+19 -2
View File
@@ -6,6 +6,7 @@ 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 {
@@ -22,7 +23,20 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: Text('Hallo Yannick')),
appBar: AppBar(
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,
@@ -84,10 +98,13 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
await Navigator.of(context).pushNamed(TaskEditPage.routeName)
as CreateTaskRequest?;
if (result != null && context.mounted) {
if (result != null && mounted) {
context.controller<TaskController>().saveTask(
result.toTask(id: generateId()),
);
}
}
void onLocationsButtonTapped() =>
Navigator.of(context).pushNamed(LocationsOverviewPage.routeName);
}
@@ -12,6 +12,8 @@ class LocationController extends ChangeNotifier {
final List<Location> _locations = [];
List<Location> get locations => _locations;
Future<void> addLocation(Location location) {
_locations.add(location);
notifyListeners();
@@ -24,6 +26,16 @@ 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(
+23
View File
@@ -7,8 +7,31 @@ String? timeValidator(String? value) {
return 'Not a valid time format';
}
String? wholeNumberValidator(String? value) {
if (value == null || value.isEmpty) return null;
if (RegExp(r'^[0-9]*$').hasMatch(value)) {
return null;
}
return 'Not a valid number';
}
String? dateTimeValidator(String? value) {
if (value == null || value.isEmpty) return null;
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';
}
@@ -0,0 +1,40 @@
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 'fixed_time_alarm_form.dart';
import 'location_alarm_form.dart';
import 'relative_time_alarm_form.dart';
class AlarmForm extends StatelessWidget {
const AlarmForm({super.key, required this.request, required this.onChanged});
final CreateAlarmRequest request;
final ValueChanged<CreateAlarmRequest> onChanged;
@override
Widget build(BuildContext context) {
switch (request.alarmType) {
case AlarmType.timeFixed:
return FixedTimeAlarmForm(
request: request as CreateFixedTimeAlarmRequest,
onChanged: onChanged,
);
case AlarmType.timeRelative:
return RelativeTimeAlarmForm(
request: request as CreateRelativeTimeAlarmRequest,
onChanged: onChanged,
);
case AlarmType.location:
return LocationAlarmForm(
request: request as CreateLocationAlarmRequest,
onChanged: onChanged,
);
}
}
}
@@ -0,0 +1,19 @@
import 'package:flutter/material.dart';
import '../../model/callback_models/create_alarm_request.dart';
import '../../model/callback_models/create_fixed_time_alarm_request.dart';
class FixedTimeAlarmForm extends StatelessWidget {
const FixedTimeAlarmForm({
super.key,
required this.request,
required this.onChanged,
});
final CreateFixedTimeAlarmRequest request;
final ValueChanged<CreateAlarmRequest> onChanged;
@override
Widget build(BuildContext context) {
return const Placeholder();
}
}
@@ -0,0 +1,19 @@
import 'package:flutter/material.dart';
import '../../model/callback_models/create_alarm_request.dart';
import '../../model/callback_models/create_location_alarm_request.dart';
class LocationAlarmForm extends StatelessWidget {
const LocationAlarmForm({
super.key,
required this.request,
required this.onChanged,
});
final CreateLocationAlarmRequest request;
final ValueChanged<CreateAlarmRequest> onChanged;
@override
Widget build(BuildContext context) {
return const Placeholder();
}
}
@@ -0,0 +1,19 @@
import 'package:flutter/material.dart';
import '../../model/callback_models/create_alarm_request.dart';
import '../../model/callback_models/create_relative_time_alarm_request.dart';
class RelativeTimeAlarmForm extends StatelessWidget {
const RelativeTimeAlarmForm({
super.key,
required this.request,
required this.onChanged,
});
final CreateRelativeTimeAlarmRequest request;
final ValueChanged<CreateAlarmRequest> onChanged;
@override
Widget build(BuildContext context) {
return const Placeholder();
}
}
@@ -0,0 +1,93 @@
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,
),
);
}
}
}
+4 -1
View File
@@ -16,7 +16,10 @@ class TaskDismissible extends StatelessWidget {
key: key!,
direction: DismissDirection.startToEnd,
background: Container(
color: Theme.of(context).colorScheme.error,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Theme.of(context).colorScheme.error,
),
child: Align(
alignment: AlignmentGeometry.centerLeft,
child: Padding(
+28 -2
View File
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import '../app_theme.dart';
import '../service/tools.dart' show getIsoDateString;
import '../service/validators.dart';
@@ -11,6 +12,7 @@ class TimeSelector extends StatefulWidget {
required this.dueDateController,
required this.dueTimeController,
this.formKey,
this.onChanged,
});
final DateTime? initialDueDateTime;
@@ -18,6 +20,7 @@ class TimeSelector extends StatefulWidget {
final FocusNode? nextFocusNode;
final TextEditingController dueDateController;
final TextEditingController dueTimeController;
final void Function(DateTime dateTime)? onChanged;
@override
State<TimeSelector> createState() => _TimeSelectorState();
@@ -47,7 +50,18 @@ class _TimeSelectorState extends State<TimeSelector> {
child: TextFormField(
focusNode: dueDateFocusNode,
controller: widget.dueDateController,
onChanged: maybeEnableDueTime,
onChanged: (value) {
maybeEnableDueTime(value);
if (dateTimeValidator(value) == null &&
widget.onChanged != null) {
final dateTime = DateTime.tryParse(
'$value ${widget.dueTimeController.text}'.trim(),
);
if (dateTime != null) {
widget.onChanged!(dateTime);
}
}
},
onFieldSubmitted: (_) {
isDueTimeEnabled
? dueDateFocusNode.nextFocus()
@@ -74,7 +88,9 @@ class _TimeSelectorState extends State<TimeSelector> {
textInputAction: TextInputAction.next,
),
),
Padding(padding: EdgeInsetsGeometry.only(left: 10)),
Padding(
padding: EdgeInsetsGeometry.only(left: AppTheme.formColumnSpacing),
),
Flexible(
flex: 2,
child: TextFormField(
@@ -82,6 +98,16 @@ class _TimeSelectorState extends State<TimeSelector> {
onFieldSubmitted: (_) => dueTimeFocusNode.nextFocus(),
controller: widget.dueTimeController,
enabled: isDueTimeEnabled,
onChanged: (value) {
if (timeValidator(value) == null && widget.onChanged != null) {
final dateTime = DateTime.tryParse(
'${widget.dueDateController.text} $value'.trim(),
);
if (dateTime != null) {
widget.onChanged!(dateTime);
}
}
},
decoration: InputDecoration(
label: Text('Due Time'),
suffixIcon: IconButton(