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

# Conflicts:
#	lib/main.dart

lib/pages/InboxView.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+class InboxView extends StatefulWidget {
+  const InboxView({super.key});
+
+  @override
+  State<InboxView> createState() => _InboxViewState();
+}
+
+class _InboxViewState extends State<InboxView> {
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+        body: Center(
+          child: Icon(Icons.inbox),
+        )
+    );
+  }
+}

lib/pages/NoteDetailView.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+class NoteDetailView extends StatefulWidget {
+  const NoteDetailView({super.key});
+
+  @override
+  State<NoteDetailView> createState() => _NoteDetailViewState();
+}
+
+class _NoteDetailViewState extends State<NoteDetailView> {
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+        body: Center(
+          child: Text('NoteDetailView'),
+        )
+    );
+  }
+}

lib/pages/NotesView.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+class NotesView extends StatefulWidget {
+  const NotesView({super.key});
+
+  @override
+  State<NotesView> createState() => _NotesViewState();
+}
+
+class _NotesViewState extends State<NotesView> {
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+        body: Center(
+          child: Icon(Icons.note),
+        )
+    );
+  }
+}

lib/pages/TodayView.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+class TodayView extends StatefulWidget {
+  const TodayView({super.key});
+
+  @override
+  State<TodayView> createState() => _TodayViewState();
+}
+
+class _TodayViewState extends State<TodayView> {
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: Center(
+        child: Icon(Icons.calendar_today)
+      )
+    );
+  }
+}

lib/pages/testUI.dart

@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+
+class TestUI extends StatefulWidget {
+  const TestUI({super.key});
+
+  @override
+  State<TestUI> createState() => _TestUIState();
+}
+
+class _TestUIState extends State<TestUI> {
+  int _test = 0;
+
+  void _onPressed() {
+    setState(() {
+      _test = 1;
+    });
+  }
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Column(children: [
+          FloatingActionButton(onPressed: _onPressed),
+          Text('$_test'),
+        ],),
+      ),
+    );
+  }
+}