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" ? ( <> ) : ( ) : ( { 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} + + {topStickyContent} + { {topStickyContent && ( - {topStickyContent} - + /> )} {children} 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