From 644c08f4c62be58fe3cfe38a1586b659a33f1085 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Wed, 15 May 2024 10:39:48 +0000 Subject: [PATCH] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E5=9C=B0=E7=94=B1=E6=9D=A5?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=AB=E5=B0=82=E7=94=A8=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=82=92=E4=BB=98=E4=B8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/駅名表/Sign.js | 86 ++++++++++++++++++++++-------------- menu.js | 1 + 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/components/駅名表/Sign.js b/components/駅名表/Sign.js index 38bc62f..391bfdd 100644 --- a/components/駅名表/Sign.js +++ b/components/駅名表/Sign.js @@ -1,6 +1,7 @@ import React, { useRef, useState, useEffect, useLayoutEffect } from "react"; import { View, Text, TouchableOpacity } from "react-native"; import { widthPercentageToDP as wp } from "react-native-responsive-screen"; +import { MaterialCommunityIcons } from "@expo/vector-icons"; import LottieView from "lottie-react-native"; import { useInterval } from "../../lib/useInterval"; import { AS } from "../../storageControl"; @@ -9,7 +10,13 @@ import { useFavoriteStation } from "../../stateBox/useFavoriteStation"; import lineColorList from "../../assets/originData/lineColorList"; export default function Sign(props) { - const { currentStation, originalStationList, oP, oLP } = props; + const { + currentStation, + originalStationList, + oP, + oLP, + isCurrentStation = false, + } = props; const { favoriteStation, setFavoriteStation } = useFavoriteStation(); const [nexPrePosition, setNexPrePosition] = useState(0); @@ -92,39 +99,50 @@ export default function Sign(props) { - { - if (testButtonStatus) { - const otherData = favoriteStation.filter((d) => { - const compare = JSON.stringify(d); - const current = JSON.stringify(currentStation); - if (compare !== current) { - return true; - } else { - return false; - } - }); - AS.setItem("favoriteStation", JSON.stringify(otherData)); - setFavoriteStation(otherData); - } else { - let ret = favoriteStation; - ret.push(currentStation); - AS.setItem("favoriteStation", JSON.stringify(ret)); - setFavoriteStation(ret); - } - setTestButtonStatus(!testButtonStatus); - }} - > - - + {isCurrentStation ? ( + + + + ) : ( + { + if (testButtonStatus) { + const otherData = favoriteStation.filter((d) => { + const compare = JSON.stringify(d); + const current = JSON.stringify(currentStation); + if (compare !== current) { + return true; + } else { + return false; + } + }); + AS.setItem("favoriteStation", JSON.stringify(otherData)); + setFavoriteStation(otherData); + } else { + let ret = favoriteStation; + ret.push(currentStation); + AS.setItem("favoriteStation", JSON.stringify(ret)); + setFavoriteStation(ret); + } + setTestButtonStatus(!testButtonStatus); + }} + > + + + )} JR diff --git a/menu.js b/menu.js index 1606d78..929d182 100644 --- a/menu.js +++ b/menu.js @@ -172,6 +172,7 @@ export default function Menu({ getCurrentTrain }) { { const payload = { currentStation: