From 00e43772a0eabe89ae05fbd4ab61776d2c792ace Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Fri, 8 Aug 2025 10:31:33 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EachTrainInfoCore/HeaderText.tsx | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx index 2b3d322..9caced5 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx +++ b/components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx @@ -11,6 +11,7 @@ import { useTrainMenu } from "@/stateBox/useTrainMenu"; import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram"; import { useNotification } from "@/stateBox/useNotifications"; import { getStringConfig } from "@/lib/getStringConfig"; +import { FontAwesome } from "@expo/vector-icons"; type Props = { data: { trainNum: string; limited: string }; @@ -49,9 +50,9 @@ export const HeaderText: FC = ({ const { expoPushToken } = useNotification(); // 列車名、種別、フォントの取得 - const [typeName, trainName, fontAvailable, isOneMan, infogram] = + const [typeName, trainName, fontAvailable, isOneMan, infogram, isEdit] = useMemo(() => { - const { type, trainName, trainNumDistance, infogram } = + const { type, trainName, trainNumDistance, infogram, isEdit } = customTrainDataDetector(trainNum, allCustomTrainData); const [typeString, fontAvailable, isOneMan] = getStringConfig( type, @@ -61,19 +62,19 @@ export const HeaderText: FC = ({ case trainName !== "": // 特急の場合は、列車名を取得 // 列番対称データがある場合はそれから列車番号を取得 - const number = - trainNumDistance !== null - ? ` ${parseInt(trainNum) - trainNumDistance}号` - : ""; return [ typeString, - trainName + number, + trainName + + (trainNumDistance !== null + ? ` ${parseInt(trainNum) - trainNumDistance}号` + : ""), fontAvailable, isOneMan, infogram, + isEdit, ]; case trainData[trainData.length - 1] === undefined: - return [typeString, "", fontAvailable, isOneMan, infogram]; + return [typeString, "", fontAvailable, isOneMan, infogram, isEdit]; default: // 行先がある場合は、行先を取得 return [ @@ -84,6 +85,7 @@ export const HeaderText: FC = ({ fontAvailable, isOneMan, infogram, + isEdit ]; } }, [trainData]); @@ -99,14 +101,8 @@ export const HeaderText: FC = ({ { - navigate("generalWebView", { - uri: - "https://jr-shikoku-data-post-system.pages.dev?trainNum=" + - trainNum + - "&token=" + - expoPushToken, - useExitButton: false, - }); + const uri = `https://jr-shikoku-data-post-system.pages.dev?trainNum=${trainNum}&token=${expoPushToken}`; + navigate("generalWebView", { uri, useExitButton: false }); SheetManager.hide("EachTrainInfo"); }} disabled={!updatePermission} @@ -125,6 +121,7 @@ export const HeaderText: FC = ({ {isOneMan && } {trainName} + {isEdit &&alert("このアイコン、列車データはコミュニティによってリアルタイム追加されています。")} />}