diff --git a/app.json b/app.json index a4f42658..2dfe334a 100644 --- a/app.json +++ b/app.json @@ -71,7 +71,8 @@ "expo-build-properties", { "ios": { - "deploymentTarget": "15.6" + "deploymentTarget": "15.6", + "useFrameworks": "static" }, "android": { "android": { diff --git a/app/(auth)/(tabs)/_layout.tsx b/app/(auth)/(tabs)/_layout.tsx index 01e7ea73..f8b8b8fb 100644 --- a/app/(auth)/(tabs)/_layout.tsx +++ b/app/(auth)/(tabs)/_layout.tsx @@ -6,7 +6,7 @@ import { withLayoutContext } from "expo-router"; import { createNativeBottomTabNavigator, NativeBottomTabNavigationEventMap, -} from "react-native-bottom-tabs/react-navigation"; +} from "@bottom-tabs/react-navigation"; const { Navigator } = createNativeBottomTabNavigator(); @@ -18,7 +18,7 @@ import type { TabNavigationState, } from "@react-navigation/native"; import { SystemBars } from "react-native-edge-to-edge"; -import {useSettings} from "@/utils/atoms/settings"; +import { useSettings } from "@/utils/atoms/settings"; export const NativeTabs = withLayoutContext< BottomTabNavigationOptions, @@ -77,13 +77,14 @@ export default function TabLayout() { name="(custom-links)" options={{ title: "Custom Links", - tabBarIcon: Platform.OS == "android" - ? () => require("@/assets/icons/list.png") - : () => ({sfSymbol: "list.dash"}), + tabBarIcon: + Platform.OS == "android" + ? () => require("@/assets/icons/list.png") + : () => ({ sfSymbol: "list.dash" }), tabBarButton: (p) => - settings?.showCustomMenuLinks == true ? undefined : null, - }} - /> + settings?.showCustomMenuLinks == true ? undefined : null, + }} + /> ); diff --git a/bun.lockb b/bun.lockb index 2753a348..51796e43 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 3bac6b23..0f8bae05 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "preset": "jest-expo" }, "dependencies": { + "@bottom-tabs/react-navigation": "^0.7.1", "@config-plugins/ffmpeg-kit-react-native": "^8.0.0", "@expo/react-native-action-sheet": "^4.1.0", "@expo/vector-icons": "^14.0.4", @@ -69,7 +70,7 @@ "react-dom": "18.2.0", "react-native": "0.74.5", "react-native-awesome-slider": "^2.5.6", - "react-native-bottom-tabs": "^0.4.0", + "react-native-bottom-tabs": "^0.7.1", "react-native-circular-progress": "^1.4.1", "react-native-compressor": "^1.9.0", "react-native-device-info": "^14.0.1",