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

# Conflicts:
#	lib/navigation.dart
#	lib/pages/InboxView.dart
#	lib/pages/TodayView.dart
This commit is contained in:
Giulia
2023-09-29 08:43:10 +02:00
8 changed files with 182 additions and 92 deletions

View File

@@ -1,9 +1,12 @@
import 'dart:ffi';
import 'package:flutter/material.dart';
import 'pages/testUI.dart';
import 'pages/TodayView.dart';
import 'pages/InboxView.dart';
import 'pages/NotesView.dart';
class Navigation extends StatefulWidget {
const Navigation({super.key});