Merge commit '87129c6815233ea6e42575b83a26c0a2c34a6e5c'

App.js

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

components/ActionSheetComponents/EachTrainInfo.js

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

components/ActionSheetComponents/JRSTraInfo.js

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

components/ActionSheetComponents/StationDeteilView.js

@@ -1,5 +1,5 @@
 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 { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons";
 import ActionSheet from "react-native-actions-sheet";
@@ -45,7 +45,7 @@ export const StationDeteilView = (props) => {
       ? getPDFViewURL(currentStation[0].StationTimeTable)
       : currentStation[0].StationTimeTable);
   return (
-    <ActionSheet gestureEnabled CustomHeaderComponent={<></>}>
+    <ActionSheet gestureEnabled CustomHeaderComponent={<></>} isModal={false}>
       <View
         key={currentStation}
         style={{

components/settings.js

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