Merge commit 'c2ca832b804afb3b5817afece0c98b4e9e504020' into develop

This commit is contained in:
harukin-DeskMini 2023-02-05 05:03:31 +09:00
commit 4c47a1684c
2 changed files with 12 additions and 5 deletions

View File

@ -145,10 +145,10 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
return (
<View style={styleSheet.下枠フレーム}>
<View style={styleSheet.下枠フレーム}>
{preStation && (
{preStation ? (
<>
<Text style={styleSheet.下枠左右マーク}></Text>
{preStation.StationNumber && (
{preStation.StationNumber ? (
<View style={styleSheet.下枠駅ナンバー}>
<View style={{ flex: 1 }} />
<Text
@ -161,22 +161,26 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
</Text>
<View style={{ flex: 1 }} />
</View>
) : (
<></>
)}
<StationName
stringData={preStation}
ss={{ flex: 1, alignItems: "flex-start" }}
/>
</>
) : (
<></>
)}
</View>
<View style={styleSheet.下枠フレーム}>
{nexStation && (
{nexStation ? (
<>
<StationName
stringData={nexStation}
ss={{ flex: 1, alignItems: "flex-end" }}
/>
{nexStation.StationNumber && (
{nexStation.StationNumber ? (
<View style={styleSheet.下枠駅ナンバー}>
<View style={{ flex: 1 }} />
<Text style={{ fontSize: parseInt("10%"), color: "white" }}>
@ -184,9 +188,13 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
</Text>
<View style={{ flex: 1 }} />
</View>
) : (
<></>
)}
<Text style={styleSheet.下枠左右マーク}></Text>
</>
) : (
<></>
)}
</View>
</View>

View File

@ -128,7 +128,6 @@ export default function Menu(props) {
}
} else {
setCurrentStation(undefined);
StationBoardAcSR.current?.hide();
}
}, [location, originalStationList]);