24 Commits
Tito ... Zina

Author SHA1 Message Date
Giulia
ccb56ffa9c fix notes 2023-09-29 09:52:26 +02:00
Giulia
bf3a9c552d fix 2023-09-29 09:09:26 +02:00
Giulia
c2196663ae Merge remote-tracking branch 'origin/dev' into Zina
# Conflicts:
#	lib/navigation.dart
#	lib/pages/InboxView.dart
#	lib/pages/TodayView.dart
2023-09-29 08:43:10 +02:00
Giulia
6d9eb5f4db fixed style 2023-09-28 14:45:00 +02:00
lama137
b284a3d6d6 TITOOOOOOOOOOOOO 2023-09-28 14:26:17 +02:00
lama137
d69c7ab525 Merge remote-tracking branch 'origin/Tito' into Zina
# Conflicts:
#	lib/database/database.dart
#	lib/model/note.dart
#	lib/model/promemoria.dart
#	lib/navigation.dart
2023-09-28 14:12:20 +02:00
Giulia
c0c090085f create note 2023-09-28 13:57:51 +02:00
Giulia
850497301c Merge remote-tracking branch 'origin/Zina' into Zina
# Conflicts:
#	lib/pages/NotesView.dart
2023-09-28 13:57:19 +02:00
Giulia
4121239e36 create note 2023-09-28 13:56:54 +02:00
Giulia
abc0926f49 create note 2023-09-28 13:55:49 +02:00
lama137
0d53d1421f Aggiornamento note e pulsanti. 2023-09-28 13:22:47 +02:00
Giulia
b81cfc70fb fix 2023-09-28 13:21:02 +02:00
lama137
0fb537d24e Aggiornamento note e pulsanti. 2023-09-28 11:04:46 +02:00
lama137
06a3712d0a Aggiornamento note e pulsanti. 2023-09-28 11:03:54 +02:00
Giulia
65ed67b8f6 fixed navigation and added create new note page 2023-09-28 10:40:01 +02:00
Giulia
bf7981671d add note button 2023-09-28 09:07:00 +02:00
lama137
2f851bc630 IDK 2023-09-28 09:02:52 +02:00
lama137
4c4dcc2654 Merge remote-tracking branch 'origin/Joe' into Zina 2023-09-28 08:48:36 +02:00
05386ac20f entity 2023-09-28 08:47:50 +02:00
9f26bc8595 note entity 2023-09-27 15:17:16 +02:00
Tito Arrigo
c35684c8f1 inizzializazione pagine 2023-09-27 14:17:52 +02:00
205f575db5 Merge remote-tracking branch 'origin/dev' into Joe 2023-09-27 13:52:34 +02:00
ecf7011302 new directory 2023-09-27 13:50:56 +02:00
58e013a709 database 2023-09-27 13:43:04 +02:00
16 changed files with 273 additions and 60 deletions

View File

@@ -0,0 +1,17 @@
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),
);
}
}

27
lib/Components/Note.dart Normal file
View File

@@ -0,0 +1,27 @@
import 'package:flutter/material.dart';
import '../pages/NoteDetailView.dart';
class Note extends StatefulWidget {
const Note({super.key});
@override
State<Note> createState() => _NotesViewState();
}
class _NotesViewState extends State<Note> {
@override
Widget build(BuildContext context) {
return ListTile(
title: Text("Titolo"),
subtitle: Text('Testo'),
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const NoteDetailView(),
),
);
},
);
}
}

View File

@@ -1,11 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../model/promemoria.dart'; import '../Components/EditReminderButton.dart';
import '../pages/EditReminder.dart'; import '../pages/EditReminder.dart';
class Reminder extends StatefulWidget { class Reminder extends StatefulWidget {
final Promemoria? promemoria; const Reminder({super.key});
const Reminder(this.promemoria, {super.key});
@override @override
State<Reminder> createState() => _ReminderState(); State<Reminder> createState() => _ReminderState();
@@ -27,12 +26,12 @@ class _ReminderState extends State<Reminder> {
value: _value, value: _value,
onChanged: _onChanged, onChanged: _onChanged,
), ),
title: Text(widget.promemoria?.description ?? 'Nessun titolo'), title: Text("Reminder"),
subtitle: Text(DateTime.now().toString()), subtitle: Text(DateTime.now().toString()),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => EditReminder(widget.promemoria)), MaterialPageRoute(builder: (context) => EditReminder()),
); );
}, },
); );

