react-native-move-sdk 0.1.4 → 0.2.0

package/README.md

@@ -15,7 +15,7 @@ yarn add react-native-move-sdk
 Add to the AppDelegate.m file
 
 ```objectivec
-#import <react-native-move-sdk/DolphinSdk.h>
+#import <ReactMoveSDK/MoveSdk.h>
 ...
 - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:7.2.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -28,13 +28,11 @@ def getExtOrIntegerDefault(name) {
 
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
     versionCode 1
     versionName "1.0"
-
   }
 
   buildTypes {
@@ -55,19 +53,18 @@ repositories {
 
   mavenLocal()
   mavenCentral()
+  google()
   maven {
-      // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-      url "$rootDir/../node_modules/react-native/android"
+    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+    url "$rootDir/../node_modules/react-native/android"
   }
   maven {
-      // Android JSC is installed from npm
-      url "$rootDir/../node_modules/jsc-android/dist"
+    // Android JSC is installed from npm
+    url "$rootDir/../node_modules/jsc-android/dist"
+  }
+  maven {
+    url "https://dolphin.jfrog.io/artifactory/move-sdk-libs-release"
   }
-  google()
-
-
-
-
 
   def found = false
   def defaultDir = null
@@ -77,8 +74,8 @@ repositories {
     defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
   } else {
     defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
+      projectDir,
+      '/../../../node_modules/react-native/android'
     )
   }
 
@@ -97,40 +94,44 @@ repositories {
       if (found) return true
       parentDir = parentDir.parentFile
 
-      def androidSourcesDir = new File(
-              parentDir,
-              'node_modules/react-native'
-      )
+      if (parentDir != null) {
 
-      def androidPrebuiltBinaryDir = new File(
-              parentDir,
-              'node_modules/react-native/android'
-      )
 
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
+        def androidSourcesDir = new File(
+          parentDir,
+          'node_modules/react-native'
+        )
 
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
+        def androidPrebuiltBinaryDir = new File(
+          parentDir,
+          'node_modules/react-native/android'
+        )
+
+        if (androidPrebuiltBinaryDir.exists()) {
+          maven {
+            url androidPrebuiltBinaryDir.toString()
+            name androidSourcesName
+          }
 
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
+          logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+          found = true
+        } else if (androidSourcesDir.exists()) {
+          maven {
+            url androidSourcesDir.toString()
+            name androidSourcesName
+          }
+
+          logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+          found = true
+        }
       }
     })
   }
 
   if (!found) {
     throw new GradleException(
-            "${project.name}: unable to locate React Native android sources. " +
-                    "Ensure you have you installed React Native as a dependency in your project and try again."
+      "${project.name}: unable to locate React Native android sources. " +
+        "Ensure you have you installed React Native as a dependency in your project and try again."
     )
   }
 }
@@ -141,5 +142,10 @@ dependencies {
   // noinspection GradleDynamicVersion
 
   implementation "com.facebook.react:react-native:+"
-  api "io.dolphin.move:move-sdk:1.6.11.+"
+  api "io.dolphin.move:move-sdk:2.0.1.55"
+
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation "androidx.test:core:1.4.0"
+  testImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+  testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+
+android.useAndroidX=true
+android.enableJetifier=true

package/android/gradle.properties

@@ -1,4 +1,8 @@
-MoveSdk_kotlinVersion=1.4.32
-MoveSdk_compileSdkVersion=31
-MoveSdk_buildToolsVersion=29.0.2
-MoveSdk_targetSdkVersion=31
+MoveSdk_kotlinVersion=1.7.10
+MoveSdk_compileSdkVersion=33
+MoveSdk_targetSdkVersion=32
+
+android.useAndroidX=true
+android.enableJetifier=true
+
+org.gradle.jvmargs=-Xmx4g

package/android/src/main/java/in/dolph/move/sdk/MoveExtensions.kt

@@ -0,0 +1,44 @@
+package `in`.dolph.move.sdk
+
+import io.dolphin.move.MoveDetectionService
+import java.util.Locale
+import java.util.regex.Pattern
+
+/**
+ * https://stackoverflow.com/questions/60010298/how-can-i-convert-a-camel-case-string-to-snake-case-and-back-in-idiomatic-kotlin
+ */
+
+val camelRegex = "(?<=[a-zA-Z])[A-Z]".toRegex()
+val snakeRegex = "_[a-zA-Z]".toRegex()
+
+// String extensions
+private fun String.camelToSnakeCase(): String {
+  return camelRegex.replace(this) {
+    "_${it.value}"
+  }.uppercase(Locale.getDefault())
+}
+
+fun String.toSnakeCase(): String {
+  return if (Pattern.compile(".*[a-z].*").matcher(this).find()) {
+    camelRegex.replace(this) {
+      "_${it.value}"
+    }.uppercase(Locale.getDefault()).replace("-", "_")
+  } else {
+    uppercase()
+  }
+}
+
+fun String.snakeToLowerCamelCase(): String {
+  return snakeRegex.replace(this) {
+    it.value.replace("_", "")
+      .uppercase(Locale.getDefault())
+  }
+}
+
+fun String.snakeToUpperCamelCase(): String {
+  return this.snakeToLowerCamelCase().capitalize()
+}
+
+fun String.equalsService(service: MoveDetectionService): Boolean {
+  return equals(service.name().camelToSnakeCase(), ignoreCase = true)
+}

package/android/src/main/java/in/dolph/move/sdk/MoveNotificationConfig.kt

@@ -8,34 +8,34 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 
 data class MoveNotificationConfig(
-    var title: String,
-    var text: String,
-    var channelId: String,
-    var channelName: String,
-    var channelDescription: String
+  var title: String,
+  var text: String,
+  var channelId: String,
+  var channelName: String,
+  var channelDescription: String
 ) {
 
-    fun toAndroidNotification(context: Context): NotificationCompat.Builder {
-        createChannel(context)
-        // TODO: Host app should decide on icon
-        return NotificationCompat.Builder(context, this.channelId)
-            .setSmallIcon(R.drawable.ic_notification)
-            .setContentTitle(this.title)
-            .setContentText(this.text)
-            .setChannelId(this.channelId)
-            .setSound(null)
-            .setPriority(NotificationCompat.PRIORITY_MAX);
-    }
+  fun toAndroidNotification(context: Context): NotificationCompat.Builder {
+    createChannel(context)
+    // TODO: Host app should decide on icon
+    return NotificationCompat.Builder(context, this.channelId)
+      .setSmallIcon(R.drawable.ic_notification)
+      .setContentTitle(this.title)
+      .setContentText(this.text)
+      .setChannelId(this.channelId)
+      .setSound(null)
+      .setPriority(NotificationCompat.PRIORITY_MAX);
+  }
 
-    fun createChannel(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // Create the NotificationChannel
-            val importance = NotificationManager.IMPORTANCE_DEFAULT
-            val mChannel = NotificationChannel(channelId, channelName, importance)
-            mChannel.description = channelDescription
-            val notificationManager =
-                context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-            notificationManager.createNotificationChannel(mChannel)
-        }
+  private fun createChannel(context: Context) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      // Create the NotificationChannel
+      val importance = NotificationManager.IMPORTANCE_DEFAULT
+      val channel = NotificationChannel(channelId, channelName, importance)
+      channel.description = channelDescription
+      val notificationManager =
+        context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+      notificationManager.createNotificationChannel(channel)
     }
+  }
 }

package/android/src/main/java/in/dolph/move/sdk/MoveSdkConfig.kt

@@ -1,18 +1,13 @@
 package `in`.dolph.move.sdk
 
-import io.dolphin.move.DrivingService
 import io.dolphin.move.MoveAuth
-import io.dolphin.move.OtherService
-import io.dolphin.move.TimelineDetectionService
-import io.dolphin.move.WalkingService
+import io.dolphin.move.MoveDetectionService
 
 data class MoveSdkConfig(
-    val auth: MoveAuth,
-    val timelineDetectionServices: List<TimelineDetectionService>,
-    val drivingServices: List<DrivingService>,
-    val walkingServices: List<WalkingService>,
-    val otherServices: List<OtherService>,
-    val tripNotification: MoveNotificationConfig,
-    val recognitionNotification: MoveNotificationConfig,
-    val allowMockLocations: Boolean
-)
+  val auth: MoveAuth,
+  // not used for now
+  val timelineDetectionServices: List<MoveDetectionService>,
+  val tripNotification: MoveNotificationConfig,
+  val recognitionNotification: MoveNotificationConfig,
+  val walkingNotification: MoveNotificationConfig,
+)

package/android/src/main/java/in/dolph/move/sdk/MoveSdkModule.kt

@@ -17,21 +17,30 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import io.dolphin.move.MoveSdk
-
-internal const val EVENT_INIT_ERROR = "DolphinSdk-InitError"
-internal const val EVENT_MOVE_STATE = "DolphinSdk-State"
-internal const val EVENT_TRIP_STATE = "DolphinSdk-TripState"
-internal const val EVENT_AUTH_STATE = "DolphinSdk-AuthState"
-internal const val EVENT_AUTH_BATTERY_PERMISSION = "DolphinSdk-Permission-BatteryOptimization"
-internal const val EVENT_AUTH_OVERLAY_PERMISSION = "DolphinSdk-Permission-Overlay"
+import io.dolphin.move.MoveServiceFailure
+import io.dolphin.move.MoveServiceWarning
+
+internal const val EVENT_INIT_ERROR = "MoveSdk-InitError"
+internal const val EVENT_MOVE_STATE = "MoveSdk-State"
+internal const val EVENT_TRIP_STATE = "MoveSdk-TripState"
+internal const val EVENT_AUTH_STATE = "MoveSdk-AuthState"
+internal const val EVENT_ERRORS = "MoveSdk-Errors"
+internal const val EVENT_WARNINGS = "MoveSdk-Warnings"
+internal const val EVENT_AUTH_BATTERY_PERMISSION = "MoveSdk-Permission-BatteryOptimization"
+internal const val EVENT_AUTH_OVERLAY_PERMISSION = "MoveSdk-Permission-Overlay"
 
 internal const val ARGUMENT_ACCESS_TOKEN = "accessToken"
 internal const val ARGUMENT_REFRESH_TOKEN = "refreshToken"
 internal const val ARGUMENT_STATE = "state"
-internal const val ARGUMENT_ERROR = "error"
+internal const val ARGUMENT_ERROR = "errors"
+internal const val ARGUMENT_ERRORS = "errors"
+internal const val ARGUMENT_WARNINGS = "warnings"
+internal const val ARGUMENT_LOG = "log"
+internal const val ARGUMENT_WARNING = "warnings"
 internal const val ARGUMENT_ERROR_REASON = "errorReason"
 
 internal const val PROMISE_OK = "OK"
@@ -40,8 +49,8 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   ActivityEventListener {
 
   companion object {
-    const val LOG_TAG = "DOLPHIN_SDK"
-    const val ERROR_CODE = "DOLPHIN_SDK_ERROR"
+    const val LOG_TAG = "MOVE_SDK"
+    const val ERROR_CODE = "MOVE_SDK_ERROR"
 
     // **** PERMISSIONS MODULE START *****
     const val OVERLAY_REQUEST_CODE = 1
@@ -68,16 +77,15 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   // **** PERMISSIONS MODULE START *****
 
   @ReactMethod
-  fun initialize(
-    contractId: String,
+  fun setup(
+    userId: String,
     accessToken: String,
     refreshToken: String,
-    productId: Int,
+    projectId: Int,
     // Config
     timelineDetectionServices: ReadableArray,
     drivingServices: ReadableArray,
     walkingServices: ReadableArray,
-    otherServices: ReadableArray,
     // Platform config
     recognitionNotificationTitle: String,
     recognitionNotificationText: String,
@@ -89,20 +97,18 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     tripNotificationChannelId: String,
     tripNotificationChannelName: String,
     tripNotificationChannelDescription: String,
-    allowMockLocations: Boolean,
     promise: Promise?
   ) {
 
-    nativeSdkWrapper.initialize(
-      contractId,
+    nativeSdkWrapper.setup(
+      userId,
       accessToken,
       refreshToken,
-      productId,
+      projectId,
       // Config
       timelineDetectionServices,
       drivingServices,
       walkingServices,
-      otherServices,
       // Platform config
       recognitionNotificationTitle,
       recognitionNotificationText,
@@ -114,16 +120,25 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
       tripNotificationChannelId,
       tripNotificationChannelName,
       tripNotificationChannelDescription,
-      allowMockLocations,
       promise = promise
     )
   }
 
+  @ReactMethod
+  fun init() {
+    MoveSdk.init(reactContext.applicationContext)
+  }
+
   @ReactMethod
   fun resolveError() {
     nativeSdkWrapper.resolveError()
   }
 
+  @ReactMethod
+  fun allowMockLocations(allowMockLocations: Boolean) {
+    nativeSdkWrapper.allowMockLocations(allowMockLocations)
+  }
+
   @ReactMethod
   fun startAutomaticDetection() {
     nativeSdkWrapper.startAutomaticDetection()
@@ -179,6 +194,20 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     nativeSdkWrapper.getTripState(promise)
   }
 
+  @ReactMethod
+  fun geocode(latitude: Double, longitude: Double, promise: Promise) {
+    nativeSdkWrapper.geocode(latitude, longitude, promise)
+  }
+
+  @ReactMethod
+  fun setAssistanceMetaData(data: String) {
+  }
+
+  @ReactMethod
+  fun initiateAssistanceCall(promise: Promise) {
+    nativeSdkWrapper.initiateAssistanceCall(promise)
+  }
+
   @ReactMethod
   fun updateAuth(
     contractId: String,
@@ -195,7 +224,7 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   }
 
   override fun getName(): String {
-    return "DolphinSdk"
+    return "MoveSdk"
   }
 
   override fun getConstants(): MutableMap<String, Any> {
@@ -204,10 +233,23 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     return constants
   }
 
-  internal fun emitDeviceEvent(eventName: String, eventData: WritableMap?) {
+  internal fun emitDeviceEvent(eventName: String, data: Array<Any>) {
+    try {
+      val eventData: WritableArray = data.toWritableArray()
+      reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+        .emit(eventName.toSnakeCase(), eventData)
+    } catch (t: Throwable) {
+      Log.e("SDK Module", t.message, t)
+      //  java.lang.IllegalStateException: Tried to access a JS module before the React instance was fully set up.
+      //  Calls to ReactContext#getJSModule should only happen once initialize() has been called on your native module.
+    }
+  }
+
+  internal fun emitDeviceEvent(eventName: String, data: Map<*, *>) {
     try {
+      val eventData: WritableMap = data.toWritableMap()
       reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-        .emit(eventName, eventData)
+        .emit(eventName.toSnakeCase(), eventData)
     } catch (t: Throwable) {
       Log.e("SDK Module", t.message, t)
       //  java.lang.IllegalStateException: Tried to access a JS module before the React instance was fully set up.
@@ -225,6 +267,18 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     // Remove upstream listeners, stop unnecessary background tasks
   }
 
+  @ReactMethod
+  fun getErrors(promise: Promise?) {
+    val errors: List<MoveServiceFailure> = nativeSdkWrapper.getErrors() ?: emptyList()
+    promise?.resolve(errors.failuresToArray().toWritableArray())
+  }
+
+  @ReactMethod
+  fun getWarnings(promise: Promise?) {
+    val warnings: List<MoveServiceWarning> = nativeSdkWrapper.getWarnings() ?: emptyList()
+    promise?.resolve(warnings.warningsToArray().toWritableArray())
+  }
+
   // **** PERMISSIONS MODULE START *****
   @SuppressLint("NewApi")
   override fun onActivityResult(
@@ -234,12 +288,12 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
     data: Intent?
   ) {
     if (requestCode == OVERLAY_REQUEST_CODE) {
-      val eventData = Arguments.createMap()
-      eventData.putBoolean(ARGUMENT_STATE, Settings.canDrawOverlays(reactContext))
+      val eventData = mutableMapOf<Any, Any>()
+      eventData[ARGUMENT_STATE] = Settings.canDrawOverlays(reactContext)
       emitDeviceEvent(EVENT_AUTH_OVERLAY_PERMISSION, eventData)
     } else if (requestCode == BATTERY_OPTIMIZATION_REQUEST_CODE) {
-      val eventData = Arguments.createMap()
-      eventData.putBoolean(ARGUMENT_STATE, isAppIgnoringBatteryOptimization())
+      val eventData = mutableMapOf<Any, Any>()
+      eventData[ARGUMENT_STATE] = isAppIgnoringBatteryOptimization()
       emitDeviceEvent(EVENT_AUTH_BATTERY_PERMISSION, eventData)
     }
   }
@@ -291,3 +345,59 @@ class MoveSdkModule(context: ReactApplicationContext) : ReactContextBaseJavaModu
   }
   // **** PERMISSIONS MODULE END *****
 }
+
+internal fun Array<*>.toWritableArray(): WritableArray {
+  val data: WritableArray = Arguments.createArray()
+  for (value in iterator()) {
+    when (value) {
+      is String -> {
+        data.pushString(value)
+      }
+      is Boolean -> {
+        data.pushBoolean(value)
+      }
+      is Int -> {
+        data.pushInt(value)
+      }
+      is Array<*> -> {
+        data.pushArray(value.toWritableArray())
+      }
+      is List<*> -> {
+        data.pushArray(value.toTypedArray().toWritableArray())
+      }
+      is Map<*, *> -> {
+        data.pushMap(value.toWritableMap())
+      }
+    }
+  }
+  return data
+}
+
+internal fun Map<*, *>.toWritableMap(): WritableMap {
+  val data: WritableMap = Arguments.createMap()
+  for (entry in iterator()) {
+    val value = entry.value
+    print("${entry.key} : $value")
+    when (value) {
+      is String -> {
+        data.putString(entry.key.toString(), value)
+      }
+      is Boolean -> {
+        data.putBoolean(entry.key.toString(), value)
+      }
+      is Int -> {
+        data.putInt(entry.key.toString(), value)
+      }
+      is Array<*> -> {
+        data.putArray(entry.key.toString(), value.toWritableArray())
+      }
+      is List<*> -> {
+        data.putArray(entry.key.toString(), value.toTypedArray().toWritableArray())
+      }
+      is Map<*, *> -> {
+        data.putMap(entry.key.toString(), value.toWritableMap())
+      }
+    }
+  }
+  return data
+}

package/android/src/main/java/in/dolph/move/sdk/MoveSdkPackage.kt

@@ -16,4 +16,4 @@ class MoveSdkPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): MutableList<NativeModule> {
         return mutableListOf(MoveSdkModule(reactContext))
     }
-}
+}