62 Commits
main ... dev

Author SHA1 Message Date
ab01f8625b build fix android 2023-09-29 15:24:33 +02:00
grata
4759f768f3 removed duplicated library 2023-09-29 15:19:54 +02:00
Giulia
07604bddaa notes 2023-09-29 15:16:30 +02:00
Giulia
2b18144691 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
2023-09-29 15:15:04 +02:00
e07fd0d191 fix init database 2023-09-29 15:12:55 +02:00
grata
de4769cbb8 removed controller on dev 2023-09-29 15:05:22 +02:00
Giulia
e4cf349cbb Merge remote-tracking branch 'origin/Zina' into dev 2023-09-29 14:54:38 +02:00
grata
93b54f357b Merge remote-tracking branch 'origin/firebase' into dev 2023-09-29 14:50:49 +02:00
Tito Arrigo
0628fcbbdb bo non lo so 2023-09-29 14:44:12 +02:00
grata
5b02be9ae7 removed controller 2023-09-29 14:26:09 +02:00
grata
8049165f44 collegato lightsql e firebase 2023-09-29 13:39:03 +02:00
Tito Arrigo
a4a13cc2ea Merge remote-tracking branch 'origin/firebase' into dev
# Conflicts:
#	lib/model/promemoria.dart
2023-09-29 11:57:24 +02:00
Tito Arrigo
67dd09b2dd new ui model integration 2023-09-29 11:49:31 +02:00
grata
34a73c62f7 database work in progress 2023-09-29 11:49:21 +02:00
b75903e3cb work in progress database 2023-09-29 11:38:06 +02:00
grata
039fde6dbe file strani 2023-09-29 11:24:08 +02:00
Tito Arrigo
ca504e5e24 Merge remote-tracking branch 'origin/firebase' into dev
# Conflicts:
#	lib/database/database.dart
#	lib/model/note.dart
#	lib/model/promemoria.dart
#	lib/navigation.dart
#	lib/pages/InboxView.dart
#	lib/pages/TodayView.dart
#	pubspec.yaml
2023-09-29 10:27:17 +02:00
Giulia
ccb56ffa9c fix notes 2023-09-29 09:52:26 +02:00
simonmaggini
5c68d85b98 listViw builder 2023-09-29 09:50:48 +02:00
grata
7aa8c8dcbc Added Firebase 2023-09-29 09:40:35 +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
Tito Arrigo
7d1bec6b0c grafica quasi finita 2023-09-29 08:28:08 +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
grata
a58721a6f4 crud 2023-09-28 13:57:21 +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
64b4f64f8c work in progress database 2023-09-28 13:38:09 +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
Tito Arrigo
c2824c99a4 merge 2023-09-28 13:04:42 +02:00
52d7defb75 entity upgrade 2023-09-28 11:47:01 +02:00
Tito Arrigo
e061871c4f grafica pagina TodayView.dart 2023-09-28 11:46:08 +02:00
782bbebce9 database init 2023-09-28 11:38:19 +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
Tito Arrigo
29a54bbcbc grafica pagina TodayView.dart 2023-09-28 09:49:09 +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
Tito Arrigo
330d0e4c61 Merge branch 'Tito' into dev 2023-09-27 14:04:34 +02:00
Tito Arrigo
6a05861341 inizzializazione pagine 2023-09-27 14:02:53 +02:00
205f575db5 Merge remote-tracking branch 'origin/dev' into Joe 2023-09-27 13:52:34 +02:00
Tito Arrigo
67aa0d4341 added GoggleServie-Info.plist 2023-09-27 13:51:14 +02:00
ecf7011302 new directory 2023-09-27 13:50:56 +02:00
Tito Arrigo
4006030f5b added GoggleServie-Info.plist 2023-09-27 13:48:10 +02:00
58e013a709 database 2023-09-27 13:43:04 +02:00
929c4cc403 . 2023-09-27 13:31:40 +02:00
8eff19cecc Merge remote-tracking branch 'origin/aramis' into dev 2023-09-27 13:30:46 +02:00
Tito Arrigo
416c230a33 basic structure with material 3 2023-09-27 13:24:31 +02:00
Tito Arrigo
e793631ab0 bottom nav bar init 2023-09-27 11:21:33 +02:00
grata
dfc0d43060 Revert "google files"
This reverts commit d598a41475.
2023-09-27 09:10:22 +02:00
grata
d598a41475 google files 2023-09-27 09:01:50 +02:00
grata
5a3aea16ba added firebase 2023-09-27 09:01:14 +02:00
4 changed files with 43 additions and 63 deletions

