Resolve icon issues.

This commit is contained in:
Patrick Fic
2025-10-21 14:36:03 -07:00
parent f001e87a49
commit 49d40aa038
3 changed files with 865 additions and 463 deletions

View File

@@ -1,11 +1,17 @@
import { checkUserSession } from "@/redux/user/user.actions";
import { selectBodyshop, selectCurrentUser } from "@/redux/user/user.selectors";
import { ApolloProvider } from "@apollo/client";
import MaterialIcons from "@expo/vector-icons/MaterialIcons";
import { Stack } from "expo-router";
import { Icon, Label, NativeTabs } from "expo-router/unstable-native-tabs";
import {
Icon,
Label,
NativeTabs,
VectorIcon,
} from "expo-router/unstable-native-tabs";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { ActivityIndicator, View } from "react-native";
import { ActivityIndicator, Platform, View } from "react-native";
import { Provider as PaperProvider } from "react-native-paper";
import { connect, Provider } from "react-redux";
import { PersistGate } from "redux-persist/integration/react";
@@ -21,13 +27,34 @@ function AuthenticatedLayout() {
<NativeTabs minimizeBehavior="onScrollDown" disableTransparentOnScrollEdge>
<NativeTabs.Trigger name="jobs">
<Label>{t("joblist.labels.activejobs")}</Label>
<Icon sf="checklist" drawable="custom_android_drawable" />
{Platform.select({
ios: <Icon sf="checklist" drawable="custom_android_drawable" />,
android: (
<Icon
src={<VectorIcon family={MaterialIcons} name="checklist" />}
/>
),
})}
</NativeTabs.Trigger>
<NativeTabs.Trigger name="settings">
<Icon sf="gear" drawable="custom_settings_drawable" />
{Platform.select({
ios: <Icon sf="gear" drawable="custom_android_drawable" />,
android: (
<Icon src={<VectorIcon family={MaterialIcons} name="settings" />} />
),
})}
<Label>{t("settings.titles.settings")}</Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="search" role="search">
{Platform.select({
//ios: <Icon sf="checklist" drawable="custom_android_drawable" />,
android: (
<Icon
src={<VectorIcon family={MaterialIcons} name="search" />}
/>
),
})}
<Label>Search</Label>
</NativeTabs.Trigger>
</NativeTabs>

1245
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -24,36 +24,36 @@
"@expo/vector-icons": "^15.0.2",
"@react-native-async-storage/async-storage": "2.2.0",
"@react-native-vector-icons/material-design-icons": "^12.3.0",
"@react-navigation/bottom-tabs": "^7.4.0",
"@react-navigation/elements": "^2.6.3",
"@react-navigation/native": "^7.1.8",
"@reduxjs/toolkit": "^2.9.0",
"@react-navigation/bottom-tabs": "^7.4.9",
"@react-navigation/elements": "^2.6.5",
"@react-navigation/native": "^7.1.18",
"@reduxjs/toolkit": "^2.9.1",
"axios": "^1.12.2",
"dinero.js": "^1.9.1",
"expo": "~54.0.12",
"expo": "~54.0.18",
"expo-application": "~7.0.7",
"expo-constants": "~18.0.9",
"expo-dev-client": "~6.0.13",
"expo-file-system": "~19.0.16",
"expo-font": "~14.0.8",
"expo-constants": "~18.0.10",
"expo-dev-client": "~6.0.16",
"expo-file-system": "~19.0.17",
"expo-font": "~14.0.9",
"expo-haptics": "~15.0.7",
"expo-image": "~3.0.8",
"expo-image": "~3.0.10",
"expo-image-picker": "~17.0.8",
"expo-linking": "~8.0.8",
"expo-localization": "~17.0.7",
"expo-media-library": "~18.2.0",
"expo-notifications": "~0.32.12",
"expo-router": "~6.0.10",
"expo-router": "~6.0.13",
"expo-splash-screen": "~31.0.10",
"expo-status-bar": "~3.0.8",
"expo-symbols": "~1.0.7",
"expo-system-ui": "~6.0.7",
"expo-system-ui": "~6.0.8",
"expo-updates": "~29.0.12",
"expo-web-browser": "~15.0.8",
"firebase": "^12.3.0",
"firebase": "^12.4.0",
"formik": "^2.4.6",
"graphql": "^16.11.0",
"i18next": "^25.5.3",
"i18next": "^25.6.0",
"intl": "^1.2.5",
"lodash": "^4.17.21",
"luxon": "^3.7.2",
@@ -62,28 +62,28 @@
"normalize-url": "^8.1.0",
"react": "19.1.0",
"react-dom": "19.1.0",
"react-i18next": "^16.0.0",
"react-i18next": "^16.1.4",
"react-native": "0.81.4",
"react-native-gesture-handler": "~2.28.0",
"react-native-image-viewing": "^0.2.2",
"react-native-paper": "^5.14.5",
"react-native-reanimated": "~4.1.1",
"react-native-safe-area-context": "~5.6.0",
"react-native-screens": "~4.16.0",
"react-native-reanimated": "~4.1.3",
"react-native-safe-area-context": "~5.6.1",
"react-native-screens": "~4.17.1",
"react-native-tab-view": "4.1.3",
"react-native-web": "~0.21.0",
"react-native-worklets": "0.5.1",
"react-native-web": "~0.21.2",
"react-native-worklets": "0.6.1",
"react-redux": "^9.2.0",
"redux": "^5.0.1",
"redux-logger": "^3.0.6",
"redux-persist": "^6.0.0",
"redux-saga": "^1.3.0",
"redux-saga": "^1.4.2",
"reselect": "^5.1.1"
},
"devDependencies": {
"@types/react": "~19.1.0",
"eslint": "^9.25.0",
"@types/react": "~19.2.2",
"eslint": "^9.38.0",
"eslint-config-expo": "~10.0.0",
"typescript": "~5.9.2"
"typescript": "~5.9.3"
}
}