harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'fc50a2c827ad23424f6d67e48a3b731b6b667eb1' into develop

Browse Source
This commit is contained in:
harukin-expo-dev-env 2025-01-06 11:45:35 +00:00
commit 517bcc3cea
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apps.js
View File

@ -2,6 +2,7 @@ import React from "react";
import { NavigationContainer } from "@react-navigation/native"; import { NavigationContainer } from "@react-navigation/native";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { Platform } from "react-native"; import { Platform } from "react-native";
import { useFonts } from "expo-font";
import TNDView from "./ndView"; import TNDView from "./ndView";
import { initIcon } from "./lib/initIcon"; import { initIcon } from "./lib/initIcon";
import { Top } from "./Top"; import { Top } from "./Top";
@ -24,6 +25,10 @@ export function AppContainer() {
tabBarBadgeStyle: style, tabBarBadgeStyle: style,
}, },
}); });
const [fontLoaded, error] = useFonts({
"JR-Nishi": require("./assets/fonts/西日本方向幕ロゴ.otf"),
"Zou": require("./assets/fonts/DelaGothicOne-Regular.ttf"),
});
return ( return (
<NavigationContainer name="Root" style={{ flex: 1 }} ref={navigationRef}> <NavigationContainer name="Root" style={{ flex: 1 }} ref={navigationRef}>
<Tab.Navigator <Tab.Navigator

7
components/ActionSheetComponents/EachTrainInfoCore.js
View File

@ -10,7 +10,6 @@ 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";
@ -45,10 +44,6 @@ 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();
@ -411,7 +406,6 @@ export const EachTrainInfoCore = ({
tailStation={tailStation} tailStation={tailStation}
navigate={navigate} navigate={navigate}
from={from} from={from}
fontLoaded={fontLoaded}
/> />
<DynamicHeaderScrollView <DynamicHeaderScrollView
@ -501,7 +495,6 @@ export const EachTrainInfoCore = ({
currentTrainData, currentTrainData,
openStationACFromEachTrainInfo, openStationACFromEachTrainInfo,
showThrew, showThrew,
fontLoaded,
}} }}
/> />
) )

1
components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
View File

@ -35,7 +35,6 @@ export const HeaderText: FC<Props> = ({
tailStation, tailStation,
navigate, navigate,
from, from,
fontLoaded,
}) => { }) => {
const { limited, trainNum } = data; const { limited, trainNum } = data;