Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	lib/database/database.dart
#	lib/main.dart
#	lib/model/note.dart
#	lib/model/promemoria.dart
#	lib/navigation.dart
This commit is contained in:
Giulia
2023-09-29 15:15:04 +02:00
22 changed files with 1970 additions and 266 deletions

View File

@@ -1,17 +0,0 @@
import 'package:flutter/material.dart';
import '../pages/EditReminder.dart';
class EditReminderButton extends StatelessWidget{
@override
Widget build(BuildContext context) {
return FilledButton(
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => EditReminder()),
);
},
child: Icon(Icons.list),
);
}
}

View File

@@ -1,4 +1,7 @@
import 'package:flutter/material.dart';
import 'package:progetto_m335_flutter/database/database.dart';
import '../model/promemoria.dart';
import '../navigation.dart';
class QuickReminder extends StatefulWidget {
const QuickReminder({super.key});
@@ -8,18 +11,35 @@ class QuickReminder extends StatefulWidget {
}
class _QuickReminderState extends State<QuickReminder> {
NoteDatabase noteDatabase = NoteDatabase.instance;
@override
Widget build(BuildContext context) {
return const ListTile(
leading: Checkbox(
return ListTile(
leading: const Checkbox(
value: false,
onChanged: null,
),
title: TextField(
decoration: InputDecoration(
labelText: 'New Reminder',
),
),
decoration: const InputDecoration(
labelText: 'New Reminder',
),
onSubmitted: (String value) async{
final db = await noteDatabase.database;
noteDatabase.addPromemoria(Promemoria.today(
value,
DateTime.now().toString(),
DateTime.now().toString(),
DateTime.now().toString(),
"description"));
Navigator.pushReplacement(
context,
PageRouteBuilder(pageBuilder: (context, animation1, animation2) {
return Navigation();
},
transitionDuration: const Duration(seconds: 0)),
);
}),
);
}
}

View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import '../Components/EditReminderButton.dart';
import '../model/promemoria.dart';
import '../pages/EditReminder.dart';
@@ -30,12 +29,12 @@ class _ReminderState extends State<Reminder> {
value: _value,
onChanged: _onChanged,
),
title: Text(widget.promemoria?.description ?? 'Nessun titolo'),
subtitle: Text(DateTime.now().toString()),
title: Text(widget.promemoria?.getTitle() ?? 'Nessun titolo'),
subtitle: Text(widget.promemoria!.getExpirationDate().toString()),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => EditReminder()),
MaterialPageRoute(builder: (context) => EditReminder(widget.promemoria)),
);
},
);