Merge pull request #329 from UM-ARK/2.8.3

2.8.3
UM-ARK · Mar 11, 2024 · 0b89d03 · 0b89d03
2 parents 347f3c5 + 23f21da
commit 0b89d03
Show file tree

Hide file tree

Showing 13 changed files with 390 additions and 340 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -139,8 +139,8 @@ android {
         applicationId "one.umall"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 53
-        versionName "2.8.2"
+        versionCode 54
+        versionName "2.8.3"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -331,7 +331,7 @@ PODS:
     - React-Core
   - react-native-safe-area-context (4.9.0):
     - React-Core
-  - react-native-simple-toast (3.2.0):
+  - react-native-simple-toast (3.3.0):
     - React-Core
     - Toast (~> 4)
   - react-native-webview (13.8.1):
@@ -415,11 +415,11 @@ PODS:
     - React-Core
     - SDWebImage (~> 5.11.1)
     - SDWebImageWebPCoder (~> 0.8.4)
-  - RNFBAnalytics (18.8.0):
+  - RNFBAnalytics (18.9.0):
     - Firebase/Analytics (= 10.20.0)
     - React-Core
     - RNFBApp
-  - RNFBApp (18.8.0):
+  - RNFBApp (18.9.0):
     - Firebase/CoreOnly (= 10.20.0)
     - React-Core
   - RNFS (2.20.0):
@@ -708,7 +708,7 @@ SPEC CHECKSUMS:
   react-native-pager-view: c29d484f19c49ff19525a94105e4ab2c4d4ae273
   react-native-restart: 45c8dca02491980f2958595333cbccd6877cb57e
   react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
-  react-native-simple-toast: 2079d417c52fc3ca295edba094d5632f7720e68d
+  react-native-simple-toast: 6148335d096ab63dc852535ec64c82527315d575
   react-native-webview: bef49fb935d75e1ca83aed3ac74eecf5b78764ac
   React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d
   React-RCTActionSheet: 1888a229684762c40cc96c7ff4716f809655dc09
@@ -728,8 +728,8 @@ SPEC CHECKSUMS:
   RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
   RNDateTimePicker: 65e1d202799460b286ff5e741d8baf54695e8abd
   RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
-  RNFBAnalytics: 991772a4cd8c90de9a5eec33ef24dbba6e028c5b
-  RNFBApp: a4f5b074984cf612e4c97d68b42be690c59e2638
+  RNFBAnalytics: ec290267aac57446c10b491293373ac86357f575
+  RNFBApp: 9b25191f7a5e72c185b7e43fffb0d906869c4659
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: e98441928705d9d1184b599d7c1c6df2dd4f7724
   RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364

diff --git a/ios/UMALL.xcodeproj/project.pbxproj b/ios/UMALL.xcodeproj/project.pbxproj
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umall",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -11,33 +11,33 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@babel/plugin-proposal-decorators": "^7.23.9",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
     "@react-native-async-storage/async-storage": "^1.21.0",
     "@react-native-camera-roll/camera-roll": "5.6.0",
     "@react-native-clipboard/clipboard": "^1.13.2",
     "@react-native-community/datetimepicker": "^6.7.5",
     "@react-native-cookies/cookies": "^6.2.1",
-    "@react-native-firebase/analytics": "^18.8.0",
-    "@react-native-firebase/app": "^18.8.0",
+    "@react-native-firebase/analytics": "^18.9.0",
+    "@react-native-firebase/app": "^18.9.0",
     "@react-native-menu/menu": "^0.9.1",
     "@react-native/gradle-plugin": "^0.73.4",
-    "@react-navigation/material-top-tabs": "^6.6.6",
-    "@react-navigation/native": "^6.1.10",
-    "@react-navigation/native-stack": "^6.9.18",
-    "@react-navigation/stack": "^6.3.21",
+    "@react-navigation/material-top-tabs": "^6.6.11",
+    "@react-navigation/native": "^6.1.15",
+    "@react-navigation/native-stack": "^6.9.24",
+    "@react-navigation/stack": "^6.3.27",
     "@rneui/base": "^4.0.0-rc.5",
     "@rneui/themed": "^4.0.0-rc.5",
     "axios": "^1.6.7",
     "fbjs": "^3.0.5",
-    "i18next": "^23.8.2",
+    "i18next": "^23.10.1",
     "mobx": "^6.12.0",
     "mobx-react": "^9.1.0",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",
-    "qs": "^6.11.2",
+    "qs": "^6.12.0",
     "react": "17.0.2",
     "react-content-loader": "^6.2.1",
-    "react-i18next": "^14.0.5",
+    "react-i18next": "^14.1.0",
     "react-native": "0.68.7",
     "react-native-actionsheet": "^2.4.2",
     "react-native-animated-nav-tab-bar": "^3.1.10",
@@ -69,7 +69,7 @@
     "react-native-restart": "^0.0.24",
     "react-native-safe-area-context": "^4.9.0",
     "react-native-screens": "^3.29.0",
-    "react-native-simple-toast": "^3.2.0",
+    "react-native-simple-toast": "^3.3.0",
     "react-native-size-matters": "^0.4.2",
     "react-native-super-grid": "^5.0.0",
     "react-native-svg": "^12.5.1",
@@ -83,11 +83,11 @@
     "styled-components": "^5.3.11"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/runtime": "^7.23.9",
+    "@babel/core": "^7.24.0",
+    "@babel/runtime": "^7.24.0",
     "@react-native-community/eslint-config": "^3.2.0",
     "babel-jest": "^29.7.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "jest": "^29.7.0",
     "metro-react-native-babel-preset": "^0.77.0",
     "react-test-renderer": "17.0.2"

diff --git a/src/components/HyperlinkText.js b/src/components/HyperlinkText.js
@@ -8,6 +8,7 @@ import { openLink } from '../utils/browser';
 import Hyperlink from 'react-native-hyperlink';
 import Clipboard from '@react-native-clipboard/clipboard';
 import Toast from "react-native-toast-message";
+import { scale } from 'react-native-size-matters';
 
 const HyperlinkText = ({
     children,
@@ -51,7 +52,9 @@ const HyperlinkText = ({
         Clipboard.setString(text);
         Toast.show({
             type: 'arkToast',
-            text1: '已複製Link到粘貼板！'
+            text1: '已複製Link到粘貼板！',
+            topOffset: scale(100),
+            onPress: () => Toast.hide(),
         });
     };
 

diff --git a/src/pages/ClubSystem/login/ClubLogin.js b/src/pages/ClubSystem/login/ClubLogin.js
@@ -35,7 +35,9 @@ class ClubLogin extends Component {
         if (accountPassword.account == '' || accountPassword.password == '') {
             Toast.show({
                 type: 'warning',
-                text1: '賬號密碼輸入未完成！'
+                text1: '賬號密碼輸入未完成！',
+                topOffset: scale(100),
+                onPress: () => Toast.hide(),
             });
         } else {
             this.clubSignIn();
@@ -59,7 +61,9 @@ class ClubLogin extends Component {
             if (json.message == 'success') {
                 Toast.show({
                     type: 'arkToast',
-                    text1: 'Welcome Back ~'
+                    text1: 'Welcome Back ~',
+                    topOffset: scale(100),
+                    onPress: () => Toast.hide(),
                 });
                 handleLogin({ isClub: true, clubData: json.content, });
             }
@@ -68,14 +72,18 @@ class ClubLogin extends Component {
                 Toast.show({
                     type: 'error',
                     text1: '賬號或密碼錯誤！',
-                    text2: '登錄失敗！'
+                    text2: '登錄失敗！',
+                    topOffset: scale(100),
+                    onPress: () => Toast.hide(),
                 });
             }
         }).catch(err => {
             alert('Warning', err);
             Toast.show({
                 type: 'warning',
-                text1: '網絡錯誤！'
+                text1: '網絡錯誤！',
+                topOffset: scale(100),
+                onPress: () => Toast.hide(),
             });
         });
     }

diff --git a/src/pages/Features/Bus.js b/src/pages/Features/Bus.js
@@ -174,14 +174,18 @@ class BusScreen extends Component {
                     Toast.show({
                         type: 'warning',
                         text1: '當前沒有巴士~',
-                        text2: '[]~(￣▽￣)~* 👋'
+                        text2: '[]~(￣▽￣)~* 👋',
+                        topOffset: scale(100),
+                        onPress: () => Toast.hide(),
                     });
                 } else {
                     this.setState({ toastColor: themeColor });
                     Toast.show({
                         type: 'arkToast',
                         text1: 'Data is Loading~',
-                        text2: '幫你刷新了一下~ []~(￣▽￣)~* 👋'
+                        text2: '幫你刷新了一下~ []~(￣▽￣)~* 👋',
+                        topOffset: scale(100),
+                        onPress: () => Toast.hide(),
                     });
                 }
             })
@@ -190,6 +194,8 @@ class BusScreen extends Component {
                 Toast.show({
                     type: 'error',
                     text1: '網絡錯誤！',
+                    topOffset: scale(100),
+                    onPress: () => Toast.hide(),
                 });
             });
     };

