diff --git a/MenuPage.js b/MenuPage.js index a7b01f0..81aa9a7 100644 --- a/MenuPage.js +++ b/MenuPage.js @@ -44,7 +44,10 @@ export function MenuPage({ navigation }) { > {(props) => } - + {(props) => } { - Updates.reloadAsync(); - }); + ]).then(() => Updates.reloadAsync()); }; return ( - - - - 設定画面 - + + + navigate("menu")}> + + 閉じる + + + + + 設定画面 + + + + - + ); } -const SimpleSwitch = ({ bool, setBool, color }) => ( - setBool(value.toString())} - /> -); -const SwitchArea = ({ str, bool, setBool }) => { +const SimpleSwitch = ({ + bool, + setBool, + color, + value, + image = require("../assets/icons.png"), + subText = "", +}) => { + const { width } = useWindowDimensions(); return ( - + + setBool(value.toString())} + > + + + + {subText} + + + ); +}; +const SwitchArea = ({ + str, + bool, + setBool, + falseImage, + trueImage, + falseText, + trueText, +}) => { + return ( + { > {str} - - + + + + ); };