Merge branch 'dev'

This commit is contained in:
Milan Paunovic
2024-12-20 13:28:06 +01:00

View File

@ -13,7 +13,7 @@ import {
TouchableOpacity, TouchableOpacity,
View, View,
} from "react-native-ui-lib"; } from "react-native-ui-lib";
import { ImageBackground, StyleSheet } from "react-native"; import { ImageBackground, Pressable, StyleSheet } from "react-native";
import DrawerButton from "@/components/shared/DrawerButton"; import DrawerButton from "@/components/shared/DrawerButton";
import NavGroceryIcon from "@/assets/svgs/NavGroceryIcon"; import NavGroceryIcon from "@/assets/svgs/NavGroceryIcon";
import NavToDosIcon from "@/assets/svgs/NavToDosIcon"; import NavToDosIcon from "@/assets/svgs/NavToDosIcon";
@ -98,6 +98,7 @@ export default function TabLayout() {
navigation: DrawerNavigationProp<DrawerParamList>; navigation: DrawerNavigationProp<DrawerParamList>;
route: RouteProp<DrawerParamList>; route: RouteProp<DrawerParamList>;
}): DrawerNavigationOptions => ({ }): DrawerNavigationOptions => ({
lazy: true,
headerShown: true, headerShown: true,
headerTitleAlign: headerTitleAlign:
Device.deviceType === DeviceType.TABLET ? "left" : "center", Device.deviceType === DeviceType.TABLET ? "left" : "center",
@ -124,12 +125,21 @@ export default function TabLayout() {
fontSize: Device.deviceType === DeviceType.TABLET ? 22 : 17, fontSize: Device.deviceType === DeviceType.TABLET ? 22 : 17,
}, },
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <Pressable
onPress={navigation.toggleDrawer} onPress={() => {
style={{ marginLeft: 16 }} navigation.toggleDrawer()
}}
hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
style={({ pressed }) => [
{
marginLeft: 16,
opacity: pressed ? 0.4 : 1
}
]}
> >
<DrawerIcon /> <DrawerIcon />
</TouchableOpacity> </Pressable>
), ),
headerRight: () => { headerRight: () => {
const showViewSwitch = ["calendar", "todos", "index"].includes( const showViewSwitch = ["calendar", "todos", "index"].includes(