From a33ffb013e8d3972de0d7521b3cf14509f7af7d6 Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Sun, 5 Jan 2025 16:18:07 +0000
Subject: [PATCH] =?UTF-8?q?OneMan=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=80=81CSS=E8=8B=A5=E5=B9=B2=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EachTrainInfoCore/HeaderText.tsx          | 105 ++++++------------
 .../HeaderTextParts/OneManText.tsx            |  16 +++
 2 files changed, 52 insertions(+), 69 deletions(-)
 create mode 100644 components/ActionSheetComponents/EachTrainInfoCore/HeaderTextParts/OneManText.tsx

diff --git a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
index e0e3b65..7c39241 100644
--- a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
+++ b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
@@ -6,6 +6,7 @@ import { getType } from "../../../lib/eachTrainInfoCoreLib/getType";
 import { migrateTrainName } from "../../../lib/eachTrainInfoCoreLib/migrateTrainName";
 import { TrainIconStatus } from "./trainIconStatus";
 import { TrainViewIcon } from "./trainViewIcon";
+import { OneManText } from "./HeaderTextParts/OneManText";
 
 type Props = {
   data: { trainNum: string; limited: string };
@@ -62,39 +63,31 @@ export const HeaderText: FC<Props> = ({
     <View style={{ padding: 10, flexDirection: "row", alignItems: "center" }}>
       <TrainIconStatus {...{ data, navigate, from }} />
       <View
-        style={{
-          //backgroundColor: "rgb(69, 69, 69)",
-          borderRadius: 5,
-          //borderWidth: 1,
-          flexDirection: "row",
-          alignItems: "center",
-        }}
+        style={{ borderRadius: 5, flexDirection: "row", alignItems: "center" }}
       >
         {fontLoaded ? (
           <>
             <Text
               style={{
                 fontSize: 20,
-                fontFamily: "JR-Nishi",
-                textShadowColor: "white",
-                textShadowOffset: { width: 0, height: 0 },
-                textShadowRadius: 0,
-                //margin: 2,
-                marginRight: 5,
-                //backgroundColor: "rgb(69, 69, 69)",
                 color: "white",
+                fontFamily: !!typeName ? "JR-Nishi" : undefined,
+                marginRight: 5,
               }}
             >
               {(() => {
-                if (typeName) return typeName;
+                if (!!typeName) return typeName;
                 switch (true) {
-                  case !!data.trainNum.match("T"):
-                  case !!data.trainNum.match("R"):
-                  case !!data.trainNum.match("E"):
-                  case !!data.trainNum.match("L"):
-                  case !!data.trainNum.match("A"):
-                  case !!data.trainNum.match("B"):
+                  case !!data.trainNum.includes("T"):
+                    return "単機回送";
+                  case !!data.trainNum.includes("R"):
+                  case !!data.trainNum.includes("E"):
+                  case !!data.trainNum.includes("L"):
+                  case !!data.trainNum.includes("A"):
+                  case !!data.trainNum.includes("B"):
                     return "回送";
+                  case !!data.trainNum.includes("H"):
+                    return "試運転";
                   case !!data.trainNum.match("D"):
                   case !!data.trainNum.match("M"):
                     return "普通";
@@ -103,62 +96,30 @@ export const HeaderText: FC<Props> = ({
                 }
               })()}
             </Text>
-            {new RegExp(/^4[1-9]\d\d[DM]$/).test(data.trainNum) || new RegExp(/^5[1-7]\d\d[DM]$/).test(data.trainNum) || data.trainNum ==="3621D" ?
-            
-            <View style={{ flexDirection: "column", marginRight: 7 }}>
-              <Text
-                style={{
-                  fontSize: 12,
-                  textShadowColor: "white",
-                  textShadowOffset: { width: 0, height: 0 },
-                  textShadowRadius: 0,
-                  margin: -2,
-                  marginRight: 5,
-                  color: "white",
-                  fontFamily: "Zou",
-                }}
-              >
-                ワン
-              </Text>
-              <Text
-                style={{
-                  fontSize: 12,
-                  textShadowColor: "white",
-                  textShadowOffset: { width: 0, height: 0 },
-                  textShadowRadius: 0,
-                  margin: -2,
-                  color: "white",
-                  fontFamily: "Zou",
-                }}
-              >
-                {"　"}マン
-              </Text>
-            </View>
-           : null} 
+            {!!(
+              new RegExp(/^4[1-9]\d\d[DM]$/).test(data.trainNum) ||
+              new RegExp(/^5[1-7]\d\d[DM]$/).test(data.trainNum) ||
+              data.trainNum === "3621D"
+            ) && <OneManText />}
           </>
         ) : (
-          <Text style={textConfig}>{typeName}</Text>
+          <Text
+            style={{
+              fontSize: 18,
+              fontWeight: "bold",
+              color: "white",
+            }}
+          >
+            {typeName}
+          </Text>
         )}
         <Text
           style={{
             fontSize: 18,
+            fontWeight: "bold",
             textShadowColor: "white",
             textShadowOffset: { width: 0, height: 0 },
             textShadowRadius: 0,
-            //borderWidth: 1,
-            //borderColor: "white",
-            fontWeight: "bold",
-            //fontStyle: "italic",
-            // color: (() => {
-            //   switch (typeName) {
-            //     case "快速":
-            //       return "rgb(7, 124, 192)";
-            //     case "特急":
-            //       return "rgb(211, 13, 6)";
-            //     default:
-            //       return "white";
-            //   }
-            // })(),
             color: "white",
           }}
         >
@@ -167,7 +128,13 @@ export const HeaderText: FC<Props> = ({
       </View>
 
       <View style={{ flex: 1 }} />
-      <Text style={textConfig}>
+      <Text
+        style={{
+          fontSize: 18,
+          fontWeight: "bold",
+          color: "white",
+        }}
+      >
         {showHeadStation.map((d) => `${headStation[d].id} + `)}
         {data.trainNum}
         {showTailStation.map((d) => ` + ${tailStation[d].id}`)}
diff --git a/components/ActionSheetComponents/EachTrainInfoCore/HeaderTextParts/OneManText.tsx b/components/ActionSheetComponents/EachTrainInfoCore/HeaderTextParts/OneManText.tsx
new file mode 100644
index 0000000..9891dd8
--- /dev/null
+++ b/components/ActionSheetComponents/EachTrainInfoCore/HeaderTextParts/OneManText.tsx
@@ -0,0 +1,16 @@
+import React, { FC } from "react";
+import { Text, View } from "react-native";
+export const OneManText: FC = () => {
+  const styles = {
+    fontSize: 12,
+    margin: -2,
+    color: "white",
+    fontFamily: "Zou",
+  };
+  return (
+    <View style={{ flexDirection: "column", marginRight: 7 }}>
+      <Text style={{ ...styles, marginRight: 5 }}>ワン</Text>
+      <Text style={{ ...styles, marginLeft: 5 }}>マン</Text>
+    </View>
+  );
+};