Merge commit '431c4c9c0b426250adefbb42db7893233fabb55b' into develop

components/ActionSheetComponents/EachTrainInfo.js

@@ -630,7 +630,7 @@ export const EachTrainInfo = (props) => {
               />
               <Text>ほげほげふがふが</Text> */}
 
-          {trainData.map((i, index) => (
+          {trainData.map((i, index) => (i.split(",")[1] == "提" ? <DataFromButton i={i} /> :
             <StationButton
               i={i}
               index={index}
@@ -664,6 +664,35 @@ export const EachTrainInfo = (props) => {
   );
 };
 
+const DataFromButton  = ({i}) => {
+  const [station, se, time] = i.split(",");
+  return (
+    <TouchableWithoutFeedback
+      onPress={() => Linking.openURL(time)}
+      key={station}
+    >
+      <View style={{ flexDirection: "row" }}>
+        <View
+          style={{
+            padding: 8,
+            flexDirection: "row",
+            borderBottomWidth: 1,
+            borderBottomColor: "#f0f0f0",
+            flex: 1,
+          }}
+        >
+          <Text style={{ fontSize: 20 }}>{station}</Text>
+          <View style={{ flex: 1 }} />
+          <Text style={{ fontSize: 18 }}>
+            提供元<MaterialCommunityIcons name={"open-in-new"} color="black" size={20} />
+          </Text>
+          
+        </View>
+      </View>
+    </TouchableWithoutFeedback>
+  );
+}
+
 const StationButton = ({
   i,
   index,

components/settings.js

@@ -165,7 +165,7 @@ export default function Setting(props) {
                 textAlignVertical: "center",
               }}
             >
-              内部バージョン: 4.6.3.1
+              内部バージョン: 4.6.4
             </Text>
             <View style={{ flex: 1 }} />
           </View>

lib/getTrainType.js

@@ -6,6 +6,8 @@ export const getTrainType = (nameString) => {
       return { color: "red", name: "特急", data: "express" };
     case "NightLTDEXP":
       return { color: "red", name: "寝台特急", data: "express" };
+    case "SPCL":
+      return { color: "blue", name: "臨時", data: "normal" };
     case "Normal":
       return { color: "white", name: "普通列車", data: "normal" };
     default: