とりあえず実装、明日動作チェックして挙動確認

This commit is contained in:
harukin-expo-dev-env
2025-08-23 16:34:29 +00:00
parent 37e21be4c0
commit ebf72e35bc
5 changed files with 19 additions and 7 deletions

View File

@@ -79,7 +79,7 @@ export const EachStopList = ({
<View <View
style={{ style={{
flexDirection: "row", flexDirection: "row",
backgroundColor: seType == "community" ? "#e3ffcdff" : "white", backgroundColor: seType == "community" ? "#c2ff94c4" : "#ffffffc2",
}} }}
> >
<View <View

View File

@@ -7,7 +7,7 @@ export const ScrollStickyContent = (props) => {
<View <View
style={{ style={{
alignItems: "center", alignItems: "center",
backgroundColor: "white", backgroundColor: "#ffffffc2",
flexDirection: "row", flexDirection: "row",
}} }}
> >
@@ -16,7 +16,7 @@ export const ScrollStickyContent = (props) => {
padding: 8, padding: 8,
flexDirection: "row", flexDirection: "row",
borderBottomWidth: 1, borderBottomWidth: 1,
borderBottomColor: "#f0f0f0", borderBottomColor: "#ffffffc2",
flex: 1, flex: 1,
}} }}
> >

View File

@@ -392,6 +392,7 @@ export const EachTrainInfoCore = ({
containerProps={{ containerProps={{
style: { style: {
maxHeight: isLandscape ? height - 94 : (height / 100) * 70, maxHeight: isLandscape ? height - 94 : (height / 100) * 70,
backgroundColor:getTrainType(customTrainDataDetector(data.trainNum, allCustomTrainData).type).data === "notService" ? "#868686ff" :"white"
}, },
}} }}
shortHeader={ shortHeader={
@@ -422,6 +423,7 @@ export const EachTrainInfoCore = ({
/> />
} }
> >
{getTrainType(customTrainDataDetector(data.trainNum, allCustomTrainData).type).data === "notService" &&<Text>この列車には乗車できません</Text>}
{headStation.length != 0 && {headStation.length != 0 &&
headStation.map((i, index) => headStation.map((i, index) =>
showHeadStation.findIndex((d) => d == index) == -1 ? ( showHeadStation.findIndex((d) => d == index) == -1 ? (
@@ -494,7 +496,7 @@ export const EachTrainInfoCore = ({
/> />
) )
)} )}
<Text>背景が緑色時刻が斜体になっている時刻はコミュニティで追加されている独自データです</Text> <Text style={{backgroundColor:"#ffffffc2"}}>背景が緑色時刻が斜体になっている時刻はコミュニティで追加されている独自データです</Text>
{tailStation.length != 0 && {tailStation.length != 0 &&
tailStation.map(({ station, dia }, index) => tailStation.map(({ station, dia }, index) =>
showTailStation.findIndex((d) => d == index) == -1 ? ( showTailStation.findIndex((d) => d == index) == -1 ? (
@@ -535,6 +537,7 @@ export const EachTrainInfoCore = ({
flexDirection: "row", flexDirection: "row",
borderBottomWidth: 1, borderBottomWidth: 1,
borderBottomColor: "#f0f0f0", borderBottomColor: "#f0f0f0",
backgroundColor:"#ffffffc2",
flex: 1, flex: 1,
}} }}
> >

View File

@@ -159,7 +159,7 @@ export const DynamicHeaderScrollView = (props) => {
ref={scrollHandlers.ref} ref={scrollHandlers.ref}
onLayout={scrollHandlers.onLayout} onLayout={scrollHandlers.onLayout}
scrollEventThrottle={scrollHandlers.scrollEventThrottle} scrollEventThrottle={scrollHandlers.scrollEventThrottle}
style={{ backgroundColor: "white", zIndex: 0 }} style={{ zIndex: 0 }}
stickyHeaderIndices={[1]} stickyHeaderIndices={[1]}
onScroll={onScroll} onScroll={onScroll}
> >

View File

@@ -5,7 +5,7 @@ type nameString =
| "SPCL" | "SPCL"
| "Normal" | "Normal"
| string; | string;
type colorString = "aqua" | "red" | "#297bff" | "#ff7300ff" | "white" | "pink"; type colorString = "aqua" | "red" | "#297bff" | "#ff7300ff" | "#00869ecc" | "#727272cc" | "white" | "pink";
type trainTypeString = type trainTypeString =
| "快速" | "快速"
| "特急" | "特急"
@@ -16,8 +16,11 @@ type trainTypeString =
| "臨時快速" | "臨時快速"
| "臨時特急" | "臨時特急"
| "団体臨時" | "団体臨時"
| "貨物"
| "回送"
| "単機回送"
| "その他"; | "その他";
type trainTypeDataString = "rapid" | "express" | "normal"; type trainTypeDataString = "rapid" | "express" | "normal" | "notService";
type getTrainType = (d: nameString) => { type getTrainType = (d: nameString) => {
color: colorString; color: colorString;
name: trainTypeString; name: trainTypeString;
@@ -45,6 +48,12 @@ export const getTrainType: getTrainType = (nameString) => {
return { color: "#297bff", name: "臨時特急", data: "normal" }; return { color: "#297bff", name: "臨時特急", data: "normal" };
case "Party": case "Party":
return { color: "#ff7300ff", name: "団体臨時", data: "normal" }; return { color: "#ff7300ff", name: "団体臨時", data: "normal" };
case "Freight":
return { color: "#00869ecc", name: "貨物", data: "notService" };
case "Forwarding":
return { color: "#727272cc", name: "回送", data: "notService" };
case "FreightForwarding":
return { color: "#727272cc", name: "単機回送", data: "notService" };
default: default:
return { color: "white", name: "その他", data: "normal" }; return { color: "white", name: "その他", data: "normal" };
} }