From 655f174321ccfe35b1631adf568f590dc6286b03 Mon Sep 17 00:00:00 2001
From: harukin-DeskMini <harukin@haruk.in>
Date: Mon, 6 Feb 2023 12:06:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=B5=E3=81=81=E3=81=BC=E3=81=8C=E7=A9=BA?=
 =?UTF-8?q?=E3=81=AE=E6=99=82=E3=81=AB=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7?=
 =?UTF-8?q?=E3=83=A5=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.js                                        | 21 +++++++++++++++++--
 .../StationDeteilView.js                      |  1 -
 menu.js                                       |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/App.js b/App.js
index 31effa5..40877ee 100644
--- a/App.js
+++ b/App.js
@@ -67,7 +67,7 @@ export default function App() {
 
   return (
     <NavigationContainer name="Root" style={{ flex: 1 }}>
-      <Tab.Navigator>
+      <Tab.Navigator detachInactiveScreens={false}>
         <Tab.Screen
           name="login"
           options={{
@@ -228,7 +228,24 @@ const Top = ({
     </Stack.Navigator>
   );
 };
-function MenuPage({ favoriteStation, setFavoriteStation, busAndTrainData }) {
+function MenuPage({
+  navigation,
+  favoriteStation,
+  setFavoriteStation,
+  busAndTrainData,
+}) {
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("tabPress", (e) => {
+      AS.getItem("favoriteStation")
+        .then((d) => {
+          const returnData = JSON.parse(d);
+          setFavoriteStation(returnData);
+        })
+        .catch((d) => console.log(d));
+    });
+
+    return unsubscribe;
+  }, [navigation]);
   return (
     <Stack.Navigator>
       <Stack.Screen
diff --git a/components/ActionSheetComponents/StationDeteilView.js b/components/ActionSheetComponents/StationDeteilView.js
index a2f75b8..237db26 100644
--- a/components/ActionSheetComponents/StationDeteilView.js
+++ b/components/ActionSheetComponents/StationDeteilView.js
@@ -37,7 +37,6 @@ export const StationDeteilView = (props) => {
     });
     if (data.length == 0) {
       setTrainBus();
-      return () => {};
     }
     setTrainBus(data[0]);
   }, [currentStation]);
diff --git a/menu.js b/menu.js
index 81b0173..8aa6e67 100644
--- a/menu.js
+++ b/menu.js
@@ -211,7 +211,7 @@ export default function Menu(props) {
             );
           }}
         />
-        {(currentStation || originalStationList) && (
+        {locationAndFavorite.length != 0 && originalStationList && (
           <LED_vision
             station={
               originalStationList &&