ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2026-03-10 18:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source 
# Conflicts:
#	components/pages/calendar/DetailedCalendar.tsx
This commit is contained in:
Dejan
2024-12-29 18:59:46 +01:00
parent ab7a844bb5 7d3e39b77d
commit 42b18856e4
29 changed files with 414 additions and 4684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,10 +79,11 @@ export default function TabLayout() {
const setToDosIndex = useSetAtom(toDosPageIndex);
const { resyncAllCalendars, isSyncing } = useCalSync();
const isFormatting = useIsFetching({queryKey: ['formattedEvents']}) > 0;
const isFetching = useIsFetching({queryKey: ['events']}) > 0;
const isLoading = isSyncing || isFormatting || isFetching;
const isLoading = React.useMemo(() => {
return isSyncing || isFetching;
}, [isSyncing, isFetching]);
const onRefresh = React.useCallback(async () => {
try {
@ -102,7 +103,7 @@ export default function TabLayout() {
lazy: true,
headerShown: true,
headerTitleAlign:
Device.deviceType === DeviceType.TABLET ? "left" : "center",
Device.deviceType === DeviceType.TABLET ? "left" : "unaligned",
headerTitle: ({ children }) => {
const isCalendarRoute = ["calendar", "index"].includes(route.name);

1
app/_layout.tsx
View File

@ -56,6 +56,7 @@ import {Platform} from 'react-native';
import KeyboardManager from 'react-native-keyboard-manager';
import {enableScreens} from 'react-native-screens';
import {PersistQueryClientProvider} from "@/contexts/PersistQueryClientProvider";
import auth from "@react-native-firebase/auth";
enableScreens(true)