Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add skeletons and responsive navbar #211

Merged
merged 1 commit into from
Jul 17, 2024
Merged

feat: add skeletons and responsive navbar #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions frontend/occupi-mobile4/app/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Stack } from 'expo-router';
import * as SplashScreen from 'expo-splash-screen';
import 'react-native-reanimated';
import { GluestackUIProvider } from "@gluestack-ui/themed";
import { NavBarProvider } from '@/components/NavBarProvider';
import { config } from "@gluestack-ui/config"; // Optional if you want to use default theme

// Prevent the splash screen from auto-hiding before asset loading is complete.
Expand All @@ -31,6 +32,7 @@ export default function RootLayout() {

return (
<GluestackUIProvider config={config} theme={theme}>
<NavBarProvider>
<Stack>
<Stack.Screen name="index" options={{ headerShown: false }} />
<Stack.Screen name="login" options={{ headerShown: false }} />
Expand All @@ -56,6 +58,7 @@ export default function RootLayout() {
<Stack.Screen name="set-security" options={{ headerShown: false }} />
<Stack.Screen name="notiftester" options={{ headerShown: false }} />
</Stack>
</NavBarProvider>
</GluestackUIProvider>
);
}
148 changes: 131 additions & 17 deletions frontend/occupi-mobile4/components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useState } from 'react';

Check warning on line 1 in frontend/occupi-mobile4/components/NavBar.tsx

View workflow job for this annotation

GitHub Actions / lint 

'useState' is defined but never used
import { StyleSheet } from 'react-native';
import { Text, Button, Icon, CalendarDaysIcon, BellIcon } from '@gluestack-ui/themed';
import { Feather } from '@expo/vector-icons';
Expand All @@ -7,31 +7,145 @@
import { BlurView } from 'expo-blur';
import { useColorScheme } from 'react-native';
import { widthPercentageToDP as wp, heightPercentageToDP as hp } from 'react-native-responsive-screen';
import { useNavBar } from './NavBarProvider';

const NavBar = () => {
let colorScheme = useColorScheme();
const styles = getStyles(colorScheme);
const { currentTab, setCurrentTab } = useNavBar();

const handleTabPress = (tabName, route) => {
setCurrentTab(tabName);
router.replace(route);
};
console.log(currentTab);

return (
<BlurView tint="light" pb={hp('3%')} backgroundColor={colorScheme === 'dark' ? 'black' : '#fff'} intensity={20} style={styles.container}>
<Button onPress={() => router.replace('/home')} flex={1} mt={hp('1%')} w={wp('20%')} backgroundColor="none" title="Home" flexDirection="column">
<Feather name="home" size={hp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'} />
<Text numberOfLines={1} w={wp('9%')} fontSize={wp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'}>Home</Text>
<BlurView
tint="light"
pb={hp('3%')}
backgroundColor={colorScheme === 'dark' ? 'black' : '#fff'}
intensity={20}
style={styles.container}
>
<Button
onPress={() => handleTabPress('Home', '/home')}
flex={1}
mt={hp('1%')}
w={wp('20%')}
backgroundColor="none"
title="Home"
flexDirection="column"
>
<Feather
name="home"
size={hp('3%')}
color={currentTab === 'Home' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
/>
<Text
numberOfLines={1}
w={wp('9%')}
fontSize={wp('3%')}
color={currentTab === 'Home' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
>
Home
</Text>
</Button>
<Button onPress={() => router.replace('/viewbookings')} flex={1} mt={hp('1%')} w={wp('20%')} backgroundColor="none" title="Search" flexDirection="column">
<Ionicons name="receipt-outline" size={24} color={colorScheme === 'dark' ? '#fff' : '#000'} />
<Text numberOfLines={1} w={wp('19%')} fontSize={wp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'}>My bookings</Text>
<Button
onPress={() => handleTabPress('ViewBookings', '/viewbookings')}
flex={1}
mt={hp('1%')}
w={wp('20%')}
backgroundColor="none"
title="Search"
flexDirection="column"
>
<Ionicons
name="receipt-outline"
size={24}
color={currentTab === 'ViewBookings' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
/>
<Text
numberOfLines={1}
w={wp('19%')}
fontSize={wp('3%')}
color={currentTab === 'ViewBookings' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
>
My bookings
</Text>
</Button>
<Button onPress={() => router.replace('/bookings')} flex={1} mt={hp('1%')} w={wp('20%')} backgroundColor="none" title="Book" flexDirection="column">
<Icon as={CalendarDaysIcon} w={hp('3%')} h={hp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'} />
<Text numberOfLines={1} w={wp('7.4%')} fontSize={wp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'}>Book</Text>
<Button
onPress={() => handleTabPress('Book', '/bookings')}
flex={1}
mt={hp('1%')}
w={wp('20%')}
backgroundColor="none"
title="Book"
flexDirection="column"
>
<Icon
as={CalendarDaysIcon}
w={hp('3%')}
h={hp('3%')}
color={currentTab === 'Book' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
/>
<Text
numberOfLines={1}
w={wp('7.4%')}
fontSize={wp('3%')}
color={currentTab === 'Book' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
>
Book
</Text>
</Button>
<Button onPress={() => router.replace('/notifications')} flex={1} mt={hp('1%')} w={wp('20%')} backgroundColor="none" title="Notifications" flexDirection="column">
<Icon as={BellIcon} w={hp('3%')} h={hp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'} />
<Text pl={wp('1%')} numberOfLines={1} w={wp('20%')} fontSize={wp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'}>Notifications</Text>
<Button
onPress={() => handleTabPress('Notifications', '/notifications')}
flex={1}
mt={hp('1%')}
w={wp('20%')}
backgroundColor="none"
title="Notifications"
flexDirection="column"
>
<Icon
as={BellIcon}
w={hp('3%')}
h={hp('3%')}
color={currentTab === 'Notifications' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
/>
<Text
pl={wp('1%')}
numberOfLines={1}
w={wp('20%')}
fontSize={wp('3%')}
color={currentTab === 'Notifications' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
>
Notifications
</Text>
</Button>
<Button onPress={() => router.replace('/settings')} flex={1} mt={hp('1%')} w={wp('20%')} backgroundColor="none" title="Profile" flexDirection="column">
<FontAwesome6 name="user" size={hp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'} />
<Text pl={wp('1%')} numberOfLines={1} w={wp('12%')} fontSize={wp('3%')} color={colorScheme === 'dark' ? 'white' : 'black'}>Profile</Text>
<Button
onPress={() => handleTabPress('Profile', '/settings')}
flex={1}
mt={hp('1%')}
w={wp('20%')}
backgroundColor="none"
title="Profile"
flexDirection="column"
>
<FontAwesome6
name="user"
size={hp('3%')}
color={currentTab === 'Profile' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
/>
<Text
pl={wp('1%')}
numberOfLines={1}
w={wp('12%')}
fontSize={wp('3%')}
color={currentTab === 'Profile' ? 'yellowgreen' : colorScheme === 'dark' ? 'white' : 'black'}
>
Profile
</Text>
</Button>
</BlurView>
);
Expand Down
15 changes: 15 additions & 0 deletions frontend/occupi-mobile4/components/NavBarProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React, { createContext, useContext, useState } from 'react';

const NavBarContext = createContext();

export const NavBarProvider = ({ children }) => {
const [currentTab, setCurrentTab] = useState('');

return (
<NavBarContext.Provider value={{ currentTab, setCurrentTab }}>
{children}
</NavBarContext.Provider>
);
};

export const useNavBar = () => useContext(NavBarContext);
Loading
Loading