From cbe797612be0b323fdd749768e7ece6f4c137eea Mon Sep 17 00:00:00 2001 From: mfajri Date: Tue, 18 Feb 2025 14:18:12 +0700 Subject: [PATCH] update from home --- assets/icon/findmylock.png | Bin 0 -> 415 bytes assets/icon/layerList.png | Bin 0 -> 334 bytes assets/icon/mapOutline.png | Bin 0 -> 276 bytes assets/icon/openCamera.png | Bin 0 -> 1177 bytes src/component/editLinescreen.tsx | 20 ++++++------- src/component/editPolygonscreen.tsx | 22 +++++++------- src/component/editscreen.tsx | 11 +++---- src/component/mapCollectLineScreen.tsx | 34 ++++++++++++++++++---- src/component/mapCollectPolygonScreen.tsx | 24 +++++++++++++-- src/component/myAccount.tsx | 7 +++++ 10 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 assets/icon/findmylock.png create mode 100644 assets/icon/layerList.png create mode 100644 assets/icon/mapOutline.png create mode 100644 assets/icon/openCamera.png diff --git a/assets/icon/findmylock.png b/assets/icon/findmylock.png new file mode 100644 index 0000000000000000000000000000000000000000..e4cd798384479b320c162798b87e3be77708b9c4 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(ACY~;iAr*{gL%Vwq8SvDW3mZ7Oz2La};08lp z^KBq$mSMgkujz$a1Mexe4U8(2*6z^rjCE9<_a!97`rlE*1G68xnLHNeJ}k6=FNdjG z(Rxx&ulfTf+o0&8Hz&))RvqBB?6^O-Na$;H(K$2Go`OS_(mS+nxZQPRDKu!J zyett_vtP`x2XRWS9_2sVcu%XCA{R}1iiBUm!TIEo~`Pba9S^I>%kAXI}XJ2h%c(V z>8XC_y3p6!Gj4bMbuVc@UzL=dwMU{~E?lttzq)>(bwS?5j00_wPl4gd;OXk;vd$@? F2>|T0q@Vx* literal 0 HcmV?d00001 diff --git a/assets/icon/layerList.png b/assets/icon/layerList.png new file mode 100644 index 0000000000000000000000000000000000000000..0d497843368e7c45229101edac97c988691c1221 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#$DS^ZAr*{ogL8Qg8Hm^fG_-ilXz@J2S$x4t zf^R}YizkrBz`pqOu7XO>EQE8tDUCp b=@x&Hd7yO0Nhy7xcNsig{an^LB{Ts5%>RUm literal 0 HcmV?d00001 diff --git a/assets/icon/mapOutline.png b/assets/icon/mapOutline.png new file mode 100644 index 0000000000000000000000000000000000000000..0428d6caee6e0a9cebfe3108a874f66177d4e179 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#m7Xq+Ar*{oLl5#cDDdpDXjC@fn*D;UZ-MfT z#=Hj{eP9%&qjn@f!SG+zN!5V9xCe!-BJv3xwuP#BN6uYWiFo96C-BA>kr(Hr*00_B zuOic>MX5ZK=UefTi_!5p3Cdg9b$@6d5|4D$mU@zP^cI)BGw&4#-b-v^GMxN(cAb2& zxq~%a=gP7K`$x{R_#SweJ(v(ZvF{_}%bA7z-Kw8snC0xEGlN})#JhPSSBBj`33NOI NgQu&X%Q~loCIC}YV59&5 literal 0 HcmV?d00001 diff --git a/assets/icon/openCamera.png b/assets/icon/openCamera.png new file mode 100644 index 0000000000000000000000000000000000000000..8fe6bc23b2efe072e9b8f42fb2bd53dca255682b GIT binary patch literal 1177 zcmV;K1ZMk*P)O3ESxsYam)*P$Y)DO4@niY$s$p`uVxq3+_18JkVA!($dWTUd~= zKnONQ0*M9TBZZ#?Atopyi`YTRM`U3eiC|AG818w=n6aIVCm~0A{=B(!&%1B#J@1Z0 z4iE?gl=}L5pG4Hd<1kOP@laMTXL*bpLUFqoP zApWMNrY34=Xb?8}e4gg#=V^h*n4%@4zrQMOalYL?aPnZf?%lEYj(;p|KD6azx6JUcPbt zx{=G}jBiEm<45Dl@UQ`&RU?JrRs(^QM_yz82nB;DIcXyQo;pRcEEf&3{LJ#YUQDLV zpq&#k@#dmZB8?HGiYsXB~(a#ZEXPmMLF^Qr-B@{mH67#t7|&=`}lEsJuxAM6+iCX zD~26VYUedAo7453a`?=d9u|d)XiX<92;v*UVWPRYxr77`v5>;@GS$}At=MeeF6^uT z2ZU%kne@r5O20vo%3(TQeD|*8f6*xqE1o@hLQ_*yUnh7We;z$bjg5^ZcHl}TlRYx; z^}ZI~|Mj5oDkZ5>;0lETEq(Y*d7lyLRFE9!A~xT5X6qAu8sk z-n?1aS|$hJ{CAesa+0;+QAAR=A*&U;8htr7CQ8Z#o;l{Q)!l~<(SfcmF@KNs8PB*H zP+H)Ws~Kj}>5~6=j!2SUnbZU##n#Tw&Xy#h9T0IAN1IbX$-dvQqh!uZw56q`s`uw} zIpM~|N7oF>!6^`(ndv4Fsd=p$78VwWkK1tv7l0(Xed`w8jK{MqkKsr( zIj+(g5HZR1&26}P%Omy3Ij5z-|8z&mP=+(*Yy}9yPj`bVk^)hp%?;*WVK_(oxBQ)^^Z(o?lZb%tR00000NkvXXu0mjfQUD}^ literal 0 HcmV?d00001 diff --git a/src/component/editLinescreen.tsx b/src/component/editLinescreen.tsx index 1a52183..44baa2d 100644 --- a/src/component/editLinescreen.tsx +++ b/src/component/editLinescreen.tsx @@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react'; import {View,Text, StyleSheet, ScrollView, TouchableOpacity, Image, Animated, TextInput, Button, Alert} from 'react-native'; import MapLibreGL from '@maplibre/maplibre-react-native'; +import { MapView,ShapeSource,Camera,UserLocation,PointAnnotation,FillLayer,LineLayer,VectorSource } from "@maplibre/maplibre-react-native"; import { SelectList } from 'react-native-dropdown-select-list'; import { RadioButton } from 'react-native-paper'; import DatePicker from 'react-native-date-picker'; @@ -378,7 +379,7 @@ export default function EditLineScreen({route,navigation}:collectLineScreenProps - - - - - + { coordinates.map((item:any,index:number)=>( - } key={index} id={String(index)} @@ -466,7 +466,7 @@ export default function EditLineScreen({route,navigation}:collectLineScreenProps /> )) } - + {!secondPress ? {navigation.navigate('Map View Line', { screen: 'Map View Line',data: { id:data.id, diff --git a/src/component/editPolygonscreen.tsx b/src/component/editPolygonscreen.tsx index 39b666b..88c87c9 100644 --- a/src/component/editPolygonscreen.tsx +++ b/src/component/editPolygonscreen.tsx @@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react'; import {View,Text, StyleSheet, ScrollView, TouchableOpacity, Image, Animated, TextInput, Button, Alert} from 'react-native'; import {useNavigation,NavigationContainer,useIsFocused} from '@react-navigation/native'; import MapLibreGL from '@maplibre/maplibre-react-native'; +import { MapView,ShapeSource,Camera,UserLocation,PointAnnotation,FillLayer,LineLayer,VectorSource } from "@maplibre/maplibre-react-native"; import { SelectList } from 'react-native-dropdown-select-list'; import { RadioButton } from 'react-native-paper'; import DatePicker from 'react-native-date-picker'; @@ -420,15 +421,14 @@ export default function EditPolygonScreen({route,navigation}:EditPolygonScreenPr }} /> - - - - - - + : null @@ -474,7 +474,7 @@ export default function EditPolygonScreen({route,navigation}:EditPolygonScreenPr { coordinates.map((item:any,index:number)=>( - - + )) } - + {!secondPress ? {navigation.navigate('Map View Polygon', { screen: 'Map View Polygon',data: { id:data.id, diff --git a/src/component/editscreen.tsx b/src/component/editscreen.tsx index 78b1a47..8fce18c 100644 --- a/src/component/editscreen.tsx +++ b/src/component/editscreen.tsx @@ -26,6 +26,7 @@ import { import RNFS from 'react-native-fs'; import MapLibreGL from '@maplibre/maplibre-react-native'; + import { MapView,ShapeSource,Camera,UserLocation,PointAnnotation,FillLayer,LineLayer,VectorSource } from "@maplibre/maplibre-react-native"; import Moment from 'moment'; import { RadioButton } from 'react-native-paper'; import AwesomeAlert from 'react-native-awesome-alerts'; @@ -432,27 +433,27 @@ function EditScreen({route,navigation}: editScreenProps) { }} /> - - } id={"pjuCoordinate"} coordinate={[long, lat]} /> - - + navigation.navigate('MapView', { screen: 'MapView',data: { id:data.id, nama:pju_name, diff --git a/src/component/mapCollectLineScreen.tsx b/src/component/mapCollectLineScreen.tsx index 956da4b..e1a4a21 100644 --- a/src/component/mapCollectLineScreen.tsx +++ b/src/component/mapCollectLineScreen.tsx @@ -1,5 +1,5 @@ import React, {useState, useEffect} from "react"; -import { View, Text, StyleSheet, Alert, TouchableOpacity, Image } from "react-native"; +import { View, Text, StyleSheet, Alert, TouchableOpacity, Image, StatusBar } from "react-native"; import MapLibreGL from '@maplibre/maplibre-react-native'; import { MapView,ShapeSource,Camera,UserLocation,PointAnnotation,FillLayer,LineLayer,VectorSource } from "@maplibre/maplibre-react-native"; @@ -108,13 +108,17 @@ function MapCollectLineScreen({route,navigation}:MapCollectLineProps):React.JSX. return( + + + setZoom(region.properties.zoomLevel) } + compassEnabled={false} > + + + + + + + + + + + - {/* Widget Map */} - + {/* handleZoom(true)}> - + */} + { startPoint.length === 0 ? currentPosition.length > 0 ? diff --git a/src/component/mapCollectPolygonScreen.tsx b/src/component/mapCollectPolygonScreen.tsx index 2a8e045..7183cb3 100644 --- a/src/component/mapCollectPolygonScreen.tsx +++ b/src/component/mapCollectPolygonScreen.tsx @@ -1,5 +1,5 @@ import React, {useState, useEffect, useRef} from "react"; -import { View, Text, StyleSheet, Alert, TouchableOpacity, Image } from "react-native"; +import { View, Text, StyleSheet, Alert, TouchableOpacity, Image, StatusBar } from "react-native"; import MapLibreGL from '@maplibre/maplibre-react-native'; import { MapView,ShapeSource,Camera,UserLocation,PointAnnotation,FillLayer,LineLayer,VectorSource } from "@maplibre/maplibre-react-native"; @@ -123,8 +123,10 @@ function MapCollectPolygonScreen({route,navigation}:MapCollectPolygonProps):Reac return( + + @@ -198,6 +200,24 @@ function MapCollectPolygonScreen({route,navigation}:MapCollectPolygonProps):Reac } + + + + + + + + + {/* Widget Map */} handleZoom(true)}> diff --git a/src/component/myAccount.tsx b/src/component/myAccount.tsx index aa880a6..7cd9e9f 100644 --- a/src/component/myAccount.tsx +++ b/src/component/myAccount.tsx @@ -30,7 +30,14 @@ export default function MyAccount() { source={require('../../assets/img/mcf.jpg')} style={[{width:131,height:131,borderRadius:100}]} /> + + + +