Merge commit '26cf84705abd4c9a69ac56fcade483a373089bf8' into develop

app.json

@@ -18,9 +18,11 @@
       "fallbackToCacheTimeout": 0,
       "url": "https://u.expo.dev/398abf60-57a7-11e9-970c-8f04356d08bf"
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
-      "buildNumber": "43",
+      "buildNumber": "46",
       "supportsTablet": false,
       "bundleIdentifier": "jrshikokuinfo.xprocess.hrkn",
       "config": {
@@ -31,7 +33,8 @@
         "com.apple.developer.nfc.readersession.felica.systemcodes": [
           "0003",
           "FE00"
-        ]
+        ],
+        "ITSAppUsesNonExemptEncryption": false
       },
       "entitlements": {
         "com.apple.developer.nfc.readersession.formats": [
@@ -41,10 +44,12 @@
     },
     "android": {
       "package": "jrshikokuinfo.xprocess.hrkn",
-      "versionCode": 24,
+      "versionCode": 27,
       "permissions": [
         "ACCESS_FINE_LOCATION",
-        "NFC"
+        "NFC",
+        "android.permission.ACCESS_COARSE_LOCATION",
+        "android.permission.ACCESS_FINE_LOCATION"
       ],
       "googleServicesFile": "./google-services.json",
       "config": {
@@ -64,13 +69,6 @@
     "plugins": [
       "expo-font",
       "expo-localization",
-      [
-        "expo-video",
-        {
-          "supportsBackgroundPlayback": true,
-          "supportsPictureInPicture": true
-        }
-      ],
       [
         "expo-screen-orientation",
         {
@@ -135,7 +133,7 @@
         [
           {
             "name": "32",
-            "ios": "./assets/icons/32.png", 
+            "ios": "./assets/icons/32.png",
             "android": {
               "foregroundImage": "./assets/icons/32.png",
               "backgroundColor": "#001413"
@@ -143,7 +141,7 @@
           },
           {
             "name": "32kpuuy",
-            "ios": "./assets/icons/32kpuuy.png", 
+            "ios": "./assets/icons/32kpuuy.png",
             "android": {
               "foregroundImage": "./assets/icons/32kpuuy.png",
               "backgroundColor": "#001413"
@@ -151,7 +149,7 @@
           },
           {
             "name": "32tht",
-            "ios": "./assets/icons/32tht.png", 
+            "ios": "./assets/icons/32tht.png",
             "android": {
               "foregroundImage": "./assets/icons/32tht.png",
               "backgroundColor": "#001413"
@@ -159,7 +157,7 @@
           },
           {
             "name": "32at",
-            "ios": "./assets/icons/32at.png", 
+            "ios": "./assets/icons/32at.png",
             "android": {
               "foregroundImage": "./assets/icons/32at.png",
               "backgroundColor": "#001413"
@@ -167,7 +165,7 @@
           },
           {
             "name": "54",
-            "ios": "./assets/icons/54.png", 
+            "ios": "./assets/icons/54.png",
             "android": {
               "foregroundImage": "./assets/icons/54.png",
               "backgroundColor": "#001413"
@@ -175,7 +173,7 @@
           },
           {
             "name": "54st",
-            "ios": "./assets/icons/54st.png", 
+            "ios": "./assets/icons/54st.png",
             "android": {
               "foregroundImage": "./assets/icons/54st.png",
               "backgroundColor": "#001413"
@@ -183,7 +181,7 @@
           },
           {
             "name": "40",
-            "ios": "./assets/icons/40.png", 
+            "ios": "./assets/icons/40.png",
             "android": {
               "foregroundImage": "./assets/icons/40.png",
               "backgroundColor": "#001413"
@@ -194,12 +192,12 @@
             "ios": "./assets/icons/s185_mrt.png",
             "android": {
               "foregroundImage": "./assets/icons/s185_mrt.png",
-              "backgroundColor": "#001413" 
+              "backgroundColor": "#001413"
             }
           },
           {
             "name": "185tu",
-            "ios": "./assets/icons/s185tu.png", 
+            "ios": "./assets/icons/s185tu.png",
             "android": {
               "foregroundImage": "./assets/icons/s185tu.png",
               "backgroundColor": "#001413"
@@ -207,7 +205,7 @@
           },
           {
             "name": "185iyor",
-            "ios": "./assets/icons/s185iyor.png", 
+            "ios": "./assets/icons/s185iyor.png",
             "android": {
               "foregroundImage": "./assets/icons/s185iyor.png",
               "backgroundColor": "#001413"
@@ -215,7 +213,7 @@
           },
           {
             "name": "185iyoy",
-            "ios": "./assets/icons/s185iyoy.png", 
+            "ios": "./assets/icons/s185iyoy.png",
             "android": {
               "foregroundImage": "./assets/icons/s185iyoy.png",
               "backgroundColor": "#001413"
@@ -223,7 +221,7 @@
           },
           {
             "name": "185toai",
-            "ios": "./assets/icons/s185to_ai.png", 
+            "ios": "./assets/icons/s185to_ai.png",
             "android": {
               "foregroundImage": "./assets/icons/s185to_ai.png",
               "backgroundColor": "#001413"
@@ -231,7 +229,7 @@
           },
           {
             "name": "185mm1",
-            "ios": "./assets/icons/s185mm1.png", 
+            "ios": "./assets/icons/s185mm1.png",
             "android": {
               "foregroundImage": "./assets/icons/s185mm1.png",
               "backgroundColor": "#001413"
@@ -239,7 +237,7 @@
           },
           {
             "name": "185ym1",
-            "ios": "./assets/icons/s185ym1.png", 
+            "ios": "./assets/icons/s185ym1.png",
             "android": {
               "foregroundImage": "./assets/icons/s185ym1.png",
               "backgroundColor": "#001413"
@@ -247,7 +245,7 @@
           },
           {
             "name": "1000",
-            "ios": "./assets/icons/s1000.png", 
+            "ios": "./assets/icons/s1000.png",
             "android": {
               "foregroundImage": "./assets/icons/s1000.png",
               "backgroundColor": "#001413"
@@ -255,7 +253,7 @@
           },
           {
             "name": "1200n",
-            "ios": "./assets/icons/s1200n.png", 
+            "ios": "./assets/icons/s1200n.png",
             "android": {
               "foregroundImage": "./assets/icons/s1200n.png",
               "backgroundColor": "#001413"
@@ -263,7 +261,7 @@
           },
           {
             "name": "1500",
-            "ios": "./assets/icons/s1500.png", 
+            "ios": "./assets/icons/s1500.png",
             "android": {
               "foregroundImage": "./assets/icons/s1500.png",
               "backgroundColor": "#001413"
@@ -271,7 +269,7 @@
           },
           {
             "name": "5001",
-            "ios": "./assets/icons/s5001.png", 
+            "ios": "./assets/icons/s5001.png",
             "android": {
               "foregroundImage": "./assets/icons/s5001.png",
               "backgroundColor": "#001413"
@@ -279,7 +277,7 @@
           },
           {
             "name": "5001k",
-            "ios": "./assets/icons/s5001k.png", 
+            "ios": "./assets/icons/s5001k.png",
             "android": {
               "foregroundImage": "./assets/icons/s5001k.png",
               "backgroundColor": "#001413"
@@ -287,7 +285,7 @@
           },
           {
             "name": "6000p",
-            "ios": "./assets/icons/s6000p.png", 
+            "ios": "./assets/icons/s6000p.png",
             "android": {
               "foregroundImage": "./assets/icons/s6000p.png",
               "backgroundColor": "#001413"
@@ -295,7 +293,7 @@
           },
           {
             "name": "7000",
-            "ios": "./assets/icons/s7000.png", 
+            "ios": "./assets/icons/s7000.png",
             "android": {
               "foregroundImage": "./assets/icons/s7000.png",
               "backgroundColor": "#001413"
@@ -303,7 +301,7 @@
           },
           {
             "name": "s7200",
-            "ios": "./assets/icons/s7200.png", 
+            "ios": "./assets/icons/s7200.png",
             "android": {
               "foregroundImage": "./assets/icons/s7200.png",
               "backgroundColor": "#001413"
@@ -311,7 +309,7 @@
           },
           {
             "name": "2000asi",
-            "ios": "./assets/icons/s2000_asi.png", 
+            "ios": "./assets/icons/s2000_asi.png",
             "android": {
               "foregroundImage": "./assets/icons/s2000_asi.png",
               "backgroundColor": "#001413"
@@ -319,7 +317,7 @@
           },
           {
             "name": "N2000",
-            "ios": "./assets/icons/s2000n.png", 
+            "ios": "./assets/icons/s2000n.png",
             "android": {
               "foregroundImage": "./assets/icons/s2000n.png",
               "backgroundColor": "#001413"
@@ -327,7 +325,7 @@
           },
           {
             "name": "2002a",
-            "ios": "./assets/icons/s2002a.png", 
+            "ios": "./assets/icons/s2002a.png",
             "android": {
               "foregroundImage": "./assets/icons/s2002a.png",
               "backgroundColor": "#001413"
@@ -335,7 +333,7 @@
           },
           {
             "name": "2600",
-            "ios": "./assets/icons/s2600.png", 
+            "ios": "./assets/icons/s2600.png",
             "android": {
               "foregroundImage": "./assets/icons/s2600.png",
               "backgroundColor": "#001413"
@@ -343,7 +341,7 @@
           },
           {
             "name": "2700",
-            "ios": "./assets/icons/s2700.png", 
+            "ios": "./assets/icons/s2700.png",
             "android": {
               "foregroundImage": "./assets/icons/s2700.png",
               "backgroundColor": "#001413"
@@ -351,7 +349,7 @@
           },
           {
             "name": "2700apy",
-            "ios": "./assets/icons/s2700apy.png", 
+            "ios": "./assets/icons/s2700apy.png",
             "android": {
               "foregroundImage": "./assets/icons/s2700apy.png",
               "backgroundColor": "#001413"
@@ -359,7 +357,7 @@
           },
           {
             "name": "2700apr",
-            "ios": "./assets/icons/s2700apr.png", 
+            "ios": "./assets/icons/s2700apr.png",
             "android": {
               "foregroundImage": "./assets/icons/s2700apr.png",
               "backgroundColor": "#001413"
@@ -367,7 +365,7 @@
           },
           {
             "name": "8000no",
-            "ios": "./assets/icons/s8000no.png", 
+            "ios": "./assets/icons/s8000no.png",
             "android": {
               "foregroundImage": "./assets/icons/s8000no.png",
               "backgroundColor": "#001413"
@@ -375,7 +373,7 @@
           },
           {
             "name": "8000nr",
-            "ios": "./assets/icons/s8000nr.png", 
+            "ios": "./assets/icons/s8000nr.png",
             "android": {
               "foregroundImage": "./assets/icons/s8000nr.png",
               "backgroundColor": "#001413"
@@ -383,7 +381,7 @@
           },
           {
             "name": "8000ap",
-            "ios": "./assets/icons/s8000ap.png", 
+            "ios": "./assets/icons/s8000ap.png",
             "android": {
               "foregroundImage": "./assets/icons/s8000ap.png",
               "backgroundColor": "#001413"
@@ -391,7 +389,7 @@
           },
           {
             "name": "8000nn",
-            "ios": "./assets/icons/s8000nn.png", 
+            "ios": "./assets/icons/s8000nn.png",
             "android": {
               "foregroundImage": "./assets/icons/s8000nn.png",
               "backgroundColor": "#001413"
@@ -399,7 +397,7 @@
           },
           {
             "name": "8600",
-            "ios": "./assets/icons/s8600.png", 
+            "ios": "./assets/icons/s8600.png",
             "android": {
               "foregroundImage": "./assets/icons/s8600.png",
               "backgroundColor": "#001413"
@@ -407,7 +405,7 @@
           },
           {
             "name": "9640",
-            "ios": "./assets/icons/tosa9640.png", 
+            "ios": "./assets/icons/tosa9640.png",
             "android": {
               "foregroundImage": "./assets/icons/tosa9640.png",
               "backgroundColor": "#001413"
@@ -415,7 +413,7 @@
           },
           {
             "name": "9640jgr",
-            "ios": "./assets/icons/tosa9640jgr.png", 
+            "ios": "./assets/icons/tosa9640jgr.png",
             "android": {
               "foregroundImage": "./assets/icons/tosa9640jgr.png",
               "backgroundColor": "#001413"
@@ -423,7 +421,7 @@
           },
           {
             "name": "285",
-            "ios": "./assets/icons/w285.png", 
+            "ios": "./assets/icons/w285.png",
             "android": {
               "foregroundImage": "./assets/icons/w285.png",
               "backgroundColor": "#001413"
@@ -431,7 +429,7 @@
           },
           {
             "name": "213w",
-            "ios": "./assets/icons/w213w.png", 
+            "ios": "./assets/icons/w213w.png",
             "android": {
               "foregroundImage": "./assets/icons/w213w.png",
               "backgroundColor": "#001413"
@@ -439,7 +437,7 @@
           },
           {
             "name": "EF65",
-            "ios": "./assets/icons/ef65.png", 
+            "ios": "./assets/icons/ef65.png",
             "android": {
               "foregroundImage": "./assets/icons/ef65.png",
               "backgroundColor": "#001413"
@@ -447,7 +445,7 @@
           },
           {
             "name": "EF210",
-            "ios": "./assets/icons/ef210.png", 
+            "ios": "./assets/icons/ef210.png",
             "android": {
               "foregroundImage": "./assets/icons/ef210.png",
               "backgroundColor": "#001413"

config/newsUpdate.ts

@@ -1 +1 @@
-export const news = "2025-01-09";
+export const news = "2025-03-06";