Merge pull request NCUAppTeam#90 from 1989ONCE/main

地圖、活動、首頁前後端 bug修改
1989ONCE · Sep 15, 2023 · 696abe0 · 696abe0
2 parents fb72bbd + cce54a9
commit 696abe0
Show file tree

Hide file tree

Showing 33 changed files with 1,279 additions and 1,141 deletions.
diff --git a/app.json b/app.json
@@ -37,19 +37,22 @@
         "backgroundColor": "#FFFFFF"
       },
       "intentFilters": [
-      {
-        "action": "VIEW",
-        "autoVerify": true,
-        "data": [
-          {
-            "scheme": "https",
-            "host": "dynamic.link.host",
-            "pathPrefix": "/"
-          }
-        ],
-        "category": ["BROWSABLE", "DEFAULT"]
-      }
-    ]
+        {
+          "action": "VIEW",
+          "autoVerify": true,
+          "data": [
+            {
+              "scheme": "https",
+              "host": "dynamic.link.host",
+              "pathPrefix": "/"
+            }
+          ],
+          "category": [
+            "BROWSABLE",
+            "DEFAULT"
+          ]
+        }
+      ]
     },
     "web": {
       "favicon": "./assets/favicon.png"
@@ -58,6 +61,21 @@
       "eas": {
         "projectId": "b795d866-5d36-4bbb-9c46-c8d5446bbf26"
       }
-    }
+    },
+    "plugins": [
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "compileSdkVersion": 33,
+            "targetSdkVersion": 33,
+            "buildToolsVersion": "33.0.0"
+          },
+          "ios": {
+            "deploymentTarget": "13.0"
+          }
+        }
+      ]
+    ]
   }
 }
diff --git a/controller/Active.js b/controller/Active.js
@@ -388,7 +388,7 @@ async function getParticipatedActive () {
         imageUri1: result.data().imageUri1,
         startTimeWeekday: dateToWeekday(result.data().startTime),
         startTimeInNum: toDateString(result.data().startTime),
-        place: result.data().place,
+        place: result.data().place.length < 10 ? result.data().place : result.data().place.slice(0, 8) + '...',
         cost: result.data().cost,
         limitNum: result.data().limitNum,
         genre: result.data().genre,
@@ -425,7 +425,7 @@ async function getFinishedActive () {
         imageUri1: result.data().imageUri1,
         startTimeWeekday: dateToWeekday(result.data().startTime),
         startTimeInNum: toDateString(result.data().startTime),
-        place: result.data().place,
+        place: result.data().place.length < 10 ? result.data().place : result.data().place.slice(0, 8) + '...',
         cost: result.data().cost,
         limitNum: result.data().limitNum,
         genre: result.data().genre,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,8 @@
     "react-native-svg": "13.4.0",
     "react-native-tab-view": "^3.5.1",
     "react-native-webview": "11.23.1",
-    "url": "^0.11.0"
+    "url": "^0.11.0",
+    "expo-build-properties": "~0.4.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

diff --git a/screens/Event/Message.jsx b/screens/Event/Message.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import {
-  Text, SafeAreaView, RefreshControl, Image
+  Text, RefreshControl, Image
 } from 'react-native'
 import { Card } from 'react-native-paper'
 import { FontAwesome5, AntDesign, Octicons } from '@expo/vector-icons'
@@ -52,7 +52,7 @@ function Message ({ navigation }) {
     return focusHandler
   }, [])
   return (
-    <SafeAreaView style={styles.container}>
+    <Box safeArea style={styles.container}>
 
         <LinearGradient
           colors={['#1784B2', '#476685']}
@@ -69,10 +69,11 @@ function Message ({ navigation }) {
               />
             </Box>
             <Box style={styles.title}>
-              <FontAwesome5
+            <FontAwesome5
                 name="comment"
                 size={25}
                 color="#fff"
+                style={{ height: 40 }}
               >
                 <Text>&ensp;私訊中心</Text>
               </FontAwesome5>
@@ -158,7 +159,7 @@ function Message ({ navigation }) {
           />
         </Box>
 
-    </SafeAreaView>
+    </Box>
   )
 }
 export default Message
diff --git a/screens/Event/activityList.jsx b/screens/Event/activityList.jsx
@@ -154,12 +154,12 @@ function List ({ navigation }) {
             <VStack mx={4} my={2}>
               <HStack style={{ flexDirection: 'row' }}>
                 <Text flex={10} fontSize="lg" bold color="primary.600">
-                  熱門活動
+                  近期活動
                 </Text>
                 <Pressable
                   flexDirection="column-reverse"
                   onPress={() => {
-                    navigation.navigate('moreHang')
+                    navigation.navigate('more')
                   }}
                 >
                   <Text fontSize="sm" color="primary.600">