Merge commit '816d96d37be6537c9ebcf0be30c74fd154b80dc5'

App.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { NavigationContainer } from "@react-navigation/native";
 import {
   createStackNavigator,
@@ -8,14 +8,23 @@ import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
 import { AntDesign, Ionicons } from "@expo/vector-icons";
 import { Platform, UIManager } from "react-native";
 import { UpdateAsync } from "./UpdateAsync.js";
+import { getStationList2 } from "./lib/getStationList2";
+import { AS } from "./storageControl";
 import Apps from "./Apps";
-import tndView from "./ndView";
+import TNDView from "./ndView";
-import trainbase from "./trainbaseview";
+import TrainBase from "./trainbaseview";
-import howto from "./howto";
+import HowTo from "./howto";
-import menu from "./menu";
+import Menu from "./menu";
 import News from "./components/news.js";
 import Setting from "./components/settings.js";
-import trainMenu from "./components/trainMenu.js";
+import TrainMenu from "./components/trainMenu.js";
+import FavoriteList from "./components/FavoriteList.js";
+import { LogBox } from "react-native";
+
+LogBox.ignoreLogs([
+  "ViewPropTypes will be removed",
+  "ColorPropType will be removed",
+]);
 const Stack = createStackNavigator();
 const Tab = createBottomTabNavigator();
 if (Platform.OS === "android") {
@@ -24,95 +33,245 @@ if (Platform.OS === "android") {
   }
 }
 export default function App() {
-  const navigationRef = useRef();
   useEffect(() => {
     UpdateAsync();
   }, []);
+  const [favoriteStation, setFavoriteStation] = useState([]);
+
+  useEffect(() => {
+    AS.getItem("favoriteStation")
+      .then((d) => {
+        const returnData = JSON.parse(d);
+        setFavoriteStation(returnData);
+      })
+      .catch((d) => console.log(d));
+  }, []);
+  const [busAndTrainData, setBusAndTrainData] = useState([]);
+  useEffect(() => {
+    AS.getItem("busAndTrain")
+      .then((d) => {
+        const returnData = JSON.parse(d);
+        setBusAndTrainData(returnData);
+      })
+      .catch((d) => {
+        fetch(
+          "https://script.google.com/macros/s/AKfycbw0UW6ZeCDgUYFRP0zxpc_Oqfy-91dBdbWv-cM8n3narKp14IyCd2wy5HW7taXcW7E/exec"
+        )
+          .then((d) => d.json())
+          .then((d) => {
+            setBusAndTrainData(d);
+            AS.setItem("busAndTrain", JSON.stringify(d));
+          });
+      });
+  }, []);
+
   return (
-    <NavigationContainer name="Root" ref={navigationRef} style={{ flex: 1 }}>
+    <NavigationContainer name="Root" style={{ flex: 1 }}>
-      <Tab.Navigator>
+      <Tab.Navigator detachInactiveScreens={false}>
-        <Stack.Screen
+        <Tab.Screen
           name="login"
-          component={top}
           options={{
             tabBarLabel: "位置情報",
             headerTransparent: true,
             gestureEnabled: true,
-            tabBarIcon: () => <AntDesign name="barchart" size={32} />,
+            tabBarIcon: initIcon("barchart", "AntDesign"),
           }}
-        />
+        >
-        <Stack.Screen
+          {(props) => (
+            <Top
+              {...props}
+              favoriteStation={favoriteStation}
+              setFavoriteStation={setFavoriteStation}
+              busAndTrainData={busAndTrainData}
+            />
+          )}
+        </Tab.Screen>
+        <Tab.Screen
           name="menuPage"
-          component={menuPage}
           options={{
             tabBarLabel: "リンク",
             headerTransparent: true,
             gestureEnabled: true,
-            tabBarIcon: () => <Ionicons name="ios-radio" size={32} />,
+            tabBarIcon: initIcon("ios-radio", "Ionicons"),
           }}
-        />
+        >
-        <Stack.Screen
+          {(props) => (
+            <MenuPage
+              {...props}
+              favoriteStation={favoriteStation}
+              setFavoriteStation={setFavoriteStation}
+              busAndTrainData={busAndTrainData}
+            />
+          )}
+        </Tab.Screen>
+        <Tab.Screen
           name="home"
-          component={tndView}
           options={{
             tabBarLabel: "運行情報",
             headerTransparent: true,
             gestureEnabled: true,
-            tabBarIcon: () => <Ionicons name="md-train" size={32} />,
+            tabBarIcon: initIcon("md-train", "Ionicons"),
           }}
-        />
+        >
+          {(props) => <TNDView {...props} />}
+        </Tab.Screen>
       </Tab.Navigator>
     </NavigationContainer>
   );
 }
-const top = () => (
+
-  <Stack.Navigator>
+const initIcon = (name, type) => {
-    <Stack.Screen
+  switch (type) {
-      name="Apps"
+    case "Ionicons":
-      component={Apps}
+      return ({ focused, color, size }) => (
-      options={{
+        <Ionicons name={name} size={32} color={focused ? "#0099CC" : "black"} />
-        headerShown: false,
+      );
-        gestureEnabled: true,
+    case "AntDesign":
-        headerTransparent: true,
+      return ({ focused, color, size }) => (
-      }}
+        <AntDesign
-    />
+          name={name}
-    <Stack.Screen
+          size={32}
-      name="trainbase"
+          color={focused ? "#0099CC" : "black"}
-      component={trainbase}
+        />
-      options={{
+      );
-        title: "トレインビジョン",
+  }
-        gestureEnabled: true,
+};
-        ...TransitionPresets.SlideFromRightIOS,
+
-      }}
+const Top = ({
-    />
+  navigation,
-    <Stack.Screen
+  favoriteStation,
-      name="howto"
+  setFavoriteStation,
-      component={howto}
+  busAndTrainData,
-      options={{
+}) => {
-        title: "使い方",
+  const webview = useRef();
-        ...optionData,
+
-      }}
+  //地図用
-    />
+  const [mapsStationData, setMapsStationData] = useState(undefined);
-    <Stack.Screen name="news" component={News} options={optionData} />
+
-    <Stack.Screen name="trainMenu" component={trainMenu} options={optionData} />
+  useEffect(() => {
-  </Stack.Navigator>
+    getStationList2().then(setMapsStationData);
-);
+  }, []);
-function menuPage() {
+
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("tabLongPress", (e) => {
+      navigation.navigate("favoriteList");
+    });
+
+    return unsubscribe;
+  }, [navigation]);
+
   return (
     <Stack.Navigator>
       <Stack.Screen
-        name="menu"
+        name="Apps"
-        component={menu}
         options={{
           headerShown: false,
           gestureEnabled: true,
           headerTransparent: true,
         }}
-      />
+      >
-      <Stack.Screen name="setting" component={Setting} options={optionData} />
+        {(props) => (
+          <Apps
+            {...props}
+            webview={webview}
+            favoriteStation={favoriteStation}
+            setFavoriteStation={setFavoriteStation}
+            busAndTrainData={busAndTrainData}
+          />
+        )}
+      </Stack.Screen>
+      <Stack.Screen
+        name="trainbase"
+        options={{
+          title: "トレインビジョン",
+          gestureEnabled: true,
+          ...TransitionPresets.SlideFromRightIOS,
+        }}
+      >
+        {(props) => <TrainBase {...props} />}
+      </Stack.Screen>
+      <Stack.Screen
+        name="howto"
+        options={{
+          title: "使い方",
+          ...optionData,
+        }}
+      >
+        {(props) => <HowTo {...props} />}
+      </Stack.Screen>
+      <Stack.Screen name="news" options={optionData}>
+        {(props) => <News {...props} />}
+      </Stack.Screen>
+      <Stack.Screen name="trainMenu" options={optionData}>
+        {(props) => (
+          <TrainMenu
+            {...props}
+            webview={webview}
+            stationData={mapsStationData}
+          />
+        )}
+      </Stack.Screen>
+      <Stack.Screen
+        name="favoriteList"
+        options={{ ...optionData, gestureEnabled: false }}
+      >
+        {(props) => (
+          <FavoriteList
+            {...props}
+            webview={webview}
+            stationData={mapsStationData}
+            favoriteStation={favoriteStation}
+            setFavoriteStation={setFavoriteStation}
+          />
+        )}
+      </Stack.Screen>
+    </Stack.Navigator>
+  );
+};
+function MenuPage({
+  navigation,
+  favoriteStation,
+  setFavoriteStation,
+  busAndTrainData,
+}) {
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("tabPress", (e) => {
+      AS.getItem("favoriteStation")
+        .then((d) => {
+          const returnData = JSON.parse(d);
+          if (favoriteStation.toString() != d) {
+            setFavoriteStation(returnData);
+          }
+        })
+        .catch((d) => console.log(d));
+    });
+
+    return unsubscribe;
+  }, [navigation]);
+  return (
+    <Stack.Navigator>
+      <Stack.Screen
+        name="menu"
+        options={{
+          headerShown: false,
+          gestureEnabled: true,
+          headerTransparent: true,
+        }}
+      >
+        {(props) => (
+          <Menu
+            {...props}
+            favoriteStation={favoriteStation}
+            setFavoriteStation={setFavoriteStation}
+            busAndTrainData={busAndTrainData}
+          />
+        )}
+      </Stack.Screen>
+      <Stack.Screen name="setting" options={optionData}>
+        {(props) => <Setting {...props} />}
+      </Stack.Screen>
       <Stack.Screen
         name="trainbase"
-        component={trainbase}
         options={{
           ...TransitionPresets.ModalPresentationIOS,
           cardOverlayEnabled: true,
@@ -121,7 +280,9 @@ function menuPage() {
           headerTransparent: true,
           gestureResponseDistance: { vertical: 300 },
         }}
-      />
+      >
+        {(props) => <TrainBase {...props} />}
+      </Stack.Screen>
     </Stack.Navigator>
   );
 }

