diff --git a/MenuPage.js b/MenuPage.js index a12dfb6..4b8e873 100644 --- a/MenuPage.js +++ b/MenuPage.js @@ -46,7 +46,11 @@ export function MenuPage({ navigation }) { {(props) => } diff --git a/components/Settings/LayoutSettings.js b/components/Settings/LayoutSettings.js new file mode 100644 index 0000000..1ccbd88 --- /dev/null +++ b/components/Settings/LayoutSettings.js @@ -0,0 +1,133 @@ +import React from "react"; +import { + View, + Text, + TouchableOpacity, + ScrollView, + Linking, +} from "react-native"; +import * as Updates from "expo-updates"; +import { SwitchArea } from "../atom/SwitchArea"; + +export const LayoutSettings = ({ + navigate, + iconSetting, + setIconSetting, + mapSwitch, + setMapSwitch, + stationMenu, + setStationMenu, + usePDFView, + setUsePDFView, + trainMenu, + setTrainMenu, + trainPosition, + setTrainPosition, + testNFC, + updateAndReload, +}) => { + return ( + + + + navigate("settingTopPage")} + style={{ + flexDirection: "column", + flex: 1, + }} + > + + + < 設定 + + + + + + + 設定画面 + + + + + + + + + + + + + + testNFC + + + + + + + ); +}; diff --git a/components/Settings/SettingTopPage.js b/components/Settings/SettingTopPage.js index 3089ff9..c18e959 100644 --- a/components/Settings/SettingTopPage.js +++ b/components/Settings/SettingTopPage.js @@ -5,9 +5,11 @@ import { TouchableOpacity, ScrollView, Linking, + Image, } from "react-native"; import * as Updates from "expo-updates"; import { SwitchArea } from "../atom/SwitchArea"; +import { useWindowDimensions } from "react-native"; export const SettingTopPage = ({ navigate, @@ -26,110 +28,141 @@ export const SettingTopPage = ({ testNFC, updateAndReload, }) => { + const { width } = useWindowDimensions(); return ( - navigate("menu")}> + navigate("menu")} + style={{ + flexDirection: "column", + flex: 1, + }} + > + 閉じる + - 設定画面 + このアプリについて - - - - - - - - + + + - - 内部バージョン: 5.0.2.1 - + + 内部バージョン: 5.0.2.1 + + + + このアプリは、四国旅客鉄道株式会社の提供する列車走行位置表示システムを利用し、HARUKIN/Xprocessにより一部の機能を拡張したものです。 + + + このアプリに関するお問い合わせは、HARUKIN/Xprocessにお願いします。くれぐれも四国旅客鉄道株式会社にはお問い合わせしないようにお願いします。 + + + + {}} > - releaseChannel: {Updates.channel} + お気に入り登録の管理(工事中) + + {">"} + + + navigate("LayoutSettings")} + > + + レイアウト設定 + + + + {">"} + Updates.reloadAsync()); }; return ( - + + + {(props) => ( + + )} + + + {(props) => ( + + )} + + ); }