デザイン小調整

Apps.js

@@ -6,9 +6,7 @@ import { Ionicons } from "@expo/vector-icons";
 import { AS } from "./storageControl";
 import { news } from "./config/newsUpdate";
 import { getStationList, lineList } from "./lib/getStationList";
-import { StationDeteilView } from "./components/ActionSheetComponents/StationDeteilView";
 import { injectJavascriptData } from "./lib/webViewInjectjavascript";
-import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
 import { checkDuplicateTrainData } from "./lib/checkDuplicateTrainData";
 import { useFavoriteStation } from "./stateBox/useFavoriteStation";
 import { useCurrentTrain } from "./stateBox/useCurrentTrain";
@@ -322,13 +320,6 @@ export default function Apps({ navigation, webview, stationData }) {
         top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
         LoadError={LoadError}
       />
-
-      <EachTrainInfo
-        data={trainInfo}
-        navigate={navigate}
-        originalStationList={originalStationList}
-        openStationACFromEachTrainInfo={openStationACFromEachTrainInfo}
-      />
     </View>
   );
 }

components/ActionSheetComponents/EachTrainInfo.js

@@ -263,6 +263,7 @@ export const EachTrainInfo = (props) => {
       gestureEnabled={isTop}
       CustomHeaderComponent={<></>}
       ref={actionSheetRef}
+      drawUnderStatusBar={false}
     >
       <View
         style={{
@@ -525,29 +526,13 @@ export const EachTrainInfo = (props) => {
           </View> */}
           </ScrollView>
         )}
-        <ScrollView
+        <View
-          {...scrollHandlers}
           style={{
-            maxHeight: heightPercentageToDP(
+            alignItems: "center",
-              from == "AllTrainDiagramView" ? "70%" : "50%"
+            backgroundColor: "white",
-            ),
+            flexDirection: "row",
-          }}
-          nestedScrollEnabled
-          onScroll={(e) => {
-            if (!Platform.OS !== "android") return;
-            setIsTop(e.nativeEvent.contentOffset.y < 0);
           }}
         >
-          <View style={{ padding: 10, backgroundColor: "white" }}>
-            <View style={{ alignItems: "center" }}>
-              {/* <LottieView
-                autoPlay
-                loop
-                style={{ width: 150, height: 150, backgroundColor: "#fff" }}
-                source={require("../../assets/51690-loading-diamonds.json")}
-              />
-              <Text>ほげほげふがふが</Text> */}
-              <View style={{ flexDirection: "row" }}>
           <View
             style={{
               padding: 8,
@@ -592,6 +577,27 @@ export const EachTrainInfo = (props) => {
             </View>
           </View>
         </View>
+        <ScrollView
+          {...scrollHandlers}
+          style={{
+            maxHeight: heightPercentageToDP(
+              from == "AllTrainDiagramView" ? "70%" : "50%"
+            ),
+          }}
+          onScroll={(e) => {
+            if (!Platform.OS !== "android") return;
+            setIsTop(e.nativeEvent.contentOffset.y < 0);
+          }}
+        >
+          <View style={{ backgroundColor: "white", alignItems: "center" }}>
+            {/* <LottieView
+                autoPlay
+                loop
+                style={{ width: 150, height: 150, backgroundColor: "#fff" }}
+                source={require("../../assets/51690-loading-diamonds.json")}
+              />
+              <Text>ほげほげふがふが</Text> */}
+
             {trainData.map((i, index) => {
               const [station, se, time] = i.split(",");
               const Stations = stationList.map((a) =>
@@ -737,7 +743,6 @@ export const EachTrainInfo = (props) => {
               );
             })}
           </View>
-          </View>
         </ScrollView>
       </View>
     </ActionSheet>