From 2e5f53c46bdc5bb3c6370a0b1586da936ae20bda Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Tue, 20 Aug 2024 08:29:38 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=83=9F=E3=82=B9?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/getTrainDelayStatus.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/getTrainDelayStatus.ts b/lib/getTrainDelayStatus.ts index 5dd722f..af7e163 100644 --- a/lib/getTrainDelayStatus.ts +++ b/lib/getTrainDelayStatus.ts @@ -1,7 +1,7 @@ type getTrainDelayStatus = ( - current: { delay: string; Pos: string }, + current: { delay: number | "入線" | string; Pos: string }, Station_JP: string -) => string; +) => string | number; export const getTrainDelayStatus: getTrainDelayStatus = ( current, Station_JP @@ -17,7 +17,7 @@ export const getTrainDelayStatus: getTrainDelayStatus = ( } case Number.isNaN(delay): return delay; - case delay === "0": + case delay === 0: return "定刻通り"; default: return delay + "分遅れ"; From e7f30b3884b025a856452eecf7f84f9ea3ea5d96 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Tue, 20 Aug 2024 09:18:49 +0000 Subject: [PATCH 2/3] =?UTF-8?q?originData=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/originData/{between.js => between.ts} | 0 assets/originData/{dosan.js => dosan.ts} | 0 assets/originData/{dosan2.js => dosan2.ts} | 0 assets/originData/{koutoku.js => koutoku.ts} | 0 assets/originData/{lineColorList.js => lineColorList.ts} | 0 assets/originData/{naruto.js => naruto.ts} | 0 assets/originData/{seto.js => seto.ts} | 0 assets/originData/{tokushima.js => tokushima.ts} | 0 assets/originData/{trainList.js => trainList.ts} | 0 assets/originData/{train_lang.js => train_lang.ts} | 0 assets/originData/{uwajima.js => uwajima.ts} | 0 assets/originData/{uwajima2.js => uwajima2.ts} | 0 assets/originData/{yosan.js => yosan.ts} | 0 lib/{getStationList2.js => getStationList2.ts} | 2 +- ...ViewInjectjavascript.js => webViewInjectjavascript.ts} | 8 +++++++- 15 files changed, 8 insertions(+), 2 deletions(-) rename assets/originData/{between.js => between.ts} (100%) rename assets/originData/{dosan.js => dosan.ts} (100%) rename assets/originData/{dosan2.js => dosan2.ts} (100%) rename assets/originData/{koutoku.js => koutoku.ts} (100%) rename assets/originData/{lineColorList.js => lineColorList.ts} (100%) rename assets/originData/{naruto.js => naruto.ts} (100%) rename assets/originData/{seto.js => seto.ts} (100%) rename assets/originData/{tokushima.js => tokushima.ts} (100%) rename assets/originData/{trainList.js => trainList.ts} (100%) rename assets/originData/{train_lang.js => train_lang.ts} (100%) rename assets/originData/{uwajima.js => uwajima.ts} (100%) rename assets/originData/{uwajima2.js => uwajima2.ts} (100%) rename assets/originData/{yosan.js => yosan.ts} (100%) rename lib/{getStationList2.js => getStationList2.ts} (96%) rename lib/{webViewInjectjavascript.js => webViewInjectjavascript.ts} (99%) diff --git a/assets/originData/between.js b/assets/originData/between.ts similarity index 100% rename from assets/originData/between.js rename to assets/originData/between.ts diff --git a/assets/originData/dosan.js b/assets/originData/dosan.ts similarity index 100% rename from assets/originData/dosan.js rename to assets/originData/dosan.ts diff --git a/assets/originData/dosan2.js b/assets/originData/dosan2.ts similarity index 100% rename from assets/originData/dosan2.js rename to assets/originData/dosan2.ts diff --git a/assets/originData/koutoku.js b/assets/originData/koutoku.ts similarity index 100% rename from assets/originData/koutoku.js rename to assets/originData/koutoku.ts diff --git a/assets/originData/lineColorList.js b/assets/originData/lineColorList.ts similarity index 100% rename from assets/originData/lineColorList.js rename to assets/originData/lineColorList.ts diff --git a/assets/originData/naruto.js b/assets/originData/naruto.ts similarity index 100% rename from assets/originData/naruto.js rename to assets/originData/naruto.ts diff --git a/assets/originData/seto.js b/assets/originData/seto.ts similarity index 100% rename from assets/originData/seto.js rename to assets/originData/seto.ts diff --git a/assets/originData/tokushima.js b/assets/originData/tokushima.ts similarity index 100% rename from assets/originData/tokushima.js rename to assets/originData/tokushima.ts diff --git a/assets/originData/trainList.js b/assets/originData/trainList.ts similarity index 100% rename from assets/originData/trainList.js rename to assets/originData/trainList.ts diff --git a/assets/originData/train_lang.js b/assets/originData/train_lang.ts similarity index 100% rename from assets/originData/train_lang.js rename to assets/originData/train_lang.ts diff --git a/assets/originData/uwajima.js b/assets/originData/uwajima.ts similarity index 100% rename from assets/originData/uwajima.js rename to assets/originData/uwajima.ts diff --git a/assets/originData/uwajima2.js b/assets/originData/uwajima2.ts similarity index 100% rename from assets/originData/uwajima2.js rename to assets/originData/uwajima2.ts diff --git a/assets/originData/yosan.js b/assets/originData/yosan.ts similarity index 100% rename from assets/originData/yosan.js rename to assets/originData/yosan.ts diff --git a/lib/getStationList2.js b/lib/getStationList2.ts similarity index 96% rename from lib/getStationList2.js rename to lib/getStationList2.ts index e554828..6d5bb5c 100644 --- a/lib/getStationList2.js +++ b/lib/getStationList2.ts @@ -7,7 +7,7 @@ import koutoku from "../assets/originData/koutoku"; import tokushima from "../assets/originData/tokushima"; import naruto from "../assets/originData/naruto"; import seto from "../assets/originData/seto"; -export const getStationList2 = async (props) => { +export const getStationList2 = async () => { return { yosan, uwajima, diff --git a/lib/webViewInjectjavascript.js b/lib/webViewInjectjavascript.ts similarity index 99% rename from lib/webViewInjectjavascript.js rename to lib/webViewInjectjavascript.ts index e9feaf4..089405a 100644 --- a/lib/webViewInjectjavascript.js +++ b/lib/webViewInjectjavascript.ts @@ -1,6 +1,12 @@ import { getJRF } from "../components/custom-train-data"; -export const injectJavascriptData = ( +type InjectJavascriptData = ( + a: string, + b: string, + c: string, + d: string +) => string; +export const injectJavascriptData: InjectJavascriptData = ( mapSwitch, iconSetting, stationMenu, From 0fdcee6f1729c2e1a8c934c1e6f17395c462cf8d Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Tue, 20 Aug 2024 10:04:43 +0000 Subject: [PATCH 3/3] =?UTF-8?q?StateBox=E3=81=A8DataFromButton=E3=82=92tsx?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{DataFromButton.js => DataFromButton.tsx} | 4 +-- .../{StateBox.js => StateBox.tsx} | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename components/ActionSheetComponents/EachTrainInfo/{DataFromButton.js => DataFromButton.tsx} (90%) rename components/ActionSheetComponents/EachTrainInfo/{StateBox.js => StateBox.tsx} (67%) diff --git a/components/ActionSheetComponents/EachTrainInfo/DataFromButton.js b/components/ActionSheetComponents/EachTrainInfo/DataFromButton.tsx similarity index 90% rename from components/ActionSheetComponents/EachTrainInfo/DataFromButton.js rename to components/ActionSheetComponents/EachTrainInfo/DataFromButton.tsx index 664a8bf..155a48a 100644 --- a/components/ActionSheetComponents/EachTrainInfo/DataFromButton.js +++ b/components/ActionSheetComponents/EachTrainInfo/DataFromButton.tsx @@ -1,8 +1,8 @@ -import React from "react"; +import React, { FC } from "react"; import { View, Text, TouchableWithoutFeedback } from "react-native"; import { MaterialCommunityIcons } from "@expo/vector-icons"; import { Linking } from "react-native"; -export const DataFromButton = ({ i }) => { +export const DataFromButton: FC<{ i: string }> = ({ i }) => { const [station, se, time] = i.split(","); return ( ( +type stateBox = { + text: string; + title: string; + style?: ViewStyle; + mode?: number; +}; +export const StateBox: FC = ({ text, title, style, mode }) => ( {title} - + {text?.match("～") ? ( <> @@ -30,27 +30,27 @@ export const StateBox = ({ text, title, style, mode }) => ( ); -const boxStyle = { +const boxStyle: ViewStyle = { flex: 1, backgroundColor: "white", borderRadius: 10, padding: 10, margin: 10, }; -const boxStyle2 = { +const boxStyle2: ViewStyle = { flex: 1, backgroundColor: "white", borderRadius: 10, padding: 5, margin: 5, }; -const boxTextStyle2 = { +const boxTextStyle2: TextStyle = { fontSize: 18, color: "#0099CC", textAlign: "right", }; -const boxTextStyle = { +const boxTextStyle: TextStyle = { fontSize: 25, color: "#0099CC", textAlign: "right",