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,
"bundleIdentifier": "com.cally.app",
"googleServicesFile": "./ios/GoogleService-Info.plist",
"buildNumber": "62",
"buildNumber": "63",
"usesAppleSignIn": true
},
"android": {

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

@ -1,29 +1,16 @@
import React from "react";
import { Drawer } from "expo-router/drawer";
import { useSignOut } from "@/hooks/firebase/useSignOut";
import {
DrawerContentScrollView,
DrawerItem,
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 {Drawer} from "expo-router/drawer";
import {useSignOut} from "@/hooks/firebase/useSignOut";
import {DrawerContentScrollView,} from "@react-navigation/drawer";
import {Button, ButtonSize, Text, View} from "react-native-ui-lib";
import {ImageBackground, StyleSheet} from "react-native";
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 NavToDosIcon from "@/assets/svgs/NavToDosIcon";
import NavBrainDumpIcon from "@/assets/svgs/NavBrainDumpIcon";
import NavCalendarIcon from "@/assets/svgs/NavCalendarIcon";
import NavSettingsIcon from "@/assets/svgs/NavSettingsIcon";
import { useAtom, useSetAtom } from "jotai";
import {useSetAtom} from "jotai";
import {
isFamilyViewAtom,
settingsPageIndex,
@ -32,7 +19,7 @@ import {
} from "@/components/pages/calendar/atoms";
export default function TabLayout() {
const { mutateAsync: signOut } = useSignOut();
const {mutateAsync: signOut} = useSignOut();
const setIsFamilyView = useSetAtom(isFamilyViewAtom);
const setPageIndex = useSetAtom(settingsPageIndex);
const setUserView = useSetAtom(userSettingsView);
@ -52,7 +39,7 @@ export default function TabLayout() {
}}
drawerContent={(props) => {
return (
<DrawerContentScrollView {...props} style={{ height: "100%" }}>
<DrawerContentScrollView {...props} style={{height: "100%"}}>
<View centerV margin-30 row>
<ImageBackground
source={require("../../assets/images/splash.png")}
@ -68,10 +55,10 @@ export default function TabLayout() {
<View
style={{
flexDirection: "row",
paddingHorizontal: 30,
paddingHorizontal: 30
}}
>
<View style={{ flex: 1, paddingRight: 5 }}>
<View style={{flex: 1, paddingRight: 5}}>
<DrawerButton
title={"Calendar"}
color="rgb(7, 184, 199)"
@ -83,7 +70,7 @@ export default function TabLayout() {
setUserView(true);
setIsFamilyView(false);
}}
icon={<NavCalendarIcon />}
icon={<NavCalendarIcon/>}
/>
<DrawerButton
color="#50be0c"
@ -96,10 +83,10 @@ export default function TabLayout() {
setUserView(true);
setIsFamilyView(false);
}}
icon={<NavGroceryIcon />}
icon={<NavGroceryIcon/>}
/>
</View>
<View style={{ flex: 1 }}>
<View style={{flex: 1}}>
{/*<DrawerButton
color="#fd1775"
title={"My Reminders"}
@ -124,7 +111,7 @@ export default function TabLayout() {
setUserView(true);
setIsFamilyView(false);
}}
icon={<NavToDosIcon />}
icon={<NavToDosIcon/>}
/>
<DrawerButton
color="#e0ca03"
@ -137,9 +124,8 @@ export default function TabLayout() {
setUserView(true);
setIsFamilyView(false);
}}
icon={<NavBrainDumpIcon />}
icon={<NavBrainDumpIcon/>}
/>
{/*<DrawerItem label="Logout" onPress={() => signOut()} />*/}
</View>
</View>
<Button
@ -157,29 +143,28 @@ export default function TabLayout() {
backgroundColor="#ededed"
width={60}
height={60}
style={{ borderRadius: 50 }}
style={{borderRadius: 50}}
marginR-10
centerV
centerH
>
<NavSettingsIcon />
<NavSettingsIcon/>
</View>
)}
backgroundColor="white"
color="#464039"
paddingV-30
marginH-30
marginB-10
borderRadius={18.55}
style={{ elevation: 0 }}
style={{elevation: 0}}
/>
<Button
size={ButtonSize.large}
marginH-30
marginH-10
paddingV-15
style={{
marginTop: "42%",
marginTop: 50,
backgroundColor: "transparent",
borderWidth: 1.3,
borderColor: "#fd1775",
@ -205,7 +190,7 @@ export default function TabLayout() {
options={{
drawerLabel: "Calendar",
title: "Calendar",
drawerItemStyle: { display: "none" },
drawerItemStyle: {display: "none"},
}}
/>
<Drawer.Screen
@ -248,8 +233,8 @@ export default function TabLayout() {
}
const styles = StyleSheet.create({
signOut: { fontFamily: "Poppins_500Medium", fontSize: 15 },
label: { fontFamily: "Poppins_400Medium", fontSize: 15 },
signOut: {fontFamily: "Poppins_500Medium", fontSize: 15},
label: {fontFamily: "Poppins_400Medium", fontSize: 15},
title: {
fontSize: 26.13,
fontFamily: "Manrope_600SemiBold",