View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'myApp.dart'; import '../myApp.dart';
void main() { void main() {
runApp(MyApp()); runApp(MyApp());

View File

@@ -1,8 +1,19 @@
abstract class BaseEntity{ abstract class BaseEntity{
String id = 'id'; static String id = 'id';
String title = 'Title'; static String title = 'Title';
String creationDate = 'CreationDate'; static String creationDate = 'CreationDate';
String lastEditDate = 'LastEditDate'; static String lastEditDate = 'LastEditDate';
BaseEntity(); static String get getId{
return id;
}
static String get getTitle{
return title;
}
static String get getCreationDate{
return creationDate;
}
static String get getLastEditDate{
return lastEditDate;
}
} }

View File

@@ -7,13 +7,10 @@ const String promemoriaTable = 'promemoria';
class Promemoria extends BaseEntity { class Promemoria extends BaseEntity {
static String expirationDate = ''; static String expirationDate = '';
static String arrayPromemoria = ''; static String arrayPromemoria = '';
String description = ''; static String description = '';
static Priority priority = Priority.none; static Priority priority = Priority.none;
static Color color = Color.none; static Color color = Color.none;
Promemoria(String description) : super(){
this.description = description;
}
} }

View File

@@ -1,6 +1,5 @@
import 'dart:ffi';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'pages/testUI.dart';
import 'pages/TodayView.dart'; import 'pages/TodayView.dart';
import 'pages/InboxView.dart'; import 'pages/InboxView.dart';
import 'pages/NotesView.dart'; import 'pages/NotesView.dart';

View File

@@ -0,0 +1,89 @@
import 'package:flutter/material.dart';
import 'package:progetto_m335_flutter/pages/NotesView.dart';
class CreateNewNote extends StatefulWidget {
const CreateNewNote({Key? key}) : super(key: key);
@override
State<CreateNewNote> createState() => _CreateNewNoteState();
}
class _CreateNewNoteState extends State<CreateNewNote> {
TextEditingController _titleController = TextEditingController();
TextEditingController _textController = TextEditingController();
@override
void dispose() {
_titleController.dispose();
_textController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Create New Note'),
),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextField(
controller: _titleController,
decoration: InputDecoration(
hintText: 'Enter a title',
),
),
SizedBox(height: 16),
TextField(
controller: _textController,
maxLines: null,
decoration: InputDecoration(
hintText: 'Enter text',
border: InputBorder.none,
),
),
const SizedBox(height: 10),
const Spacer(),
Row(
children: [
Expanded(
child: ElevatedButton(
onPressed: () {
print("Delete button pressed");
},
style: ElevatedButton.styleFrom(
primary: Colors.red,
),
child: const Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.delete),
Text("Delete"),
],
),
),
),
const SizedBox(width: 10),
Expanded(
child: ElevatedButton(
onPressed: () {
String title = _titleController.text;
String text = _textController.text;
_titleController.clear();
_textController.clear();
Navigator.pop(context);
},
child: const Text("Save"),
),
),
],
),
], //
),
),
);
}
}

View File

