feat: improve uxui and update new logo

CP23PL1 · Apr 26, 2024 · 0d938b4 · 0d938b4
1 parent 54f8bf2
commit 0d938b4
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 46 deletions.
diff --git a/assets/adaptive-icon.png b/assets/adaptive-icon.png
diff --git a/assets/favicon.png b/assets/favicon.png
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/logo/icon.png b/assets/logo/icon.png
diff --git a/assets/logo/logo.png b/assets/logo/logo.png
diff --git a/assets/map_marker_orange.png b/assets/map_marker_orange.png
diff --git a/src/app/(protected)/signup/new-service-spot/index.tsx b/src/app/(protected)/signup/new-service-spot/index.tsx
@@ -28,7 +28,6 @@ import MapView, { Marker, PROVIDER_GOOGLE, Region } from 'react-native-maps'
 import { Alert, StyleSheet, ToastAndroid } from 'react-native'
 import { Coordinate } from '@/apis/service-spots/type'
 import { DRIVER_INFO_QUERY_KEY, useDriverInfo } from '@/hooks/useDriverInfo'
-import CustomMarkerImage from '@/components/map/CustomMarkerImage'
 import { isAxiosError } from 'axios'
 
 type Params = {
@@ -182,9 +181,10 @@ const AddAddress = () => {
             rotateEnabled={false}
             scrollEnabled={false}
           >
-            <Marker coordinate={parsedRegion}>
-              <CustomMarkerImage color="orange" />
-            </Marker>
+            <Marker
+              coordinate={parsedRegion}
+              icon={require('../../../../../assets/map_marker_orange.png')}
+            />
           </MapView>
         ) : (
           <TouchableOpacity style={styles.mapCard} onPress={openMapPicker}>

diff --git a/src/components/JobOfferModal.tsx b/src/components/JobOfferModal.tsx
@@ -6,7 +6,6 @@ import { mapUtil } from '@/utils/map'
 import Waypoint from './Waypoint'
 import { DriveRequestSession, DriveRequestSessionStatus } from '@/sockets/drive-request/type'
 import { commonUtil } from '@/utils/common'
-import CustomMarkerImage from './map/CustomMarkerImage'
 
 type Props = {
   driveRequest: DriveRequestSession | null
@@ -55,10 +54,9 @@ export default function JobOfferModal({ driveRequest, onAccepted, onRejected }:
               latitude: driveRequest.origin?.location.lat!,
               longitude: driveRequest.origin?.location.lng!,
             }}
+            icon={require('../../assets/map_marker_blue.png')}
             tracksViewChanges={false}
-          >
-            <CustomMarkerImage color="blue" />
-          </Marker>
+          />
           {points.length > 0 && (
             <Polyline coordinates={points} strokeWidth={3} strokeColor="#7C89FF" />
           )}
@@ -68,10 +66,9 @@ export default function JobOfferModal({ driveRequest, onAccepted, onRejected }:
               latitude: driveRequest.destination?.location.lat!,
               longitude: driveRequest.destination?.location.lng!,
             }}
+            icon={require('../../assets/map_marker_red.png')}
             tracksViewChanges={false}
-          >
-            <CustomMarkerImage color="red" />
-          </Marker>
+          />
         </MapView>
         <View absB absL bg-white padding-25 gap-20 style={styles.footer}>
           <View>

diff --git a/src/components/map/CustomMarkerImage.tsx b/src/components/map/CustomMarkerImage.tsx
diff --git a/src/contexts/JobContext.tsx b/src/contexts/JobContext.tsx
@@ -99,16 +99,6 @@ export default function JobContextProvider({ children }: Props) {
     driveRequestSocket.connect()
   }, [driveRequestSocket])
 
-  const value = useMemo(() => {
-    return {
-      driveRequest,
-      isOnline,
-      connectToSocket,
-      updateDriverOnlineStatus,
-      updateDriveRequestStatus,
-    }
-  }, [driveRequest, isOnline, connectToSocket, updateDriverOnlineStatus, updateDriveRequestStatus])
-
   useEffect(() => {
     driveRequestSocket.on('job-offer', handleJobOffer)
     driveRequestSocket.on('drive-request-created', handleDriveRequestCreated)
@@ -141,7 +131,15 @@ export default function JobContextProvider({ children }: Props) {
   }, [])
 
   return (
-    <JobContext.Provider value={value}>
+    <JobContext.Provider
+      value={{
+        driveRequest,
+        isOnline,
+        connectToSocket,
+        updateDriverOnlineStatus,
+        updateDriveRequestStatus,
+      }}
+    >
       {children}
       <JobOfferModal
         driveRequest={driveRequest}