ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-11-26 08:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

PKG update

Browse Source
This commit is contained in:
Milan Paunovic
2024-11-01 04:58:55 +01:00
parent 4f1a96d0f1
commit 0d2fe33caa
2 changed files with 214 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.json
View File

@ -16,7 +16,7 @@
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "com.cally.app", "bundleIdentifier": "com.cally.app",
"googleServicesFile": "./ios/GoogleService-Info.plist", "googleServicesFile": "./ios/GoogleService-Info.plist",
"buildNumber": "62", "buildNumber": "63",
"usesAppleSignIn": true "usesAppleSignIn": true
}, },
"android": { "android": {

441
app/(auth)/_layout.tsx
View File

@ -1,106 +1,93 @@
import React from "react"; import React from "react";
import { Drawer } from "expo-router/drawer"; import {Drawer} from "expo-router/drawer";
import { useSignOut } from "@/hooks/firebase/useSignOut"; import {useSignOut} from "@/hooks/firebase/useSignOut";
import { import {DrawerContentScrollView,} from "@react-navigation/drawer";
DrawerContentScrollView, import {Button, ButtonSize, Text, View} from "react-native-ui-lib";
DrawerItem, import {ImageBackground, StyleSheet} from "react-native";
DrawerItemList,
} from "@react-navigation/drawer";
import { Button, View, Text, ButtonSize } from "react-native-ui-lib";
import { ImageBackground, StyleSheet } from "react-native";
import Feather from "@expo/vector-icons/Feather";
import DrawerButton from "@/components/shared/DrawerButton"; import DrawerButton from "@/components/shared/DrawerButton";
import {
AntDesign,
FontAwesome6,
MaterialCommunityIcons,
Octicons,
} from "@expo/vector-icons";
import MenuIcon from "@/assets/svgs/MenuIcon";
import { router } from "expo-router";
import NavGroceryIcon from "@/assets/svgs/NavGroceryIcon"; import NavGroceryIcon from "@/assets/svgs/NavGroceryIcon";
import NavToDosIcon from "@/assets/svgs/NavToDosIcon"; import NavToDosIcon from "@/assets/svgs/NavToDosIcon";
import NavBrainDumpIcon from "@/assets/svgs/NavBrainDumpIcon"; import NavBrainDumpIcon from "@/assets/svgs/NavBrainDumpIcon";
import NavCalendarIcon from "@/assets/svgs/NavCalendarIcon"; import NavCalendarIcon from "@/assets/svgs/NavCalendarIcon";
import NavSettingsIcon from "@/assets/svgs/NavSettingsIcon"; import NavSettingsIcon from "@/assets/svgs/NavSettingsIcon";
import { useAtom, useSetAtom } from "jotai"; import {useSetAtom} from "jotai";
import { import {
isFamilyViewAtom, isFamilyViewAtom,
settingsPageIndex, settingsPageIndex,
toDosPageIndex, toDosPageIndex,
userSettingsView, userSettingsView,
} from "@/components/pages/calendar/atoms"; } from "@/components/pages/calendar/atoms";
export default function TabLayout() { export default function TabLayout() {
const { mutateAsync: signOut } = useSignOut(); const {mutateAsync: signOut} = useSignOut();
const setIsFamilyView = useSetAtom(isFamilyViewAtom); const setIsFamilyView = useSetAtom(isFamilyViewAtom);
const setPageIndex = useSetAtom(settingsPageIndex); const setPageIndex = useSetAtom(settingsPageIndex);
const setUserView = useSetAtom(userSettingsView); const setUserView = useSetAtom(userSettingsView);
const setToDosIndex = useSetAtom(toDosPageIndex); const setToDosIndex = useSetAtom(toDosPageIndex);
return ( return (
<Drawer <Drawer
initialRouteName={"index"} initialRouteName={"index"}
detachInactiveScreens detachInactiveScreens
screenOptions={{ screenOptions={{
headerShown: true, headerShown: true,
drawerStyle: { drawerStyle: {
width: "90%", width: "90%",
backgroundColor: "#f9f8f7", backgroundColor: "#f9f8f7",
height: "100%", height: "100%",
}, },
}} }}
drawerContent={(props) => { drawerContent={(props) => {
return ( return (
<DrawerContentScrollView {...props} style={{ height: "100%" }}> <DrawerContentScrollView {...props} style={{height: "100%"}}>
<View centerV margin-30 row> <View centerV margin-30 row>
<ImageBackground <ImageBackground
source={require("../../assets/images/splash.png")} source={require("../../assets/images/splash.png")}
style={{ style={{
backgroundColor: "transparent", backgroundColor: "transparent",
height: 51.43, height: 51.43,
aspectRatio: 1, aspectRatio: 1,
marginRight: 8, marginRight: 8,
}} }}
/> />
<Text style={styles.title}>Welcome to Cally</Text> <Text style={styles.title}>Welcome to Cally</Text>
</View> </View>
<View <View
style={{ style={{
flexDirection: "row", flexDirection: "row",
paddingHorizontal: 30, paddingHorizontal: 30
}} }}
> >
<View style={{ flex: 1, paddingRight: 5 }}> <View style={{flex: 1, paddingRight: 5}}>
<DrawerButton <DrawerButton
title={"Calendar"} title={"Calendar"}
color="rgb(7, 184, 199)" color="rgb(7, 184, 199)"
bgColor={"rgb(231, 248, 250)"} bgColor={"rgb(231, 248, 250)"}
pressFunc={() => { pressFunc={() => {
props.navigation.navigate("calendar"); props.navigation.navigate("calendar");
setPageIndex(0); setPageIndex(0);
setToDosIndex(0); setToDosIndex(0);
setUserView(true); setUserView(true);
setIsFamilyView(false); setIsFamilyView(false);
}} }}
icon={<NavCalendarIcon />} icon={<NavCalendarIcon/>}
/> />
<DrawerButton <DrawerButton
color="#50be0c" color="#50be0c"
title={"Groceries"} title={"Groceries"}
bgColor={"#eef9e7"} bgColor={"#eef9e7"}
pressFunc={() => { pressFunc={() => {
props.navigation.navigate("grocery"); props.navigation.navigate("grocery");
setPageIndex(0); setPageIndex(0);
setToDosIndex(0); setToDosIndex(0);
setUserView(true); setUserView(true);
setIsFamilyView(false); setIsFamilyView(false);
}} }}
icon={<NavGroceryIcon />} icon={<NavGroceryIcon/>}
/> />
</View> </View>
<View style={{ flex: 1 }}> <View style={{flex: 1}}>
{/*<DrawerButton {/*<DrawerButton
color="#fd1775" color="#fd1775"
title={"My Reminders"} title={"My Reminders"}
bgColor={"#ffe8f2"} bgColor={"#ffe8f2"}
@ -113,146 +100,144 @@ export default function TabLayout() {
/> />
} }
/>*/} />*/}
<DrawerButton <DrawerButton
color="#8005eb" color="#8005eb"
title={"To Do's"} title={"To Do's"}
bgColor={"#f3e6fd"} bgColor={"#f3e6fd"}
pressFunc={() => { pressFunc={() => {
props.navigation.navigate("todos"); props.navigation.navigate("todos");
setPageIndex(0); setPageIndex(0);
setToDosIndex(0); setToDosIndex(0);
setUserView(true); setUserView(true);
setIsFamilyView(false); setIsFamilyView(false);
}} }}
icon={<NavToDosIcon />} icon={<NavToDosIcon/>}
/> />
<DrawerButton <DrawerButton
color="#e0ca03" color="#e0ca03"
title={"Brain Dump"} title={"Brain Dump"}
bgColor={"#fffacb"} bgColor={"#fffacb"}
pressFunc={() => { pressFunc={() => {
props.navigation.navigate("brain_dump"); props.navigation.navigate("brain_dump");
setPageIndex(0); setPageIndex(0);
setToDosIndex(0); setToDosIndex(0);
setUserView(true); setUserView(true);
setIsFamilyView(false); setIsFamilyView(false);
}} }}
icon={<NavBrainDumpIcon />} icon={<NavBrainDumpIcon/>}
/> />
{/*<DrawerItem label="Logout" onPress={() => signOut()} />*/} </View>
</View> </View>
</View> <Button
<Button onPress={() => {
onPress={() => { props.navigation.navigate("settings");
props.navigation.navigate("settings"); setPageIndex(0);
setPageIndex(0); setToDosIndex(0);
setToDosIndex(0); setUserView(true);
setUserView(true); setIsFamilyView(false);
setIsFamilyView(false); }}
}} label={"Manage Settings"}
label={"Manage Settings"} labelStyle={styles.label}
labelStyle={styles.label} iconSource={() => (
iconSource={() => ( <View
<View backgroundColor="#ededed"
backgroundColor="#ededed" width={60}
width={60} height={60}
height={60} style={{borderRadius: 50}}
style={{ borderRadius: 50 }} marginR-10
marginR-10 centerV
centerV centerH
centerH >
> <NavSettingsIcon/>
<NavSettingsIcon /> </View>
</View> )}
)} backgroundColor="white"
backgroundColor="white" color="#464039"
color="#464039" paddingV-30
paddingV-30 marginH-30
marginH-30 borderRadius={18.55}
marginB-10 style={{elevation: 0}}
borderRadius={18.55} />
style={{ elevation: 0 }}
/>
<Button <Button
size={ButtonSize.large} size={ButtonSize.large}
marginH-30 marginH-10
paddingV-15 paddingV-15
style={{ style={{
marginTop: "42%", marginTop: 50,
backgroundColor: "transparent", backgroundColor: "transparent",
borderWidth: 1.3, borderWidth: 1.3,
borderColor: "#fd1775", borderColor: "#fd1775",
}} }}
label="Sign out of Cally" label="Sign out of Cally"
color="#fd1775" color="#fd1775"
labelStyle={styles.signOut} labelStyle={styles.signOut}
onPress={() => signOut()} onPress={() => signOut()}
/>
</DrawerContentScrollView>
);
}}
>
<Drawer.Screen
name="index"
options={{
drawerLabel: "Calendar",
title: "Calendar",
}}
/> />
</DrawerContentScrollView> <Drawer.Screen
); name="calendar"
}} options={{
> drawerLabel: "Calendar",
<Drawer.Screen title: "Calendar",
name="index" drawerItemStyle: {display: "none"},
options={{ }}
drawerLabel: "Calendar", />
title: "Calendar", <Drawer.Screen
}} name="brain_dump"
/> options={{
<Drawer.Screen drawerLabel: "Brain Dump",
name="calendar" title: "Brain Dump",
options={{ }}
drawerLabel: "Calendar", />
title: "Calendar", <Drawer.Screen
drawerItemStyle: { display: "none" }, name="settings"
}} options={{
/> drawerLabel: "Settings",
<Drawer.Screen title: "Settings",
name="brain_dump" }}
options={{ />
drawerLabel: "Brain Dump", <Drawer.Screen
title: "Brain Dump", name="grocery"
}} options={{
/> drawerLabel: "Grocery",
<Drawer.Screen title: "Grocery",
name="settings" }}
options={{ />
drawerLabel: "Settings", <Drawer.Screen
title: "Settings", name="reminders"
}} options={{
/> drawerLabel: "Reminders",
<Drawer.Screen title: "Reminders",
name="grocery" }}
options={{ />
drawerLabel: "Grocery", <Drawer.Screen
title: "Grocery", name="todos"
}} options={{
/> drawerLabel: "To-Do",
<Drawer.Screen title: "To-Dos",
name="reminders" }}
options={{ />
drawerLabel: "Reminders", </Drawer>
title: "Reminders", );
}}
/>
<Drawer.Screen
name="todos"
options={{
drawerLabel: "To-Do",
title: "To-Dos",
}}
/>
</Drawer>
);
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
signOut: { fontFamily: "Poppins_500Medium", fontSize: 15 }, signOut: {fontFamily: "Poppins_500Medium", fontSize: 15},
label: { fontFamily: "Poppins_400Medium", fontSize: 15 }, label: {fontFamily: "Poppins_400Medium", fontSize: 15},
title: { title: {
fontSize: 26.13, fontSize: 26.13,
fontFamily: "Manrope_600SemiBold", fontFamily: "Manrope_600SemiBold",
color: "#262627", color: "#262627",
}, },
}); });