diff --git a/src/pages/TabbarPages/arkwiki/index.js b/src/pages/TabbarPages/arkwiki/index.js
@@ -101,7 +101,8 @@ export default class ARKWiki extends Component {
         Toast.show({
             type: 'arkToast',
             text1: '正全力返回主頁！',
-            topOffset: scale(80),
+            topOffset: scale(100),
+            onPress: () => Toast.hide(),
         })
     }
 
@@ -112,7 +113,8 @@ export default class ARKWiki extends Component {
         Toast.show({
             type: 'arkToast',
             text1: '正為你打開隨機條目！',
-            topOffset: scale(80),
+            topOffset: scale(100),
+            onPress: () => Toast.hide(),
         })
     }
 
@@ -274,7 +276,8 @@ export default class ARKWiki extends Component {
                                 type: 'arkToast',
                                 text1: '已複製當前頁面鏈接到粘貼板！',
                                 text2: '快去和小夥伴分享吧~',
-                                topOffset: scale(80),
+                                topOffset: scale(100),
+                                onPress: () => Toast.hide(),
                             })
                         }}
                     >

diff --git a/src/pages/TabbarPages/what2Reg/index.js b/src/pages/TabbarPages/what2Reg/index.js
@@ -13,7 +13,7 @@ import {
     Alert,
 } from "react-native";
 
