diff --git a/frontend/app/(drawer)/_layout.tsx b/frontend/app/(drawer)/_layout.tsx index 0bea61e..3b81a20 100644 --- a/frontend/app/(drawer)/_layout.tsx +++ b/frontend/app/(drawer)/_layout.tsx @@ -22,6 +22,7 @@ export default function Layout() { drawerType: media.sm ? "front" : "permanent", drawerStyle: { width: 250 }, headerLeft: media.sm ? undefined : () => null, + headerStyle: {elevation: 0, borderBottomWidth: 0} }} > { + const insets = useSafeAreaInsets(); + return ( - <> + @@ -35,7 +38,7 @@ const Drawer = (props: DrawerContentComponentProps) => { - + ); }; @@ -81,6 +84,8 @@ const DrawerItemList = ({ bg={focused ? "$background" : "$colorTransparent"} onPress={onPress} icon={drawerIcon?.({ size: 16, color: "$color", focused }) as never} + size="$4" + $xs={{ size: "$5", borderRadius: 999, borderWidth: 0 }} > {drawerLabel !== undefined ? drawerLabel diff --git a/frontend/components/ui/input.tsx b/frontend/components/ui/input.tsx index 4b9acec..7c51b12 100644 --- a/frontend/components/ui/input.tsx +++ b/frontend/components/ui/input.tsx @@ -17,7 +17,7 @@ export const InputField = ({ name={name} render={({ field, fieldState }) => ( <> - + )} diff --git a/frontend/components/ui/menu-button.tsx b/frontend/components/ui/menu-button.tsx index 55a6896..163ce16 100644 --- a/frontend/components/ui/menu-button.tsx +++ b/frontend/components/ui/menu-button.tsx @@ -1,9 +1,10 @@ import React from "react"; +import { Platform } from "react-native"; import { + Adapt, GetProps, ListItem, Popover, - styled, withStaticProperties, } from "tamagui"; @@ -14,7 +15,7 @@ type MenuButtonProps = GetProps & { }; const MenuButtonFrame = ({ - asChild, + asChild = true, trigger, children, width, @@ -24,6 +25,20 @@ const MenuButtonFrame = ({ {trigger} + + + + + {/* */} + {children} + + + + ) => ( - - - -); +const MenuButtonItem = (props: GetProps) => { + if (Platform.OS === "android" || Platform.OS === "ios") { + return ; + } + + return ( + + + + ); +}; const MenuButton = withStaticProperties(MenuButtonFrame, { Item: MenuButtonItem, diff --git a/frontend/components/ui/modal.tsx b/frontend/components/ui/modal.tsx index e994848..2b72d56 100644 --- a/frontend/components/ui/modal.tsx +++ b/frontend/components/ui/modal.tsx @@ -32,6 +32,7 @@ const Modal = ({ zIndex={999} modal dismissOnSnapToBottom + snapPoints={[40, 60, 0]} // disableDrag > @@ -65,6 +66,7 @@ export default function LoginPage() { diff --git a/frontend/pages/auth/register.tsx b/frontend/pages/auth/register.tsx index 003b5e5..6eb68f8 100644 --- a/frontend/pages/auth/register.tsx +++ b/frontend/pages/auth/register.tsx @@ -48,25 +48,36 @@ const RegisterPage = () => { - + - + - + - +