From f5e4947c3bad839fb6022904e77da03e03c24dca Mon Sep 17 00:00:00 2001
From: harukin-DeskMini <harukin@haruk.in>
Date: Mon, 30 Jan 2023 00:04:18 +0900
Subject: [PATCH] =?UTF-8?q?navigation=E3=81=AE=E5=88=B6=E5=BE=A1=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=9A=E5=B0=91=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.js                  | 112 +++++++++++++++++++++++-----------------
 Apps.js                 |   8 ++-
 components/trainMenu.js |   2 +-
 3 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/App.js b/App.js
index 74cbb29..73761d3 100644
--- a/App.js
+++ b/App.js
@@ -10,12 +10,12 @@ import { Platform, UIManager } from "react-native";
 import { UpdateAsync } from "./UpdateAsync.js";
 import Apps from "./Apps";
 import tndView from "./ndView";
-import trainbase from "./trainbaseview";
-import howto from "./howto";
+import TrainBase from "./trainbaseview";
+import HowTo from "./howto";
 import menu from "./menu";
 import News from "./components/news.js";
 import Setting from "./components/settings.js";
-import trainMenu from "./components/trainMenu.js";
+import TrainMenu from "./components/trainMenu.js";
 import FavoriteList from "./components/FavoriteList.js";
 const Stack = createStackNavigator();
 const Tab = createBottomTabNavigator();
@@ -25,14 +25,14 @@ if (Platform.OS === "android") {
   }
 }
 export default function App() {
-  const navigationRef = useRef();
   useEffect(() => {
     UpdateAsync();
   }, []);
+
   return (
-    <NavigationContainer name="Root" ref={navigationRef} style={{ flex: 1 }}>
+    <NavigationContainer name="Root" style={{ flex: 1 }}>
       <Tab.Navigator>
-        <Stack.Screen
+        <Tab.Screen
           name="login"
           component={top}
           options={{
@@ -42,7 +42,7 @@ export default function App() {
             tabBarIcon: () => <AntDesign name="barchart" size={32} />,
           }}
         />
-        <Stack.Screen
+        <Tab.Screen
           name="menuPage"
           component={menuPage}
           options={{
@@ -52,7 +52,7 @@ export default function App() {
             tabBarIcon: () => <Ionicons name="ios-radio" size={32} />,
           }}
         />
-        <Stack.Screen
+        <Tab.Screen
           name="home"
           component={tndView}
           options={{
@@ -66,43 +66,63 @@ export default function App() {
     </NavigationContainer>
   );
 }
-const top = () => (
-  <Stack.Navigator>
-    <Stack.Screen
-      name="Apps"
-      component={Apps}
-      options={{
-        headerShown: false,
-        gestureEnabled: true,
-        headerTransparent: true,
-      }}
-    />
-    <Stack.Screen
-      name="trainbase"
-      component={trainbase}
-      options={{
-        title: "トレインビジョン",
-        gestureEnabled: true,
-        ...TransitionPresets.SlideFromRightIOS,
-      }}
-    />
-    <Stack.Screen
-      name="howto"
-      component={howto}
-      options={{
-        title: "使い方",
-        ...optionData,
-      }}
-    />
-    <Stack.Screen name="news" component={News} options={optionData} />
-    <Stack.Screen name="trainMenu" component={trainMenu} options={optionData} />
-    <Stack.Screen
-      name="favoriteList"
-      component={FavoriteList}
-      options={{ ...optionData, gestureEnabled: false }}
-    />
-  </Stack.Navigator>
-);
+const top = ({ navigation }) => {
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("tabLongPress", (e) => {
+      alert("longPress!");
+      navigation.navigate("favoriteList", { webview, stationData });
+    });
+
+    return unsubscribe;
+  }, [navigation]);
+
+  const webview = useRef();
+  return (
+    <Stack.Navigator>
+      <Stack.Screen
+        name="Apps"
+        options={{
+          headerShown: false,
+          gestureEnabled: true,
+          headerTransparent: true,
+        }}
+      >
+        {(props) => <Apps {...props} webview={webview} />}
+      </Stack.Screen>
+      <Stack.Screen
+        name="trainbase"
+        options={{
+          title: "トレインビジョン",
+          gestureEnabled: true,
+          ...TransitionPresets.SlideFromRightIOS,
+        }}
+      >
+        {(props) => <TrainBase {...props} webview={webview} />}
+      </Stack.Screen>
+      <Stack.Screen
+        name="howto"
+        options={{
+          title: "使い方",
+          ...optionData,
+        }}
+      >
+        {(props) => <HowTo {...props} />}
+      </Stack.Screen>
+      <Stack.Screen name="news" options={optionData}>
+        {(props) => <News {...props} />}
+      </Stack.Screen>
+      <Stack.Screen name="trainMenu" options={optionData}>
+        {(props) => <TrainMenu {...props} webview={webview} />}
+      </Stack.Screen>
+      <Stack.Screen
+        name="favoriteList"
+        options={{ ...optionData, gestureEnabled: false }}
+      >
+        {(props) => <FavoriteList {...props} webview={webview} />}
+      </Stack.Screen>
+    </Stack.Navigator>
+  );
+};
 function menuPage() {
   return (
     <Stack.Navigator>
@@ -118,7 +138,7 @@ function menuPage() {
       <Stack.Screen name="setting" component={Setting} options={optionData} />
       <Stack.Screen
         name="trainbase"
-        component={trainbase}
+        component={TrainBase}
         options={{
           ...TransitionPresets.ModalPresentationIOS,
           cardOverlayEnabled: true,
diff --git a/Apps.js b/Apps.js
index fbb2fec..2fb1502 100644
--- a/Apps.js
+++ b/Apps.js
@@ -19,12 +19,10 @@ import { getStationList2 } from "./lib/getStationList2";
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
 
-export default function Apps(props) {
-  const {
-    navigation: { navigate },
-  } = props;
+export default function Apps({ navigation, webview }) {
+  const { navigate } = navigation;
   var urlcache = "";
-  const webview = useRef();
+
   //画面表示関連
   const [iconSetting, setIconSetting] = useState(undefined);
   const [mapSwitch, setMapSwitch] = useState(undefined);
diff --git a/components/trainMenu.js b/components/trainMenu.js
index 5921c1d..85bcf6d 100644
--- a/components/trainMenu.js
+++ b/components/trainMenu.js
@@ -2,7 +2,7 @@ import React, { useRef } from "react";
 import { View, Text, TouchableOpacity, Linking } from "react-native";
 import MapView, { Marker } from "react-native-maps";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
-export default function trainMenu({
+export default function TrainMenu({
   route: {
     params: { webview, stationData },
   },