This commit is contained in:
Fredrik Burmester
2024-12-01 23:08:21 +01:00
parent 5cc0f381fa
commit 5fd1d9080e
4 changed files with 13 additions and 10 deletions

View File

@@ -71,7 +71,8 @@
"expo-build-properties", "expo-build-properties",
{ {
"ios": { "ios": {
"deploymentTarget": "15.6" "deploymentTarget": "15.6",
"useFrameworks": "static"
}, },
"android": { "android": {
"android": { "android": {

View File

@@ -6,7 +6,7 @@ import { withLayoutContext } from "expo-router";
import { import {
createNativeBottomTabNavigator, createNativeBottomTabNavigator,
NativeBottomTabNavigationEventMap, NativeBottomTabNavigationEventMap,
} from "react-native-bottom-tabs/react-navigation"; } from "@bottom-tabs/react-navigation";
const { Navigator } = createNativeBottomTabNavigator(); const { Navigator } = createNativeBottomTabNavigator();
@@ -18,7 +18,7 @@ import type {
TabNavigationState, TabNavigationState,
} from "@react-navigation/native"; } from "@react-navigation/native";
import { SystemBars } from "react-native-edge-to-edge"; import { SystemBars } from "react-native-edge-to-edge";
import {useSettings} from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
export const NativeTabs = withLayoutContext< export const NativeTabs = withLayoutContext<
BottomTabNavigationOptions, BottomTabNavigationOptions,
@@ -77,13 +77,14 @@ export default function TabLayout() {
name="(custom-links)" name="(custom-links)"
options={{ options={{
title: "Custom Links", title: "Custom Links",
tabBarIcon: Platform.OS == "android" tabBarIcon:
? () => require("@/assets/icons/list.png") Platform.OS == "android"
: () => ({sfSymbol: "list.dash"}), ? () => require("@/assets/icons/list.png")
: () => ({ sfSymbol: "list.dash" }),
tabBarButton: (p) => tabBarButton: (p) =>
settings?.showCustomMenuLinks == true ? undefined : null, settings?.showCustomMenuLinks == true ? undefined : null,
}} }}
/> />
</NativeTabs> </NativeTabs>
</> </>
); );

BIN
bun.lockb

Binary file not shown.

View File

@@ -16,6 +16,7 @@
"preset": "jest-expo" "preset": "jest-expo"
}, },
"dependencies": { "dependencies": {
"@bottom-tabs/react-navigation": "^0.7.1",
"@config-plugins/ffmpeg-kit-react-native": "^8.0.0", "@config-plugins/ffmpeg-kit-react-native": "^8.0.0",
"@expo/react-native-action-sheet": "^4.1.0", "@expo/react-native-action-sheet": "^4.1.0",
"@expo/vector-icons": "^14.0.4", "@expo/vector-icons": "^14.0.4",
@@ -69,7 +70,7 @@
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-native": "0.74.5", "react-native": "0.74.5",
"react-native-awesome-slider": "^2.5.6", "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-circular-progress": "^1.4.1",
"react-native-compressor": "^1.9.0", "react-native-compressor": "^1.9.0",
"react-native-device-info": "^14.0.1", "react-native-device-info": "^14.0.1",