This commit is contained in:
harukin-expo-dev-env 2024-09-02 09:14:36 +00:00
parent 4ac4c7d1c3
commit c68a455e47
4 changed files with 2 additions and 28 deletions

9
Top.js
View File

@ -13,7 +13,6 @@ import FavoriteList from "./components/FavoriteList";
import { optionData } from "./lib/stackOption"; import { optionData } from "./lib/stackOption";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import { useCurrentTrain } from "./stateBox/useCurrentTrain"; import { useCurrentTrain } from "./stateBox/useCurrentTrain";
import { ASCore } from "./storageControl";
import { useTrainMenu } from "./stateBox/useTrainMenu"; import { useTrainMenu } from "./stateBox/useTrainMenu";
const Stack = createStackNavigator(); const Stack = createStackNavigator();
export const Top = ({ navigationRef }) => { export const Top = ({ navigationRef }) => {
@ -21,13 +20,7 @@ export const Top = ({ navigationRef }) => {
const { navigate, addListener } = useNavigation(); const { navigate, addListener } = useNavigation();
//地図用 //地図用
const { injectJavaScript, setInjectJavaScript } = useTrainMenu(); const { injectJavaScript, setInjectJavaScript, mapSwitch } = useTrainMenu();
const [mapSwitch, setMapSwitch] = useState("false");
useEffect(() => {
//地図スイッチ
ASCore({ k: "mapSwitch", s: setMapSwitch, d: "false" });
}, []);
const goToFavoriteList = () => navigate("favoriteList"); const goToFavoriteList = () => navigate("favoriteList");

View File

@ -1,42 +1,26 @@
import React, { useEffect, useRef } from "react"; import React, { useEffect, useRef } from "react";
import { import {
View, View,
LayoutAnimation,
ScrollView,
Linking,
Text, Text,
TouchableOpacity, TouchableOpacity,
Platform, Platform,
BackHandler, BackHandler,
} from "react-native"; } from "react-native";
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import ActionSheet, { SheetManager } from "react-native-actions-sheet";
import ActionSheet, {
SheetManager,
useScrollHandlers,
} from "react-native-actions-sheet";
import LottieView from "lottie-react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import ViewShot from "react-native-view-shot";
import * as Sharing from "expo-sharing";
import { useTrainDelayData } from "../../stateBox/useTrainDelayData";
import { useTrainMenu } from "../../stateBox/useTrainMenu"; import { useTrainMenu } from "../../stateBox/useTrainMenu";
import lineColorList from "../../assets/originData/lineColorList"; import lineColorList from "../../assets/originData/lineColorList";
import { stationIDPair } from "../../lib/getStationList2"; import { stationIDPair } from "../../lib/getStationList2";
import { lineListPair } from "../../lib/getStationList"; import { lineListPair } from "../../lib/getStationList";
export const TrainMenuLineSelector = () => { export const TrainMenuLineSelector = () => {
const { getTime, delayData, loadingDelayData, setLoadingDelayData } =
useTrainDelayData();
const { const {
selectedLine, selectedLine,
setSelectedLine, setSelectedLine,
mapsStationData: stationData, mapsStationData: stationData,
setMapsStationData,
} = useTrainMenu(); } = useTrainMenu();
const actionSheetRef = useRef(null); const actionSheetRef = useRef(null);
const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef);
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
const viewShot = useRef(null);
const platformIs = Platform.OS == "android"; const platformIs = Platform.OS == "android";
return ( return (
<ActionSheet <ActionSheet

View File

@ -262,9 +262,7 @@ const TopMenuButton = () => {
const JRSTraInfoBox = () => { const JRSTraInfoBox = () => {
const { const {
getTime, getTime,
setGetTime,
delayData, delayData,
setDelayData,
loadingDelayData, loadingDelayData,
setLoadingDelayData, setLoadingDelayData,
} = useTrainDelayData(); } = useTrainDelayData();

View File

@ -102,7 +102,6 @@ export const TrainMenuProvider = ({ children }) => {
setMapsStationData, setMapsStationData,
injectJavaScript, injectJavaScript,
setInjectJavaScript, setInjectJavaScript,
iconSetting, iconSetting,
setIconSetting, setIconSetting,
mapSwitch, mapSwitch,