Apps.js

@@ -19,23 +19,21 @@ import { getStationList2 } from "./lib/getStationList2";
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
 
-export default function Apps(props) {
+export default function Apps({
-  const {
+  navigation,
-    navigation: { navigate },
+  webview,
-  } = props;
+  favoriteStation,
+  setFavoriteStation,
+  busAndTrainData,
+}) {
+  const { navigate } = navigation;
   var urlcache = "";
-  const webview = useRef();
+
   //画面表示関連
   const [iconSetting, setIconSetting] = useState(undefined);
   const [mapSwitch, setMapSwitch] = useState(undefined);
   const [stationMenu, setStationMenu] = useState(undefined);
 
-  //地図用
-  const [mapsStationData, setMapsStationData] = useState(undefined);
-  useEffect(() => {
-    getStationList2().then(setMapsStationData);
-  }, []);
-
   //駅情報画面用
   const StationBoardAcSR = useRef(null);
   const [stationBoardData, setStationBoardData] = useState(undefined);
@@ -187,9 +185,7 @@ export default function Apps(props) {
         onTouchMove={() => StationBoardAcSR.current?.hide()}
       />
       <MapsButton
-        onPress={() =>
+        onPress={() => navigate("trainMenu", { webview })}
-          navigate("trainMenu", { webview, stationData: mapsStationData })
-        }
         top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
         mapSwitch={mapSwitch == "true" ? "flex" : "none"}
       />
@@ -202,6 +198,9 @@ export default function Apps(props) {
         StationBoardAcSR={StationBoardAcSR}
         currentStation={stationBoardData}
         originalStationList={originalStationList}
+        favoriteStation={favoriteStation}
+        setFavoriteStation={setFavoriteStation}
+        busAndTrainData={busAndTrainData}
       />
     </View>
   );

app.json

@@ -3,8 +3,11 @@
     "name": "JR四国運行状況",
     "slug": "jrshikoku",
     "privacy": "public",
-    "platforms": ["ios", "android"],
+    "platforms": [
-    "version": "4.4",
+      "ios",
+      "android"
+    ],
+    "version": "4.5",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -15,9 +18,11 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
-      "buildNumber": "23",
+      "buildNumber": "25",
       "supportsTablet": true,
       "bundleIdentifier": "jrshikokuinfo.xprocess.hrkn",
       "config": {
@@ -26,14 +31,21 @@
     },
     "android": {
       "package": "jrshikokuinfo.xprocess.hrkn",
-      "versionCode": 16,
+      "versionCode": 17,
-      "permissions": ["ACCESS_FINE_LOCATION"],
+      "permissions": [
+        "ACCESS_FINE_LOCATION"
+      ],
       "googleServicesFile": "./google-services.json",
       "config": {
         "googleMaps": {
           "apiKey": "AIzaSyAmFb-Yj033bXZWlSzNrfq_0jc1PgRrWcE"
         }
       }
+    },
+    "extra": {
+      "eas": {
+        "projectId": "398abf60-57a7-11e9-970c-8f04356d08bf"
+      }
     }
   }
 }

assets/originData/lineColorList.js

@@ -0,0 +1,11 @@
+export default {
+  Y: "#F5AC13",
+  U: "#F5AC13",
+  S: "#9AA7D7",
+  D: "#DC4586",
+  K: "#DC4586",
+  B: "#366481",
+  N: "#881F61",
+  T: "#87CA3B",
+  M: "#0071be",
+};

components/ActionSheetComponents/StationDeteilView.js

@@ -1,13 +1,45 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
-import { View, Linking } from "react-native";
+import {
+  StatusBar,
+  View,
+  LayoutAnimation,
+  ScrollView,
+  Linking,
+  Text,
+  TouchableOpacity,
+} from "react-native";
 import { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons";
 import ActionSheet from "react-native-actions-sheet";
 import Sign from "../../components/駅名表/Sign";
+import { useInterval } from "../../lib/useInterval";
 
 import { TicketBox } from "../atom/TicketBox";
+import {
+  widthPercentageToDP as wp,
+  heightPercentageToDP as hp,
+} from "react-native-responsive-screen";
+import lineColorList from "../../assets/originData/lineColorList";
 
 export const StationDeteilView = (props) => {
-  const { StationBoardAcSR, currentStation, originalStationList } = props;
+  const {
+    StationBoardAcSR,
+    currentStation,
+    originalStationList,
+    favoriteStation,
+    setFavoriteStation,
+    busAndTrainData,
+  } = props;
+  const [trainBus, setTrainBus] = useState();
+  useEffect(() => {
+    if (!currentStation) return () => {};
+    const data = busAndTrainData.filter((d) => {
+      return d.name === currentStation[0].Station_JP;
+    });
+    if (data.length == 0) {
+      setTrainBus();
+    }
+    setTrainBus(data[0]);
+  }, [currentStation]);
 
   return (
     <ActionSheet
@@ -38,12 +70,30 @@ export const StationDeteilView = (props) => {
         </View>
         <View>
           {currentStation && (
-            <Sign
+            <View
-              currentStation={currentStation}
+              style={{
-              originalStationList={originalStationList}
+                margin: 10,
-              oP={() => Linking.openURL(currentStation[0].StationTimeTable)}
+                marginHorizontal: wp("10%"),
-            />
+              }}
+            >
+              <Sign
+                currentStation={currentStation}
+                originalStationList={originalStationList}
+                favoriteStation={favoriteStation}
+                setFavoriteStation={setFavoriteStation}
+                oP={() => Linking.openURL(currentStation[0].StationTimeTable)}
+              />
+            </View>
           )}
+          {currentStation &&
+            currentStation.map((d) => (
+              <NexPreStationLine
+                currentStation={d}
+                originalStationList={originalStationList}
+                favoriteStation={favoriteStation}
+                setFavoriteStation={setFavoriteStation}
+              />
+            ))}
           {currentStation && (
             <View style={{ flexDirection: "row" }}>
               {!currentStation[0].JrHpUrl || (
@@ -79,7 +129,17 @@ export const StationDeteilView = (props) => {
                     Linking.openURL(currentStation[0].StationMap)
                   }
                 >
-                  GoogleMap
+                  Map
+                </TicketBox>
+              )}
+              {!trainBus || (
+                <TicketBox
+                  backgroundColor={"#CE5C00"}
+                  icon={<Ionicons name="bus" color="white" size={50} />}
+                  flex={1}
+                  onPressButton={() => Linking.openURL(trainBus.address)}
+                >
+                  平行バス
                 </TicketBox>
               )}
             </View>
@@ -89,3 +149,226 @@ export const StationDeteilView = (props) => {
     </ActionSheet>
   );
 };
+
+const StationName = (props) => {
+  const { stringData, ss } = props;
+  return (
+    <View style={ss}>
+      <Text style={styleSheet.下枠駅名}>{stringData.Station_JP}</Text>
+      <Text style={styleSheet.下枠駅名}>{stringData.Station_EN}</Text>
+    </View>
+  );
+};
+
+const NexPreStationLine = ({
+  currentStation,
+  originalStationList,
+  oP,
+  favoriteStation,
+  setFavoriteStation,
+}) => {
+  const [preStation, setPreStation] = useState();
+  const [nexStation, setNexStation] = useState();
+  const [lineName, setLineName] = useState();
+
+  useEffect(() => {
+    getPreNextStation(currentStation);
+  }, [currentStation]);
+
+  useEffect(() => {
+    if (!currentStation) return () => {};
+    getPreNextStation(currentStation);
+  }, []);
+  const getPreNextStation = (now) => {
+    const lineList = [
+      "予讃線(高松-松山間)[Y]",
+      "予讃線(松山-宇和島間)[U]",
+      "予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]",
+      "土讃線(多度津-高知間)[D]",
+      "土讃線(高知-窪川間)[K]",
+      "高徳線(高松-徳島間)[T]",
+      "徳島線(徳島-阿波池田)[B]",
+      "鳴門線(池谷-鳴門間)[N]",
+      "瀬戸大橋線(宇多津-児島間)[M]",
+    ];
+    let returnData;
+    lineList.forEach((d) => {
+      let cache = originalStationList[d].findIndex(
+        (data) => data.StationNumber == now.StationNumber
+      );
+      if (cache != -1) {
+        returnData = [
+          originalStationList[d][cache - 1],
+          originalStationList[d][cache + 1],
+          d,
+        ];
+      }
+    });
+    setPreStation(returnData[0]);
+    setNexStation(returnData[1]);
+    setLineName(returnData[2]);
+  };
+  return (
+    <View
+      style={{
+        height: 50,
+        backgroundColor: lineName
+          ? lineColorList[lineName.split("[")[1].replace("]", "")]
+          : "red",
+        flexDirection: "row",
+        alignContent: "center",
+        alignItems: "center",
+      }}
+    >
+      <View style={styleSheet.下枠フレーム}>
+        {preStation ? (
+          <>
+            <Text style={styleSheet.下枠左右マーク}>◀</Text>
+            {preStation.StationNumber ? (
+              <View style={styleSheet.下枠駅ナンバー}>
+                <View style={{ flex: 1 }} />
+                <Text
+                  style={{
+                    fontSize: parseInt("10%"),
+                    color: "white",
+                  }}
+                >
+                  {preStation.StationNumber}
+                </Text>
+                <View style={{ flex: 1 }} />
+              </View>
+            ) : (
+              <></>
+            )}
+            <StationName
+              stringData={preStation}
+              ss={{ flex: 1, alignItems: "flex-start" }}
+            />
+          </>
+        ) : (
+          <></>
+        )}
+      </View>
+
+      <Text
+        style={{
+          fontSize: parseInt("10%"),
+          color: "white",
+          textAlign: "center",
+        }}
+      >
+        {lineName &&
+          lineName
+            .split("(")
+            .map((d, index) => (index == 1 ? "(" + d : d))
+            .join("\n")}
+      </Text>
+      <View style={styleSheet.下枠フレーム}>
+        {nexStation ? (
+          <>
+            <StationName
+              stringData={nexStation}
+              ss={{ flex: 1, alignItems: "flex-end" }}
+            />
+            {nexStation.StationNumber ? (
+              <View style={styleSheet.下枠駅ナンバー}>
+                <View style={{ flex: 1 }} />
+                <Text style={{ fontSize: parseInt("15%"), color: "white" }}>
+                  {nexStation.StationNumber}
+                </Text>
+                <View style={{ flex: 1 }} />
+              </View>
+            ) : (
+              <></>
+            )}
+            <Text style={styleSheet.下枠左右マーク}>▶</Text>
+          </>
+        ) : (
+          <></>
+        )}
+      </View>
+    </View>
+  );
+};
+
+const styleSheet = {
+  外枠: {
+    width: wp("80%"),
+    height: (wp("80%") / 20) * 9,
+    borderColor: "#2E94BB",
+    borderWidth: 1,
+    backgroundColor: "white",
+  },
+  下帯: {
+    position: "absolute",
+    bottom: "0%",
+    left: "0%",
+    width: "100%",
+    height: "30%",
+    backgroundColor: "#2E94BB",
+  },
+  JRStyle: {
+    position: "absolute",
+    top: "2%",
+    left: "2%",
+    fontWeight: "bold",
+    fontSize: parseInt("30%"),
+    color: "#2E94BB",
+  },
+  stationNameAreaOverWrap: {
+    position: "absolute",
+    top: "10%",
+    alignContent: "center",
+    flexDirection: "row",
+  },
+  Station_JP: {
+    fontWeight: "bold",
+    fontSize: parseInt("40%"),
+    color: "#005170",
+  },
+  Station_EN: {
+    fontWeight: "bold",
+    fontSize: parseInt("15%"),
+    color: "#005170",
+  },
+  下帯内容: {
+    position: "absolute",
+    bottom: "0%",
+    height: "30%",
+    width: "100%",
+    alignItems: "center",
+    flexDirection: "column",
+  },
+  下枠フレーム: {
+    flex: 1,
+    flexDirection: "row",
+    alignContent: "center",
+    height: wp("10%"),
+  },
+  下枠左右マーク: {
+    fontWeight: "bold",
+    fontSize: parseInt("20%"),
+    color: "white",
+    paddingHorizontal: 10,
+    textAlignVertical: "center",
+  },
+  下枠駅ナンバー: {
+    alignContent: "center",
+    alignItems: "center",
+    width: wp("8%"),
+    height: wp("8%"),
+    margin: wp("1%"),
+    borderColor: "white",
+    borderWidth: parseInt("2%"),
+    borderRadius: parseInt("100%"),
+  },
+  下枠駅名: {
+    fontWeight: "bold",
+    fontSize: parseInt("15%"),
+    color: "white",
+    flex: 1,
+    paddingHorizontal: 0,
+    marginVertical: 0,
+    textAlignVertical: "center",
+  },
+};

components/FavoriteList.js

@@ -0,0 +1,111 @@
+import React, { Component, useRef, useState, useEffect } from "react";
+import { View, Text, TouchableOpacity, ScrollView } from "react-native";
+import { WebView } from "react-native-webview";
+import { ListItem } from "native-base";
+import Icon from "react-native-vector-icons/Entypo";
+import StatusbarDetect from "../StatusbarDetect";
+import { AS } from "../storageControl";
+import { news } from "../config/newsUpdate";
+import { getStationList, lineList } from "../lib/getStationList";
+var Status = StatusbarDetect();
+export default function FavoriteList({
+  navigation,
+  webview,
+  stationData,
+  favoriteStation,
+  setFavoriteStation,
+}) {
+  const { navigate } = navigation;
+
+  return (
+    <View style={{ height: "100%", backgroundColor: "#0099CC" }}>
+      <Text
+        style={{
+          textAlign: "center",
+          fontSize: 25,
+          color: "white",
+          fontWeight: "bold",
+          paddingVertical: 10,
+        }}
+      >
+        位置情報クイック移動メニュー
+      </Text>
+      <ScrollView style={{ height: "100%", backgroundColor: "white" }}>
+        {favoriteStation
+          .filter((d) => d[0].StationMap)
+          .map((currentStation) => {
+            return (
+              <ListItem
+                onPress={() => {
+                  const getStationLine = (now) => {
+                    const returnData = Object.keys(stationData).filter((d) => {
+                      const cache = stationData[d].findIndex(
+                        (data) => data.Station_JP == now.Station_JP
+                      );
+                      return cache != -1;
+                    });
+                    return returnData[0];
+                  };
+                  const lineName = getStationLine(currentStation[0]);
+
+                  webview.current?.injectJavaScript(
+                    `MoveDisplayStation('${lineName}_${currentStation[0].MyStation}_${currentStation[0].Station_JP}')`
+                  );
+                  navigate("Apps");
+                }}
+              >
+                <Text style={{ fontSize: 20, flex: 2 }}>
+                  {currentStation
+                    .map((d) => d.StationNumber)
+                    .filter((d) => d !== null)
+                    .join("/")}
+                </Text>
+                <Text style={{ fontSize: 20, flex: 3 }}>
+                  {currentStation[0].Station_JP}
+                </Text>
+                <View
+                  style={{
+                    flex: 2,
+                    flexDirection: "row",
+                    alignContent: "center",
+                    alignItems: "center",
+                  }}
+                >
+                  <View style={{ flex: 1 }} />
+                  <Text style={{ fontSize: 20 }}>移動する</Text>
+                  <Icon name="chevron-right" size={20} />
+                </View>
+              </ListItem>
+            );
+          })}
+      </ScrollView>
+      <Text
+        style={{
+          backgroundColor: "white",
+          borderWidth: 1,
+          borderStyle: "solid",
+        }}
+      >
+        お気に入り登録した駅のうち、位置情報システムで移動可能な駅が表示されています。タップすることで位置情報システムの当該の駅に移動します。
+      </Text>
+      <TouchableOpacity
+        style={{
+          padding: 10,
+          flexDirection: "row",
+          borderColor: "white",
+          borderWidth: 1,
+          margin: 10,
+          borderRadius: 5,
+          alignItems: "center",
+        }}
+        onPress={() => navigation.goBack()}
+      >
+        <View style={{ flex: 1 }} />
+        <Text style={{ fontSize: 25, fontWeight: "bold", color: "white" }}>
+          閉じる
+        </Text>
+        <View style={{ flex: 1 }} />
+      </TouchableOpacity>
+    </View>
+  );
+}

components/settings.js

@@ -102,7 +102,7 @@ export default function Setting(props) {
                 textAlignVertical: "center",
               }}
             >
-              内部バージョン: 4.4.2.9
+              内部バージョン: 4.5 beta-2
             </Text>
             <View style={{ flex: 1 }} />
           </View>

components/trainMenu.js

@@ -2,11 +2,10 @@ import React, { useRef } from "react";
 import { View, Text, TouchableOpacity, Linking } from "react-native";
 import MapView, { Marker } from "react-native-maps";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
-export default function trainMenu({
+export default function TrainMenu({
-  route: {
-    params: { webview, stationData },
-  },
   navigation: { navigate },
+  webview,
+  stationData,
 }) {
   const mapRef = useRef();
   return (
@@ -67,12 +66,7 @@ export default function trainMenu({
           backgroundColor={"#EA4752"}
           icon="star"
           flex={1}
-          onPressButton={() =>
+          onPressButton={() => navigate("favoriteList")}
-            /* Linking.openURL(
-              "https://www.jr-shikoku.co.jp/01_trainbus/jikoku/sp/#mainprice-box"
-            ) */
-            alert("お気に入り駅登録機能は現在開発中です！レイアウト募集中！")
-          }
         >
           お気に入り
         </UsefulBox>
@@ -99,9 +93,7 @@ export default function trainMenu({
           borderRadius: 5,
           alignItems: "center",
         }}
-        onPress={() => {
+        onPress={() => navigate("Apps")}
-          navigate("Apps");
-        }}
       >
         <View style={{ flex: 1 }} />
         <Text style={{ fontSize: 25, fontWeight: "bold", color: "white" }}>

components/発車時刻表/LED_vidion.js

@@ -138,7 +138,6 @@ export default function LED_vision(props) {
       });
       return { train: d, time: a.time, lastStation: a.lastStation };
     });
-    console.log(returnData);
     return returnData.sort((a, b) => {
       switch (true) {
         case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]):
@@ -280,7 +279,7 @@ const Footer = ({
   setFinalSwitch,
 }) => {
   return (
-    <View style={{ flexDirection: "row", padding: 10 }}>
+    <View style={{ flexDirection: "row", padding: 10, alignItems: "center" }}>
       <Text
         style={{
           alignItems: "center",
@@ -404,7 +403,7 @@ const TrainName = ({ train, trainIDSwitch, d, getTrainType }) => {
     <View style={{ flex: 9 }}>
       <Text
         style={{
-          fontSize: trainName.length > 6 ? 15 : 20,
+          fontSize: trainName.length > 6 ? parseInt("13%") : parseInt("18%"),
           color: getTrainType.color,
           fontWeight: "bold",
         }}
@@ -422,7 +421,8 @@ const LastStation = ({ d }) => {
     <View style={{ flex: 4, flexDirection: "row" }}>
       <Text
         style={{
-          fontSize: d.lastStation.length > 4 ? 15 : 20,
+          fontSize:
+            d.lastStation.length > 4 ? parseInt("13%") : parseInt("18%"),
           color: "white",
           fontWeight: "bold",
         }}
@@ -437,7 +437,7 @@ const DependTime = ({ d }) => {
     <View style={{ flex: 3 }}>
       <Text
         style={{
-          fontSize: 20,
+          fontSize: parseInt("18%"),
           color: "white",
           fontWeight: "bold",
         }}
@@ -486,9 +486,10 @@ const StatusAndDelay = ({ currentTrain, d, props, trainDescriptionSwitch }) => {
     <View style={{ flex: 4 }}>
       <Text
         style={{
-          fontSize: 20,
+          fontSize: parseInt("18%"),
           color: "white",
           fontWeight: "bold",
+          paddingLeft: 1,
         }}
       >
         {status}
@@ -512,7 +513,7 @@ const Description = ({ train }) => {
       <View style={{ flex: 4 }}>
         <Text
           style={{
-            fontSize: 20,
+            fontSize: parseInt("18%"),
             color: "green",
             fontWeight: "bold",
           }}

components/駅名表/Sign.js

@@ -12,21 +12,42 @@ import {
   widthPercentageToDP as wp,
   heightPercentageToDP as hp,
 } from "react-native-responsive-screen";
+import LottieView from "lottie-react-native";
 import { useInterval } from "../../lib/useInterval";
+import { AS } from "../../storageControl";
 
 export default function Sign(props) {
-  const { currentStation, originalStationList, oP } = props;
+  const {
+    currentStation,
+    originalStationList,
+    oP,
+    favoriteStation,
+    setFavoriteStation,
+  } = props;
   const [nexPrePosition, setNexPrePosition] = useState(0);
 
   const [preStation, setPreStation] = useState();
   const [nexStation, setNexStation] = useState();
+  const [testButtonStatus, setTestButtonStatus] = useState(false);
+
+  useEffect(() => {
+    const isFavorite = favoriteStation.filter((d) => {
+      const compare = JSON.stringify(d);
+      const current = JSON.stringify(currentStation);
+      if (compare === current) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+    setTestButtonStatus(isFavorite.length != 0);
+  }, [favoriteStation, currentStation]);
 
   useInterval(() => {
     if (currentStation.length == 1) {
       setNexPrePosition(0);
       return () => {};
     }
-    LayoutAnimation.easeInEaseOut();
     setNexPrePosition(
       nexPrePosition + 1 == currentStation.length ? 0 : nexPrePosition + 1
     );
@@ -43,15 +64,15 @@ export default function Sign(props) {
   }, [nexPrePosition]);
   const getPreNextStation = (now) => {
     const lineList = [
-      "予讃線",
+      "予讃線(高松-松山間)[Y]",
-      "松宇線",
+      "予讃線(松山-宇和島間)[U]",
-      "伊予灘線",
+      "予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]",
-      "土讃線",
+      "土讃線(多度津-高知間)[D]",
-      "窪川線",
+      "土讃線(高知-窪川間)[K]",
-      "高徳線",
+      "高徳線(高松-徳島間)[T]",
-      "徳島線",
+      "徳島線(徳島-阿波池田)[B]",
-      "鳴門線",
+      "鳴門線(池谷-鳴門間)[N]",
-      "瀬戸大橋線",
+      "瀬戸大橋線(宇多津-児島間)[M]",
     ];
     let returnData;
     lineList.forEach((d) => {
@@ -68,10 +89,45 @@ export default function Sign(props) {
     setPreStation(returnData[0]);
     setNexStation(returnData[1]);
   };
+  const lottieRef = useRef();
   return (
     <TouchableOpacity style={styleSheet.外枠} onPress={oP}>
       <StationNumberMaker currentStation={currentStation} />
       <StationNameArea currentStation={currentStation} />
+      <TouchableOpacity
+        style={{ position: "absolute", right: -15, top: -20 }}
+        onPress={() => {
+          if (testButtonStatus) {
+            const otherData = favoriteStation.filter((d) => {
+              const compare = JSON.stringify(d);
+              const current = JSON.stringify(currentStation);
+              if (compare !== current) {
+                return true;
+              } else {
+                return false;
+              }
+            });
+            AS.setItem("favoriteStation", JSON.stringify(otherData));
+            setFavoriteStation(otherData);
+          } else {
+            let ret = favoriteStation;
+            ret.push(currentStation);
+            AS.setItem("favoriteStation", JSON.stringify(ret));
+            setFavoriteStation(ret);
+          }
+          setTestButtonStatus(!testButtonStatus);
+        }}
+      >
+        <LottieDelayView
+          progress={testButtonStatus ? 1 : 0}
+          speed={1.4}
+          style={{ width: 80, height: 80 }}
+          source={require("../../assets/939-star.json")}
+          lottieRef={lottieRef}
+          loop={false}
+        />
+      </TouchableOpacity>
+
       <Text style={styleSheet.JRStyle}>JR</Text>
       <View style={styleSheet.下帯} />
       <View style={styleSheet.下帯内容}>
@@ -81,14 +137,45 @@ export default function Sign(props) {
   );
 }
 
+const LottieDelayView = ({
+  progress,
+  speed,
+  style,
+  source,
+  lottieRef,
+  loop,
+}) => {
+  const [progressState, setProgressState] = useState(undefined);
+  useEffect(() => {
+    if (progress == 0) {
+      lottieRef.current.play(progressState !== undefined ? 35 : 7, 7);
+    } else {
+      lottieRef.current.play(progressState !== undefined ? 7 : 35, 35);
+    }
+  }, [progress]);
+  return (
+    <LottieView
+      progress={progressState}
+      speed={speed}
+      style={style}
+      source={source}
+      ref={lottieRef}
+      loop={loop}
+      onAnimationFinish={(isCanceled) => {
+        console.log("finish");
+        setProgressState(progress);
+      }}
+    />
+  );
+};
 const NexPreStationLine = ({ nexStation, preStation }) => {
   return (
     <View style={styleSheet.下枠フレーム}>
       <View style={styleSheet.下枠フレーム}>
-        {preStation && (
+        {preStation ? (
           <>
             <Text style={styleSheet.下枠左右マーク}>◀</Text>
-            {preStation.StationNumber && (
+            {preStation.StationNumber ? (
               <View style={styleSheet.下枠駅ナンバー}>
                 <View style={{ flex: 1 }} />
                 <Text
@@ -101,22 +188,26 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
                 </Text>
                 <View style={{ flex: 1 }} />
               </View>
+            ) : (
+              <></>
             )}
             <StationName
               stringData={preStation}
               ss={{ flex: 1, alignItems: "flex-start" }}
             />
           </>
+        ) : (
+          <></>
         )}
       </View>
       <View style={styleSheet.下枠フレーム}>
-        {nexStation && (
+        {nexStation ? (
           <>
             <StationName
               stringData={nexStation}
               ss={{ flex: 1, alignItems: "flex-end" }}
             />
-            {nexStation.StationNumber && (
+            {nexStation.StationNumber ? (
               <View style={styleSheet.下枠駅ナンバー}>
                 <View style={{ flex: 1 }} />
                 <Text style={{ fontSize: parseInt("10%"), color: "white" }}>
@@ -124,9 +215,13 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
                 </Text>
                 <View style={{ flex: 1 }} />
               </View>
+            ) : (
+              <></>
             )}
             <Text style={styleSheet.下枠左右マーク}>▶</Text>
           </>
+        ) : (
+          <></>
         )}
       </View>
     </View>
@@ -199,8 +294,6 @@ const styleSheet = {
     height: (wp("80%") / 20) * 9,
     borderColor: "#2E94BB",
     borderWidth: 1,
-    margin: 10,
-    marginHorizontal: wp("10%"),
     backgroundColor: "white",
   },
   下帯: {
@@ -247,6 +340,7 @@ const styleSheet = {
     flex: 1,
     flexDirection: "row",
     alignContent: "center",
+    alignItems: "center",
   },
   下枠左右マーク: {
     fontWeight: "bold",

eas.json

@@ -15,6 +15,12 @@
     },
     "production": {
       "releaseChannel": "aliexpress"
+    },
+    "beta4.5": {
+      "releaseChannel": "base"
+    },
+    "production4.5": {
+      "releaseChannel": "buyma"
     }
   },
   "submit": {

lib/getStationList.js

@@ -19,15 +19,15 @@ import train_lang from "../assets/originData/train_lang";
 let status = undefined;
 
 export const lineList = [
-  "予讃線",
+  "予讃線(高松-松山間)[Y]",
-  "松宇線",
+  "予讃線(松山-宇和島間)[U]",
-  "伊予灘線",
+  "予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]",
-  "土讃線",
+  "土讃線(多度津-高知間)[D]",
-  "窪川線",
+  "土讃線(高知-窪川間)[K]",
-  "高徳線",
+  "高徳線(高松-徳島間)[T]",
-  "徳島線",
+  "徳島線(徳島-阿波池田)[B]",
-  "鳴門線",
+  "鳴門線(池谷-鳴門間)[N]",
-  "瀬戸大橋線",
+  "瀬戸大橋線(宇多津-児島間)[M]",
 ];
 
 export const getStationList = async (props) => {
@@ -53,15 +53,15 @@ export const getStationList = async (props) => {
   ]).then((values) => {
     let stationList = {};
     [
-      stationList.予讃線,
+      stationList["予讃線(高松-松山間)[Y]"],
-      stationList.松宇線,
+      stationList["予讃線(松山-宇和島間)[U]"],
-      stationList.伊予灘線,
+      stationList["予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]"],
-      stationList.土讃線,
+      stationList["土讃線(多度津-高知間)[D]"],
-      stationList.窪川線,
+      stationList["土讃線(高知-窪川間)[K]"],
-      stationList.高徳線,
+      stationList["高徳線(高松-徳島間)[T]"],
-      stationList.徳島線,
+      stationList["徳島線(徳島-阿波池田)[B]"],
-      stationList.鳴門線,
+      stationList["鳴門線(池谷-鳴門間)[N]"],
-      stationList.瀬戸大橋線,
+      stationList["瀬戸大橋線(宇多津-児島間)[M]"],
       stationList.駅間リスト,
       stationList.日英対応表,
     ] = values;
@@ -115,52 +115,55 @@ export const getStationList = async (props) => {
         return data;
       });
     };
-    stationList.予讃線 = addStationPosition(
+    stationList["予讃線(高松-松山間)[Y]"] = addStationPosition(
-      concatBetweenStations(stationList.予讃線),
+      concatBetweenStations(stationList["予讃線(高松-松山間)[Y]"]),
       予讃線,
       stationList.日英対応表
     );
-    stationList.松宇線 = addStationPosition(
+    stationList["予讃線(松山-宇和島間)[U]"] = addStationPosition(
-      concatBetweenStations(stationList.松宇線),
+      concatBetweenStations(stationList["予讃線(松山-宇和島間)[U]"]),
       予讃線,
       stationList.日英対応表
     );
-    stationList.伊予灘線 = addStationPosition(
+    stationList["予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]"] =
-      concatBetweenStations(stationList.伊予灘線),
+      addStationPosition(
-      予讃線,
+        concatBetweenStations(
-      stationList.日英対応表
+          stationList["予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]"]
-    );
+        ),
-    stationList.土讃線 = addStationPosition(
+        予讃線,
-      concatBetweenStations(stationList.土讃線),
+        stationList.日英対応表
+      );
+    stationList["土讃線(多度津-高知間)[D]"] = addStationPosition(
+      concatBetweenStations(stationList["土讃線(多度津-高知間)[D]"]),
       土讃線,
       stationList.日英対応表
     );
-    stationList.窪川線 = addStationPosition(
+    stationList["土讃線(高知-窪川間)[K]"] = addStationPosition(
-      concatBetweenStations(stationList.窪川線),
+      concatBetweenStations(stationList["土讃線(高知-窪川間)[K]"]),
       土讃線,
       stationList.日英対応表
     );
-    stationList.高徳線 = addStationPosition(
+    stationList["高徳線(高松-徳島間)[T]"] = addStationPosition(
-      concatBetweenStations(stationList.高徳線),
+      concatBetweenStations(stationList["高徳線(高松-徳島間)[T]"]),
       高徳線,
       stationList.日英対応表
     );
-    stationList.鳴門線 = addStationPosition(
+    stationList["鳴門線(池谷-鳴門間)[N]"] = addStationPosition(
-      concatBetweenStations(stationList.鳴門線),
+      concatBetweenStations(stationList["鳴門線(池谷-鳴門間)[N]"]),
       鳴門線,
       stationList.日英対応表
     );
     const tokushimaCurrent = addStationPosition(
-      concatBetweenStations(stationList.徳島線),
+      concatBetweenStations(stationList["徳島線(徳島-阿波池田)[B]"]),
       徳島線,
       stationList.日英対応表
     );
-    stationList.徳島線 = [
+    stationList["徳島線(徳島-阿波池田)[B]"] = [
       tokushimaCurrent[tokushimaCurrent.length - 1],
       ...tokushimaCurrent,
     ];
-    stationList.徳島線.pop();
+    stationList["徳島線(徳島-阿波池田)[B]"].pop();
-    stationList.瀬戸大橋線 = [
+    stationList["瀬戸大橋線(宇多津-児島間)[M]"] = [
       {
         Station_JP: "坂出",
         Station_EN: "Sakaide",

menu.js

@@ -1,12 +1,13 @@
 import React, { useRef, useState, useEffect } from "react";
+import Carousel from "react-native-snap-carousel";
 import {
   Platform,
   View,
-  LayoutAnimation,
   ScrollView,
   Linking,
   Text,
   TouchableOpacity,
+  ToastAndroid,
 } from "react-native";
 import Constants from "expo-constants";
 import { ListItem } from "native-base";
@@ -38,44 +39,29 @@ import useInterval from "./lib/useInterval";
 export default function Menu(props) {
   const {
     navigation: { navigate },
+    favoriteStation,
+    setFavoriteStation,
+    busAndTrainData,
   } = props;
   const JRSTraInfoEXAcSR = useRef(null);
   const StationBoardAcSR = useRef(null);
   const navigation = useNavigation();
 
   //位置情報
-  const [location, setLocation] = useState(null);
   const [locationStatus, setLocationStatus] = useState(null);
   useEffect(() => {
     Location.requestForegroundPermissionsAsync().then((data) => {
       setLocationStatus(data.status);
     });
   }, []);
-  useEffect(() => {
-    if (locationStatus !== "granted") return () => {};
-    getCurrentPosition();
-  }, [locationStatus]);
 
   const getCurrentPosition = () => {
+    if (locationStatus !== "granted") return () => {};
     Location.getCurrentPositionAsync({}).then((location) =>
-      setLocation(location)
+      makeCurrentStation(location)
     );
   };
-
+  const makeCurrentStation = (location) => {
-  useInterval(() => {
-    if (locationStatus !== "granted") return () => {};
-    getCurrentPosition();
-  }, 5000);
-
-  const [originalStationList, setOriginalStationList] = useState();
-  useEffect(() => {
-    getStationList().then(setOriginalStationList);
-  }, []);
-
-  const [stationName, setStationName] = useState(undefined);
-  const [currentStation, setCurrentStation] = useState(undefined);
-  useEffect(() => {
-    if (!location) return () => {};
     if (!originalStationList) return () => {};
     const findStationEachLine = (selectLine) => {
       const searchArea = 0.0015;
@@ -101,7 +87,6 @@ export default function Menu(props) {
         pre.push(...current);
         return pre;
       }, []);
-    LayoutAnimation.easeInEaseOut();
     if (returnDataBase.length) {
       let currentStation = currentStation == undefined ? [] : currentStation;
       if (currentStation.toString() != returnDataBase.toString()) {
@@ -109,14 +94,23 @@ export default function Menu(props) {
       }
     } else {
       setCurrentStation(undefined);
-      StationBoardAcSR.current?.hide();
     }
-  }, [location, originalStationList]);
+  };
+
+  useEffect(getCurrentPosition, [locationStatus]);
+  useInterval(getCurrentPosition, 5000);
+
+  const [currentStation, setCurrentStation] = useState(undefined); //第三要素
+
+  const [originalStationList, setOriginalStationList] = useState(); // 第一要素
+  useEffect(() => getStationList().then(setOriginalStationList), []);
 
   const [count, setCount] = useState(0);
   const [delayData, setDelayData] = useState(undefined);
   const [getTime, setGetTime] = useState(new Date());
   const [loadingDelayData, setLoadingDelayData] = useState(true);
+  const carouselRef = useRef();
+  const [selectedCurrentStation, setSelectedCurrentStation] = useState(0);
 
   useEffect(() => {
     fetch(
@@ -124,11 +118,32 @@ export default function Menu(props) {
     )
       .then((response) => response.text())
       .then((data) => setDelayData(data !== "" ? data.split("^") : null))
-      .then(LayoutAnimation.easeInEaseOut)
       .then(() => setGetTime(new Date()))
       .finally(() => setLoadingDelayData(false));
   }, [loadingDelayData]);
-
+  const allStationData = [currentStation, ...favoriteStation].filter(
+    (d) => d != undefined
+  );
+  console.log(allStationData);
+  useEffect(() => {
+    if (allStationData.length == 0) {
+      setSelectedCurrentStation(0);
+      return;
+    }
+    console.log(allStationData[selectedCurrentStation]);
+    if (allStationData[selectedCurrentStation] == undefined) {
+      const count = selectedCurrentStation - 1;
+      setSelectedCurrentStation(count);
+    }
+  }, [selectedCurrentStation, currentStation, favoriteStation]);
+  useEffect(() => {
+    if (!carouselRef.current) return;
+    console.log(carouselRef.current);
+    if (carouselRef.current?._itemToSnapTo != selectedCurrentStation) {
+      carouselRef.current.snapToItem(0);
+      carouselRef.current.snapToItem(selectedCurrentStation);
+    }
+  }, [selectedCurrentStation]);
   return (
     <View
       style={{
@@ -140,33 +155,48 @@ export default function Menu(props) {
       <StatusbarDetect />
       <TitleBar />
       <ScrollView>
-        <TopMenuButton />
+        <FixedContentTop navigate={navigate} />
-        <TextBox
+        {originalStationList && allStationData.length != 0 && (
-          backgroundColor="#0099CC"
+          <Carousel
-          flex={1}
+            ref={carouselRef}
-          onPressButton={() =>
+            layout={"default"}
-            Linking.openURL(
+            data={originalStationList && allStationData}
-              "https://www.jr-shikoku.co.jp/02_information/suspension/sp/"
+            sliderWidth={wp("100%")}
-            )
+            itemWidth={wp("80%")}
-          }
+            enableMomentum
-        >
+            callbackOffsetMargin={1000}
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 18 }}>
+            activeAnimationOptions={0.3}
-            新型コロナウイルスに関するお知らせ
+            onSnapToItem={(d) => {
-          </Text>
+              setSelectedCurrentStation(d);
-          <Text style={{ color: "white", fontSize: 15 }}>
+            }}
-            列車の運行計画・混雑状況・感染症対策への取り組み
+            renderItem={({ item, index }) => {
-          </Text>
+              return (
-        </TextBox>
+                <View
-        {currentStation && (
+                  style={{ marginVertical: 10 }}
-          <>
+                  key={item[0].StationNumber}
-            <Sign
+                >
-              currentStation={currentStation}
+                  <Sign
-              originalStationList={originalStationList}
+                    currentStation={item}
-              oP={StationBoardAcSR.current?.setModalVisible}
+                    originalStationList={originalStationList}
-            />
+                    favoriteStation={favoriteStation}
-            <LED_vision station={currentStation[0]} navigate={navigate} />
+                    setFavoriteStation={setFavoriteStation}
-          </>
+                    oP={StationBoardAcSR.current?.setModalVisible}
+                  />
+                </View>
+              );
+            }}
+          />
         )}
+        {allStationData.length != 0 &&
+          originalStationList &&
+          allStationData[selectedCurrentStation] && (
+            <LED_vision
+              station={
+                originalStationList && allStationData[selectedCurrentStation][0]
+              }
+              navigate={navigate}
+            />
+          )}
         <JRSTraInfoBox
           JRSTraInfoEXAcSR={JRSTraInfoEXAcSR}
           getTime={getTime}
@@ -174,290 +204,20 @@ export default function Menu(props) {
           loadingDelayData={loadingDelayData}
           delayData={delayData}
         />
-
+        <FixedContentBottom navigate={navigate} />
-        <View style={{ flexDirection: "row" }}>
-          <TicketBox
-            backgroundColor={"#AD7FA8"}
-            icon={<Foundation name="ticket" color="white" size={50} />}
-            flex={1}
-            onPressButton={() =>
-              Linking.openURL("https://www.jr-eki.com/ticket/brand")
-            }
-          >
-            トクトク切符
-          </TicketBox>
-          <TicketBox
-            backgroundColor={"#8F5902"}
-            icon={<FontAwesome name="first-order" color="white" size={50} />}
-            flex={1}
-            onPressButton={() =>
-              Linking.openURL(
-                "https://www.jr-shikoku.co.jp/01_trainbus/event_train/sp/"
-              )
-            }
-          >
-            観光列車
-          </TicketBox>
-          <TicketBox
-            backgroundColor={"#888A85"}
-            icon={<Ionicons name="flag" color="white" size={50} />}
-            flex={1}
-            onPressButton={() =>
-              Linking.openURL("https://www.jr-eki.com/tour/brand")
-            }
-          >
-            旅行ツアー
-          </TicketBox>
-        </View>
-        <TextBox
-          backgroundColor="#0099CC"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL("https://www.jr-eki.com/smart-eki/index.html")
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            スマートえきちゃん
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            JR四国のチケットレススマホアプリです。
-          </Text>
-        </TextBox>
-        <TextBox
-          backgroundColor="#0099CC"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL(
-              "https://www.jr-shikoku.co.jp/sp/index.html#menu-box"
-            )
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            臨時列車などのお知らせ
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            区間縮小・計画運休・イベント・季節臨時列車など
-          </Text>
-        </TextBox>
-        <TextBox
-          backgroundColor="#0099CC"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL("https://www.jr-shikoku.co.jp/03_news/press/")
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            ニュースリリース
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            公式プレス記事はこちら
-          </Text>
-        </TextBox>
-        <TextBox
-          backgroundColor="#0099CC"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL("https://www.jr-shikoku.co.jp/teiki/")
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            定期運賃計算
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            通常/学生/快て〜き等はこちら
-          </Text>
-        </TextBox>
-        <TextBox
-          backgroundColor="#0099CC"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL("https://www.jr-shikoku.co.jp/04_company/group/sp/")
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            JR四国のお店・サービス
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            JR四国グループの施設をご案内
-          </Text>
-        </TextBox>
-        <View style={{ flexDirection: "row" }}>
-          <TouchableOpacity
-            style={{
-              flex: 1,
-              backgroundColor: "#729FCF",
-              borderColor: "#0099CC",
-              padding: 10,
-              borderWidth: 1,
-              margin: 2,
-              alignItems: "center",
-            }}
-            onPress={() => Linking.openURL("https://www.jr-odekake.net/smt/")}
-          >
-            <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-              時刻・運賃計算
-            </Text>
-            <Text style={{ color: "white", fontWeight: "bold", fontSize: 18 }}>
-              (マイ・ダイヤ)
-            </Text>
-            <Foundation name="yen" color="white" size={50} />
-            <Text style={{ color: "white" }}>
-              マイ・ダイヤはJR西日本提供のサービスです。
-            </Text>
-          </TouchableOpacity>
-          <TouchableOpacity
-            style={{
-              flex: 1,
-              backgroundColor: "#8AE234",
-              borderColor: "#0099CC",
-              padding: 10,
-              borderWidth: 1,
-              margin: 2,
-              alignItems: "center",
-            }}
-            onPress={() => Linking.openURL("tel:0570-00-4592")}
-          >
-            <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-              JR四国案内センター
-            </Text>
-            <Foundation name="telephone" color="white" size={50} />
-            <Text style={{ color: "white" }}>0570-00-4592</Text>
-            <Text style={{ color: "white" }}>(8:00~20:00 年中無休)</Text>
-            <Text style={{ color: "white" }}>(通話料がかかります)</Text>
-          </TouchableOpacity>
-        </View>
-        <View
-          style={{
-            backgroundColor: "#0099CC",
-            borderRadius: 10,
-            margin: 10,
-            borderColor: "black",
-            borderWidth: 2,
-          }}
-        >
-          <View
-            style={{ padding: 10, flexDirection: "row", alignItems: "center" }}
-          >
-            <MaterialCommunityIcons
-              name="twitter"
-              style={{ padding: 5 }}
-              color="white"
-              size={30}
-            />
-            <Text style={{ fontSize: 30, fontWeight: "bold", color: "white" }}>
-              JR四国公式Twitter一族
-            </Text>
-          </View>
-          <View
-            style={{
-              padding: 10,
-              backgroundColor: "white",
-              borderBottomLeftRadius: 10,
-              borderBottomRightRadius: 10,
-            }}
-          >
-            {((data) =>
-              data.map((d) => (
-                <ListItem onPress={() => Linking.openURL(d.url)}>
-                  <Text>{d.name}</Text>
-                  <View style={{ flex: 1 }} />
-                  <Icon name="chevron-right" size={20} />
-                </ListItem>
-              )))([
-              {
-                url: "https://twitter.com/JRshikoku_eigyo",
-                name: "JR四国営業部【公式】",
-              },
-              {
-                url: "https://twitter.com/JRshikoku_tokyo",
-                name: "JR四国 東京営業情報【公式】",
-              },
-              {
-                url: "https://twitter.com/JRshikoku_osaka",
-                name: "JR四国 大阪営業部【公式】",
-              },
-              {
-                url: "https://twitter.com/jr_shikoku_info",
-                name: "ＪＲ四国列車運行情報【公式】",
-              },
-              {
-                url: "https://twitter.com/Smile_Eki_Chan",
-                name: "すまいるえきちゃん♡JR四国【公式】",
-              },
-              {
-                url: "https://twitter.com/jrs_matsuyama",
-                name: "JR四国 松山駅 【公式】",
-              },
-              {
-                url: "https://twitter.com/jrshikoku_kochi",
-                name: "JR四国 高知駅【公式】",
-              },
-              {
-                url: "https://twitter.com/jr_tokust",
-                name: "JR四国 徳島駅【公式】",
-              },
-              {
-                url: "https://twitter.com/jrshikoku_uwjm",
-                name: "JR四国 宇和島駅【公式】",
-              },
-              {
-                url: "https://twitter.com/JRshikoku_wkoch",
-                name: "JR四国 ワープ高知支店【公式】",
-              },
-              {
-                url: "https://twitter.com/jrshikoku_nihaw",
-                name: "JR四国 ワープ新居浜営業所【公式】",
-              },
-              {
-                url: "https://twitter.com/Yoakemonogatari",
-                name: "志国土佐　時代の夜明けのものがたり【公式】",
-              },
-            ])}
-          </View>
-        </View>
-        <Text style={{ fontWeight: "bold", fontSize: 20 }}>
-          このアプリについて
-        </Text>
-        <Text>
-          このアプリはXprocess(HARUKIN)が製作しているJR四国の完全非公式アシストアプリケーションです。このアプリに関することでのJR四国公式へ問合せすることはお控えください。以下のTwitterよりお願いします。
-        </Text>
-        <TextBox
-          backgroundColor="#CC0000"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL("https://twitter.com/Xprocess_main")
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            XprocessのTwitter
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            制作運営のTwitterです。
-          </Text>
-        </TextBox>
-        <TextBox
-          backgroundColor="black"
-          flex={1}
-          onPressButton={() => navigate("setting")}
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
-            アプリの設定
-          </Text>
-          <Text style={{ color: "white", fontSize: 18 }}>
-            アプリの設定画面を表示します。
-          </Text>
-        </TextBox>
-        {/* 
-        <SvgUri
-          width="200"
-          height="200"
-          source={require("./assets/トレインビジョン関係/1.svg")}
-        /> */}
       </ScrollView>
+
       <StationDeteilView
         StationBoardAcSR={StationBoardAcSR}
-        currentStation={currentStation}
+        currentStation={
+          originalStationList &&
+          allStationData.length != 0 &&
+          allStationData[selectedCurrentStation]
+        }
         originalStationList={originalStationList}
+        favoriteStation={favoriteStation}
+        setFavoriteStation={setFavoriteStation}
+        busAndTrainData={busAndTrainData}
       />
       <JRSTraInfo
         JRSTraInfoEXAcSR={JRSTraInfoEXAcSR}
@@ -591,7 +351,6 @@ const JRSTraInfoBox = (props) => {
             size={30}
             style={{ margin: 5 }}
             onPress={() => {
-              LayoutAnimation.easeInEaseOut();
               setLoadingDelayData(true);
             }}
           />
@@ -634,3 +393,311 @@ const JRSTraInfoBox = (props) => {
     </TouchableOpacity>
   );
 };
+
+const FixedContentTop = (props) => {
+  return (
+    <>
+      <TopMenuButton />
+      <TextBox
+        backgroundColor="#0099CC"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL(
+            "https://www.jr-shikoku.co.jp/02_information/suspension/sp/"
+          )
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 18 }}>
+          新型コロナウイルスに関するお知らせ
+        </Text>
+        <Text style={{ color: "white", fontSize: 15 }}>
+          列車の運行計画・混雑状況・感染症対策への取り組み
+        </Text>
+      </TextBox>
+    </>
+  );
+};
+const FixedContentBottom = (props) => {
+  return (
+    <>
+      {props.children}
+
+      <View style={{ flexDirection: "row" }}>
+        <TicketBox
+          backgroundColor={"#AD7FA8"}
+          icon={<Foundation name="ticket" color="white" size={50} />}
+          flex={1}
+          onPressButton={() =>
+            Linking.openURL("https://www.jr-eki.com/ticket/brand")
+          }
+        >
+          トクトク切符
+        </TicketBox>
+        <TicketBox
+          backgroundColor={"#8F5902"}
+          icon={<FontAwesome name="first-order" color="white" size={50} />}
+          flex={1}
+          onPressButton={() =>
+            Linking.openURL(
+              "https://www.jr-shikoku.co.jp/01_trainbus/event_train/sp/"
+            )
+          }
+        >
+          観光列車
+        </TicketBox>
+        <TicketBox
+          backgroundColor={"#888A85"}
+          icon={<Ionicons name="flag" color="white" size={50} />}
+          flex={1}
+          onPressButton={() =>
+            Linking.openURL("https://www.jr-eki.com/tour/brand")
+          }
+        >
+          旅行ツアー
+        </TicketBox>
+      </View>
+      <TextBox
+        backgroundColor="#0099CC"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL("https://www.jr-eki.com/smart-eki/index.html")
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          スマートえきちゃん
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          JR四国のチケットレススマホアプリです。
+        </Text>
+      </TextBox>
+      <TextBox
+        backgroundColor="#0099CC"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL("https://www.jr-shikoku.co.jp/sp/index.html#menu-box")
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          臨時列車などのお知らせ
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          区間縮小・計画運休・イベント・季節臨時列車など
+        </Text>
+      </TextBox>
+      <TextBox
+        backgroundColor="#0099CC"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL("https://www.jr-shikoku.co.jp/03_news/press/")
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          ニュースリリース
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          公式プレス記事はこちら
+        </Text>
+      </TextBox>
+      <TextBox
+        backgroundColor="#0099CC"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL("https://www.jr-shikoku.co.jp/teiki/")
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          定期運賃計算
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          通常/学生/快て〜き等はこちら
+        </Text>
+      </TextBox>
+      <TextBox
+        backgroundColor="#0099CC"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL("https://www.jr-shikoku.co.jp/04_company/group/sp/")
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          JR四国のお店・サービス
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          JR四国グループの施設をご案内
+        </Text>
+      </TextBox>
+      <View style={{ flexDirection: "row" }}>
+        <TouchableOpacity
+          style={{
+            flex: 1,
+            backgroundColor: "#729FCF",
+            borderColor: "#0099CC",
+            padding: 10,
+            borderWidth: 1,
+            margin: 2,
+            alignItems: "center",
+          }}
+          onPress={() => Linking.openURL("https://www.jr-odekake.net/smt/")}
+        >
+          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+            時刻・運賃計算
+          </Text>
+          <Text style={{ color: "white", fontWeight: "bold", fontSize: 18 }}>
+            (マイ・ダイヤ)
+          </Text>
+          <Foundation name="yen" color="white" size={50} />
+          <Text style={{ color: "white" }}>
+            マイ・ダイヤはJR西日本提供のサービスです。
+          </Text>
+        </TouchableOpacity>
+        <TouchableOpacity
+          style={{
+            flex: 1,
+            backgroundColor: "#8AE234",
+            borderColor: "#0099CC",
+            padding: 10,
+            borderWidth: 1,
+            margin: 2,
+            alignItems: "center",
+          }}
+          onPress={() => Linking.openURL("tel:0570-00-4592")}
+        >
+          <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+            JR四国案内センター
+          </Text>
+          <Foundation name="telephone" color="white" size={50} />
+          <Text style={{ color: "white" }}>0570-00-4592</Text>
+          <Text style={{ color: "white" }}>(8:00~20:00 年中無休)</Text>
+          <Text style={{ color: "white" }}>(通話料がかかります)</Text>
+        </TouchableOpacity>
+      </View>
+      <View
+        style={{
+          backgroundColor: "#0099CC",
+          borderRadius: 10,
+          margin: 10,
+          borderColor: "black",
+          borderWidth: 2,
+        }}
+      >
+        <View
+          style={{ padding: 10, flexDirection: "row", alignItems: "center" }}
+        >
+          <MaterialCommunityIcons
+            name="twitter"
+            style={{ padding: 5 }}
+            color="white"
+            size={30}
+          />
+          <Text style={{ fontSize: 30, fontWeight: "bold", color: "white" }}>
+            JR四国公式Twitter一族
+          </Text>
+        </View>
+        <View
+          style={{
+            padding: 10,
+            backgroundColor: "white",
+            borderBottomLeftRadius: 10,
+            borderBottomRightRadius: 10,
+          }}
+        >
+          {((data) =>
+            data.map((d) => (
+              <ListItem onPress={() => Linking.openURL(d.url)}>
+                <Text>{d.name}</Text>
+                <View style={{ flex: 1 }} />
+                <Icon name="chevron-right" size={20} />
+              </ListItem>
+            )))([
+            {
+              url: "https://twitter.com/JRshikoku_eigyo",
+              name: "JR四国営業部【公式】",
+            },
+            {
+              url: "https://twitter.com/JRshikoku_tokyo",
+              name: "JR四国 東京営業情報【公式】",
+            },
+            {
+              url: "https://twitter.com/JRshikoku_osaka",
+              name: "JR四国 大阪営業部【公式】",
+            },
+            {
+              url: "https://twitter.com/jr_shikoku_info",
+              name: "ＪＲ四国列車運行情報【公式】",
+            },
+            {
+              url: "https://twitter.com/Smile_Eki_Chan",
+              name: "すまいるえきちゃん♡JR四国【公式】",
+            },
+            {
+              url: "https://twitter.com/jrs_matsuyama",
+              name: "JR四国 松山駅 【公式】",
+            },
+            {
+              url: "https://twitter.com/jrshikoku_kochi",
+              name: "JR四国 高知駅【公式】",
+            },
+            {
+              url: "https://twitter.com/jr_tokust",
+              name: "JR四国 徳島駅【公式】",
+            },
+            {
+              url: "https://twitter.com/jrshikoku_uwjm",
+              name: "JR四国 宇和島駅【公式】",
+            },
+            {
+              url: "https://twitter.com/JRshikoku_wkoch",
+              name: "JR四国 ワープ高知支店【公式】",
+            },
+            {
+              url: "https://twitter.com/jrshikoku_nihaw",
+              name: "JR四国 ワープ新居浜営業所【公式】",
+            },
+            {
+              url: "https://twitter.com/Yoakemonogatari",
+              name: "志国土佐　時代の夜明けのものがたり【公式】",
+            },
+          ])}
+        </View>
+      </View>
+      <Text style={{ fontWeight: "bold", fontSize: 20 }}>
+        このアプリについて
+      </Text>
+      <Text>
+        このアプリはXprocess(HARUKIN)が製作しているJR四国の完全非公式アシストアプリケーションです。このアプリに関することでのJR四国公式へ問合せすることはお控えください。以下のTwitterよりお願いします。
+      </Text>
+      <TextBox
+        backgroundColor="#CC0000"
+        flex={1}
+        onPressButton={() =>
+          Linking.openURL("https://twitter.com/Xprocess_main")
+        }
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          XprocessのTwitter
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          制作運営のTwitterです。
+        </Text>
+      </TextBox>
+      <TextBox
+        backgroundColor="black"
+        flex={1}
+        onPressButton={() => props.navigate("setting")}
+      >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
+          アプリの設定
+        </Text>
+        <Text style={{ color: "white", fontSize: 18 }}>
+          アプリの設定画面を表示します。
+        </Text>
+      </TextBox>
+      {/* 
+  <SvgUri
+    width="200"
+    height="200"
+    source={require("./assets/トレインビジョン関係/1.svg")}
+  /> */}
+    </>
+  );
+};

package.json

@@ -36,6 +36,7 @@
     "react-native-router-flux": "^4.3.1",
     "react-native-safe-area-context": "4.5.0",
     "react-native-screens": "~3.20.0",
+    "react-native-snap-carousel": "^3.9.1",
     "react-native-storage": "^1.0.1",
     "react-native-svg": "13.4.0",
     "react-native-svg-uri": "^1.2.3",

trainbaseview.js

@@ -12,7 +12,6 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 export default function TrainBase({ route, navigation }) {
   const { info, from } = route.params;
   const { navigate } = navigation;
-  console.log(info);
   const webview = useRef();
   const jss = `document.getElementById('Footer').style.display = 'none';
   ${

yarn.lock

@@ -3614,6 +3614,11 @@ core-js@3.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
 
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+  integrity sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==
+
 core-js@^2.4.0:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
@@ -4386,6 +4391,19 @@ fbjs-css-vars@^1.0.0:
   resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
   integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==
 
+fbjs@^0.8.4:
+  version "0.8.18"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz#9835e0addb9aca2eff53295cd79ca1cfc7c9662a"
+  integrity sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.30"
+
 fbjs@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6"
@@ -5408,6 +5426,14 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -6834,6 +6860,14 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
@@ -7644,7 +7678,7 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-prop-types@*, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@*, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -7806,6 +7840,14 @@ rc@~1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-addons-shallow-compare@15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.2.tgz#198a00b91fc37623db64a28fd17b596ba362702f"
+  integrity sha512-yAV9tOObmKPiohqne1jiMcx6kDjfz7GeL8K9KHgI+HvDsbrRv148uyUzrPc6GwepZnQcJ59Q3lp1ghrkyPwtjg==
+  dependencies:
+    fbjs "^0.8.4"
+    object-assign "^4.1.0"
+
 react-devtools-core@^4.26.1:
   version "4.27.2"
   resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.27.2.tgz#d20fc57e258c656eedabafc2c851d38b33583148"
@@ -7997,6 +8039,14 @@ react-native-size-matters@^0.3.1:
   resolved "https://registry.yarnpkg.com/react-native-size-matters/-/react-native-size-matters-0.3.1.tgz#24d0cfc335a2c730f6d58bd7b43ea5a41be4b49f"
   integrity sha512-mKOfBLIBFBcs9br1rlZDvxD5+mAl8Gfr5CounwJtxI6Z82rGrMO+Kgl9EIg3RMVf3G855a85YVqHJL2f5EDRlw==
 
+react-native-snap-carousel@^3.9.1:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/react-native-snap-carousel/-/react-native-snap-carousel-3.9.1.tgz#6fd9bd8839546c2c6043a41d2035afbc6fe0443e"
+  integrity sha512-xWEGusacIgK1YaDXLi7Gao2+ISLoGPVEBR8fcMf4tOOJQufutlNwkoLu0l6B8Qgsrre0nTxoVZikRgGRDWlLaQ==
+  dependencies:
+    prop-types "^15.6.1"
+    react-addons-shallow-compare "15.6.2"
+
 react-native-storage@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/react-native-storage/-/react-native-storage-1.0.1.tgz#2c493875ff76ec301987c951a8302f3a54381241"
@@ -9644,7 +9694,7 @@ whatwg-fetch@2.0.4:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
-whatwg-fetch@^3.0.0:
+whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
   integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==