フォントの設定箇所を変更’
This commit is contained in:
parent
d9fb24840a
commit
d05ec3f647
@ -46,7 +46,10 @@ export const EachStopList = ({
|
|||||||
.set("minute", parseInt(time.split(":")[1]))
|
.set("minute", parseInt(time.split(":")[1]))
|
||||||
.add(isNaN(currentTrainData?.delay) ? 0 : currentTrainData.delay, "minute");
|
.add(isNaN(currentTrainData?.delay) ? 0 : currentTrainData.delay, "minute");
|
||||||
const timeString = se == "通過" ? "" : dates.format("HH:mm").split(":");
|
const timeString = se == "通過" ? "" : dates.format("HH:mm").split(":");
|
||||||
|
const onClickStateText = (string) => {
|
||||||
|
if (string != "通過") return;
|
||||||
|
alert("この駅は通過駅です");
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<TouchableWithoutFeedback
|
<TouchableWithoutFeedback
|
||||||
onPress={() =>
|
onPress={() =>
|
||||||
@ -140,6 +143,7 @@ export const EachStopList = ({
|
|||||||
: "red",
|
: "red",
|
||||||
width: 60,
|
width: 60,
|
||||||
}}
|
}}
|
||||||
|
onPress={() => onClickStateText(se)}
|
||||||
>
|
>
|
||||||
{se == "通過" ? "レ" : `${timeString[0]}:${timeString[1]}`}
|
{se == "通過" ? "レ" : `${timeString[0]}:${timeString[1]}`}
|
||||||
</Text>
|
</Text>
|
||||||
|
@ -10,6 +10,7 @@ import {
|
|||||||
LayoutAnimation,
|
LayoutAnimation,
|
||||||
} from "react-native";
|
} from "react-native";
|
||||||
import { SheetManager } from "react-native-actions-sheet";
|
import { SheetManager } from "react-native-actions-sheet";
|
||||||
|
import { useFonts } from "expo-font";
|
||||||
import { AS } from "../../storageControl";
|
import { AS } from "../../storageControl";
|
||||||
import trainList from "../../assets/originData/trainList";
|
import trainList from "../../assets/originData/trainList";
|
||||||
import { lineListPair } from "../../lib/getStationList";
|
import { lineListPair } from "../../lib/getStationList";
|
||||||
@ -44,6 +45,10 @@ export const EachTrainInfoCore = ({
|
|||||||
from,
|
from,
|
||||||
navigate,
|
navigate,
|
||||||
}) => {
|
}) => {
|
||||||
|
const [fontLoaded, error] = useFonts({
|
||||||
|
"JR-Nishi": require("../../assets/fonts/西日本方向幕ロゴ.otf"),
|
||||||
|
"Zou": require("../../assets/fonts/DelaGothicOne-Regular.ttf"),
|
||||||
|
});
|
||||||
// const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
|
// const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
|
||||||
const { currentTrain } = useCurrentTrain();
|
const { currentTrain } = useCurrentTrain();
|
||||||
const { originalStationList, stationList } = useStationList();
|
const { originalStationList, stationList } = useStationList();
|
||||||
@ -405,6 +410,7 @@ export const EachTrainInfoCore = ({
|
|||||||
tailStation={tailStation}
|
tailStation={tailStation}
|
||||||
navigate={navigate}
|
navigate={navigate}
|
||||||
from={from}
|
from={from}
|
||||||
|
fontLoaded={fontLoaded}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<DynamicHeaderScrollView
|
<DynamicHeaderScrollView
|
||||||
@ -494,6 +500,7 @@ export const EachTrainInfoCore = ({
|
|||||||
currentTrainData,
|
currentTrainData,
|
||||||
openStationACFromEachTrainInfo,
|
openStationACFromEachTrainInfo,
|
||||||
showThrew,
|
showThrew,
|
||||||
|
fontLoaded,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
@ -6,7 +6,6 @@ import { getType } from "../../../lib/eachTrainInfoCoreLib/getType";
|
|||||||
import { migrateTrainName } from "../../../lib/eachTrainInfoCoreLib/migrateTrainName";
|
import { migrateTrainName } from "../../../lib/eachTrainInfoCoreLib/migrateTrainName";
|
||||||
import { TrainIconStatus } from "./trainIconStatus";
|
import { TrainIconStatus } from "./trainIconStatus";
|
||||||
import { TrainViewIcon } from "./trainViewIcon";
|
import { TrainViewIcon } from "./trainViewIcon";
|
||||||
import { useFonts } from "expo-font";
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
data: { trainNum: string; limited: string };
|
data: { trainNum: string; limited: string };
|
||||||
@ -17,6 +16,7 @@ type Props = {
|
|||||||
tailStation: { id: string }[];
|
tailStation: { id: string }[];
|
||||||
navigate: any;
|
navigate: any;
|
||||||
from: string;
|
from: string;
|
||||||
|
fontLoaded: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
const textConfig: TextStyle = {
|
const textConfig: TextStyle = {
|
||||||
@ -34,11 +34,8 @@ export const HeaderText: FC<Props> = ({
|
|||||||
tailStation,
|
tailStation,
|
||||||
navigate,
|
navigate,
|
||||||
from,
|
from,
|
||||||
|
fontLoaded,
|
||||||
}) => {
|
}) => {
|
||||||
const [loaded, error] = useFonts({
|
|
||||||
"JR-Nishi": require("../../../assets/fonts/西日本方向幕ロゴ.otf"),
|
|
||||||
"Zou": require("../../../assets/fonts/DelaGothicOne-Regular.ttf"),
|
|
||||||
});
|
|
||||||
const [typeName, trainName] = useMemo(() => {
|
const [typeName, trainName] = useMemo(() => {
|
||||||
if (!data.limited) return "";
|
if (!data.limited) return "";
|
||||||
const limitedArray = data.limited.split(":");
|
const limitedArray = data.limited.split(":");
|
||||||
@ -73,7 +70,7 @@ export const HeaderText: FC<Props> = ({
|
|||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{loaded ? (
|
{fontLoaded ? (
|
||||||
<>
|
<>
|
||||||
<Text
|
<Text
|
||||||
style={{
|
style={{
|
||||||
|
Loading…
Reference in New Issue
Block a user