diff --git a/Apps.js b/Apps.js index cc526e0..8d7c8b6 100644 --- a/Apps.js +++ b/Apps.js @@ -2,6 +2,7 @@ import React from "react"; import { NavigationContainer } from "@react-navigation/native"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { Platform } from "react-native"; +import { useFonts } from "expo-font"; import TNDView from "./ndView"; import { initIcon } from "./lib/initIcon"; import { Top } from "./Top"; @@ -24,6 +25,10 @@ export function AppContainer() { tabBarBadgeStyle: style, }, }); + const [fontLoaded, error] = useFonts({ + "JR-Nishi": require("./assets/fonts/西日本方向幕ロゴ.otf"), + "Zou": require("./assets/fonts/DelaGothicOne-Regular.ttf"), + }); return ( { - const [fontLoaded, error] = useFonts({ - "JR-Nishi": require("../../assets/fonts/西日本方向幕ロゴ.otf"), - "Zou": require("../../assets/fonts/DelaGothicOne-Regular.ttf"), - }); // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); const { currentTrain } = useCurrentTrain(); const { originalStationList, stationList } = useStationList(); @@ -411,7 +406,6 @@ export const EachTrainInfoCore = ({ tailStation={tailStation} navigate={navigate} from={from} - fontLoaded={fontLoaded} /> ) diff --git a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx index 6b299b0..e4d8a51 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx +++ b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx @@ -35,7 +35,6 @@ export const HeaderText: FC = ({ tailStation, navigate, from, - fontLoaded, }) => { const { limited, trainNum } = data;