From eb806e3f8a6b96630baa981e54dc67c7f0e2fb5f Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Fri, 7 Jul 2023 00:07:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB?=
 =?UTF-8?q?=E7=AF=84=E5=9B=B2=E5=A4=96=E3=81=AB=E3=82=B9=E3=83=86=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=82=92=E7=A7=BB=E5=8B=95=E3=81=97=E3=80=81?=
 =?UTF-8?q?=E9=AB=98=E3=81=95=E3=81=A8=E6=96=87=E5=AD=97=E3=82=B5=E3=82=A4?=
 =?UTF-8?q?=E3=82=BA=E7=AD=89=E3=81=AE=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionSheetComponents/EachTrainInfo.js    | 153 +++++++++++-------
 1 file changed, 94 insertions(+), 59 deletions(-)

diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js
index 93c0f42..5ea9ad5 100644
--- a/components/ActionSheetComponents/EachTrainInfo.js
+++ b/components/ActionSheetComponents/EachTrainInfo.js
@@ -122,72 +122,107 @@ export const EachTrainInfo = ({
               />
             )}
         </View>
+        <View
+          style={{ flexDirection: "row", height: heightPercentageToDP("20%") }}
+        >
+          <View
+            style={{
+              flex: 1,
+              backgroundColor: "white",
+              borderRadius: 10,
+              padding: 10,
+              margin: 10,
+            }}
+          >
+            <Text style={{ fontSize: 10, color: "#0099CC" }} t>
+              現在地
+            </Text>
+            <View style={{ flex: 1 }} />
+            {data.trainData?.Pos && data.trainData?.Pos.match("～") ? (
+              <>
+                <Text
+                  style={{
+                    fontSize: 28,
+                    color: "#0099CC",
+                    textAlign: "right",
+                  }}
+                >
+                  {data.trainData?.Pos.split("～")[0]}
+                </Text>
+                <Text style={{ color: "#0099CC", textAlign: "right" }}>～</Text>
+                <Text
+                  style={{
+                    fontSize: 28,
+                    color: "#0099CC",
+                    textAlign: "right",
+                  }}
+                >
+                  {data.trainData?.Pos.split("～")[1]}
+                </Text>
+              </>
+            ) : (
+              <Text
+                style={{ fontSize: 28, color: "#0099CC", textAlign: "right" }}
+              >
+                {data.trainData?.Pos}
+              </Text>
+            )}
+          </View>
+          <View style={{ flex: 1, flexDirection: "column" }}>
+            <View
+              style={{
+                flex: 1,
+                backgroundColor: "white",
+                borderRadius: 10,
+                padding: 10,
+                margin: 10,
+              }}
+            >
+              <Text style={{ fontSize: 10, color: "#0099CC" }}>
+                {isNaN(data.trainData?.delay) ? "状態" : "遅延時分"}
+              </Text>
+              <View style={{ flex: 1 }} />
+              <Text
+                style={{
+                  fontSize: 32,
+                  color: "#0099CC",
+                  textAlign: "right",
+                }}
+              >
+                {data.trainData?.delay}
+                {isNaN(data.trainData?.delay) ? "" : "分"}
+              </Text>
+            </View>
+            <View
+              style={{
+                flex: 1,
+                backgroundColor: "white",
+                borderRadius: 10,
+                padding: 10,
+                margin: 10,
+              }}
+            >
+              <Text style={{ fontSize: 10, color: "#0099CC" }}>列番</Text>
+              <Text
+                style={{
+                  fontSize: 32,
+                  color: "#0099CC",
+                  textAlign: "right",
+                }}
+              >
+                {data.trainData?.num}
+              </Text>
+            </View>
+          </View>
+        </View>
         <ScrollView
-          style={{ maxHeight: heightPercentageToDP("70%") }}
+          style={{ maxHeight: heightPercentageToDP("55%") }}
           nestedScrollEnabled
           onScroll={(e) => {
             if (!Platform.OS !== "android") return;
             setIsTop(e.nativeEvent.contentOffset.y < 0);
           }}
         >
-          <View style={{ flexDirection: "row" }}>
-            <View
-              style={{
-                flex: 1,
-                backgroundColor: "black",
-                borderRadius: 10,
-                padding: 10,
-                margin: 10,
-              }}
-            >
-              <Text style={{ fontSize: 10, color: "white" }} t>
-                現在地
-              </Text>
-              <View style={{ flex: 1 }} />
-              <Text
-                style={{ fontSize: 30, color: "white", textAlign: "right" }}
-              >
-                {data.trainData?.Pos}
-              </Text>
-            </View>
-            <View style={{ flex: 1, flexDirection: "column" }}>
-              <View
-                style={{
-                  flex: 1,
-                  backgroundColor: "black",
-                  borderRadius: 10,
-                  padding: 10,
-                  margin: 10,
-                }}
-              >
-                <Text style={{ fontSize: 10, color: "white" }}>
-                  {isNaN(data.trainData?.delay) ? "状態" : "遅延時分"}
-                </Text>
-                <Text
-                  style={{ fontSize: 30, color: "white", textAlign: "right" }}
-                >
-                  {data.trainData?.delay}
-                  {isNaN(data.trainData?.delay) ? "" : "分"}
-                </Text>
-              </View>
-              <View
-                style={{
-                  flex: 1,
-                  backgroundColor: "black",
-                  borderRadius: 10,
-                  padding: 10,
-                  margin: 10,
-                }}
-              >
-                <Text style={{ fontSize: 10, color: "white" }}>列番</Text>
-                <Text
-                  style={{ fontSize: 30, color: "white", textAlign: "right" }}
-                >
-                  {data.trainData?.num}
-                </Text>
-              </View>
-            </View>
-          </View>
           <View
             style={{
               padding: 10,