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/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", 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/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 + "分遅れ"; 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,