diff --git a/bun.lockb b/bun.lockb index 96b748c..9ff234f 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/components/drawerBottom.tsx b/components/drawerBottom.tsx index 1807736..bfab50e 100644 --- a/components/drawerBottom.tsx +++ b/components/drawerBottom.tsx @@ -1,30 +1,56 @@ import Styles from "@/constants/Styles" import { MaterialIcons } from "@expo/vector-icons" -import { Modal, Pressable, Text, View } from "react-native" +import { Pressable, Text, View } from "react-native" +import Modal from 'react-native-modal'; type Props = { isVisible: boolean setVisible: (value: boolean) => void title?: string children: React.ReactNode - animation: 'slide' | 'none' | 'fade' + animation?: 'slide' | 'none' | 'fade' height?: number } export default function DrawerBottom({ isVisible, setVisible, title, children, animation, height }: Props) { return ( - - - - - {title} - setVisible(false)}> - - - - - {children} - + // + // + // + // + // {title} + // setVisible(false)}> + // + // + // + // + // {children} + // + // + // + // + + setVisible(false)} + swipeDirection="down" + hideModalContentWhileAnimating={true} + onBackdropPress={() => { setVisible(false) }} + style={[{ justifyContent: 'flex-end', margin: 0 }]} + > + + + {title} + setVisible(false)}> + + + + + {children} diff --git a/constants/Styles.ts b/constants/Styles.ts index f38a95b..2a6c3fa 100644 --- a/constants/Styles.ts +++ b/constants/Styles.ts @@ -240,7 +240,7 @@ const Styles = StyleSheet.create({ shadowRadius: 3, elevation: 10, borderRadius: 15, - marginBottom:15 + marginBottom: 15 }, wrapGridCaraousel: { width: '95%', @@ -280,7 +280,7 @@ const Styles = StyleSheet.create({ backgroundColor: '#ccc', borderRadius: 10, margin: 10, - width:'90%' + width: '90%' }, contentBar: { height: 20, @@ -388,9 +388,23 @@ const Styles = StyleSheet.create({ paddingVertical: 10 }, contentContainer: { - paddingHorizontal: 20, height: '80%' }, + modalContentNew: { + width: '100%', + backgroundColor: 'white', + borderTopRightRadius: 18, + borderTopLeftRadius: 18, + paddingTop: 5, + paddingBottom: 20, + paddingHorizontal: 20 + }, + titleContainerNew: { + flexDirection: 'row', + alignItems: 'center', + justifyContent: 'space-between', + paddingVertical: 10, + }, wrapBtnTab: { justifyContent: 'space-between', flexDirection: 'row', diff --git a/package.json b/package.json index 196df72..2cd3c8f 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "react-native-confirmation-code-field": "^7.4.0", "react-native-gesture-handler": "~2.20.2", "react-native-gifted-charts": "^1.4.57", + "react-native-modal": "^14.0.0-rc.1", "react-native-reanimated": "~3.16.1", "react-native-reanimated-carousel": "^4.0.2", "react-native-safe-area-context": "4.12.0",