diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js index d6f9678..c145c36 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore.js +++ b/components/ActionSheetComponents/EachTrainInfoCore.js @@ -33,6 +33,7 @@ import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainI import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain"; import { useTrainMenu } from "../../stateBox/useTrainMenu"; import { HeaderText } from "./EachTrainInfoCore/HeaderText"; +import { useStationList } from "../../stateBox/useStationList"; export const EachTrainInfoCore = ({ actionSheetRef, @@ -43,7 +44,8 @@ export const EachTrainInfoCore = ({ }) => { // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); const { currentTrain } = useCurrentTrain(); - const { setTrainInfo, originalStationList } = useTrainMenu(); + const { originalStationList } = useStationList(); + const { setTrainInfo } = useTrainMenu(); const [currentTrainData, setCurrentTrainData] = useState(); // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); diff --git a/components/Apps.js b/components/Apps.js index 52af34a..2052ba7 100644 --- a/components/Apps.js +++ b/components/Apps.js @@ -22,6 +22,7 @@ import { NewMenu } from "./Apps/NewMenu"; import { MapsButton } from "./Apps/MapsButton"; import { ReloadButton } from "./Apps/ReloadButton"; import { LandscapeBackButton } from "./Apps/LandscapeBackButton"; +import { useStationList } from "../stateBox/useStationList"; /* import StatusbarDetect from '../StatusbarDetect'; var Status = StatusbarDetect(); */ @@ -34,13 +35,9 @@ export default function Apps() { const { navigate } = useNavigation(); const { isLandscape } = useDeviceOrientationChange(); const handleLayout = () => {}; - const { - setInjectJavaScript, - mapSwitch, - trainInfo, - setTrainInfo, - originalStationList, - } = useTrainMenu(); + const { originalStationList } = useStationList(); + const { setInjectJavaScript, mapSwitch, trainInfo, setTrainInfo } = + useTrainMenu(); const openStationACFromEachTrainInfo = async (stationName) => { await SheetManager.hide("EachTrainInfo"); diff --git a/components/Apps/WebView.jsx b/components/Apps/WebView.jsx index 7e64959..e5e8d7d 100644 --- a/components/Apps/WebView.jsx +++ b/components/Apps/WebView.jsx @@ -12,17 +12,18 @@ import { SheetManager } from "react-native-actions-sheet"; import { useNavigation } from "@react-navigation/native"; import { useTrainMenu } from "../../stateBox/useTrainMenu"; import { stationNamePair } from "../../lib/getStationList2"; +import { useStationList } from "../../stateBox/useStationList"; export const AppsWebView = ({ openStationACFromEachTrainInfo }) => { const { webview, currentTrain } = useCurrentTrain(); const { navigate } = useNavigation(); const { favoriteStation } = useFavoriteStation(); const { isLandscape } = useDeviceOrientationChange(); + const { originalStationList } = useStationList(); const { setSelectedLine, mapsStationData: stationData, setLoadError, setTrainInfo, - originalStationList, injectJavascript, } = useTrainMenu(); var urlcache = ""; diff --git a/components/駅名表/Sign.js b/components/駅名表/Sign.js index 2d959f5..7cd1723 100644 --- a/components/駅名表/Sign.js +++ b/components/駅名表/Sign.js @@ -12,13 +12,13 @@ import { StationNumberMaker } from "./StationNumberMaker"; import { NextPreStationLine } from "./NextPreStationLine"; import { LottieDelayView } from "./LottieDelayView"; import { AddressText } from "./AddressText"; -import { useTrainMenu } from "../../stateBox/useTrainMenu"; +import { useStationList } from "../../stateBox/useStationList"; export default function Sign(props) { const { currentStation, oP, oLP, isCurrentStation = false } = props; const { favoriteStation, setFavoriteStation } = useFavoriteStation(); const [nexPrePosition, setNexPrePosition] = useState(0); - const { originalStationList } = useTrainMenu(); + const { originalStationList } = useStationList(); const [preStation, setPreStation] = useState(); const [nexStation, setNexStation] = useState(); diff --git a/menu.js b/menu.js index d410287..e454fa7 100644 --- a/menu.js +++ b/menu.js @@ -30,12 +30,12 @@ import { useFavoriteStation } from "./stateBox/useFavoriteStation"; import { SheetManager } from "react-native-actions-sheet"; import { useTrainDelayData } from "./stateBox/useTrainDelayData"; import { useNavigation } from "@react-navigation/native"; -import { useTrainMenu } from "./stateBox/useTrainMenu"; +import { useStationList } from "./stateBox/useStationList"; export default function Menu({ getCurrentTrain }) { const { navigate } = useNavigation(); const { favoriteStation } = useFavoriteStation(); - const { originalStationList } = useTrainMenu(); + const { originalStationList } = useStationList(); //位置情報 const [locationStatus, setLocationStatus] = useState(null); diff --git a/stateBox/useTrainMenu.js b/stateBox/useTrainMenu.js index 5e1c10b..fe66c3b 100644 --- a/stateBox/useTrainMenu.js +++ b/stateBox/useTrainMenu.js @@ -2,7 +2,6 @@ import React, { createContext, useContext, useState, useEffect } from "react"; import { AS, ASCore } from "../storageControl"; -import { getStationList } from "../lib/getStationList"; import { getStationList2 } from "../lib/getStationList2"; import { injectJavascriptData } from "../lib/webViewInjectjavascript"; @@ -27,8 +26,6 @@ const initialState = { trainData: undefined, }, setTrainInfo: () => {}, - originalStationList: [], - setOriginalStationList: () => {}, trainMenu: "true", setTrainMenu: () => {}, injectJavascript: "", @@ -61,9 +58,7 @@ export const TrainMenuProvider = ({ children }) => { }); //駅情報画面用 - const [originalStationList, setOriginalStationList] = useState([]); const [trainMenu, setTrainMenu] = useState("true"); - useEffect(() => getStationList().then(setOriginalStationList), []); //地図表示テキスト const injectJavascript = injectJavascriptData( @@ -112,8 +107,6 @@ export const TrainMenuProvider = ({ children }) => { setLoadError, trainInfo, setTrainInfo, - originalStationList, - setOriginalStationList, trainMenu, setTrainMenu, injectJavascript,