不要な要素の整理
This commit is contained in:
parent
d07c05e523
commit
03a677ce67
8
Apps.js
8
Apps.js
@ -31,7 +31,7 @@ import { stationNamePair } from "./lib/getStationList2";
|
||||
import StatusbarDetect from './StatusbarDetect';
|
||||
var Status = StatusbarDetect(); */
|
||||
|
||||
export default function Apps({ stationData }) {
|
||||
export default function Apps() {
|
||||
const { webview, currentTrain } = useCurrentTrain();
|
||||
const { height, width } = useWindowDimensions();
|
||||
const { navigate } = useNavigation();
|
||||
@ -39,7 +39,11 @@ export default function Apps({ stationData }) {
|
||||
const { favoriteStation } = useFavoriteStation();
|
||||
const { isLandscape, setIsLandscape } = useDeviceOrientationChange();
|
||||
const handleLayout = () => {};
|
||||
const { setSelectedLine, setInjectJavaScript } = useTrainMenu();
|
||||
const {
|
||||
setSelectedLine,
|
||||
setInjectJavaScript,
|
||||
mapsStationData: stationData,
|
||||
} = useTrainMenu();
|
||||
|
||||
//画面表示関連
|
||||
const [iconSetting, setIconSetting] = useState(undefined);
|
||||
|
14
Top.js
14
Top.js
@ -22,12 +22,8 @@ export const Top = ({ navigationRef }) => {
|
||||
const { navigate, addListener } = navigation;
|
||||
|
||||
//地図用
|
||||
const {
|
||||
mapsStationData,
|
||||
setMapsStationData,
|
||||
injectJavaScript,
|
||||
setInjectJavaScript,
|
||||
} = useTrainMenu();
|
||||
const { setMapsStationData, injectJavaScript, setInjectJavaScript } =
|
||||
useTrainMenu();
|
||||
|
||||
useEffect(() => {
|
||||
getStationList2().then(setMapsStationData);
|
||||
@ -77,7 +73,7 @@ export const Top = ({ navigationRef }) => {
|
||||
gestureEnabled: true,
|
||||
headerTransparent: true,
|
||||
}}
|
||||
children={() => <Apps stationData={mapsStationData} />}
|
||||
component={Apps}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="trainbase"
|
||||
@ -95,13 +91,13 @@ export const Top = ({ navigationRef }) => {
|
||||
<Stack.Screen
|
||||
name="trainMenu"
|
||||
options={optionData}
|
||||
children={() => <TrainMenu />}
|
||||
component={TrainMenu}
|
||||
/>
|
||||
|
||||
<Stack.Screen
|
||||
name="favoriteList"
|
||||
options={{ ...optionData, gestureEnabled: false }}
|
||||
children={() => <FavoriteList stationData={mapsStationData} />}
|
||||
component={FavoriteList}
|
||||
/>
|
||||
</Stack.Navigator>
|
||||
);
|
||||
|
@ -5,11 +5,13 @@ import Icon from "react-native-vector-icons/Entypo";
|
||||
import { useFavoriteStation } from "../stateBox/useFavoriteStation";
|
||||
import { useCurrentTrain } from "../stateBox/useCurrentTrain";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { useTrainMenu } from "../stateBox/useTrainMenu";
|
||||
import { FavoriteListItem } from "./atom/FavoriteListItem";
|
||||
export default function FavoriteList({ stationData }) {
|
||||
export default function FavoriteList() {
|
||||
const { favoriteStation } = useFavoriteStation();
|
||||
const { webview } = useCurrentTrain();
|
||||
const { navigate, goBack } = useNavigation();
|
||||
const { mapsStationData: stationData } = useTrainMenu();
|
||||
|
||||
return (
|
||||
<View style={{ height: "100%", backgroundColor: "#0099CC" }}>
|
||||
|
Loading…
Reference in New Issue
Block a user