-import { UMEH_URI, UMEH_API, WHAT_2_REG, USER_AGREE, ARK_WIKI_SEARCH } from "../../../utils/pathMap";
+import { UMEH_URI, UMEH_API, WHAT_2_REG, USER_AGREE, ARK_WIKI_SEARCH, OFFICIAL_COURSE_SEARCH, } from "../../../utils/pathMap";
 import { COLOR_DIY, uiStyle, } from '../../../utils/uiMap';
 import { trigger } from '../../../utils/trigger';
 import { logToFirebase } from '../../../utils/firebaseAnalytics';
@@ -32,6 +32,7 @@ import FastImage from 'react-native-fast-image';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import TouchableScale from "react-native-touchable-scale";
 import { SafeAreaInsetsContext } from "react-native-safe-area-context";
+import { MenuView } from '@react-native-menu/menu';
 
 const { themeColor, themeColorUltraLight, black, white, viewShadow, disabled } = COLOR_DIY;
 const iconSize = scale(25);
@@ -796,23 +797,56 @@ export default class index extends Component {
                         </TouchableOpacity>
                     ) : null}
                 </View>
-                {/* ARK Wiki搜索 */}
-                <TouchableOpacity
-                    style={{
-                        backgroundColor: inputOK ? themeColor : disabled,
-                        borderRadius: scale(6),
-                        padding: scale(7), paddingHorizontal: scale(8),
-                        alignItems: 'center'
-                    }}
-                    disabled={isLoading || !inputOK}
-                    onPress={() => {
-                        trigger();
-                        let URL = ARK_WIKI_SEARCH + encodeURIComponent(inputText);
-                        this.props.navigation.navigate('Wiki', { url: URL });
+                {/* 搜索 */}
+                <MenuView
+                    onPressAction={({ nativeEvent }) => {
+                        switch (nativeEvent.event) {
+                            case 'wiki':
+                                trigger();
+                                let URL = ARK_WIKI_SEARCH + encodeURIComponent(inputText);
+                                this.props.navigation.navigate('Wiki', { url: URL });
+                                break;
+
+                            case 'official':
+                                trigger();
+                                let courseCode = encodeURIComponent(inputText);
+                                const URI = OFFICIAL_COURSE_SEARCH + courseCode;
+                                logToFirebase('checkCourse', {
+                                    courseCode: 'Official ' + courseCode,
+                                });
+                                openLink(URI);
+                                break;
+
+                            default:
+                                break;
+                        }
                     }}
+                    actions={[
+                        {
+                            id: 'wiki',
+                            title: '查 ARK Wiki !!!  ε٩(๑> ₃ <)۶з',
+                            titleColor: themeColor,
+                        },
+                        {
+                            id: 'official',
+                            title: '查 官方',
+                            titleColor: black.third,
+                        },
+                    ]}
+                    shouldOpenOnLongPress={false}
                 >
-                    <Text style={{ ...uiStyle.defaultText, fontSize: scale(12), color: white, fontWeight: 'bold' }}>搜索</Text>
-                </TouchableOpacity>
+                    <TouchableOpacity
+                        style={{
+                            backgroundColor: inputOK ? themeColor : disabled,
+                            borderRadius: scale(6),
+                            padding: scale(7), paddingHorizontal: scale(8),
+                            alignItems: 'center'
+                        }}
+                        disabled={isLoading || !inputOK}
+                    >
+                        <Text style={{ ...uiStyle.defaultText, fontSize: scale(12), color: white, fontWeight: 'bold' }}>搜索</Text>
+                    </TouchableOpacity>
+                </MenuView>
                 {/* 課程搜索按鈕 */}
                 {/* <TouchableOpacity
                     style={{