diff --git a/MenuPage.js b/MenuPage.js index b67463a..ccd8773 100644 --- a/MenuPage.js +++ b/MenuPage.js @@ -21,6 +21,16 @@ export function MenuPage() { const { getCurrentTrain } = useCurrentTrain(); const navigation = useNavigation(); const { addListener } = navigation; + useEffect(() => { + AS.getItem("startPage") + .then((res) => { + if (res == "true") navigation.navigate("login"); + }) + .catch((e) => { + //6.0以降false + AS.setItem("startPage", "true"); + }); + }, []); useEffect(() => { const unsubscribe = addListener("tabPress", (e) => { AS.getItem("favoriteStation") @@ -70,11 +80,7 @@ export function MenuPage() { options={{ ...optionData, gestureEnabled: false }} component={AllTrainDiagramView} /> - + ); } diff --git a/assets/configuration/showSetting0.jpg b/assets/configuration/showSetting0.jpg new file mode 100644 index 0000000..57bb439 Binary files /dev/null and b/assets/configuration/showSetting0.jpg differ diff --git a/assets/configuration/showSetting1.jpg b/assets/configuration/showSetting1.jpg new file mode 100644 index 0000000..dd9dbf6 Binary files /dev/null and b/assets/configuration/showSetting1.jpg differ diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js index acdd83d..30487a2 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore.js +++ b/components/ActionSheetComponents/EachTrainInfoCore.js @@ -340,6 +340,7 @@ export const EachTrainInfoCore = ({ .then((d) => { if (d) setTrainPositionSwitch(d); }) + //6.0で変更 .catch(() => AS.setItem("trainPositionSwitch", "false")); }, []); diff --git a/components/Settings/SettingTopPage.js b/components/Settings/SettingTopPage.js index 3716164..382de1b 100644 --- a/components/Settings/SettingTopPage.js +++ b/components/Settings/SettingTopPage.js @@ -11,10 +11,11 @@ import { import * as Updates from "expo-updates"; import { useWindowDimensions } from "react-native"; import { ListItem } from "native-base"; +import { SwitchArea } from "../atom/SwitchArea"; const versionCode = "5.5.1"; -export const SettingTopPage = ({ navigate, testNFC, updateAndReload }) => { +export const SettingTopPage = ({ navigate, testNFC,startPage,setStartPage, updateAndReload }) => { const { width } = useWindowDimensions(); return ( @@ -100,10 +101,19 @@ export const SettingTopPage = ({ navigate, testNFC, updateAndReload }) => { - navigate("FavoriteSettings")} > + { AS.getItem("iconSwitch").then(setIconSetting); AS.getItem("mapSwitch").then(setMapSwitch); @@ -43,6 +44,7 @@ export default function Setting(props) { AS.getItem("trainSwitch").then(setTrainMenu); AS.getItem("trainPositionSwitch").then(setTrainPosition); AS.getItem("headerSize").then(setHeaderSize); + AS.getItem("startPage").then(setStartPage); }, []); const testNFC = async () => { const result = await ExpoFelicaReader.scan(); @@ -57,6 +59,7 @@ export default function Setting(props) { AS.setItem("trainSwitch", trainMenu.toString()), AS.setItem("trainPositionSwitch", trainPosition.toString()), AS.setItem("headerSize", headerSize), + AS.setItem("startPage", startPage.toString()), ]).then(() => Updates.reloadAsync()); }; return ( @@ -75,19 +78,9 @@ export default function Setting(props) { )} diff --git a/stateBox/useTrainMenu.js b/stateBox/useTrainMenu.js index eabd0ec..4db725b 100644 --- a/stateBox/useTrainMenu.js +++ b/stateBox/useTrainMenu.js @@ -72,6 +72,7 @@ export const TrainMenuProvider = ({ children }) => { //列車アイコンスイッチ ASCore({ k: "iconSwitch", s: setIconSetting, d: "true", u: true }); //地図スイッチ + //6.0.0以降true ASCore({ k: "mapSwitch", s: setMapSwitch, d: "false", u: true }); //駅メニュースイッチ ASCore({ k: "stationSwitch", s: setStationMenu, d: "true", u: true });