From e29b4f5da38407a26e1f50b154471c9d6ac59cd1 Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Fri, 27 Dec 2024 03:28:24 +0000
Subject: [PATCH] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=84=E3=83=AC=E3=82=A4?=
 =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EachTrainInfoCore/HeaderText.tsx          | 23 +++++++++++--------
 .../EachTrainInfoCore/trainIconStatus.tsx     |  8 +++++--
 components/custom-train-data.ts               |  3 ++-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
index 45b0ab0..7afad13 100644
--- a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
+++ b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
@@ -19,7 +19,7 @@ type Props = {
 };
 
 const textConfig: TextStyle = {
-  fontSize: 20,
+  fontSize: 18,
   fontWeight: "bold",
   color: "white",
 };
@@ -34,7 +34,7 @@ export const HeaderText: FC<Props> = ({
   navigate,
   from,
 }) => {
-  const trainName = useMemo(() => {
+  const [typeName, trainName] = useMemo(() => {
     if (!data.limited) return "";
     const limitedArray = data.limited.split(":");
     const type = getType(limitedArray[0]);
@@ -42,24 +42,27 @@ export const HeaderText: FC<Props> = ({
     switch (true) {
       case !!limitedArray[1]:
         // 特急の場合は、列車名を取得
-        return type + migrateTrainName(limitedArray[1]);
+        return [type, migrateTrainName(limitedArray[1])];
       case trainData.length == 0:
         // 特急以外の場合は、列車番号を取得
-        return type;
+        return [type, ""];
       default:
         // 行先がある場合は、行先を取得
-        return (
-          type +
+        return [
+          type,
           migrateTrainName(
             trainData[trainData.length - 1].split(",")[0] + "行き"
-          )
-        );
+          ),
+        ];
     }
   }, [data.limited, trainData]);
   return (
     <View style={{ padding: 10, flexDirection: "row", alignItems: "center" }}>
-      <TrainIconStatus {...{ data, navigate, from}}/>
-      <Text style={textConfig}>{trainName}</Text>
+      <TrainIconStatus {...{ data, navigate, from }} />
+      <Text style={textConfig}>
+        {typeName}{" "}
+        {trainName}
+      </Text>
       <View style={{ flex: 1 }} />
       <Text style={textConfig}>
         {showHeadStation.map((d) => `${headStation[d].id} + `)}
diff --git a/components/ActionSheetComponents/EachTrainInfoCore/trainIconStatus.tsx b/components/ActionSheetComponents/EachTrainInfoCore/trainIconStatus.tsx
index e6ea3ac..53573d8 100644
--- a/components/ActionSheetComponents/EachTrainInfoCore/trainIconStatus.tsx
+++ b/components/ActionSheetComponents/EachTrainInfoCore/trainIconStatus.tsx
@@ -83,11 +83,15 @@ export const TrainIconStatus: FC<Props> = ({ data, navigate, from }) => {
           {move ? (
             <Image
               source={{ uri: trainIcon }}
-              style={{ height: 30, width: 25, margin: 5 }}
+              style={{ height: 34, width: 30, marginRight: 5 }}
               resizeMethod="scale"
             />
           ) : (
-            <Ionicons {...anpanmanStatus} size={30} style={{ margin: 5 }} />
+            <Ionicons
+              {...anpanmanStatus}
+              size={30}
+              style={{ marginRight: 5 }}
+            />
           )}
         </TouchableOpacity>
       )}
diff --git a/components/custom-train-data.ts b/components/custom-train-data.ts
index 2525de9..9543c3e 100644
--- a/components/custom-train-data.ts
+++ b/components/custom-train-data.ts
@@ -256,6 +256,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
         trainIcon: `https://n8n.haruk.in/webhook/dosan-anpanman-pictures.png?trainNum=${TrainNumber}&day=${dayjs().format(
           "yyyy-MM-DD"
         )}`,
+        infoUrl: "https://www.jr-eki.com/aptrain/naani/dosan/train.html",
         trainNumDistance: 30,
         info: "アンパンマン列車で運転",
       };
@@ -510,7 +511,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
         type: "LTDEXP",
         trainName: "宇和海",
         trainIcon: "https://storage.haruk.in/s2002a.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uwakai.html",
+        infoUrl: "https://www.jr-eki.com/aptrain/naani/yosan/train.html",
         trainNumDistance: 1050,
         info: "アンパン列車で運転",
       };