From ad7597a592112543e933db6db6e7b7a81a9691a9 Mon Sep 17 00:00:00 2001
From: Kyle Ramachandran <kyleramachandran@berkeley.edu>
Date: Tue, 2 Apr 2024 16:18:14 -0700
Subject: [PATCH 1/2] updated styling

---
 src/app/(tabs)/_layout.tsx                |  7 +++++++
 src/app/{ => (tabs)}/settings/_layout.tsx |  0
 src/app/{ => (tabs)}/settings/index.tsx   | 19 +++++++++++--------
 src/app/{ => (tabs)}/settings/styles.tsx  |  4 ++--
 4 files changed, 20 insertions(+), 10 deletions(-)
 rename src/app/{ => (tabs)}/settings/_layout.tsx (100%)
 rename src/app/{ => (tabs)}/settings/index.tsx (94%)
 rename src/app/{ => (tabs)}/settings/styles.tsx (94%)

diff --git a/src/app/(tabs)/_layout.tsx b/src/app/(tabs)/_layout.tsx
index 3040918a..328f3d94 100644
--- a/src/app/(tabs)/_layout.tsx
+++ b/src/app/(tabs)/_layout.tsx
@@ -88,6 +88,13 @@ function TabNav() {
           tabBarIcon: ({ color }) => LibraryIcon({ color }),
         }}
       />
+      <Tabs.Screen
+        name="settings"
+        options={{
+          headerShown: false,
+          href: null,
+        }}
+      />
     </Tabs>
   );
 }
diff --git a/src/app/settings/_layout.tsx b/src/app/(tabs)/settings/_layout.tsx
similarity index 100%
rename from src/app/settings/_layout.tsx
rename to src/app/(tabs)/settings/_layout.tsx
diff --git a/src/app/settings/index.tsx b/src/app/(tabs)/settings/index.tsx
similarity index 94%
rename from src/app/settings/index.tsx
rename to src/app/(tabs)/settings/index.tsx
index 40f501ad..10bf4af9 100644
--- a/src/app/settings/index.tsx
+++ b/src/app/(tabs)/settings/index.tsx
@@ -13,13 +13,13 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 import { Icon } from 'react-native-elements';
 
 import styles from './styles';
-import colors from '../../styles/colors';
-import AccountDataDisplay from '../../components/AccountDataDisplay/AccountDataDisplay';
-import StyledButton from '../../components/StyledButton/StyledButton';
-import UserSelectorInput from '../../components/UserSelectorInput/UserSelectorInput';
-import globalStyles from '../../styles/globalStyles';
-import { useSession } from '../../utils/AuthContext';
-import supabase from '../../utils/supabase';
+import colors from '../../../styles/colors';
+import AccountDataDisplay from '../../../components/AccountDataDisplay/AccountDataDisplay';
+import StyledButton from '../../../components/StyledButton/StyledButton';
+import UserSelectorInput from '../../../components/UserSelectorInput/UserSelectorInput';
+import globalStyles from '../../../styles/globalStyles';
+import { useSession } from '../../../utils/AuthContext';
+import supabase from '../../../utils/supabase';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
 
 function SettingsScreen() {
@@ -175,7 +175,10 @@ function SettingsScreen() {
   }
 
   return (
-    <SafeAreaView style={styles.container} edges={['right', 'left', 'top']}>
+    <SafeAreaView
+      style={styles.container}
+      edges={['right', 'left', 'top', 'bottom']}
+    >
       <ScrollView
         bounces={true}
         contentContainerStyle={styles.main}
diff --git a/src/app/settings/styles.tsx b/src/app/(tabs)/settings/styles.tsx
similarity index 94%
rename from src/app/settings/styles.tsx
rename to src/app/(tabs)/settings/styles.tsx
index 944c1819..7a3fae97 100644
--- a/src/app/settings/styles.tsx
+++ b/src/app/(tabs)/settings/styles.tsx
@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native';
-import colors from '../../styles/colors';
+import colors from '../../../styles/colors';
 
 export default StyleSheet.create({
   selectors: {
@@ -12,7 +12,7 @@ export default StyleSheet.create({
     paddingHorizontal: 24,
   },
   button: {
-    marginBottom: 32,
+    marginBottom: 100,
   },
   main: {
     paddingLeft: 12,

From 59375ad7a54df87be6bb4669289076d25858d362 Mon Sep 17 00:00:00 2001
From: Aditya Pawar <apawar@berkeley.edu>
Date: Thu, 4 Apr 2024 18:33:07 -0700
Subject: [PATCH 2/2] Small style changes

---
 src/app/(tabs)/_layout.tsx             | 2 +-
 src/app/(tabs)/settings/styles.tsx     | 2 +-
 src/app/_layout.tsx                    | 1 -
 src/components/StyledButton/styles.tsx | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/(tabs)/_layout.tsx b/src/app/(tabs)/_layout.tsx
index 328f3d94..c496d43f 100644
--- a/src/app/(tabs)/_layout.tsx
+++ b/src/app/(tabs)/_layout.tsx
@@ -1,5 +1,5 @@
 import { Tabs } from 'expo-router';
-import { Platform } from 'react-native';
+import { Platform, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import Icon from '../../../assets/icons';
diff --git a/src/app/(tabs)/settings/styles.tsx b/src/app/(tabs)/settings/styles.tsx
index 7a3fae97..a5eceadc 100644
--- a/src/app/(tabs)/settings/styles.tsx
+++ b/src/app/(tabs)/settings/styles.tsx
@@ -12,7 +12,7 @@ export default StyleSheet.create({
     paddingHorizontal: 24,
   },
   button: {
-    marginBottom: 100,
+    marginBottom: 32,
   },
   main: {
     paddingLeft: 12,
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 7e805eaa..c15ba80c 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -12,7 +12,6 @@ function StackLayout() {
         <Stack>
           <Stack.Screen name="index" options={{ headerShown: false }} />
           <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-          <Stack.Screen name="settings" options={{ headerShown: false }} />
           <Stack.Screen name="auth" options={{ headerShown: false }} />
         </Stack>
       </AuthContextProvider>
diff --git a/src/components/StyledButton/styles.tsx b/src/components/StyledButton/styles.tsx
index 4e664ced..b2c4dc94 100644
--- a/src/components/StyledButton/styles.tsx
+++ b/src/components/StyledButton/styles.tsx
@@ -13,7 +13,7 @@ export default StyleSheet.create({
   },
   titleStyle: {
     paddingHorizontal: 24,
-    paddingVertical: 10,
+    paddingVertical: 5,
     color: 'white',
   },
 });