harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '87129c6815233ea6e42575b83a26c0a2c34a6e5c'

Browse Source
This commit is contained in:
harukin-OneMix4 2024-01-09 18:21:41 +09:00
commit 32edab3289
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
App.js
View File

@ -29,6 +29,7 @@ import { AllTrainDiagramProvider } from "./stateBox/useAllTrainDiagram.js";
import { SheetProvider } from "react-native-actions-sheet"; import { SheetProvider } from "react-native-actions-sheet";
import "./components/ActionSheetComponents/sheets.js"; import "./components/ActionSheetComponents/sheets.js";
import { TrainDelayDataProvider } from "./stateBox/useTrainDelayData.js"; import { TrainDelayDataProvider } from "./stateBox/useTrainDelayData.js";
import { SafeAreaProvider } from "react-native-safe-area-context";
LogBox.ignoreLogs([ LogBox.ignoreLogs([
"ViewPropTypes will be removed", "ViewPropTypes will be removed",
"ColorPropType will be removed", "ColorPropType will be removed",
@ -43,21 +44,23 @@ if (Platform.OS === "android") {
export default function App() { export default function App() {
useEffect(() => UpdateAsync(), []); useEffect(() => UpdateAsync(), []);
return ( return (
<FavoriteStationProvider> <SafeAreaProvider>
<TrainDelayDataProvider> <FavoriteStationProvider>
<CurrentTrainProvider> <TrainDelayDataProvider>
<AreaInfoProvider> <CurrentTrainProvider>
<AllTrainDiagramProvider> <AreaInfoProvider>
<BusAndTrainDataProvider> <AllTrainDiagramProvider>
<SheetProvider> <BusAndTrainDataProvider>
<AppContainer /> <SheetProvider>
</SheetProvider> <AppContainer />
</BusAndTrainDataProvider> </SheetProvider>
</AllTrainDiagramProvider> </BusAndTrainDataProvider>
</AreaInfoProvider> </AllTrainDiagramProvider>
</CurrentTrainProvider> </AreaInfoProvider>
</TrainDelayDataProvider> </CurrentTrainProvider>
</FavoriteStationProvider> </TrainDelayDataProvider>
</FavoriteStationProvider>
</SafeAreaProvider>
); );
} }
export function AppContainer() { export function AppContainer() {

8
components/ActionSheetComponents/EachTrainInfo.js
View File

@ -15,6 +15,7 @@ import ActionSheet, {
SheetManager, SheetManager,
useScrollHandlers, useScrollHandlers,
} from "react-native-actions-sheet"; } from "react-native-actions-sheet";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { AS } from "../../storageControl"; import { AS } from "../../storageControl";
import LottieView from "lottie-react-native"; import LottieView from "lottie-react-native";
import trainList from "../../assets/originData/trainList"; import trainList from "../../assets/originData/trainList";
@ -65,7 +66,7 @@ export const EachTrainInfo = (props) => {
}) })
.catch((d) => AS.setItem("trainPositionSwitch", "false")); .catch((d) => AS.setItem("trainPositionSwitch", "false"));
}, []); }, []);
const insets = useSafeAreaInsets();
const getStationData = (stationName) => { const getStationData = (stationName) => {
const Stations = stationList.map((a) => const Stations = stationList.map((a) =>
a.filter((d) => d.StationName == stationName) a.filter((d) => d.StationName == stationName)
@ -264,6 +265,11 @@ export const EachTrainInfo = (props) => {
CustomHeaderComponent={<></>} CustomHeaderComponent={<></>}
ref={actionSheetRef} ref={actionSheetRef}
drawUnderStatusBar={false} drawUnderStatusBar={false}
isModal={Platform.OS == "ios"}
containerStyle={{
paddingBottom: insets.bottom,
}}
useBottomSafeAreaPadding={true}
> >
<View <View
style={{ style={{

2
components/ActionSheetComponents/JRSTraInfo.js
View File

@ -6,6 +6,7 @@ import {
Linking, Linking,
Text, Text,
TouchableOpacity, TouchableOpacity,
Platform,
} from "react-native"; } from "react-native";
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import ActionSheet, { useScrollHandlers } from "react-native-actions-sheet"; import ActionSheet, { useScrollHandlers } from "react-native-actions-sheet";
@ -21,6 +22,7 @@ export const JRSTraInfo = () => {
gestureEnabled gestureEnabled
CustomHeaderComponent={<></>} CustomHeaderComponent={<></>}
ref={actionSheetRef} ref={actionSheetRef}
isModal={Platform.OS == "ios"}
> >
<View <View
style={{ style={{

4
components/ActionSheetComponents/StationDeteilView.js
View File

@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { View, Linking, Text, TouchableOpacity } from "react-native"; import { View, Linking, Text, TouchableOpacity, Platform } from "react-native";
import AutoHeightImage from "react-native-auto-height-image"; import AutoHeightImage from "react-native-auto-height-image";
import { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons"; import { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons";
import ActionSheet from "react-native-actions-sheet"; import ActionSheet from "react-native-actions-sheet";
@ -45,7 +45,7 @@ export const StationDeteilView = (props) => {
? getPDFViewURL(currentStation[0].StationTimeTable) ? getPDFViewURL(currentStation[0].StationTimeTable)
: currentStation[0].StationTimeTable); : currentStation[0].StationTimeTable);
return ( return (
<ActionSheet gestureEnabled CustomHeaderComponent={<></>}> <ActionSheet gestureEnabled CustomHeaderComponent={<></>} isModal={false}>
<View <View
key={currentStation} key={currentStation}
style={{ style={{

2
components/settings.js
View File

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