Merge commit '711f0bbe9f00200c02fb70757d7c0ca2d0060ed4'

This commit is contained in:
harukin-OneMix4
2023-07-16 19:36:57 +09:00
25 changed files with 2060 additions and 954 deletions

View File

@@ -20,6 +20,7 @@ import {
heightPercentageToDP as hp,
} from "react-native-responsive-screen";
import lineColorList from "../../assets/originData/lineColorList";
import { getPDFViewURL } from "../../lib/getPdfViewURL";
export const StationDeteilView = (props) => {
const {
@@ -29,6 +30,8 @@ export const StationDeteilView = (props) => {
favoriteStation,
setFavoriteStation,
busAndTrainData,
navigate,
onExit,
} = props;
const [trainBus, setTrainBus] = useState();
useEffect(() => {
@@ -41,7 +44,11 @@ export const StationDeteilView = (props) => {
}
setTrainBus(data[0]);
}, [currentStation]);
const info =
currentStation &&
(currentStation[0].StationTimeTable.match(".pdf")
? getPDFViewURL(currentStation[0].StationTimeTable)
: currentStation[0].StationTimeTable);
return (
<ActionSheet
ref={StationBoardAcSR}
@@ -82,7 +89,14 @@ export const StationDeteilView = (props) => {
originalStationList={originalStationList}
favoriteStation={favoriteStation}
setFavoriteStation={setFavoriteStation}
oP={() => Linking.openURL(currentStation[0].StationTimeTable)}
oP={() => {
navigate("howto", {
info,
onExit,
});
StationBoardAcSR.current?.hide();
}}
oLP={() => Linking.openURL(currentStation[0].StationTimeTable)}
/>
</View>
)}
@@ -99,6 +113,21 @@ export const StationDeteilView = (props) => {
currentStation[0].JrHpUrl &&
currentStation[0].StationNumber != "M12" && (
<駅構内図 //高松/阿波池田&後免&須崎kounai.png児島例外/
oP={() => {
navigate("howto", {
info:
currentStation[0].JrHpUrl.replace("/index.html", "/") +
"/kounai_map.html",
onExit,
});
StationBoardAcSR.current?.hide();
}}
oLP={() => {
Linking.openURL(
currentStation[0].JrHpUrl.replace("/index.html", "/") +
"/kounai_map.html"
);
}}
uri={currentStation[0].JrHpUrl.replace("/index.html", "/")}
/>
)}
@@ -109,7 +138,14 @@ export const StationDeteilView = (props) => {
backgroundColor={"#AD7FA8"}
icon={<Foundation name="web" color="white" size={50} />}
flex={1}
onPressButton={() =>
onPressButton={() => {
navigate("howto", {
info: currentStation[0].JrHpUrl,
onExit,
});
StationBoardAcSR.current?.hide();
}}
onLongPressButton={() =>
Linking.openURL(currentStation[0].JrHpUrl)
}
>
@@ -121,7 +157,14 @@ export const StationDeteilView = (props) => {
backgroundColor={"#8F5902"}
icon={<FontAwesome name="table" color="white" size={50} />}
flex={1}
onPressButton={() =>
onPressButton={() => {
navigate("howto", {
info,
onExit,
});
StationBoardAcSR.current?.hide();
}}
onLongPressButton={() =>
Linking.openURL(currentStation[0].StationTimeTable)
}
>
@@ -145,7 +188,14 @@ export const StationDeteilView = (props) => {
backgroundColor={"#CE5C00"}
icon={<Ionicons name="bus" color="white" size={50} />}
flex={1}
onPressButton={() => Linking.openURL(trainBus.address)}
onPressButton={() => {
navigate("howto", {
info: trainBus.address,
onExit,
});
StationBoardAcSR.current?.hide();
}}
onLongPressButton={() => Linking.openURL(trainBus.address)}
>
並行バス
</TicketBox>
@@ -312,7 +362,8 @@ const 駅構内図 = (props) => {
alignItems: "center",
margin: 2,
}}
onPress={() => Linking.openURL(props.uri + "/kounai_map.html")}
onPress={props.oP}
onLongPress={props.oLP}
//onPress={() => setOpen(!open)}
>
<View style={{ flex: 1 }} />