設定機能の新しい核完成

components/Settings/settings.js

@@ -10,6 +10,7 @@ import {
   ToastAndroid,
 } from "react-native";
 import { createStackNavigator } from "@react-navigation/stack";
+import { TransitionPresets } from "@react-navigation/stack";
 import * as ExpoFelicaReader from "../../modules/expo-felica-reader/src";
 import * as Updates from "expo-updates";
 import StatusbarDetect from "../../StatusbarDetect";
@@ -18,6 +19,7 @@ var Status = StatusbarDetect();
 import { Switch } from "react-native-elements";
 import AutoHeightImage from "react-native-auto-height-image";
 import { SettingTopPage } from "./SettingTopPage";
+import { LayoutSettings } from "./LayoutSettings";
 
 const Stack = createStackNavigator();
 export default function Setting(props) {
@@ -53,22 +55,69 @@ export default function Setting(props) {
     ]).then(() => Updates.reloadAsync());
   };
   return (
-    <SettingTopPage
-      navigate={navigate}
-      iconSetting={iconSetting}
-      setIconSetting={setIconSetting}
-      mapSwitch={mapSwitch}
-      setMapSwitch={setMapSwitch}
-      stationMenu={stationMenu}
-      setStationMenu={setStationMenu}
-      usePDFView={usePDFView}
-      setUsePDFView={setUsePDFView}
-      trainMenu={trainMenu}
-      setTrainMenu={setTrainMenu}
-      trainPosition={trainPosition}
-      setTrainPosition={setTrainPosition}
-      testNFC={testNFC}
-      updateAndReload={updateAndReload}
-    />
+    <Stack.Navigator>
+      <Stack.Screen
+        name="settingTopPage"
+        options={{
+          gestureEnabled: false,
+          ...TransitionPresets.SlideFromRightIOS,
+          cardOverlayEnabled: true,
+          headerTransparent: true,
+          headerShown: false,
+        }}
+      >
+        {(props) => (
+          <SettingTopPage
+            {...props}
+            navigate={navigate}
+            iconSetting={iconSetting}
+            setIconSetting={setIconSetting}
+            mapSwitch={mapSwitch}
+            setMapSwitch={setMapSwitch}
+            stationMenu={stationMenu}
+            setStationMenu={setStationMenu}
+            usePDFView={usePDFView}
+            setUsePDFView={setUsePDFView}
+            trainMenu={trainMenu}
+            setTrainMenu={setTrainMenu}
+            trainPosition={trainPosition}
+            setTrainPosition={setTrainPosition}
+            testNFC={testNFC}
+            updateAndReload={updateAndReload}
+          />
+        )}
+      </Stack.Screen>
+      <Stack.Screen
+        name="LayoutSettings"
+        options={{
+          gestureEnabled: true,
+          ...TransitionPresets.SlideFromRightIOS,
+          cardOverlayEnabled: true,
+          headerTransparent: true,
+          headerShown: false,
+        }}
+      >
+        {(props) => (
+          <LayoutSettings
+            {...props}
+            navigate={navigate}
+            iconSetting={iconSetting}
+            setIconSetting={setIconSetting}
+            mapSwitch={mapSwitch}
+            setMapSwitch={setMapSwitch}
+            stationMenu={stationMenu}
+            setStationMenu={setStationMenu}
+            usePDFView={usePDFView}
+            setUsePDFView={setUsePDFView}
+            trainMenu={trainMenu}
+            setTrainMenu={setTrainMenu}
+            trainPosition={trainPosition}
+            setTrainPosition={setTrainPosition}
+            testNFC={testNFC}
+            updateAndReload={updateAndReload}
+          />
+        )}
+      </Stack.Screen>
+    </Stack.Navigator>
   );
 }