diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index d906cf1..a4be3b5 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -15,7 +15,10 @@ import ActionSheet from "react-native-actions-sheet"; import LottieView from "lottie-react-native"; import trainList from "../../assets/originData/trainList"; import { lineList } from "../../lib/getStationList"; -import { heightPercentageToDP } from "react-native-responsive-screen"; +import { + heightPercentageToDP, + widthPercentageToDP, +} from "react-native-responsive-screen"; import lineColorList from "../../assets/originData/lineColorList"; export const EachTrainInfo = ({ @@ -225,61 +228,22 @@ export const EachTrainInfo = ({ /> )} - - - 現在地 {currentPosition.toString()} - - - {data.trainData?.Pos && data.trainData?.Pos.match("~") ? ( - <> - - { - data.trainData?.Pos.replace("(下り)", "") - .replace("(上り)", "") - .split("~")[0] - } - - - - { - data.trainData?.Pos.replace("(下り)", "") - .replace("(上り)", "") - .split("~")[1] - } - - - ) : ( - - {data.trainData?.Pos} - - )} - - - {isNaN(data.trainData?.delay) ? "状態" : "遅延時分"} + 現在地 {currentPosition.toString()} - - {data.trainData?.delay} - {isNaN(data.trainData?.delay) ? "" : "分"} - + {data.trainData?.Pos && data.trainData?.Pos.match("~") ? ( + <> + + { + data.trainData?.Pos.replace("(下り)", "") + .replace("(上り)", "") + .split("~")[0] + } + + + ~ + + + { + data.trainData?.Pos.replace("(下り)", "") + .replace("(上り)", "") + .split("~")[1] + } + + + ) : ( + + {data.trainData?.Pos} + + )} - - 列番 - + - {data.trainData?.num} - + + {isNaN(data.trainData?.delay) ? "状態" : "遅延時分"} + + + + {data.trainData?.delay} + {isNaN(data.trainData?.delay) ? "" : "分"} + + + + 列番 + + {data.trainData?.num} + + - + + + + 行先 + + + 岡山 + + + + + 車両案内 + + + 宇多津でうずしお号と連結 + + + + + + + 編成(使用車両:2700系) + + + + {"[<自][自>][アン自|指>][アン指|G>]"} + + + + +