From 51f964833eb8ed5d4677dff12ed6c9921663eeb9 Mon Sep 17 00:00:00 2001 From: Tito Arrigo Date: Fri, 29 Sep 2023 10:25:34 +0200 Subject: [PATCH] boooooo --- lib/Components/EditReminderButton.dart | 17 ----------------- lib/Components/Reminder.dart | 5 +---- lib/model/base_entity.dart | 23 ++++++----------------- lib/model/promemoria.dart | 2 +- lib/pages/EditReminder.dart | 6 ++++-- lib/pages/TodayView.dart | 5 +++-- 6 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 lib/Components/EditReminderButton.dart diff --git a/lib/Components/EditReminderButton.dart b/lib/Components/EditReminderButton.dart deleted file mode 100644 index cb38d88..0000000 --- a/lib/Components/EditReminderButton.dart +++ /dev/null @@ -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), - ); - } -} diff --git a/lib/Components/Reminder.dart b/lib/Components/Reminder.dart index 25fcefd..c83cb96 100644 --- a/lib/Components/Reminder.dart +++ b/lib/Components/Reminder.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import '../Components/EditReminderButton.dart'; import '../model/promemoria.dart'; import '../pages/EditReminder.dart'; @@ -21,8 +20,6 @@ class _ReminderState extends State { }); } - - @override Widget build(BuildContext context) { return ListTile( @@ -35,7 +32,7 @@ class _ReminderState extends State { onTap: () { Navigator.push( context, - MaterialPageRoute(builder: (context) => EditReminder()), + MaterialPageRoute(builder: (context) => EditReminder(widget.promemoria)), ); }, ); diff --git a/lib/model/base_entity.dart b/lib/model/base_entity.dart index 1a0b7b5..7548df7 100644 --- a/lib/model/base_entity.dart +++ b/lib/model/base_entity.dart @@ -1,19 +1,8 @@ abstract class BaseEntity{ - static String id = 'id'; - static String title = 'Title'; - static String creationDate = 'CreationDate'; - static String lastEditDate = 'LastEditDate'; - - static String get getId{ - return id; - } - static String get getTitle{ - return title; - } - static String get getCreationDate{ - return creationDate; - } - static String get getLastEditDate{ - return lastEditDate; - } + String id = 'id'; + String title = 'Title'; + String creationDate = 'CreationDate'; + String lastEditDate = 'LastEditDate'; + + BaseEntity(); } \ No newline at end of file diff --git a/lib/model/promemoria.dart b/lib/model/promemoria.dart index c49590e..9abc57a 100644 --- a/lib/model/promemoria.dart +++ b/lib/model/promemoria.dart @@ -12,7 +12,7 @@ class Promemoria extends BaseEntity { static Color color = Color.none; - Promemoria(String description){ + Promemoria(String description) : super(){ this.description = description; } diff --git a/lib/pages/EditReminder.dart b/lib/pages/EditReminder.dart index 334012a..48f7ce0 100644 --- a/lib/pages/EditReminder.dart +++ b/lib/pages/EditReminder.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; +import '../model/promemoria.dart'; class EditReminder extends StatefulWidget { - const EditReminder({super.key}); + final Promemoria? promemoria; + const EditReminder(this.promemoria, {super.key}); @override State createState() => _EditReminderState(); @@ -28,7 +30,7 @@ class _EditReminderState extends State { child: Column( children: [ TextField( - controller: TextEditingController(text: _title), + controller: TextEditingController(text: widget.promemoria?.description ?? ""), decoration: const InputDecoration( border: OutlineInputBorder(), labelText: 'Title', diff --git a/lib/pages/TodayView.dart b/lib/pages/TodayView.dart index 3180a07..a5051de 100644 --- a/lib/pages/TodayView.dart +++ b/lib/pages/TodayView.dart @@ -20,10 +20,11 @@ class _TodayViewState extends State { new Promemoria("Primo promemoria"), new Promemoria("Secondo promemoria"), new Promemoria("Terzo promemoria"), + new Promemoria("Quarto promemoria"), + new Promemoria("Quinto promemoria"), + new Promemoria("Sesto promemoria"), ]; - - @override Widget build(BuildContext context) { return Scaffold(