From 65080e68f2197f31b8a4ed4bf94ad325aa77e923 Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Tue, 9 Jan 2024 18:31:24 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=BE=E3=81=9F=E6=9C=80=E9=81=A9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionSheetComponents/EachTrainInfo.js       | 12 ++++++++----
 components/ActionSheetComponents/JRSTraInfo.js   | 10 ++++++++++
 .../ActionSheetComponents/StationDeteilView.js   | 16 +++++++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js
index 9b448ac..67dd480 100644
--- a/components/ActionSheetComponents/EachTrainInfo.js
+++ b/components/ActionSheetComponents/EachTrainInfo.js
@@ -266,10 +266,14 @@ export const EachTrainInfo = (props) => {
       ref={actionSheetRef}
       drawUnderStatusBar={false}
       isModal={Platform.OS == "ios"}
-      containerStyle={{
-        paddingBottom: insets.bottom,
-      }}
-      useBottomSafeAreaPadding={true}
+      containerStyle={
+        Platform.OS == "android"
+          ? {
+              paddingBottom: insets.bottom,
+            }
+          : {}
+      }
+      useBottomSafeAreaPadding={Platform.OS == "android"}
     >
       <View
         style={{
diff --git a/components/ActionSheetComponents/JRSTraInfo.js b/components/ActionSheetComponents/JRSTraInfo.js
index 11f1f64..05c2123 100644
--- a/components/ActionSheetComponents/JRSTraInfo.js
+++ b/components/ActionSheetComponents/JRSTraInfo.js
@@ -11,18 +11,28 @@ import {
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import ActionSheet, { useScrollHandlers } from "react-native-actions-sheet";
 import LottieView from "lottie-react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useTrainDelayData } from "../../stateBox/useTrainDelayData";
 export const JRSTraInfo = () => {
   const { getTime, delayData, loadingDelayData, setLoadingDelayData } =
     useTrainDelayData();
   const actionSheetRef = useRef(null);
   const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef);
+  const insets = useSafeAreaInsets();
   return (
     <ActionSheet
       gestureEnabled
       CustomHeaderComponent={<></>}
       ref={actionSheetRef}
       isModal={Platform.OS == "ios"}
+      containerStyle={
+        Platform.OS == "android"
+          ? {
+              paddingBottom: insets.bottom,
+            }
+          : {}
+      }
+      useBottomSafeAreaPadding={Platform.OS == "android"}
     >
       <View
         style={{
diff --git a/components/ActionSheetComponents/StationDeteilView.js b/components/ActionSheetComponents/StationDeteilView.js
index 5be4905..3a8874e 100644
--- a/components/ActionSheetComponents/StationDeteilView.js
+++ b/components/ActionSheetComponents/StationDeteilView.js
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from "react";
 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 { useSafeAreaInsets } from "react-native-safe-area-context";
 import ActionSheet from "react-native-actions-sheet";
 import Sign from "../../components/駅名表/Sign";
 
@@ -44,8 +45,21 @@ export const StationDeteilView = (props) => {
     (currentStation[0].StationTimeTable.match(".pdf")
       ? getPDFViewURL(currentStation[0].StationTimeTable)
       : currentStation[0].StationTimeTable);
+  const insets = useSafeAreaInsets();
   return (
-    <ActionSheet gestureEnabled CustomHeaderComponent={<></>} isModal={false}>
+    <ActionSheet
+      gestureEnabled
+      CustomHeaderComponent={<></>}
+      isModal={Platform.OS == "ios"}
+      containerStyle={
+        Platform.OS == "android"
+          ? {
+              paddingBottom: insets.bottom,
+            }
+          : {}
+      }
+      useBottomSafeAreaPadding={Platform.OS == "android"}
+    >
       <View
         key={currentStation}
         style={{