View File

@@ -33,7 +33,23 @@ class Promemoria {
this.arrayPromemoria,
this.description,
this.priority,
this.color);
this.color
);
Promemoria.today(
this.title,
this.creationDate,
this.lastModificationDate,
this.expirationDate,
this.description,
);
Promemoria.inbox(
this.title,
this.creationDate,
this.lastModificationDate,
this.description,
);
Map<String, dynamic> toMap() {
return {

View File

@@ -1,9 +1,10 @@
import 'dart:ffi';
import 'package:flutter/material.dart';
import 'pages/testUI.dart';
import 'pages/TodayView.dart';
import 'pages/InboxView.dart';
import 'pages/NotesView.dart';
import 'pages/test.dart';
class Navigation extends StatefulWidget {
const Navigation({super.key});
@@ -14,12 +15,11 @@ class Navigation extends StatefulWidget {
class _NavigationState extends State<Navigation> {
int _selectedIndex = 3;
int _selectedIndex = 0;
static const List<Widget> _widgetOptions = <Widget>[
TodayView(),
InboxView(),
NotesView(),
Test()
];
void _onItemTapped(int index) {
@@ -31,17 +31,17 @@ class _NavigationState extends State<Navigation> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Center(child: _widgetOptions.elementAt(_selectedIndex)),
body: SafeArea(child: _widgetOptions.elementAt(_selectedIndex)),
bottomNavigationBar: BottomNavigationBar(
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.calendar_today), label: "today"),
BottomNavigationBarItem(icon: Icon(Icons.inbox), label: "Inbox"),
BottomNavigationBarItem(icon: Icon(Icons.note), label: "Notes"),
BottomNavigationBarItem(icon: Icon(Icons.settings), label: "Settings")
],
currentIndex: _selectedIndex,
onTap: _onItemTapped,
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.today), label: "today"),
BottomNavigationBarItem(icon: Icon(Icons.inbox), label: "Inbox"),
BottomNavigationBarItem(icon: Icon(Icons.note), label: "Notes"),
],
currentIndex: _selectedIndex,
onTap: _onItemTapped,
type: BottomNavigationBarType.fixed,
),
);
}

View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'CreateNewNote.dart';
import 'NoteDetailView.dart';
//import components
import '../Components/Reminder.dart';
class InboxView extends StatefulWidget {
const InboxView({super.key});
@@ -10,55 +11,18 @@ class InboxView extends StatefulWidget {
}
class _InboxViewState extends State<InboxView> {
List<bool> _values = [false, false, false, false, false];
void _onChanged(int index, bool? newValue){
setState(() {
_values[index] = newValue ?? false;
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(
'Inbox',
style: TextStyle(color: Colors.white),
appBar: AppBar(
title: const Text('Inbox'),
),
backgroundColor: Colors.cyan.shade700,
),
floatingActionButton: FloatingActionButton(
onPressed: () {
},
child: Icon(Icons.add, color: Colors.white),
backgroundColor: Colors.cyan.shade700,
),
body: Container(
child: ListView.builder(
itemCount: 5,
itemBuilder: (context, index) {
return Card(
color: Colors.white,
child: ListTile(
leading: Checkbox(
value: _values[index],
onChanged: (newValue) => _onChanged(index, newValue),
),
title: Text("ciao", style: TextStyle(color: Colors.cyan.shade700, fontWeight: FontWeight.bold)),
subtitle: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [Text('Descrizione della nota:')]),
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const NoteDetailView(),
),
);
},
),
);
},
),
),
body: ListView(
children: const <Widget>[
/* Reminder(),
Reminder(),*/
],
)
);
}
}

View File

@@ -8,7 +8,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:progetto_m335_flutter/main.dart';
import 'package:progetto_m335_flutter/myApp.dart';
void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {