Merge commit 'fc50a2c827ad23424f6d67e48a3b731b6b667eb1' into develop

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 (
     <NavigationContainer name="Root" style={{ flex: 1 }} ref={navigationRef}>
       <Tab.Navigator

components/ActionSheetComponents/EachTrainInfoCore.js

@@ -10,7 +10,6 @@ import {
   LayoutAnimation,
 } from "react-native";
 import { SheetManager } from "react-native-actions-sheet";
-import { useFonts } from "expo-font";
 import { AS } from "../../storageControl";
 import trainList from "../../assets/originData/trainList";
 import { lineListPair } from "../../lib/getStationList";
@@ -45,10 +44,6 @@ export const EachTrainInfoCore = ({
   from,
   navigate,
 }) => {
-    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}
       />
 
       <DynamicHeaderScrollView
@@ -501,7 +495,6 @@ export const EachTrainInfoCore = ({
                 currentTrainData,
                 openStationACFromEachTrainInfo,
                 showThrew,
-                fontLoaded,
               }}
             />
           )

components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx

@@ -35,7 +35,6 @@ export const HeaderText: FC<Props> = ({
   tailStation,
   navigate,
   from,
-  fontLoaded,
 }) => {
   const { limited, trainNum } = data;