fix merge issues

lib/gen/meta.dart

@@ -0,0 +1,8 @@
+/// DO NOT EDIT THIS FILE EXCEPT TO ENTER INITIAL VERSION AND OTHER META INFO
+/// THIS FILE IS AUTOMATICALLY OVERWRITTEN
+
+class Meta {
+  static const String version = '0.0.0+0-dev';
+  static const int buildTime = 71727248562000;
+  static const bool devBuild = true;
+}

lib/pages/settings_page.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+import '../gen/meta.dart';
+
+class SettingsPage extends StatelessWidget {
+  const SettingsPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final buildTimeString =
+        DateTime.fromMillisecondsSinceEpoch(Meta.buildTime).toIso8601String();
+
+    return Scaffold(
+        appBar: AppBar(),
+        body: Center(
+            child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const Text('Notes'),
+            const Text('Version: ${Meta.version}'),
+            Text('Build Time: $buildTimeString'),
+            if (Meta.devBuild) const Text('Attention, this is a dev build!')
+          ],
+        )));
+  }
+}

lib/widgets/collapse_drawer.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import '../context/file_change_notifier.dart';
+import '../pages/settings_page.dart';
 import 'drawer_item.dart';
 
 enum View { all, shared, recycle, folders }
@@ -86,7 +87,13 @@ class _CollapseDrawerState extends State<CollapseDrawer>
                           icon: const Icon(Icons.settings_outlined),
                           iconSize: 26,
                           color: const Color(0xffa8a8a8),
-                          onPressed: () {},
+                          onPressed: () {
+                            Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) => const SettingsPage(),
+                                ));
+                          },
                         ),
                       ),
                       const SizedBox(