diff --git a/app.json b/app.json index 4fa7289f..59cc5822 100644 --- a/app.json +++ b/app.json @@ -72,7 +72,10 @@ { "ios": { "deploymentTarget": "15.6", - "useFrameworks": "static" + "extraPods": [ + { "name": "SDWebImage", "modular_headers": true }, + { "name": "SDWebImageSVGCoder", "modular_headers": true } + ] }, "android": { "compileSdkVersion": 35, @@ -138,7 +141,8 @@ { "useDefaultExpandedMediaControls": true } - ] + ], + "react-native-bottom-tabs" ], "experiments": { "typedRoutes": true diff --git a/app/(auth)/(tabs)/_layout.tsx b/app/(auth)/(tabs)/_layout.tsx index 0aafe593..0021a549 100644 --- a/app/(auth)/(tabs)/_layout.tsx +++ b/app/(auth)/(tabs)/_layout.tsx @@ -1,8 +1,8 @@ import { - type BottomTabNavigationEventMap, - type BottomTabNavigationOptions, - createBottomTabNavigator, -} from "@react-navigation/bottom-tabs"; + createNativeBottomTabNavigator, + type NativeBottomTabNavigationEventMap, + type NativeBottomTabNavigationOptions, +} from "@bottom-tabs/react-navigation"; import type { ParamListBase, TabNavigationState, @@ -17,13 +17,13 @@ import { useSettings } from "@/utils/atoms/settings"; import { eventBus } from "@/utils/eventBus"; import { storage } from "@/utils/mmkv"; -const { Navigator } = createBottomTabNavigator(); +const { Navigator } = createNativeBottomTabNavigator(); export const NativeTabs = withLayoutContext< - BottomTabNavigationOptions, + NativeBottomTabNavigationOptions, typeof Navigator, TabNavigationState, - BottomTabNavigationEventMap + NativeBottomTabNavigationEventMap >(Navigator); export default function TabLayout() { @@ -51,7 +51,6 @@ export default function TabLayout() {