diff --git a/android/app/src/main/java/com/danovin/MainApplication.java b/android/app/src/main/java/com/danovin/MainApplication.java index 63826fe..580abf7 100644 --- a/android/app/src/main/java/com/danovin/MainApplication.java +++ b/android/app/src/main/java/com/danovin/MainApplication.java @@ -1,5 +1,4 @@ package com.danovin; - import android.app.Application; import android.content.Context; import com.facebook.react.PackageList; @@ -12,6 +11,8 @@ import com.facebook.soloader.SoLoader; import com.danovin.newarchitecture.MainApplicationReactNativeHost; import java.lang.reflect.InvocationTargetException; import java.util.List; +import com.mapbox.rctmgl.RCTMGLPackage; + public class MainApplication extends Application implements ReactApplication { @@ -26,6 +27,7 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { @SuppressWarnings("UnnecessaryLocalVariable") List packages = new PackageList(this).getPackages(); + packages.add(new RCTMGLPackage()); // Packages that cannot be autolinked yet can be added manually here, for example: // packages.add(new MyReactNativePackage()); return packages; diff --git a/android/build.gradle b/android/build.gradle index 0e9977a..6d70f2c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,4 @@ -import org.apache.tools.ant.taskdefs.condition.Os +import org.apache.tools.ant.taskdefs.condition.OS // Top-level build file where you can add configuration options common to all sub-projects/modules. @@ -31,6 +31,9 @@ buildscript { } allprojects { + dependencies { + implementation project(':@react-native-mapbox-gl_maps') + } repositories { maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm diff --git a/android/settings.gradle b/android/settings.gradle index 8ddfb2b..01bde75 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,7 +1,10 @@ rootProject.name = 'danovin' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' -includeBuild('../node_modules/react-native-gradle-plugin') + +// map +include ':@react-native-mapbox-gl_maps' +project(':@react-native-mapbox-gl_maps').projectDir = new File(rootProject.projectDir, '../node_modules/mapir-mapbox/android/rctmgl') if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { include(":ReactAndroid") diff --git a/ios/Podfile b/ios/Podfile index 9f22c75..ea90c59 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -6,12 +6,9 @@ install! 'cocoapods', :deterministic_uuids => false target 'danovin' do config = use_native_modules! - permissions_path = '../node_modules/react-native-permissions/ios' - pod 'Permission-Camera', :path => "#{permissions_path}/Camera" # Flags change depending on the env values. flags = get_default_flags() - use_react_native!( :path => config[:reactNativePath], # to enable hermes on iOS, change `false` to `true` and then install pods @@ -20,6 +17,9 @@ target 'danovin' do # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) + pod 'react-native-mapbox-gl', :path => '../node_modules/mapir-mapbox' + permissions_path = '../node_modules/react-native-permissions/ios' + pod 'Permission-Camera', :path => "#{permissions_path}/Camera" target 'danovinTests' do inherit! :complete diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e463100..ec87ac5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -75,6 +75,8 @@ PODS: - glog (0.3.5) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) + - Permission-Camera (3.3.1): + - RNPermissions - RCT-Folly (2021.06.28.00-v2): - boost - DoubleConversion @@ -282,12 +284,27 @@ PODS: - React-jsinspector (0.68.2) - React-logger (0.68.2): - glog + - react-native-camera (4.2.1): + - React-Core + - react-native-camera/RCT (= 4.2.1) + - react-native-camera/RN (= 4.2.1) + - react-native-camera/RCT (4.2.1): + - React-Core + - react-native-camera/RN (4.2.1): + - React-Core + - react-native-mapbox-gl (2.0.6): + - React - react-native-safe-area-context (4.2.5): - RCT-Folly - RCTRequired - RCTTypeSafety - React - ReactCommon/turbomodule/core + - react-native-video (5.1.1): + - React-Core + - react-native-video/Video (= 5.1.1) + - react-native-video/Video (5.1.1): + - React-Core - React-perflogger (0.68.2) - React-RCTActionSheet (0.68.2): - React-Core/RCTActionSheetHeaders (= 0.68.2) @@ -353,6 +370,10 @@ PODS: - React-jsi (= 0.68.2) - React-logger (= 0.68.2) - React-perflogger (= 0.68.2) + - RNCAsyncStorage (1.17.6): + - React-Core + - RNPermissions (3.3.1): + - React-Core - RNScreens (3.10.2): - React-Core - React-RCTImage @@ -391,6 +412,7 @@ DEPENDENCIES: - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - OpenSSL-Universal (= 1.1.1100) + - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -406,7 +428,10 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - react-native-camera (from `../node_modules/react-native-camera`) + - react-native-mapbox-gl (from `../node_modules/mapir-mapbox`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - react-native-video (from `../node_modules/react-native-video`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) @@ -419,6 +444,8 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) + - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" + - RNPermissions (from `../node_modules/react-native-permissions`) - RNScreens (from `../node_modules/react-native-screens`) - RNSVG (from `../node_modules/react-native-svg`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -452,6 +479,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + Permission-Camera: + :path: "../node_modules/react-native-permissions/ios/Camera" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -478,8 +507,14 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" + react-native-camera: + :path: "../node_modules/react-native-camera" + react-native-mapbox-gl: + :path: "../node_modules/mapir-mapbox" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" + react-native-video: + :path: "../node_modules/react-native-video" React-perflogger: :path: "../node_modules/react-native/ReactCommon/reactperflogger" React-RCTActionSheet: @@ -504,6 +539,10 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" ReactCommon: :path: "../node_modules/react-native/ReactCommon" + RNCAsyncStorage: + :path: "../node_modules/@react-native-async-storage/async-storage" + RNPermissions: + :path: "../node_modules/react-native-permissions" RNScreens: :path: "../node_modules/react-native-screens" RNSVG: @@ -530,6 +569,7 @@ SPEC CHECKSUMS: glog: 476ee3e89abb49e07f822b48323c51c57124b572 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c + Permission-Camera: bae27a8503530770c35aadfecbb97ec71823382a RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e @@ -543,7 +583,10 @@ SPEC CHECKSUMS: React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6 React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8 React-logger: a0833912d93b36b791b7a521672d8ee89107aff1 + react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f + react-native-mapbox-gl: 80e6a70380f3dea6e8087fce0e08354267258562 react-native-safe-area-context: ebf8c413eb8b5f7c392a036a315eb7b46b96845f + react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6 React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162 React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034 @@ -556,12 +599,14 @@ SPEC CHECKSUMS: React-RCTVibration: 79040b92bfa9c3c2d2cb4f57e981164ec7ab9374 React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23 ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2 + RNCAsyncStorage: 466b9df1a14bccda91da86e0b7d9a345d78e1673 + RNPermissions: 34d678157c800b25b22a488e4d8babb57456e796 RNScreens: d6da2b9e29cf523832c2542f47bf1287318b1868 RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: d2c5095ac356c634b6cd7f5a0212b96c024236e5 +PODFILE CHECKSUM: 4fee5a3104bd087ed1a33fd7eb1fa215deccfac0 COCOAPODS: 1.11.3 diff --git a/ios/danovin.xcodeproj/project.pbxproj b/ios/danovin.xcodeproj/project.pbxproj index 33e9c93..50fed72 100644 --- a/ios/danovin.xcodeproj/project.pbxproj +++ b/ios/danovin.xcodeproj/project.pbxproj @@ -9,29 +9,29 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* danovinTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* danovinTests.m */; }; 0C80B921A6F3F58F76C31292 /* libPods-danovin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-danovin.a */; }; + 0D3B4E6AA10C4181A8D2F5CB /* DemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A999215887E34C838769D997 /* DemiBold.ttf */; }; + 139DEAF0677E46CFAF61A5F0 /* IRANSansXFaNum-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E5502C1A31D540EB8DF248FD /* IRANSansXFaNum-Thin.ttf */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 5C26EF8AEA70480FBCB3040E /* Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C8DC746391F94500A2D79CCE /* Black.ttf */; }; + 703E71E573DD4A2AA8F1C5AD /* Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E9A83619AC9F4F8A90697B9A /* Light.ttf */; }; + 7251F7E46E7E4E6685A60DF1 /* Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC10AC1305C6495F927191B6 /* Bold.ttf */; }; 7699B88040F8A987B510C191 /* libPods-danovin-danovinTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-danovin-danovinTests.a */; }; + 78C4A552D9694F66A92144B3 /* DemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4495D58757C94B5192566B3B /* DemiBold.ttf */; }; + 7F0056980F674693A0FBA22A /* IRANSansXFaNum-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 67B3F1BF1F5B45C1AD0FAB20 /* IRANSansXFaNum-ExtraBold.ttf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; 93736F74389049E686D73FB7 /* Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1B4ABCF29065461C955285DF /* Black.ttf */; }; - 7251F7E46E7E4E6685A60DF1 /* Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC10AC1305C6495F927191B6 /* Bold.ttf */; }; - 0D3B4E6AA10C4181A8D2F5CB /* DemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A999215887E34C838769D997 /* DemiBold.ttf */; }; - F8F44EE8BEFE42439C3B24B5 /* IRANSansXFaNum-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9D7A28BE37DC40DB85896107 /* IRANSansXFaNum-ExtraBold.ttf */; }; - 139DEAF0677E46CFAF61A5F0 /* IRANSansXFaNum-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E5502C1A31D540EB8DF248FD /* IRANSansXFaNum-Thin.ttf */; }; - D888F8820B9346E583573250 /* IRANSansXFaNum-UltraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E5FE9F8800449458A43AD02 /* IRANSansXFaNum-UltraLight.ttf */; }; - 703E71E573DD4A2AA8F1C5AD /* Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E9A83619AC9F4F8A90697B9A /* Light.ttf */; }; - E1FA0ABE74D64829ABBAFFDD /* Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5227AEEAB97A442085F19EC6 /* Medium.ttf */; }; 9ED634E8EC36402CB1C8D6B6 /* Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FBD4476700224FAAB544816F /* Regular.ttf */; }; - 5C26EF8AEA70480FBCB3040E /* Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C8DC746391F94500A2D79CCE /* Black.ttf */; }; - C71B5FC4A9D342E8820F59D2 /* Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 519C9B2CF76444379C10BFEF /* Bold.ttf */; }; - 78C4A552D9694F66A92144B3 /* DemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4495D58757C94B5192566B3B /* DemiBold.ttf */; }; - 7F0056980F674693A0FBA22A /* IRANSansXFaNum-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 67B3F1BF1F5B45C1AD0FAB20 /* IRANSansXFaNum-ExtraBold.ttf */; }; - D3E2A570A35B4D9EB36D377E /* IRANSansXFaNum-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C43D1347FEC84662919C3620 /* IRANSansXFaNum-Thin.ttf */; }; + B08928931D154C49ADC9A577 /* Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 54C306EE82D1490CBD9F579F /* Regular.ttf */; }; C1617783A85F4170BA586FC7 /* IRANSansXFaNum-UltraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AAE2B24E772D4A098573322D /* IRANSansXFaNum-UltraLight.ttf */; }; + C71B5FC4A9D342E8820F59D2 /* Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 519C9B2CF76444379C10BFEF /* Bold.ttf */; }; C9A80B7A0B7949E3A124A2F1 /* Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FE34D0BDBBCE496D9B125E28 /* Light.ttf */; }; CEA7F2AD55534051BBCBA720 /* Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 55BD2459095C46FBB4E96BDF /* Medium.ttf */; }; - B08928931D154C49ADC9A577 /* Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 54C306EE82D1490CBD9F579F /* Regular.ttf */; }; + D3E2A570A35B4D9EB36D377E /* IRANSansXFaNum-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C43D1347FEC84662919C3620 /* IRANSansXFaNum-Thin.ttf */; }; + D888F8820B9346E583573250 /* IRANSansXFaNum-UltraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E5FE9F8800449458A43AD02 /* IRANSansXFaNum-UltraLight.ttf */; }; + E1FA0ABE74D64829ABBAFFDD /* Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5227AEEAB97A442085F19EC6 /* Medium.ttf */; }; + F8F44EE8BEFE42439C3B24B5 /* IRANSansXFaNum-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9D7A28BE37DC40DB85896107 /* IRANSansXFaNum-ExtraBold.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -55,31 +55,31 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = danovin/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = danovin/main.m; sourceTree = ""; }; 19F6CBCC0A4E27FBF8BF4A61 /* libPods-danovin-danovinTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-danovin-danovinTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1B4ABCF29065461C955285DF /* Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Black.ttf; path = ../src/assets/fonts/Black.ttf; sourceTree = ""; }; 3B4392A12AC88292D35C810B /* Pods-danovin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-danovin.debug.xcconfig"; path = "Target Support Files/Pods-danovin/Pods-danovin.debug.xcconfig"; sourceTree = ""; }; + 4495D58757C94B5192566B3B /* DemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = DemiBold.ttf; path = ../assets/fonts/DemiBold.ttf; sourceTree = ""; }; + 4E5FE9F8800449458A43AD02 /* IRANSansXFaNum-UltraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "IRANSansXFaNum-UltraLight.ttf"; path = "../src/assets/fonts/IRANSansXFaNum-UltraLight.ttf"; sourceTree = ""; }; + 519C9B2CF76444379C10BFEF /* Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Bold.ttf; path = ../assets/fonts/Bold.ttf; sourceTree = ""; }; + 5227AEEAB97A442085F19EC6 /* Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Medium.ttf; path = ../src/assets/fonts/Medium.ttf; sourceTree = ""; }; + 54C306EE82D1490CBD9F579F /* Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Regular.ttf; path = ../assets/fonts/Regular.ttf; sourceTree = ""; }; + 55BD2459095C46FBB4E96BDF /* Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Medium.ttf; path = ../assets/fonts/Medium.ttf; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-danovin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-danovin.release.xcconfig"; path = "Target Support Files/Pods-danovin/Pods-danovin.release.xcconfig"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-danovin-danovinTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-danovin-danovinTests.debug.xcconfig"; path = "Target Support Files/Pods-danovin-danovinTests/Pods-danovin-danovinTests.debug.xcconfig"; sourceTree = ""; }; 5DCACB8F33CDC322A6C60F78 /* libPods-danovin.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-danovin.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 67B3F1BF1F5B45C1AD0FAB20 /* IRANSansXFaNum-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "IRANSansXFaNum-ExtraBold.ttf"; path = "../assets/fonts/IRANSansXFaNum-ExtraBold.ttf"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = danovin/LaunchScreen.storyboard; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-danovin-danovinTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-danovin-danovinTests.release.xcconfig"; path = "Target Support Files/Pods-danovin-danovinTests/Pods-danovin-danovinTests.release.xcconfig"; sourceTree = ""; }; + 9D7A28BE37DC40DB85896107 /* IRANSansXFaNum-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "IRANSansXFaNum-ExtraBold.ttf"; path = "../src/assets/fonts/IRANSansXFaNum-ExtraBold.ttf"; sourceTree = ""; }; + A999215887E34C838769D997 /* DemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = DemiBold.ttf; path = ../src/assets/fonts/DemiBold.ttf; sourceTree = ""; }; + AAE2B24E772D4A098573322D /* IRANSansXFaNum-UltraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "IRANSansXFaNum-UltraLight.ttf"; path = "../assets/fonts/IRANSansXFaNum-UltraLight.ttf"; sourceTree = ""; }; + BC10AC1305C6495F927191B6 /* Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Bold.ttf; path = ../src/assets/fonts/Bold.ttf; sourceTree = ""; }; + C43D1347FEC84662919C3620 /* IRANSansXFaNum-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "IRANSansXFaNum-Thin.ttf"; path = "../assets/fonts/IRANSansXFaNum-Thin.ttf"; sourceTree = ""; }; + C8DC746391F94500A2D79CCE /* Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Black.ttf; path = ../assets/fonts/Black.ttf; sourceTree = ""; }; + E5502C1A31D540EB8DF248FD /* IRANSansXFaNum-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "IRANSansXFaNum-Thin.ttf"; path = "../src/assets/fonts/IRANSansXFaNum-Thin.ttf"; sourceTree = ""; }; + E9A83619AC9F4F8A90697B9A /* Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Light.ttf; path = ../src/assets/fonts/Light.ttf; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - 1B4ABCF29065461C955285DF /* Black.ttf */ = {isa = PBXFileReference; name = "Black.ttf"; path = "../src/assets/fonts/Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - BC10AC1305C6495F927191B6 /* Bold.ttf */ = {isa = PBXFileReference; name = "Bold.ttf"; path = "../src/assets/fonts/Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - A999215887E34C838769D997 /* DemiBold.ttf */ = {isa = PBXFileReference; name = "DemiBold.ttf"; path = "../src/assets/fonts/DemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 9D7A28BE37DC40DB85896107 /* IRANSansXFaNum-ExtraBold.ttf */ = {isa = PBXFileReference; name = "IRANSansXFaNum-ExtraBold.ttf"; path = "../src/assets/fonts/IRANSansXFaNum-ExtraBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - E5502C1A31D540EB8DF248FD /* IRANSansXFaNum-Thin.ttf */ = {isa = PBXFileReference; name = "IRANSansXFaNum-Thin.ttf"; path = "../src/assets/fonts/IRANSansXFaNum-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 4E5FE9F8800449458A43AD02 /* IRANSansXFaNum-UltraLight.ttf */ = {isa = PBXFileReference; name = "IRANSansXFaNum-UltraLight.ttf"; path = "../src/assets/fonts/IRANSansXFaNum-UltraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - E9A83619AC9F4F8A90697B9A /* Light.ttf */ = {isa = PBXFileReference; name = "Light.ttf"; path = "../src/assets/fonts/Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 5227AEEAB97A442085F19EC6 /* Medium.ttf */ = {isa = PBXFileReference; name = "Medium.ttf"; path = "../src/assets/fonts/Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - FBD4476700224FAAB544816F /* Regular.ttf */ = {isa = PBXFileReference; name = "Regular.ttf"; path = "../src/assets/fonts/Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - C8DC746391F94500A2D79CCE /* Black.ttf */ = {isa = PBXFileReference; name = "Black.ttf"; path = "../assets/fonts/Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 519C9B2CF76444379C10BFEF /* Bold.ttf */ = {isa = PBXFileReference; name = "Bold.ttf"; path = "../assets/fonts/Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 4495D58757C94B5192566B3B /* DemiBold.ttf */ = {isa = PBXFileReference; name = "DemiBold.ttf"; path = "../assets/fonts/DemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 67B3F1BF1F5B45C1AD0FAB20 /* IRANSansXFaNum-ExtraBold.ttf */ = {isa = PBXFileReference; name = "IRANSansXFaNum-ExtraBold.ttf"; path = "../assets/fonts/IRANSansXFaNum-ExtraBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - C43D1347FEC84662919C3620 /* IRANSansXFaNum-Thin.ttf */ = {isa = PBXFileReference; name = "IRANSansXFaNum-Thin.ttf"; path = "../assets/fonts/IRANSansXFaNum-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - AAE2B24E772D4A098573322D /* IRANSansXFaNum-UltraLight.ttf */ = {isa = PBXFileReference; name = "IRANSansXFaNum-UltraLight.ttf"; path = "../assets/fonts/IRANSansXFaNum-UltraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - FE34D0BDBBCE496D9B125E28 /* Light.ttf */ = {isa = PBXFileReference; name = "Light.ttf"; path = "../assets/fonts/Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 55BD2459095C46FBB4E96BDF /* Medium.ttf */ = {isa = PBXFileReference; name = "Medium.ttf"; path = "../assets/fonts/Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 54C306EE82D1490CBD9F579F /* Regular.ttf */ = {isa = PBXFileReference; name = "Regular.ttf"; path = "../assets/fonts/Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + FBD4476700224FAAB544816F /* Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Regular.ttf; path = ../src/assets/fonts/Regular.ttf; sourceTree = ""; }; + FE34D0BDBBCE496D9B125E28 /* Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = Light.ttf; path = ../assets/fonts/Light.ttf; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -186,7 +186,7 @@ sourceTree = ""; }; C1B031AFDB814042BD3B84B8 /* Resources */ = { - isa = "PBXGroup"; + isa = PBXGroup; children = ( 1B4ABCF29065461C955285DF /* Black.ttf */, BC10AC1305C6495F927191B6 /* Bold.ttf */, @@ -208,8 +208,8 @@ 54C306EE82D1490CBD9F579F /* Regular.ttf */, ); name = Resources; - sourceTree = ""; path = ""; + sourceTree = ""; }; /* End PBXGroup section */ diff --git a/package.json b/package.json index b0e60cf..c0d55f6 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "@react-navigation/native": "^6.0.10", "@react-navigation/native-stack": "^6.6.2", "axios": "^0.27.2", + "mapir-react-native-sdk": "^2.2.4", "react": "17.0.2", "react-native": "0.68.2", "react-native-awesome-alerts": "1.5.2", diff --git a/src/navigation.js b/src/navigation.js index 96b2d47..3599513 100644 --- a/src/navigation.js +++ b/src/navigation.js @@ -31,7 +31,7 @@ import VideoDisplay from '../src/screens/VideoDisplay'; // import Tests from "../src/screens/Tests"; import ShoppingCart from '../src/screens/ShoppingCart'; // import DeliveryForm from "../src/screens/DeliveryForm"; -// import Address from "../src/screens/Address"; +import Address from "../src/screens/Address"; import Profile from '../src/screens/Profile'; // import ProfileBookmark from "../src/screens/Profile/components/ProfileBookmark"; // import ProfileAddress from "../src/screens/Profile/components/ProfileAddress"; diff --git a/yarn.lock b/yarn.lock index b2312c6..5eaf658 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1084,6 +1084,18 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@mapbox/geo-viewport@^0.4.0": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@mapbox/geo-viewport/-/geo-viewport-0.4.1.tgz#a184c0b161975858a2e855a1e333e66af342964b" + integrity sha512-5g6eM3EOSl7+0p0VY+vHWEYjUlNzof936VKHTi/NuJVABjbYe8D2NAVJ0qt5C9Np4glUlhKFepgAgQ0OEybrjQ== + dependencies: + "@mapbox/sphericalmercator" "~1.1.0" + +"@mapbox/sphericalmercator@~1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.1.0.tgz#f3b1af042620716a1289fc41e1e97f610823aefe" + integrity sha512-pEsfZyG4OMThlfFQbCte4gegvHUjxXCjz0KZ4Xk8NdOYTQBLflj6U8PL05RPAiuRAMAQNUUKJuL6qYZ5Y4kAWA== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1405,6 +1417,58 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@turf/along@^6.0.1": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.5.0.tgz#ab12eec58a14de60fe243a62d31a474f415c8fef" + integrity sha512-LLyWQ0AARqJCmMcIEAXF4GEu8usmd4Kbz3qk1Oy5HoRNpZX47+i5exQtmIWKdqJ1MMhW26fCTXgpsEs5zgJ5gw== + dependencies: + "@turf/bearing" "^6.5.0" + "@turf/destination" "^6.5.0" + "@turf/distance" "^6.5.0" + "@turf/helpers" "^6.5.0" + "@turf/invariant" "^6.5.0" + +"@turf/bearing@^6.5.0": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-6.5.0.tgz#462a053c6c644434bdb636b39f8f43fb0cd857b0" + integrity sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A== + dependencies: + "@turf/helpers" "^6.5.0" + "@turf/invariant" "^6.5.0" + +"@turf/destination@^6.5.0": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@turf/destination/-/destination-6.5.0.tgz#30a84702f9677d076130e0440d3223ae503fdae1" + integrity sha512-4cnWQlNC8d1tItOz9B4pmJdWpXqS0vEvv65bI/Pj/genJnsL7evI0/Xw42RvEGROS481MPiU80xzvwxEvhQiMQ== + dependencies: + "@turf/helpers" "^6.5.0" + "@turf/invariant" "^6.5.0" + +"@turf/distance@^6.0.1", "@turf/distance@^6.5.0": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-6.5.0.tgz#21f04d5f86e864d54e2abde16f35c15b4f36149a" + integrity sha512-xzykSLfoURec5qvQJcfifw/1mJa+5UwByZZ5TZ8iaqjGYN0vomhV9aiSLeYdUGtYRESZ+DYC/OzY+4RclZYgMg== + dependencies: + "@turf/helpers" "^6.5.0" + "@turf/invariant" "^6.5.0" + +"@turf/helpers@4.6.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.6.0.tgz#12398733b8ae28420df6166fa44c7ee8ffd6414c" + integrity sha512-XTYO+cGhTSNEnbkIwKQvbaNbsSCPF+01TWkqZocLb8rqo7uLql9f1Hr4sYoZAujW9vcD1LrXxzIRN0rzyeExwQ== + +"@turf/helpers@^6.5.0": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-6.5.0.tgz#f79af094bd6b8ce7ed2bd3e089a8493ee6cae82e" + integrity sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw== + +"@turf/invariant@^6.5.0": + version "6.5.0" + resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-6.5.0.tgz#970afc988023e39c7ccab2341bd06979ddc7463f" + integrity sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg== + dependencies: + "@turf/helpers" "^6.5.0" + "@types/babel__core@^7.1.14": version "7.1.19" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" @@ -1864,6 +1928,13 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +axios@^0.19.2: + version "0.19.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" + integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== + dependencies: + follow-redirects "1.5.10" + axios@^0.27.2: version "0.27.2" resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" @@ -2565,6 +2636,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" +debug@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -3339,6 +3417,13 @@ flow-parser@^0.121.0: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f" integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg== +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + dependencies: + debug "=3.1.0" + follow-redirects@^1.14.9: version "1.15.1" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" @@ -4808,6 +4893,25 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +mapir-mapbox@2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/mapir-mapbox/-/mapir-mapbox-2.0.6.tgz#38ec066b085651ea650236c2d571b419ba229538" + integrity sha512-aGUysx2YzYwrJVzXwO8IWtBqaWITg8sKwKwjVv+21g6Bmg0HNiVB9LGQvNuMkqtmhhD7GIT2Ys9T4TqHxD+g8g== + dependencies: + "@mapbox/geo-viewport" "^0.4.0" + "@turf/along" "^6.0.1" + "@turf/distance" "^6.0.1" + "@turf/helpers" "4.6.0" + underscore "^1.8.3" + +mapir-react-native-sdk@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/mapir-react-native-sdk/-/mapir-react-native-sdk-2.2.4.tgz#fc5ddcc583e8aa2eab5f4ef574a34ef65f20c5ce" + integrity sha512-ACNP9h2/M98SL+XMVMfFOj+ocbxNlLFgzZoz6cQ4ZOQo+RCZxThyV+IcbbMeFXwJK3jiKLWBzIsaICJwibeLkg== + dependencies: + axios "^0.19.2" + mapir-mapbox "2.0.6" + match-all@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/match-all/-/match-all-1.2.6.tgz#66d276ad6b49655551e63d3a6ee53e8be0566f8d" @@ -7055,6 +7159,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +underscore@^1.8.3: + version "1.13.4" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" + integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"