Merge commit '1ecb9ec0463b3c2c3ebf9da3b78015e9724632f4' into develop

This commit is contained in:
harukin-OneMix4 2022-12-08 01:06:41 +09:00
commit a923ac8b20
6 changed files with 16 additions and 76 deletions

View File

@ -1,7 +1,5 @@
import React, { Component, useRef, useState, useEffect } from "react";
import React from "react";
import {
StatusBar,
Platform,
View,
LayoutAnimation,
ScrollView,
@ -9,30 +7,9 @@ import {
Text,
TouchableOpacity,
} from "react-native";
import Image from "react-native-remote-svg";
import Constants from "expo-constants";
import { List, ListItem } from "native-base";
import Icon from "react-native-vector-icons/Entypo";
import * as Location from "expo-location";
import StatusbarDetect from "../../StatusbarDetect";
var Status = StatusbarDetect();
import { useNavigation } from "@react-navigation/native";
import AutoHeightImage from "react-native-auto-height-image";
import {
widthPercentageToDP as wp,
heightPercentageToDP as hp,
} from "react-native-responsive-screen";
import {
FontAwesome,
Fontisto,
Foundation,
Ionicons,
MaterialCommunityIcons,
} from "@expo/vector-icons";
import * as WebBrowser from "expo-web-browser";
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import ActionSheet from "react-native-actions-sheet";
import LottieView from "lottie-react-native";
import SvgUri from "react-native-svg-uri";
export const JRSTraInfo = (props) => {
const {
JRSTraInfoEXAcSR,
@ -45,7 +22,7 @@ export const JRSTraInfo = (props) => {
<ActionSheet
ref={JRSTraInfoEXAcSR}
gestureEnabled
CustomHeaderComponent={() => { }}
CustomHeaderComponent={() => {}}
>
<View
style={{
@ -80,8 +57,8 @@ export const JRSTraInfo = (props) => {
<Text style={{ fontSize: 30, fontWeight: "bold", color: "white" }}>
{getTime
? getTime.toLocaleTimeString("ja-JP").split(":")[0] +
":" +
getTime.toLocaleTimeString("ja-JP").split(":")[1]
":" +
getTime.toLocaleTimeString("ja-JP").split(":")[1]
: NaN}{" "}
</Text>
<Ionicons

View File

@ -1,7 +1,5 @@
import React from "react";
import { View, ScrollView, Linking } from "react-native";
import StatusbarDetect from "../../StatusbarDetect";
var Status = StatusbarDetect();
import { View, Linking } from "react-native";
import { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons";
import ActionSheet from "react-native-actions-sheet";
import Sign from "../../components/駅名表/Sign";

View File

@ -1,17 +1,8 @@
import React, { useState, useEffect, useRef } from "react";
import React, { useRef } from "react";
import { View, Text, TouchableOpacity, Linking } from "react-native";
import { WebView } from "react-native-webview";
import StatusbarDetect from "../StatusbarDetect";
import AsyncStorage from "@react-native-async-storage/async-storage";
import MapView, { Marker, Geojson, PROVIDER_GOOGLE } from "react-native-maps";
import {
FontAwesome,
Fontisto,
Foundation,
Ionicons,
MaterialCommunityIcons,
} from "@expo/vector-icons";
var Status = StatusbarDetect();
import MapView, { Marker } from "react-native-maps";
import { MaterialCommunityIcons } from "@expo/vector-icons";
export default function trainMenu({
route: {
params: { webview, stationData },
@ -54,7 +45,6 @@ export default function trainMenu({
longitude: parseFloat(latlng[1]),
}}
onPress={() => {
console.log(stationData);
webview.current?.injectJavaScript(
`MoveDisplayStation('${d}_${D.MyStation}_${D.Station_JP}')`
);

View File

@ -1,18 +1,7 @@
import React, { Component, useRef, useState, useEffect } from "react";
import {
StatusBar,
View,
LayoutAnimation,
ScrollView,
Linking,
Text,
TouchableOpacity,
} from "react-native";
import React, { useState, useEffect } from "react";
import { View, Text } from "react-native";
import { Switch } from "react-native-elements";
import {
widthPercentageToDP as wp,
heightPercentageToDP as hp,
} from "react-native-responsive-screen";
import { widthPercentageToDP as wp } from "react-native-responsive-screen";
import { customTrainDataDetector } from "../custom-train-data";
import { useInterval } from "../../lib/useInterval";

17
menu.js
View File

@ -1,6 +1,5 @@
import React, { Component, useRef, useState, useEffect } from "react";
import React, { useRef, useState, useEffect } from "react";
import {
StatusBar,
Platform,
View,
LayoutAnimation,
@ -9,9 +8,8 @@ import {
Text,
TouchableOpacity,
} from "react-native";
import Image from "react-native-remote-svg";
import Constants from "expo-constants";
import { List, ListItem } from "native-base";
import { ListItem } from "native-base";
import Icon from "react-native-vector-icons/Entypo";
import * as Location from "expo-location";
import StatusbarDetect from "./StatusbarDetect";
@ -19,27 +17,16 @@ import { useNavigation } from "@react-navigation/native";
import AutoHeightImage from "react-native-auto-height-image";
import {
widthPercentageToDP as wp,
heightPercentageToDP as hp,
} from "react-native-responsive-screen";
import {
FontAwesome,
Fontisto,
Foundation,
Ionicons,
MaterialCommunityIcons,
} from "@expo/vector-icons";
import * as WebBrowser from "expo-web-browser";
import ActionSheet from "react-native-actions-sheet";
import LottieView from "lottie-react-native";
import SvgUri from "react-native-svg-uri";
import { StationDeteilView } from "./components/ActionSheetComponents/StationDeteilView";
import 予讃線 from "./assets/四国旅客鉄道予讃線.json";
import 土讃線 from "./assets/四国旅客鉄道土讃線.json";
import 高徳線 from "./assets/四国旅客鉄道高徳線.json";
import 内子線 from "./assets/四国旅客鉄道内子線.json";
import 徳島線 from "./assets/四国旅客鉄道徳島線.json";
import 鳴門線 from "./assets/四国旅客鉄道鳴門線.json";
import LED_vision from "./components/発車時刻表/LED_vidion";
import Sign from "./components/駅名表/Sign";

View File

@ -1,8 +1,7 @@
import React, { Component } from "react";
import { StatusBar, View, Linking, Platform, Text } from "react-native";
import React from "react";
import { View, Platform } from "react-native";
import { WebView } from "react-native-webview";
import Constants from "expo-constants";
import { TouchableOpacity } from "react-native-gesture-handler";
export default function tndView() {
return (
<View