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

fixed tablet calendar

Browse Source
This commit is contained in:
ivic00
2024-12-28 15:53:36 +01:00
parent f1869f02f2
commit ab7a844bb5
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,6 +158,8 @@ export default function TabLayout() {
return ( return (
<View marginR-16 row centerV> <View marginR-16 row centerV>
{Device.deviceType === DeviceType.TABLET && isCalendarPage && <View flex-1 center><CalendarHeader />
</View>}
{isCalendarPage && ( {isCalendarPage && (
<View marginR-16><RefreshButton onRefresh={onRefresh} isSyncing={isLoading} /></View> <View marginR-16><RefreshButton onRefresh={onRefresh} isSyncing={isLoading} /></View>
)} )}

4
components/pages/calendar/DetailedCalendar.tsx
View File

@ -10,6 +10,8 @@ import {useCalendarControls} from "@/components/pages/calendar/useCalendarContro
import {EventCell} from "@/components/pages/calendar/EventCell"; import {EventCell} from "@/components/pages/calendar/EventCell";
import {isToday} from "date-fns"; import {isToday} from "date-fns";
import { View } from "react-native-ui-lib"; import { View } from "react-native-ui-lib";
import { DeviceType } from "expo-device";
import * as Device from "expo-device"
interface EventCalendarProps { interface EventCalendarProps {
calendarHeight: number; calendarHeight: number;
@ -97,7 +99,7 @@ export const DetailedCalendar: React.FC<EventCalendarProps> = ({calendarHeight,
{...bodyProps} {...bodyProps}
renderEvent={renderEvent} renderEvent={renderEvent}
/> />
<View marginB-0/> {Device.deviceType === DeviceType.TABLET && <View style={{backgroundColor: 'white', height: '9%', width: '100%'}}/>}
</CalendarContainer> </CalendarContainer>
); );
}; };

2
components/pages/calendar/MonthCalendar.tsx
View File

@ -652,7 +652,7 @@ export const MonthCalendar: React.FC<EventCalendarProps> = React.memo(
ampm ampm
// renderCustomDateForMonth={renderCustomDateForMonth} // renderCustomDateForMonth={renderCustomDateForMonth}
/> />
{/*<View style={{backgroundColor: 'white', height: 50, width: '100%'}}/>*/} {Device.deviceType === DeviceType.TABLET && <View style={{backgroundColor: 'white', height: '9%', width: '100%'}}/>}
</> </>
); );

4
components/pages/todos/user-chores/UserChoresProgress.tsx
View File

@ -31,13 +31,13 @@ const UserChoresProgress = ({
style={{fontFamily: "Poppins_400Regular", fontSize: 14.71}} style={{fontFamily: "Poppins_400Regular", fontSize: 14.71}}
color="#979797" color="#979797"
> >
Return to To Do's Return to To Dos
</Text> </Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<View> <View>
<Text style={{fontFamily: "Manrope_700Bold", fontSize: 20}}> <Text style={{fontFamily: "Manrope_700Bold", fontSize: 20}}>
Your To Do's Progress Report Your To Dos Progress Report
</Text> </Text>
</View> </View>
<View row spread marginT-25 marginB-5> <View row spread marginT-25 marginB-5>