diff --git a/app/(dashboard)/_layout.tsx b/app/(dashboard)/_layout.tsx index 2f6fbbb..7f4c7c2 100644 --- a/app/(dashboard)/_layout.tsx +++ b/app/(dashboard)/_layout.tsx @@ -9,12 +9,14 @@ import { useEffect, useRef } from 'react'; import { useTranslation } from 'react-i18next'; import { Animated, Easing, Platform, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; import { GestureHandlerRootView } from 'react-native-gesture-handler'; +import { useSafeAreaInsets } from 'react-native-safe-area-context'; export default function TabsLayout() { const { isDark } = useTheme(); const { t } = useTranslation(); const { setShowFilter, setStep } = useHomeStore(); const rotateAnim = useRef(new Animated.Value(0)).current; + const insets = useSafeAreaInsets(); useEffect(() => { Animated.loop( @@ -54,7 +56,7 @@ export default function TabsLayout() { position: 'absolute', left: 16, right: 16, - bottom: 4, + bottom: 8, height: 70, paddingTop: 8, paddingBottom: 12, diff --git a/app/_layout.tsx b/app/_layout.tsx index 9fe881e..50e1508 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -7,33 +7,23 @@ import { ProfileDataProvider } from '@/screens/profile/lib/ProfileDataContext'; import { Stack } from 'expo-router'; import { StatusBar } from 'expo-status-bar'; import { I18nextProvider } from 'react-i18next'; -import { View } from 'react-native'; import 'react-native-reanimated'; -import { useSafeAreaInsets } from 'react-native-safe-area-context'; +import { SafeAreaView } from 'react-native-safe-area-context'; import ToastManager from "toastify-react-native"; function AppContent() { useNotifications(); - const insets = useSafeAreaInsets(); return ( - <> - {/* iOS status bar fon */} - - - {/* StatusBar */} + - + ); } export default function RootLayout() { diff --git a/components/ui/ProductList.tsx b/components/ui/ProductList.tsx index bb0338d..7addc47 100644 --- a/components/ui/ProductList.tsx +++ b/components/ui/ProductList.tsx @@ -272,7 +272,6 @@ export default function ProductList({ query }: Props) { } const styles = StyleSheet.create({ - listContainer: { gap: 0, paddingBottom: 20 }, card: { borderRadius: 16, overflow: 'hidden', diff --git a/screens/create-ads/ui/CreateAdsScreens.tsx b/screens/create-ads/ui/CreateAdsScreens.tsx index 58b311c..9162872 100644 --- a/screens/create-ads/ui/CreateAdsScreens.tsx +++ b/screens/create-ads/ui/CreateAdsScreens.tsx @@ -185,9 +185,11 @@ export default function CreateAdsScreens() { onSuccess: async (res, variables) => { if (variables.paymentType === 'payme') { await Linking.openURL(res.data.url); - router.push('/(dashboard)/announcements'); + bottomSheetModalRef.current?.dismiss(); + router.push('/profile/my-ads'); } else { - router.push('/(dashboard)/announcements'); + bottomSheetModalRef.current?.dismiss(); + router.push('/profile/my-ads') } }, onError: (err: AxiosError) => { diff --git a/screens/create-ads/ui/StepThree.tsx b/screens/create-ads/ui/StepThree.tsx index 5db2ff8..a9f4057 100644 --- a/screens/create-ads/ui/StepThree.tsx +++ b/screens/create-ads/ui/StepThree.tsx @@ -234,10 +234,10 @@ const StepThree = forwardRef(({ formData, updateForm, data }: StepProps, ref) => - - - {t('Reklama joylashtirish kompaniyasi')} - + + {t('Reklama joylashtirish kompaniyasi')} + + { try { - await WebBrowser.openBrowserAsync(fileUrl); + await WebBrowser.openBrowserAsync(fileUrl, { + dismissButtonStyle: 'close', + presentationStyle: WebBrowser.WebBrowserPresentationStyle.FULL_SCREEN, + }); } catch (error) { Toast.error(t("Xatolik yuz berdi")); } - }; + } const onRefresh = async () => { setRefreshing(true);