From e750b73f55c54d3b48278bd5ebc5f2d8c85226f0 Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Wed, 13 Mar 2024 12:55:52 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E6=99=82=E3=81=AB=E5=87=A1=E4=BE=8B=E3=81=8C=E9=9A=A0?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=83=90=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/DynamicHeaderScrollView.js | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/components/DynamicHeaderScrollView.js b/components/DynamicHeaderScrollView.js
index a381887..82b9353 100644
--- a/components/DynamicHeaderScrollView.js
+++ b/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>

From 5806e2a259e03182d082fe454f4a1932ad9c5e53 Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Wed, 13 Mar 2024 13:10:08 +0000
Subject: [PATCH 2/2] =?UTF-8?q?5.0.2.2=20=E3=83=88=E3=83=AC=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE=E4=BA=88?=
 =?UTF-8?q?=E6=9C=9F=E3=81=97=E3=81=AA=E3=81=84=E6=8C=99=E5=8B=95=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionSheetComponents/EachTrainInfoCore.js | 18 +++++++++++++-----
 components/settings.js                         |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js
index dbf6487..46bf1e0 100644
--- a/components/ActionSheetComponents/EachTrainInfoCore.js
+++ b/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}
-        Min_Header_Height={from == "AllTrainDiagramView" ? 0 : 80}
+        Max_Header_Height={
+          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
diff --git a/components/settings.js b/components/settings.js
index 01b3d48..d4eae0e 100644
--- a/components/settings.js
+++ b/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>