@@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../model/promemoria.dart';
class EditReminder extends StatefulWidget { class EditReminder extends StatefulWidget {
final Promemoria? promemoria; const EditReminder({super.key});
const EditReminder(this.promemoria, {super.key});
@override @override
State<EditReminder> createState() => _EditReminderState(); State<EditReminder> createState() => _EditReminderState();
@@ -30,7 +28,7 @@ class _EditReminderState extends State<EditReminder> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
TextField( TextField(
controller: TextEditingController(text: widget.promemoria?.description ?? ""), controller: TextEditingController(text: _title),
decoration: const InputDecoration( decoration: const InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: 'Title', labelText: 'Title',

View File

@@ -19,8 +19,8 @@ class _InboxViewState extends State<InboxView> {
), ),
body: ListView( body: ListView(
children: const <Widget>[ children: const <Widget>[
/* Reminder(), Reminder(),
Reminder(),*/ Reminder(),
], ],
) )
); );

View File

@@ -1,19 +1,89 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:progetto_m335_flutter/pages/NotesView.dart';
class NoteDetailView extends StatefulWidget { class NoteDetailView extends StatefulWidget {
const NoteDetailView({super.key}); const NoteDetailView({Key? key}) : super(key: key);
@override @override
State<NoteDetailView> createState() => _NoteDetailViewState(); State<NoteDetailView> createState() => _NoteDetailViewState();
} }
class _NoteDetailViewState extends State<NoteDetailView> { class _NoteDetailViewState extends State<NoteDetailView> {
TextEditingController _titleController = TextEditingController();
TextEditingController _textController = TextEditingController();
@override
void dispose() {
_titleController.dispose();
_textController.dispose();
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return const Scaffold( return Scaffold(
body: Center( appBar: AppBar(
child: Text('NoteDetailView'), title: Text('Edit note'),
) ),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextField(
controller: _titleController,
decoration: InputDecoration(
hintText: 'Enter a title',
),
),
SizedBox(height: 16),
TextField(
controller: _textController,
maxLines: null,
decoration: InputDecoration(
hintText: 'Enter text',
border: InputBorder.none,
),
),
const SizedBox(height: 10),
const Spacer(),
Row(
children: [
Expanded(
child: ElevatedButton(
onPressed: () {
print("Delete button pressed");
},
style: ElevatedButton.styleFrom(
primary: Colors.red,
),
child: const Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.delete),
Text("Delete"),
],
),
),
),
const SizedBox(width: 10),
Expanded(
child: ElevatedButton(
onPressed: () {
String title = _titleController.text;
String text = _textController.text;
_titleController.clear();
_textController.clear();
Navigator.pop(context);
},
child: const Text("Save"),
),
),
],
),
], //
),
),
); );
} }
} }

View File

@@ -1,19 +1,42 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../Components/Note.dart';
import 'CreateNewNote.dart';
import 'NoteDetailView.dart';
class NotesView extends StatefulWidget { class NotesView extends StatefulWidget {
const NotesView({super.key}); const NotesView({Key? key}) : super(key: key);
@override @override
State<NotesView> createState() => _NotesViewState(); State<NotesView> createState() => _NotesViewState();
} }
class _NotesViewState extends State<NotesView> { class _NotesViewState extends State<NotesView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return const Scaffold( return Scaffold(
body: Center( appBar: AppBar(
child: Icon(Icons.note), title: Text('Note'),
) ),
floatingActionButton: FloatingActionButton(
onPressed: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const CreateNewNote(),
),
);
},
child: Icon(Icons.add),
),
body:ListView(
children: const <Widget>[
Note(),
Note(),
],
)
); );
} }
} }

View File

@@ -16,15 +16,6 @@ class _TodayViewState extends State<TodayView> {
var _selectedDate = DateTime.now(); var _selectedDate = DateTime.now();
List<Promemoria> listaPromemoria = [
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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@@ -42,19 +33,11 @@ class _TodayViewState extends State<TodayView> {
), ),
), ),
body: ListView( body: ListView(
children: [ children: const <Widget>[
ListView.builder( Reminder(),
scrollDirection: Axis.vertical, Reminder(),
shrinkWrap: true, QuickReminder()
itemCount: listaPromemoria.length, ],
itemBuilder: (BuildContext context, int index){
return Reminder(
listaPromemoria[index]
);
},
),
QuickReminder(),
],
), ),
); );
} }

View File

@@ -30,7 +30,8 @@ environment:
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
sqflite:
path:
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.

View File

@@ -13,7 +13,6 @@ import 'package:progetto_m335_flutter/myApp.dart';
void main() { void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async { testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame. // Build our app and trigger a frame.
await tester.pumpWidget(const MyApp());
// Verify that our counter starts at 0. // Verify that our counter starts at 0.
expect(find.text('0'), findsOneWidget); expect(find.text('0'), findsOneWidget);