From 4d15e98eb0697f8ac8b41596c859e853886e313d Mon Sep 17 00:00:00 2001 From: Thomasdelecluse <81568452+Thomasdelecluse@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:02:03 +0200 Subject: [PATCH] feat: add custom pin to map --- apps/expo/assets/location.png | Bin 0 -> 3383 bytes apps/expo/assets/locationpin.png | Bin 0 -> 17275 bytes apps/expo/assets/userPin.png | Bin 0 -> 11986 bytes apps/expo/src/component/CustomMarker.js | 12 +++-- apps/expo/src/component/EventCard.js | 56 ++++++++++++++---------- apps/expo/src/pages/MapScreen.js | 16 +++++-- 6 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 apps/expo/assets/location.png create mode 100644 apps/expo/assets/locationpin.png create mode 100644 apps/expo/assets/userPin.png diff --git a/apps/expo/assets/location.png b/apps/expo/assets/location.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3db571202daa9b8701c112d145716acd7ef1d1 GIT binary patch literal 3383 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 N002ovPDHLkV1j-sPVWE! literal 0 HcmV?d00001 diff --git a/apps/expo/assets/locationpin.png b/apps/expo/assets/locationpin.png new file mode 100644 index 0000000000000000000000000000000000000000..4255dd3a6ebbaafc3420d25514afad107212b091 GIT binary patch literal 17275 zcmXwhcRbba`~Q9HlyQut%p(~UEoH^Q5hW{oSA>%7*yBiYP)10Sbs{@Ed(Tu>p=2B* z>)4x&?|t5%-|vsq!~MF)HSg=buIE*#mWB!g{b_mt0K;un%sl`o;6Et<9S!_z!}I4J z{Og#Ls*x)IjLqafh<3*;EBH%JH)TUN9YM^kc*N>%?zXRXyV@MTz@2gN0{xSp%o3p&KU@6Fx_tSa;Yk@~wuRdB z()1`jHtKXd-9T%E8QTK8Hd0GFhpu>`@AL9EKmUOHEP_8r61FwjNA6HldXzEv~9SA_T zmfCT!n{r06mpBvf=^0@S{(M20fIpGSQedZtJ}{QT@SAAmeS|a215)P91302G_fTCCu?R(K*H18gIO4?^-4Pl>|lZ5!fk(xwNjj(+(Qu!(e zaY3i|FU795-v!*Pi}r3Whf!2gQZ4aCK*tl3Dj{nUpkozQXFAs{Lw`B;uS+ZSDpS=5 zKNLs*F)V-d>ogcsy2KGCH8D4gVR5}ASzWsNk+>}-z55;{8(z!hgiVL{; zYxukCQR~yMgl>moS+%2_0pF0SZ_aes{FbDudBadEp6VU%y^oshKshZPA z)p;e1D0&t~fB_SldT#j8ZB1&8=M$HRGd?q4*d@Ry&C1L8jg;z2yU{BoK9n675H5xv zVk1N%3>5frL5=lHz5H);b9AoFvA0%Fca?SV7dP;FvWb+-8;vNpinB#43j5oQC zfnW7?Q(JB&U0z6F>4b7z$ep`l!4nu@G;otmqz*WWUYd9l<7z<+4r03nKhd2~9{Lro zmy#By2KKwELg*TNfk1z^AK$26XPzbgGdtWV*uPtMapIpOQ_c*cudgb^mUTd6#q(QC z^}pm;nQrM9wsw+0E44LKm+Qic!*ik|ane(S%NK~}>`+b!&G^C7luE&^qR6LdiXnmh z=BnTA8OJ^7i}-ag@0EWOMK*o0RJol5*JXQ)(+%b7EJd?-##PzSM{g%g>foVcki z_9(qmvB$Mf`-w#%%HO|UKTC@!ZbRU{W#tSX>VChS<9!@go9~0aGV7{cdGMy`y^R!I z6gwlZLLKV1rVxFC5M0(HidHJ}TWo`)eP!b&1A=Tf;p!ju*!32Z*)}Mh=yzr!Z7Ex? zF}eJ`Xy$5TlBwmkLVM{EX1^CJ^Tb`l0&qOjTof3JrJ`beBFM?>TK(Wb1G%0@tUc=a6s@8$mmqhCV~$A}|~C zH!!R=(J%#a(BC`l1X5$e<&A2~_YQ3Vtw}kv6w!=#H2A>N4`iI81$Pp1g&u!stJE9J zBGLe(grDW`ovI*| zHsXr>(g&npG=)$C`|>*FexJ~J4Eo4+L=m&osZ;N>UwSJAu3rJqZhtc6lhI*kXD+DZ zuIY#rR(*n~{2DWCGGUg{1{Z)PVjoi%sqYbeApphp�Wa*Bb9X*SO5HJhbCVVxxy# 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 literal 0 HcmV?d00001 diff --git a/apps/expo/src/component/CustomMarker.js b/apps/expo/src/component/CustomMarker.js index c3d8c81..2f6e741 100644 --- a/apps/expo/src/component/CustomMarker.js +++ b/apps/expo/src/component/CustomMarker.js @@ -1,15 +1,21 @@ import React from 'react'; +import { Image } from 'react-native'; import { Marker } from 'react-native-maps'; -const CustomMarker = ({ coordinate, title, description, onPress, pinColor = "red" }) => { +const CustomMarker = ({ coordinate, title, description, onPress, pinImage, height, width}) => { return ( + > + + ); }; diff --git a/apps/expo/src/component/EventCard.js b/apps/expo/src/component/EventCard.js index 413fd94..05c5118 100644 --- a/apps/expo/src/component/EventCard.js +++ b/apps/expo/src/component/EventCard.js @@ -1,13 +1,18 @@ import React from 'react'; import { View, Text, Image, StyleSheet } from 'react-native'; +const locationIcon = require('../../assets/location.png'); // Ton image d'icône de localisation + const EventCard = ({ city, groupName, imageSource }) => { return ( - - {city} : - {groupName} + + {groupName} + + + {city} + ); @@ -15,32 +20,37 @@ const EventCard = ({ city, groupName, imageSource }) => { const styles = StyleSheet.create({ cardContainer: { - flexDirection: 'row', - alignItems: 'center', - backgroundColor: '#b9f8f4', - borderRadius: 20, - marginBottom: 25, - padding: 15, + marginBottom: 20, + borderRadius: 10, + overflow: 'hidden', + backgroundColor: 'rgba(255,255,255,0.67)', }, image: { - width: 45, - height: 45, - borderRadius: 40, - marginRight: 20, + width: '100%', + height: 150, + }, + infoContainer: { + padding: 10, + justifyContent: 'center', + }, + cityContainer: { + flexDirection: 'row', // Permet d'aligner l'icône et le texte côte à côte + alignItems: 'center', // Centrer verticalement }, - textContainer: { - flex: 1, - flexDirection:"row", + locationImage: { + width: 20, + height: 20, + marginRight: 8, // Ajouter un espacement entre l'image et le texte }, cityText: { - fontSize: 22, - color: '#fff', - fontWeight: 'bold', + color: 'rgba(180,180,180,0.73)', + fontSize: 16, }, - groupText: { - fontSize: 22, - color: '#fff', - fontWeight: 'bold', + groupName: { + color: '#1B1464', + fontSize: 19, + marginTop: 5, + fontWeight: "bold", }, }); diff --git a/apps/expo/src/pages/MapScreen.js b/apps/expo/src/pages/MapScreen.js index fcb2068..de8b820 100644 --- a/apps/expo/src/pages/MapScreen.js +++ b/apps/expo/src/pages/MapScreen.js @@ -6,6 +6,8 @@ import CustomMarker from '../../src/component/CustomMarker'; // Image personnalisée const PopupImage = require('../../assets/logo.png'); +const UserImagePin = require('../../assets/userPin.png'); +const LocationImagePin = require('../../assets/locationPin.png'); const MapScreen = () => { const [region, setRegion] = useState({ @@ -68,7 +70,9 @@ const MapScreen = () => { coordinate={userLocation} title="Votre position actuelle" description="Vous êtes ici" - pinColor="blue" + height={45} + width={45} + pinImage={UserImagePin} onPress={() => handleMarkerPress({ title: "Votre position actuelle", description: "Vous êtes ici", @@ -84,6 +88,9 @@ const MapScreen = () => { }} title="Exo" description="Kpop" + pinImage={LocationImagePin} + height={35} + width={35} onPress={() => handleMarkerPress({ title: "Exo", description: "Heures : 17h", @@ -93,11 +100,14 @@ const MapScreen = () => { handleMarkerPress({ title: "Poab", description: "Heures : 18h",