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

不要な要素の整理

Browse Source
This commit is contained in:
harukin-expo-dev-env 2024-05-31 07:31:32 +00:00
parent d07c05e523
commit 03a677ce67
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apps.js
View File

@ -31,7 +31,7 @@ import { stationNamePair } from "./lib/getStationList2";
import StatusbarDetect from './StatusbarDetect'; import StatusbarDetect from './StatusbarDetect';
var Status = StatusbarDetect(); */ var Status = StatusbarDetect(); */
export default function Apps({ stationData }) { export default function Apps() {
const { webview, currentTrain } = useCurrentTrain(); const { webview, currentTrain } = useCurrentTrain();
const { height, width } = useWindowDimensions(); const { height, width } = useWindowDimensions();
const { navigate } = useNavigation(); const { navigate } = useNavigation();
@ -39,7 +39,11 @@ export default function Apps({ stationData }) {
const { favoriteStation } = useFavoriteStation(); const { favoriteStation } = useFavoriteStation();
const { isLandscape, setIsLandscape } = useDeviceOrientationChange(); const { isLandscape, setIsLandscape } = useDeviceOrientationChange();
const handleLayout = () => {}; const handleLayout = () => {};
const { setSelectedLine, setInjectJavaScript } = useTrainMenu(); const {
setSelectedLine,
setInjectJavaScript,
mapsStationData: stationData,
} = useTrainMenu();
//画面表示関連 //画面表示関連
const [iconSetting, setIconSetting] = useState(undefined); const [iconSetting, setIconSetting] = useState(undefined);

14
Top.js
View File

@ -22,12 +22,8 @@ export const Top = ({ navigationRef }) => {
const { navigate, addListener } = navigation; const { navigate, addListener } = navigation;
//地図用 //地図用
const { const { setMapsStationData, injectJavaScript, setInjectJavaScript } =
mapsStationData, useTrainMenu();
setMapsStationData,
injectJavaScript,
setInjectJavaScript,
} = useTrainMenu();
useEffect(() => { useEffect(() => {
getStationList2().then(setMapsStationData); getStationList2().then(setMapsStationData);
@ -77,7 +73,7 @@ export const Top = ({ navigationRef }) => {
gestureEnabled: true, gestureEnabled: true,
headerTransparent: true, headerTransparent: true,
}} }}
children={() => <Apps stationData={mapsStationData} />} component={Apps}
/> />
<Stack.Screen <Stack.Screen
name="trainbase" name="trainbase"
@ -95,13 +91,13 @@ export const Top = ({ navigationRef }) => {
<Stack.Screen <Stack.Screen
name="trainMenu" name="trainMenu"
options={optionData} options={optionData}
children={() => <TrainMenu />} component={TrainMenu}
/> />
<Stack.Screen <Stack.Screen
name="favoriteList" name="favoriteList"
options={{ ...optionData, gestureEnabled: false }} options={{ ...optionData, gestureEnabled: false }}
children={() => <FavoriteList stationData={mapsStationData} />} component={FavoriteList}
/> />
</Stack.Navigator> </Stack.Navigator>
); );

4
components/FavoriteList.js
View File

@ -5,11 +5,13 @@ import Icon from "react-native-vector-icons/Entypo";
import { useFavoriteStation } from "../stateBox/useFavoriteStation"; import { useFavoriteStation } from "../stateBox/useFavoriteStation";
import { useCurrentTrain } from "../stateBox/useCurrentTrain"; import { useCurrentTrain } from "../stateBox/useCurrentTrain";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import { useTrainMenu } from "../stateBox/useTrainMenu";
import { FavoriteListItem } from "./atom/FavoriteListItem"; import { FavoriteListItem } from "./atom/FavoriteListItem";
export default function FavoriteList({ stationData }) { export default function FavoriteList() {
const { favoriteStation } = useFavoriteStation(); const { favoriteStation } = useFavoriteStation();
const { webview } = useCurrentTrain(); const { webview } = useCurrentTrain();
const { navigate, goBack } = useNavigation(); const { navigate, goBack } = useNavigation();
const { mapsStationData: stationData } = useTrainMenu();
return ( return (
<View style={{ height: "100%", backgroundColor: "#0099CC" }}> <View style={{ height: "100%", backgroundColor: "#0099CC" }}>