Merge commit '540225d04d4fa8fcf27485a2c327f41ff208ef4f' into feature/platform-number-view

app.json

@@ -28,6 +28,12 @@
         {
           "initialOrientation": "DEFAULT"
         }
+      ],
+      [
+        "expo-location",
+        {
+          "locationWhenInUsePermission": "この位置情報は、リンク画面で現在地側近の駅情報を取得するのに使用されます。"
+        }
       ]
     ],
     "version": "5.0",
@@ -44,8 +50,8 @@
     },
     "assetBundlePatterns": ["**/*"],
     "ios": {
-      "buildNumber": "34",
-      "supportsTablet": true,
+      "buildNumber": "38",
+      "supportsTablet": false,
       "bundleIdentifier": "jrshikokuinfo.xprocess.hrkn",
       "config": {
         "googleMapsApiKey": "AIzaSyAVGDTjBkR_0wkQiNkoo5WDLhqXCjrjk8Y"

menu.js

@@ -41,12 +41,16 @@ export default function Menu({ getCurrentTrain }) {
   const [locationStatus, setLocationStatus] = useState(null);
   useEffect(() => {
     Location.requestForegroundPermissionsAsync().then((data) => {
-      setLocationStatus(data.status);
+      setLocationStatus(
+        Platform.OS == "ios"
+          ? data.status == "granted"
+          : data.android.accuracy == "fine"
+      );
     });
   }, []);
 
   const getCurrentPosition = () => {
-    if (locationStatus !== "granted") return () => {};
+    if (!locationStatus) return () => {};
     Location.getCurrentPositionAsync({}).then((location) =>
       makeCurrentStation(location)
     );