0528

components/Datepicker.js

@@ -2,7 +2,6 @@ import React from "react";
 import PropTypes from "prop-types";
 import {
     StyleSheet,
-    TouchableOpacity,
     LayoutAnimation,
     Platform,
     UIManager,

components/OpenTime.js

@@ -2,7 +2,6 @@ import React from "react";
 import PropTypes from "prop-types";
 import {
     StyleSheet,
-    TouchableOpacity,
     LayoutAnimation,
     Platform,
     UIManager,

navigation/LoadingModel.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

package.json

@@ -16,7 +16,7 @@
     "@babel/polyfill": "^7.8.7",
     "@eva-design/eva": "^2.0.0",
     "@expo/vector-icons": "^10.0.0",
-    "@react-native-community/masked-view": "^0.1.6",
+    "@react-native-community/masked-view": "0.1.6",
     "@react-navigation/bottom-tabs": "^5.0.0",
     "@react-navigation/core": "^3.7.6",
     "@react-navigation/material-top-tabs": "^5.2.8",
@@ -45,14 +45,13 @@
     "react-dom": "16.9.0",
     "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz",
     "react-native-action-button": "^2.8.5",
-    "react-native-gesture-handler": "^1.6.1",
+    "react-native-gesture-handler": "~1.6.0",
     "react-native-maps": "0.26.1",
     "react-native-modal": "^11.5.6",
     "react-native-number-please": "^1.0.5",
-    "react-native-reanimated": "^1.7.1",
-    "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.2.0",
-    "react-native-svg": "^11.0.1",
+    "react-native-reanimated": "~1.7.0",
+    "react-native-safe-area-context": "0.7.3",
+    "react-native-screens": "~2.2.0",
     "react-native-tab-view": "^2.14.0",
     "react-native-textarea": "^1.0.4",
     "react-native-web": "^0.11.7",
@@ -66,7 +65,9 @@
     "babel-loader": "^8.1.0",
     "babel-plugin-import": "^1.13.0",
     "babel-preset-expo": "^8.1.0",
-    "jest-expo": "^37.0.0"
+    "jest-expo": "^37.0.0",
+    "prettier": "^2.0.5",
+    "react-native-svg": "11.0.1"
   },
   "private": true
 }

screens/AddGoodsClassification.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -22,7 +21,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import NavHeaderBar from "../components/NavHeaderBar";
 import GoodsCard from "../components/GoodsCard";
 import EmptyComponent from "../components/EmptyComponent";

screens/Appraisal/ComplaintlistScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Appraisal/EmailDetail.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Appraisal/SystemEmail.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Bank/MoneyListScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Coupon/listScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/EditBannerScreen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -21,7 +20,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import NavHeaderBar from "../components/NavHeaderBar";
 import GoodsCard from "../components/GoodsCard";
 import UpLoadImage from "../components/UpLoadImage";

screens/EditGoods.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -22,7 +21,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import NavHeaderBar from "../components/NavHeaderBar";
 import GoodsCard from "../components/GoodsCard";
 import UpLoadImage from "../components/UpLoadImage";

screens/FullReduction.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -25,7 +24,6 @@ import {
 import EmptyComponent from "../components/EmptyComponent";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import NavHeaderBar from "../components/NavHeaderBar";
 import GoodsCard from "../components/GoodsCard";
 import ActionButton from "react-native-action-button";

screens/Goods/GoodsDetailScreen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -25,7 +24,6 @@ import {
 import EmptyComponent from "../../components/EmptyComponent";
 import FormInput from "../../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../../components/ScrollPage";
 import NavHeaderBar from "../../components/NavHeaderBar";
 import GoodsCard from "../../components/GoodsCard";
 import ActionButton from "react-native-action-button";

screens/Goods/GoodsSpecificationScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Goods/SearchScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Guide1Screen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -21,7 +20,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect, useRoute } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import ConnectButton from "../components/ConnectButton";
 import GuideHeaderBar from "../components/GuideHeaderBar";
 import Textarea from "react-native-textarea";

screens/Guide2Screen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import NavHeaderBar from "../components/NavHeaderBar";
 import {
@@ -22,7 +21,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect, useRoute } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import ConnectButton from "../components/ConnectButton";
 import GuideHeaderBar from "../components/GuideHeaderBar";
 import Textarea from "react-native-textarea";

screens/Guide3Screen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -21,7 +20,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import ConnectButton from "../components/ConnectButton";
 import GuideHeaderBar from "../components/GuideHeaderBar";
 import Textarea from "react-native-textarea";

screens/Guide4Screen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -21,7 +20,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import ConnectButton from "../components/ConnectButton";
 import GuideHeaderBar from "../components/GuideHeaderBar";
 import Textarea from "react-native-textarea";

screens/HomeScreen.js

@@ -9,7 +9,7 @@ import {
     ImageBackground,
     ScrollView,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import Badge from "../components/Badge";
 import {

screens/HomeScreenPage1.js

@@ -13,7 +13,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
     Dimensions,

screens/HomeScreenPage2.js

@@ -13,7 +13,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
     Dimensions,

screens/HomeScreenPage3.js

@@ -15,7 +15,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
     Dimensions,

screens/LoginScreen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,

screens/MoneyListScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/RegisterScreen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -20,7 +19,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import ConnectButton from "../components/ConnectButton";
 
 export default function RegisterScreen({ navigation, route }) {

screens/RegisterSeScreen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -21,7 +20,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect, useRoute } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import ConnectButton from "../components/ConnectButton";
 import GuideHeaderBar from "../components/GuideHeaderBar";
 import OpenTime from "../components/OpenTime";

screens/Set/AutomaticScreen.js

@@ -16,7 +16,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
     Dimensions,

screens/Set/ClassificationEditScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Set/FirstOrderScreen.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/Set/OrderSetting.js

@@ -4,7 +4,6 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";

screens/StoreAudit.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import {
     Layout,
@@ -21,7 +20,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import NavHeaderBar from "../components/NavHeaderBar";
 import GoodsCard from "../components/GoodsCard";
 import ConnectButton from "../components/ConnectButton";

screens/UserScreen.js

@@ -4,11 +4,10 @@ import {
     Image,
     Platform,
     StyleSheet,
-    TouchableOpacity,
     View,
     ImageBackground,
 } from "react-native";
-import scrollPage from "../components/scrollPage";
+import scrollPage from "../components/ScrollPage";
 import { useModel } from "flooks";
 import Badge from "../components/Badge";
 import {
@@ -30,7 +29,6 @@ import {
 } from "@ui-kitten/components";
 import FormInput from "../components/FormInput";
 import { useFocusEffect, useNavigation } from "@react-navigation/native";
-import ScrollPage from "../components/ScrollPage";
 import * as RootNavigation from "../navigation/RootNavigation.js";
 import NavHeaderBar from "../components/NavHeaderBar";