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 ( - + ); }; -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 ( { }); 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 && (