Merge pull request #8 from bringg/MOBILE-5146-add-apis-for-initializing-sdk-without-motion-and-bluetooth

MOBILE-5146 add apis for initializing sdk without motion and bluetooth

Author: MichaelTzach

README.md

@@ -99,3 +99,13 @@ yarn android
 
 Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)
 [More details](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+
+## Running with xcode 11.3.1 (iOS)
+The Native iOS SDK is precompiled - when using a swift version that is not the latest, you will need to do another step in order to use a native SDK that was compiled with the same Swift version that you are using.
+
+In podfile add to your application target the following pods:
+```ruby
+  pod 'BringgDriverSDK', :git => 'https://github.com/bringg/Bringg-iOS-DriverSDK.git', :branch => '1.10.0-xcode-11.3.1'  
+  pod 'BringgDriverSDKObjc', :git => 'https://github.com/bringg/Bringg-iOS-DriverSDK.git', :branch => '1.10.0-xcode-11.3.1'
+```
+You can see an example of this in `/Example/ios/Podfile`

example/ios/BringgDriverSdkIosExample.xcodeproj/project.pbxproj

@@ -204,6 +204,7 @@
 				"${PODS_ROOT}/BringgDriverSDK/BringgDriverSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/BringgDriverSDKObjc/BringgDriverSDKObjc.framework",
 				"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
+				"${BUILT_PRODUCTS_DIR}/DeviceKit/DeviceKit.framework",
 				"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
 				"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
 				"${BUILT_PRODUCTS_DIR}/Flipper-DoubleConversion/DoubleConversion.framework",
@@ -247,6 +248,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BringgDriverSDK.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BringgDriverSDKObjc.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeviceKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",

example/ios/Podfile

@@ -57,6 +57,10 @@ target 'BringgDriverSdkIosExample' do
   pod 'glog', podspec: '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', podspec: '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
+  # For using Xcode 11.3.1, uncomment the following two lines
+  # pod 'BringgDriverSDK', :git => 'https://github.com/bringg/Bringg-iOS-DriverSDK.git', :branch => '1.10.0-xcode-11.3.1'
+  # pod 'BringgDriverSDKObjc', :git => 'https://github.com/bringg/Bringg-iOS-DriverSDK.git', :branch => '1.10.0-xcode-11.3.1'
+
   use_native_modules!
 
   # Enables Flipper.

example/ios/Podfile.lock

@@ -1,9 +1,10 @@
 PODS:
   - Alamofire (4.9.0)
   - boost-for-react-native (1.63.0)
-  - BringgDriverSDK (1.9.0):
+  - BringgDriverSDK (1.10.0):
     - Alamofire (= 4.9.0)
     - CryptoSwift (= 1.0.0)
+    - DeviceKit (= 3.2.0)
     - GzipSwift (= 5.0.0)
     - KeychainAccess (= 3.2.0)
     - Kingfisher (= 5.7.1)
@@ -13,11 +14,12 @@ PODS:
     - Socket.IO-Client-Swift (= 15.1.0)
     - Starscream (= 3.1.0)
     - XCGLogger (= 7.0.0)
-  - BringgDriverSDKObjc (1.9.0):
-    - BringgDriverSDK (= 1.9.0)
+  - BringgDriverSDKObjc (1.10.0):
+    - BringgDriverSDK (= 1.10.0)
   - CocoaAsyncSocket (7.6.4)
   - CocoaLibEvent (1.0.0)
   - CryptoSwift (1.0.0)
+  - DeviceKit (3.2.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.61.5)
   - FBReactNativeSpec (0.61.5):
@@ -256,9 +258,9 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
   - React-jsinspector (0.61.5)
-  - react-native-bringg-driver-sdk (1.9.2):
-    - BringgDriverSDK (= 1.9.0)
-    - BringgDriverSDKObjc (= 1.9.0)
+  - react-native-bringg-driver-sdk (1.10.0):
+    - BringgDriverSDK (= 1.10.0)
+    - BringgDriverSDKObjc (= 1.10.0)
     - React
   - React-RCTActionSheet (0.61.5):
     - React-Core/RCTActionSheetHeaders (= 0.61.5)
@@ -300,7 +302,7 @@ PODS:
   - Realm/Headers (4.4.1)
   - RealmSwift (4.4.1):
     - Realm (= 4.4.1)
-  - RNDateTimePicker (2.4.0):
+  - RNDateTimePicker (2.6.0):
     - React
   - Socket.IO-Client-Swift (15.1.0):
     - Starscream (~> 3.1)
@@ -358,6 +360,7 @@ SPEC REPOS:
     - CocoaAsyncSocket
     - CocoaLibEvent
     - CryptoSwift
+    - DeviceKit
     - Flipper
     - Flipper-DoubleConversion
     - Flipper-Folly
@@ -442,6 +445,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
+  DeviceKit: d081659419cce07c0b5239dbc9fb39ed7413c7fe
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
@@ -469,7 +473,7 @@ SPEC CHECKSUMS:
   React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
   React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
   React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
-  react-native-bringg-driver-sdk: de761478eaf1c79b3895d01be7f2194b15a19dbb
+  react-native-bringg-driver-sdk: 8042b37cff867e53fb69676613af2d2e06dd25bc
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -482,13 +486,13 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   Realm: 4eb04d7487bd43c0581256f40b424eafb711deff
   RealmSwift: 3eb8924ff7100df5928c7602f71d0fec51e7c9c5
-  RNDateTimePicker: c4285bfdd87430f1e575b81a4742b7586a09d53e
+  RNDateTimePicker: 8784fb27ddd12a9f0eaf6d994bfe3892f0f319cf
   Socket.IO-Client-Swift: 7cb44c0ffb86e158cee32d0642d30ec5fdcf8f61
   Starscream: 08172b481e145289c4930cb567230fb55897cfa4
   XCGLogger: 0434f15e3909cdc450bb63faf638b8792ab782ab
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: ab4800b35191462fe2ed6f27347c9fdbec71d199
+PODFILE CHECKSUM: bff3406fd5576c5081204396d3b22c68f17d5608
 
 COCOAPODS: 1.9.1

example/src/hooks/initBringgDriverSDKIfNeeded.tsx

@@ -1,4 +1,7 @@
-import { initBringgDriverSDK } from '@bringg/react-native-bringg-driver-sdk';
+import {
+  initBringgDriverSDK,
+  SDKInitializeFlag,
+} from '@bringg/react-native-bringg-driver-sdk';
 
 const state: {
   didInitialize: boolean;
@@ -18,7 +21,13 @@ export function initBringgDriverSDKIfNeeded(): Promise<void> {
   }
 
   console.log('initializing sdk');
-  const initializingPromise = initBringgDriverSDK();
+
+  // Passing initialzation flags allows you to disable SDK features such as using bluetooth and motion
+  // this allows you to show less permission prompts to the user.
+  const initializingPromise = initBringgDriverSDK([
+    SDKInitializeFlag.AvoidUsingBluetooth,
+    SDKInitializeFlag.AvoidUsingMotion,
+  ]);
   state.initializingPromise = initializingPromise;
   return initializingPromise;
 }

ios/BringgDriverSdk.m

@@ -1,5 +1,6 @@
 #import "BringgDriverSdk.h"
 
+@import BringgDriverSDK;
 @import BringgDriverSDKObjc;
 
 @implementation BringgDriverSdk
@@ -11,9 +12,11 @@ - (dispatch_queue_t)methodQueue {
 }
 
 RCT_REMAP_METHOD(initBringgDriverSDK,
-                 initBringgDriverSDKWithResolver:(RCTPromiseResolveBlock)resolve
+                 initBringgDriverSDKWithFlags:(nullable NSArray<NSString *> *)flags
+                 resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTResponseErrorBlock)reject) {
-    NSError *initError = [BringgObjc initializeSDKWithLogger:nil];
+    BringgSDKInitOptions *options = [BringgSDKInitOptions fromFlagsWithFlags:flags];
+    NSError *initError = [BringgObjc initializeSDKWithLogger:nil bringgSDKInitOptions:options];
     if (initError) {
         reject(initError);
     } else {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bringg/react-native-bringg-driver-sdk",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "A React Native wrapper for the native (iOS and Android) Bringg driver SDKs (currently supporting the active customer use case)",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package.json

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'React'
 
-  s.dependency 'BringgDriverSDK', '1.9.0'
-  s.dependency 'BringgDriverSDKObjc', '1.9.0'
+  s.dependency 'BringgDriverSDK', '1.10.0'
+  s.dependency 'BringgDriverSDKObjc', '1.10.0'
 end

react-native-bringg-driver-sdk.podspec

@@ -2,6 +2,7 @@ import { BringgDriverSDKType, ActiveCustomerManagerType } from './index';
 import { Task } from './models/task';
 import { BehaviorSubject } from 'rxjs';
 import { BringgDriverSdkAndroidType } from './android';
+import { SDKInitializeFlag } from './consts/SDKInitializeFlag';
 
 // Maps the Android api to the public api (BringgDriverSdkAndroidType -> BringgDriverSDKType)
 export function androidAPIToPublicAPITransform(
@@ -22,7 +23,9 @@ export function androidAPIToPublicAPITransform(
   const isLoggedInSubject = new BehaviorSubject<boolean>(false);
   const activeTaskSubject = new BehaviorSubject<Task | null>(null);
 
-  const initBringgDriverSDK = async (): Promise<void> => {
+  const initBringgDriverSDK = async (
+    _?: SDKInitializeFlag[]
+  ): Promise<void> => {
     await bringgDriverSdkAndroidType.init();
     await addListenerToActiveTask((activeTask) =>
       activeTaskSubject.next(activeTask)