Merge commit '5806e2a259e03182d082fe454f4a1932ad9c5e53' into develop

components/ActionSheetComponents/EachTrainInfoCore.js

@@ -206,7 +206,7 @@ export const EachTrainInfoCore = ({
       },
       navigate,
       originalStationList,
-      from: "AllTrainDiagramView",
+      from: "NearTrainDiagramView",
     };
     if (setTrainInfo) {
       setTrainInfo(payload.data);
@@ -287,10 +287,18 @@ export const EachTrainInfoCore = ({
             maxHeight: isLandscape ? height - 94 : (height / 100) * 70,
           },
         }}
-        Max_Header_Height={from == "AllTrainDiagramView" ? 0 : 200}
+        Max_Header_Height={
-        Min_Header_Height={from == "AllTrainDiagramView" ? 0 : 80}
+          from == "AllTrainDiagramView" || from == "NearTrainDiagramView"
+            ? 0
+            : 200
+        }
+        Min_Header_Height={
+          from == "AllTrainDiagramView" || from == "NearTrainDiagramView"
+            ? 0
+            : 80
+        }
         shortHeader={
-          from == "AllTrainDiagramView" ? (
+          from == "AllTrainDiagramView" || from == "NearTrainDiagramView" ? (
             <></>
           ) : (
             <ShortHeader
@@ -302,7 +310,7 @@ export const EachTrainInfoCore = ({
           )
         }
         longHeader={
-          from == "AllTrainDiagramView" ? (
+          from == "AllTrainDiagramView" || from == "NearTrainDiagramView" ? (
             <></>
           ) : (
             <LongHeader

components/DynamicHeaderScrollView.js

@@ -47,7 +47,23 @@ export const DynamicHeaderScrollView = (props) => {
       backgroundColor: "#0099CC",
       margin: 0,
       top: 0,
-      opacity: 1,
+      opacity: 0,
+    },
+  };
+  const StickyStyle = {
+    on: {
+      position: "absolute",
+      width: "100%",
+      flex: 1,
+      top: Max_Header_Height,
+      zIndex: 1,
+    },
+    off: {
+      position: "absolute",
+      width: "100%",
+      flex: 1,
+      top: Min_Header_Height,
+      zIndex: 1,
     },
   };
 
@@ -70,6 +86,9 @@ export const DynamicHeaderScrollView = (props) => {
         >
           {longHeader}
         </Animated.View>
+        <Animated.View style={headerVisible ? StickyStyle.off : StickyStyle.on}>
+          {topStickyContent}
+        </Animated.View>
       </View>
       <ScrollView
         {...scrollViewProps}
@@ -97,13 +116,11 @@ export const DynamicHeaderScrollView = (props) => {
         {topStickyContent && (
           <View
             style={{
-              paddingTop: Min_Header_Height,
+              paddingTop: Min_Header_Height + 40,
               flexDirection: "column",
             }}
             index={1}
-          >
+          />
-            {topStickyContent}
-          </View>
         )}
         {children}
       </ScrollView>

components/settings.js

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