diff --git a/Top.js b/Top.js index 18f9538..403ed87 100644 --- a/Top.js +++ b/Top.js @@ -13,7 +13,6 @@ import FavoriteList from "./components/FavoriteList"; import { optionData } from "./lib/stackOption"; import { useNavigation } from "@react-navigation/native"; import { useCurrentTrain } from "./stateBox/useCurrentTrain"; -import { ASCore } from "./storageControl"; import { useTrainMenu } from "./stateBox/useTrainMenu"; const Stack = createStackNavigator(); export const Top = ({ navigationRef }) => { @@ -21,13 +20,7 @@ export const Top = ({ navigationRef }) => { const { navigate, addListener } = useNavigation(); //地図用 - const { injectJavaScript, setInjectJavaScript } = useTrainMenu(); - - const [mapSwitch, setMapSwitch] = useState("false"); - useEffect(() => { - //地図スイッチ - ASCore({ k: "mapSwitch", s: setMapSwitch, d: "false" }); - }, []); + const { injectJavaScript, setInjectJavaScript, mapSwitch } = useTrainMenu(); const goToFavoriteList = () => navigate("favoriteList"); diff --git a/components/ActionSheetComponents/TrainMenuLineSelector.js b/components/ActionSheetComponents/TrainMenuLineSelector.js index c983da4..758c4df 100644 --- a/components/ActionSheetComponents/TrainMenuLineSelector.js +++ b/components/ActionSheetComponents/TrainMenuLineSelector.js @@ -1,42 +1,26 @@ import React, { useEffect, useRef } from "react"; import { View, - LayoutAnimation, - ScrollView, - Linking, Text, TouchableOpacity, Platform, BackHandler, } from "react-native"; -import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; -import ActionSheet, { - SheetManager, - useScrollHandlers, -} from "react-native-actions-sheet"; -import LottieView from "lottie-react-native"; +import ActionSheet, { SheetManager } from "react-native-actions-sheet"; import { useSafeAreaInsets } from "react-native-safe-area-context"; -import ViewShot from "react-native-view-shot"; -import * as Sharing from "expo-sharing"; -import { useTrainDelayData } from "../../stateBox/useTrainDelayData"; import { useTrainMenu } from "../../stateBox/useTrainMenu"; import lineColorList from "../../assets/originData/lineColorList"; import { stationIDPair } from "../../lib/getStationList2"; import { lineListPair } from "../../lib/getStationList"; export const TrainMenuLineSelector = () => { - const { getTime, delayData, loadingDelayData, setLoadingDelayData } = - useTrainDelayData(); const { selectedLine, setSelectedLine, mapsStationData: stationData, - setMapsStationData, } = useTrainMenu(); const actionSheetRef = useRef(null); - const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef); const insets = useSafeAreaInsets(); - const viewShot = useRef(null); const platformIs = Platform.OS == "android"; return ( { const JRSTraInfoBox = () => { const { getTime, - setGetTime, delayData, - setDelayData, loadingDelayData, setLoadingDelayData, } = useTrainDelayData(); diff --git a/stateBox/useTrainMenu.js b/stateBox/useTrainMenu.js index 2f2991c..5e1c10b 100644 --- a/stateBox/useTrainMenu.js +++ b/stateBox/useTrainMenu.js @@ -102,7 +102,6 @@ export const TrainMenuProvider = ({ children }) => { setMapsStationData, injectJavaScript, setInjectJavaScript, - iconSetting, setIconSetting, mapSwitch,