From a876be705d6d9694eacb6f42bd986576f977e1f2 Mon Sep 17 00:00:00 2001
From: whysman <whysman@whystech.com>
Date: Mon, 31 Mar 2025 22:41:49 -0400
Subject: [PATCH] Cleaning, modified drawer, added back button

---
 assets/styles.ts          |  6 +++---
 components/Broken.tsx     |  4 +---
 components/Dialogs.tsx    |  2 +-
 components/DrawerMenu.tsx | 45 +++++++--------------------------------
 components/Status.tsx     |  4 ++--
 components/TopNav.tsx     |  4 ++--
 6 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/assets/styles.ts b/assets/styles.ts
index fd99fa0..216bd31 100644
--- a/assets/styles.ts
+++ b/assets/styles.ts
@@ -101,16 +101,16 @@ const styles = StyleSheet.create({
     },
     drawerContainer: {
         ...StyleSheet.absoluteFillObject,
-        marginTop: 70,
+        marginTop: 0,
         width: 200,
         height: "auto",
         //elevation: 4,
         //backgroundColor: "rgba(0, 0, 0, 0.5)",
         justifyContent: "flex-start",
         alignItems: "flex-start",
-        zIndex: 2, // Ensures the drawer is above everything
+        zIndex: 5, // Ensures the drawer is above everything
         elevation: 5, // Android shadow priority
-        borderRadius: 10,
+        //borderRadius: 10,
     },
     footer: {
         padding: 16,
diff --git a/components/Broken.tsx b/components/Broken.tsx
index 77c417d..024fca4 100644
--- a/components/Broken.tsx
+++ b/components/Broken.tsx
@@ -1,9 +1,7 @@
-import {Title, useTheme} from "react-native-paper";
+import { Title, useTheme } from "react-native-paper";
 import { Image, View } from "react-native";
 import React from "react";
 
-
-
 const Broken = () => {
     const theme = useTheme();
     return (
diff --git a/components/Dialogs.tsx b/components/Dialogs.tsx
index 4faa730..ac84941 100644
--- a/components/Dialogs.tsx
+++ b/components/Dialogs.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {Portal, Button, Dialog, useTheme} from "react-native-paper";
+import { Portal, Button, Dialog, useTheme } from "react-native-paper";
 import About from "@/components/About";
 import Privacy from "@/components/Privacy";
 import Broken from "@/components/Broken";
diff --git a/components/DrawerMenu.tsx b/components/DrawerMenu.tsx
index 2bbba5b..74bf4a3 100644
--- a/components/DrawerMenu.tsx
+++ b/components/DrawerMenu.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { View } from "react-native";
-import {Drawer, useTheme} from "react-native-paper";
+import { Appbar,Drawer, useTheme } from "react-native-paper";
 import styles from "@/assets/styles";
 
 interface DrawerMenuProps {
@@ -20,44 +20,15 @@ const DrawerMenu: React.FC<DrawerMenuProps> = ({ isMenuActive, onClose, toggleAb
     }
     return (
         <View style={[styles.drawerContainer, { backgroundColor: theme.colors.background }]}>
+            <Appbar.BackAction onPress={() => onClose()} />
             <Drawer.Section>
-                <Drawer.Item
-                    label="Profile"
-                    onPress={() => {
-                        toggleProfile();
-                        onClose();
-                    }}
-                />
-                <Drawer.Item
-                    label="Location"
-                    onPress={() => {
-                        toggleLocation();
-                        onClose();
-                    }}
-                />
+                <Drawer.Item label="Profile" onPress={() => { toggleProfile(); onClose(); }} />
+                <Drawer.Item label="Location" onPress={() => { toggleLocation(); onClose(); }} />
             </Drawer.Section>
-            <Drawer.Section>
-                <Drawer.Item
-                    label="About Us"
-                    onPress={() => {
-                        toggleAbout();
-                        onClose();
-                    }}
-                />
-                <Drawer.Item
-                    label="Privacy Policy"
-                    onPress={() => {
-                        togglePrivacy();
-                        onClose();
-                    }}
-                />
-                <Drawer.Item
-                    label="Report a Bug"
-                    onPress={() => {
-                        toggleBug();
-                        onClose();
-                    }}
-                />
+            <Drawer.Section showDivider={false}>
+                <Drawer.Item label="About Us" onPress={() => { toggleAbout(); onClose(); }} />
+                <Drawer.Item label="Privacy Policy" onPress={() => { togglePrivacy(); onClose(); }} />
+                <Drawer.Item label="Report a Bug" onPress={() => { toggleBug(); onClose(); }} />
             </Drawer.Section>
         </View>
     );
diff --git a/components/Status.tsx b/components/Status.tsx
index bbb211b..21bd9bf 100644
--- a/components/Status.tsx
+++ b/components/Status.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState, useRef } from "react";
 import useWebSocket from "react-use-websocket";
 import axios from "axios";
-import {Animated, Easing, ImageBackground, ScrollView, useColorScheme, View} from "react-native";
-import { Avatar, List, Button, useTheme,  } from "react-native-paper";
+import { Animated, Easing, ImageBackground, ScrollView, useColorScheme, View } from "react-native";
+import { Avatar, List, Button, useTheme } from "react-native-paper";
 import themes from "@/assets/themes";
 import styles from "@/assets/styles";
 import log from "@/util/log"
diff --git a/components/TopNav.tsx b/components/TopNav.tsx
index 5f7e9b3..4a844a0 100644
--- a/components/TopNav.tsx
+++ b/components/TopNav.tsx
@@ -1,5 +1,5 @@
-import {Appbar, useTheme} from "react-native-paper";
-import {Image, useColorScheme, View} from "react-native";
+import { Appbar, useTheme } from "react-native-paper";
+import { Image, useColorScheme, View } from "react-native";
 import React from "react";
 import styles from "@/assets/styles";