From 06c51022257416b128e766b240f53ebadd7a8cc2 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 18 Nov 2022 20:28:43 +0900 Subject: [PATCH] rererefactoring --- menu.js | 133 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 67 deletions(-) diff --git a/menu.js b/menu.js index f1d1633..7539815 100644 --- a/menu.js +++ b/menu.js @@ -64,7 +64,7 @@ export default function Menu(props) { Location.requestForegroundPermissionsAsync().then((data) => { if (data.status !== "granted") { setErrorMsg("Permission to access location was denied"); - return () => { }; + return () => {}; } Location.getCurrentPositionAsync({}).then((location) => setLocation(location) @@ -87,8 +87,8 @@ export default function Menu(props) { const [stationName, setStationName] = useState(undefined); const [currentStation, setCurrentStation] = useState(undefined); useEffect(() => { - if (!location) return () => { }; - if (!originalStationList) return () => { }; + if (!location) return () => {}; + if (!originalStationList) return () => {}; const findStationEachLine = (selectLine) => { const searchArea = 0.0015; const _calcDistance = (from, to) => { @@ -146,7 +146,7 @@ export default function Menu(props) { "https://script.google.com/macros/s/AKfycbyKxch7z7l8e07LXulRHqxjVoIiB13kcgvoToLE-rqlxLmLSKdlmqz0FI1F2EuA7Zfg/exec" ) .then((response) => response.text()) - .then(data => setDelayData(data !== "" ? data.split("^") : null)) + .then((data) => setDelayData(data !== "" ? data.split("^") : null)) .then(() => LayoutAnimation.easeInEaseOut()) .then(() => setGetTime(new Date())) .finally(() => setLoadingDelayData(false)); @@ -224,18 +224,16 @@ export default function Menu(props) { {currentStation && ( - StationBoardAcSR.current?.setModalVisible()} - /> + <> + + + )} - {currentStation && } - { - JRSTraInfoEXAcSR.current?.setModalVisible(); - }} - > + {getTime ? getTime.toLocaleTimeString("ja-JP").split(":")[0] + - ":" + - getTime.toLocaleTimeString("ja-JP").split(":")[1] + ":" + + getTime.toLocaleTimeString("ja-JP").split(":")[1] : NaN} { - LayoutAnimation.easeInEaseOut(), setLoadingDelayData(true); + LayoutAnimation.easeInEaseOut(); + setLoadingDelayData(true); }} /> @@ -521,55 +520,55 @@ export default function Menu(props) { )))([ - { - url: "https://twitter.com/JRshikoku_eigyo", - name: "JR四国営業部【公式】", - }, - { - url: "https://twitter.com/JRshikoku_tokyo", - name: "JR四国 東京営業情報【公式】", - }, - { - url: "https://twitter.com/JRshikoku_osaka", - name: "JR四国 大阪営業部【公式】", - }, - { - url: "https://twitter.com/jr_shikoku_info", - name: "JR四国列車運行情報【公式】", - }, - { - url: "https://twitter.com/Smile_Eki_Chan", - name: "すまいるえきちゃん♡JR四国【公式】", - }, - { - url: "https://twitter.com/jrs_matsuyama", - name: "JR四国 松山駅 【公式】", - }, - { - url: "https://twitter.com/jrshikoku_kochi", - name: "JR四国 高知駅【公式】", - }, - { - url: "https://twitter.com/jr_tokust", - name: "JR四国 徳島駅【公式】", - }, - { - url: "https://twitter.com/jrshikoku_uwjm", - name: "JR四国 宇和島駅【公式】", - }, - { - url: "https://twitter.com/JRshikoku_wkoch", - name: "JR四国 ワープ高知支店【公式】", - }, - { - url: "https://twitter.com/jrshikoku_nihaw", - name: "JR四国 ワープ新居浜営業所【公式】", - }, - { - url: "https://twitter.com/Yoakemonogatari", - name: "志国土佐 時代の夜明けのものがたり【公式】", - }, - ])} + { + url: "https://twitter.com/JRshikoku_eigyo", + name: "JR四国営業部【公式】", + }, + { + url: "https://twitter.com/JRshikoku_tokyo", + name: "JR四国 東京営業情報【公式】", + }, + { + url: "https://twitter.com/JRshikoku_osaka", + name: "JR四国 大阪営業部【公式】", + }, + { + url: "https://twitter.com/jr_shikoku_info", + name: "JR四国列車運行情報【公式】", + }, + { + url: "https://twitter.com/Smile_Eki_Chan", + name: "すまいるえきちゃん♡JR四国【公式】", + }, + { + url: "https://twitter.com/jrs_matsuyama", + name: "JR四国 松山駅 【公式】", + }, + { + url: "https://twitter.com/jrshikoku_kochi", + name: "JR四国 高知駅【公式】", + }, + { + url: "https://twitter.com/jr_tokust", + name: "JR四国 徳島駅【公式】", + }, + { + url: "https://twitter.com/jrshikoku_uwjm", + name: "JR四国 宇和島駅【公式】", + }, + { + url: "https://twitter.com/JRshikoku_wkoch", + name: "JR四国 ワープ高知支店【公式】", + }, + { + url: "https://twitter.com/jrshikoku_nihaw", + name: "JR四国 ワープ新居浜営業所【公式】", + }, + { + url: "https://twitter.com/Yoakemonogatari", + name: "志国土佐 時代の夜明けのものがたり【公式】", + }, + ])}