一部stateのコンテキストへの移動、不要な要素の一斉消去、コンポーネントのファイル分離

Apps.js

@@ -1,42 +1,26 @@
 import React, { useEffect, useRef, useState } from "react";
-import {
-  View,
-  Platform,
-  ToastAndroid,
-  Text,
-  TouchableOpacity,
-} from "react-native";
+import { View, Platform, Text, TouchableOpacity } from "react-native";
 import { WebView } from "react-native-webview";
 import Constants from "expo-constants";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Ionicons } from "@expo/vector-icons";
 import { AS } from "./storageControl";
 import { news } from "./config/newsUpdate";
 import { getStationList, lineList } from "./lib/getStationList";
 import { StationDeteilView } from "./components/ActionSheetComponents/StationDeteilView";
 import { injectJavascriptData } from "./lib/webViewInjectjavascript";
-import { getStationList2 } from "./lib/getStationList2";
 import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
 import { checkDuplicateTrainData } from "./lib/checkDuplicateTrainData";
+import { useFavoriteStation } from "./stateBox/useFavoriteStation";
+import { useCurrentTrain } from "./stateBox/useCurrentTrain";
 /* 
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
 
-export default function Apps({
-  navigation,
-  webview,
-  favoriteStation,
-  setFavoriteStation,
-  busAndTrainData,
-  stationData,
-  currentTrainState,
-  currentTrainLoadingState,
-  getCurrentTrain,
-}) {
-  const { currentTrain, setCurrentTrain } = currentTrainState;
-  const { currentTrainLoading, setCurrentTrainLoading } =
-    currentTrainLoadingState;
+export default function Apps({ navigation, webview, stationData }) {
+  const { currentTrain } = useCurrentTrain();
   const { navigate } = navigation;
   var urlcache = "";
+  const { favoriteStation } = useFavoriteStation();
 
   //画面表示関連
   const [iconSetting, setIconSetting] = useState(undefined);
@@ -62,7 +46,6 @@ export default function Apps({
     getStationList().then(setOriginalStationList);
   }, []);
 
-  useEffect(() => {}, [stationData, favoriteStation]);
   //地図表示テキスト
   const injectJavascript = injectJavascriptData(
     mapSwitch,
@@ -77,7 +60,7 @@ export default function Apps({
       .then((d) => {
         if (d != news) navigate("news");
       })
-      .catch((e) => navigate("news"));
+      .catch(() => navigate("news"));
   }, []);
 
   useEffect(() => {
@@ -90,7 +73,7 @@ export default function Apps({
           AS.setItem("iconSwitch", "true").then(Updates.reloadAsync);
         }
       })
-      .catch((d) => AS.setItem("iconSwitch", "true").then(Updates.reloadAsync));
+      .catch(() => AS.setItem("iconSwitch", "true").then(Updates.reloadAsync));
   }, []);
 
   useEffect(() => {
@@ -103,7 +86,7 @@ export default function Apps({
           AS.setItem("mapSwitch", "false").then(Updates.reloadAsync);
         }
       })
-      .catch((d) => AS.setItem("mapSwitch", "false").then(Updates.reloadAsync));
+      .catch(() => AS.setItem("mapSwitch", "false").then(Updates.reloadAsync));
   }, []);
 
   useEffect(() => {
@@ -116,7 +99,7 @@ export default function Apps({
           AS.setItem("stationSwitch", "true").then(Updates.reloadAsync);
         }
       })
-      .catch((d) =>
+      .catch(() =>
         AS.setItem("stationSwitch", "true").then(Updates.reloadAsync)
       );
   }, []);
@@ -130,9 +113,7 @@ export default function Apps({
           AS.setItem("trainSwitch", "true").then(Updates.reloadAsync);
         }
       })
-      .catch((d) =>
-        AS.setItem("trainSwitch", "true").then(Updates.reloadAsync)
-      );
+      .catch(() => AS.setItem("trainSwitch", "true").then(Updates.reloadAsync));
   }, []);
 
   const onMessage = (event) => {
@@ -310,9 +291,6 @@ export default function Apps({
         StationBoardAcSR={StationBoardAcSR}
         currentStation={stationBoardData}
         originalStationList={originalStationList}
-        favoriteStation={favoriteStation}
-        setFavoriteStation={setFavoriteStation}
-        busAndTrainData={busAndTrainData}
         navigate={navigate}
         onExit={() => {
           StationBoardAcSR.current?.setModalVisible();