@screeb/react-native 2.1.17 → 2.2.0

package/README.md

@@ -17,21 +17,40 @@ A react-native module to integrate Screeb mobile sdk for Android and/or iOS.
 
 [See here.](https://www.notion.so/screeb/ReactNative-SDK-30e8dc27fa7a4dea979084d83e5140c3)
 
-## Run example
+## Run examples
+
+### React Native CLI example
 
 ```sh
-npm install
+yarn install
 
 cd example/
-npm install
+yarn install
 
 cd ios/
 pod install
+cd ..
 
-npm run android
-npm run ios
+yarn android
+yarn ios
 ```
 
+### Expo example
+
+The Expo project lives in `example-expo`. It builds a full native binary (Expo Go will not load custom native modules).
+
+```sh
+yarn install
+
+yarn workspace example-expo prebuild
+yarn workspace example-expo ios   # or android
+
+# in another terminal, from the repo root
+yarn example:expo
+```
+
+Re-run `prebuild` whenever native configuration changes (for example after toggling the new architecture). Use `yarn workspace example-expo prebuild --clean` if you need to fully regenerate the iOS/Android projects. The `example-expo/react-native.config.js` file ensures the Screeb module is autolinked automatically.
+
 ## License
 
 MIT

package/{screeb-module.podspec → ScreebReactNative.podspec}

@@ -3,18 +3,20 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
-  s.name         = "screeb-module"
+  s.name         = "ScreebReactNative"
   s.version      = package["version"]
   s.summary      = package["description"]
   s.homepage     = package["homepage"]
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => "12.0" }
   s.source       = { :git => "https://github.com/ScreebApp/sdk-reactnative.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,swift}"
+  s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
+  s.private_header_files = "ios/**/*.h"
 
+  s.dependency "Screeb", '~> 2.2.0'
   s.dependency "React-Core"
-  s.dependency "Screeb", '~> 2.1.13'
+  install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -1,6 +1,7 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['ScreebModule_kotlinVersion']
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ScreebReactNative_' + name]
+  }
 
   repositories {
     google()
@@ -8,30 +9,34 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
+    classpath "com.android.tools.build:gradle:8.7.2"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ScreebModule_' + name]
-}
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+apply plugin: "com.facebook.react"
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ScreebModule_' + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["ScreebReactNative_" + name]).toInteger()
 }
 
 android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+  namespace "app.screeb.reactnative"
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
   defaultConfig {
-    minSdkVersion 21
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 1
-    versionName "0.2.0"
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+  }
+
+  buildFeatures {
+    buildConfig true
   }
 
   buildTypes {
@@ -39,90 +44,35 @@ android {
       minifyEnabled false
     }
   }
+
   lintOptions {
-    disable 'GradleCompatible'
+    disable "GradleCompatible"
   }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+    }
+  }
 }
 
 repositories {
   mavenCentral()
   google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-              parentDir,
-              'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-              parentDir,
-              'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        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."
-    )
-  }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  // noinspection GradleDynamicVersion
-  api 'com.facebook.react:react-native:+'
-  implementation "app.screeb.sdk:survey:2.1.15"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
+  implementation "com.facebook.react:react-android"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  api "app.screeb.sdk:survey:2.2.7"
 }

package/android/gradle.properties

@@ -1,3 +1,5 @@
-ScreebModule_kotlinVersion=1.8.0
-ScreebModule_compileSdkVersion=33
-ScreebModule_targetSdkVersion=33
+ScreebReactNative_kotlinVersion=2.0.21
+ScreebReactNative_minSdkVersion=21
+ScreebReactNative_targetSdkVersion=34
+ScreebReactNative_compileSdkVersion=35
+ScreebReactNative_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.screebmodule">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/android/src/main/java/app/screeb/reactnative/ScreebReactNativeModule.kt

@@ -0,0 +1,258 @@
+package app.screeb.reactnative
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import java.util.HashMap
+import app.screeb.sdk.Screeb
+import app.screeb.sdk.InitOptions
+import android.os.Handler
+import android.os.Looper
+
+@ReactModule(name = ScreebReactNativeModule.NAME)
+class ScreebReactNativeModule(reactContext: ReactApplicationContext) :
+  NativeScreebReactNativeSpec(reactContext) {
+
+  override fun getName(): String = NAME
+
+
+  override fun initSdk(
+    channelId: String,
+    userId: String?,
+    properties: ReadableMap?,
+    hooks: ReadableMap?,
+    initOptions: ReadableMap?,
+    language: String?,
+    promise: Promise
+  ) {
+    Screeb.setSecondarySDK("react-native", "2.2.0")
+
+    val mapHooks: HashMap<String, Any>? = hooks?.let { readable ->
+      hashMapOf<String, Any>().apply {
+        val itKeys = readable.keySetIterator()
+        while (itKeys.hasNextKey()) {
+          val key = itKeys.nextKey()
+          if (key == "version") {
+            put(key, readable.getString(key)!!)
+          } else {
+            val value = readable.getString(key)
+            put(key) { payload: Any ->
+              reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit(
+                  "ScreebEvent",
+                  Arguments.createMap().apply {
+                    putString("hookId", value!!)
+                    putString("payload", payload.toString())
+                  }
+                )
+            }
+          }
+        }
+      }
+    }
+
+    Handler(Looper.getMainLooper()).post {
+      Screeb.pluginInit(channelId, userId, fromReadableMap(properties), fromReadableMap(initOptions), mapHooks, language)
+      promise.resolve(null)
+    }
+  }
+
+  override fun setIdentity(userId: String, properties: ReadableMap?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.setIdentity(userId, fromReadableMap(properties))
+      promise.resolve(null)
+    }
+  }
+
+  override fun setProperties(properties: ReadableMap?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      fromReadableMap(properties)?.let { Screeb.setVisitorProperties(it) }
+      promise.resolve(null)
+    }
+  }
+
+  override fun assignGroup(type: String?, name: String, properties: ReadableMap?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.assignGroup(type, name, fromReadableMap(properties))
+      promise.resolve(null)
+    }
+  }
+
+  override fun unassignGroup(type: String?, name: String, properties: ReadableMap?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.unassignGroup(type, name, fromReadableMap(properties))
+      promise.resolve(null)
+    }
+  }
+
+  override fun trackEvent(name: String, properties: ReadableMap?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.trackEvent(name, fromReadableMap(properties))
+      promise.resolve(null)
+    }
+  }
+
+  override fun trackScreen(name: String, properties: ReadableMap?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.trackScreen(name, fromReadableMap(properties))
+      promise.resolve(null)
+    }
+  }
+
+  override fun startSurvey(
+    surveyId: String,
+    allowMultipleResponses: Boolean?,
+    hiddenFields: ReadableMap?,
+    ignoreSurveyStatus: Boolean?,
+    hooks: ReadableMap?,
+    language: String?,
+    distributionId: String?,
+    promise: Promise
+  ) {
+    val mapHooks: HashMap<String, Any>? = hooks?.let { readable ->
+      hashMapOf<String, Any>().apply {
+        val itKeys = readable.keySetIterator()
+        while (itKeys.hasNextKey()) {
+          val key = itKeys.nextKey()
+          if (key == "version") {
+            put(key, readable.getString(key)!!)
+          } else {
+            val value = readable.getString(key)
+            put(key) { payload: Any ->
+              reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit(
+                  "ScreebEvent",
+                  Arguments.createMap().apply {
+                    putString("hookId", value!!)
+                    putString("payload", payload.toString())
+                  }
+                )
+            }
+          }
+        }
+      }
+    }
+
+    Handler(Looper.getMainLooper()).post {
+      Screeb.startSurvey(
+        surveyId,
+        allowMultipleResponses ?: true,
+        fromReadableMap(hiddenFields),
+        ignoreSurveyStatus ?: true,
+        mapHooks,
+        language,
+        distributionId
+      )
+      promise.resolve(null)
+    }
+  }
+
+  override fun startMessage(
+    messageId: String,
+    allowMultipleResponses: Boolean?,
+    hiddenFields: ReadableMap?,
+    ignoreMessageStatus: Boolean?,
+    hooks: ReadableMap?,
+    language: String?,
+    distributionId: String?,
+    promise: Promise
+  ) {
+    val mapHooks: HashMap<String, Any>? = hooks?.let { readable ->
+      hashMapOf<String, Any>().apply {
+        val itKeys = readable.keySetIterator()
+        while (itKeys.hasNextKey()) {
+          val key = itKeys.nextKey()
+          if (key == "version") {
+            put(key, readable.getString(key)!!)
+          } else {
+            val value = readable.getString(key)
+            put(key) { payload: Any ->
+              reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit(
+                  "ScreebEvent",
+                  Arguments.createMap().apply {
+                    putString("hookId", value!!)
+                    putString("payload", payload.toString())
+                  }
+                )
+            }
+          }
+        }
+      }
+    }
+
+    Handler(Looper.getMainLooper()).post {
+      Screeb.startMessage(
+        messageId,
+        allowMultipleResponses ?: true,
+        fromReadableMap(hiddenFields),
+        ignoreMessageStatus ?: true,
+        mapHooks,
+        language,
+        distributionId
+      )
+      promise.resolve(null)
+    }
+  }
+
+  override fun debug(promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.debug()
+      promise.resolve(null)
+    }
+  }
+
+  override fun debugTargeting(promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.debugTargeting()
+      promise.resolve(null)
+    }
+  }
+
+  override fun resetIdentity(promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.resetIdentity()
+      promise.resolve(null)
+    }
+  }
+
+  override fun closeSdk(promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.closeSdk()
+      promise.resolve(null)
+    }
+  }
+
+  override fun closeSurvey(surveyId: String?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.closeSurvey(surveyId)
+      promise.resolve(null)
+    }
+  }
+
+  override fun closeMessage(messageId: String?, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.closeMessage(messageId)
+      promise.resolve(null)
+    }
+  }
+
+  override fun onHookResult(hookId: String, result: ReadableMap, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      Screeb.onHookResult(hookId, result.toHashMap())
+      promise.resolve(null)
+    }
+  }
+
+  private fun fromReadableMap(readableMap: ReadableMap?): HashMap<String, Any?>? =
+    readableMap?.toHashMap() as? HashMap<String, Any?>
+
+  companion object {
+    const val NAME = "ScreebReactNative"
+  }
+}

package/android/src/main/java/app/screeb/reactnative/ScreebReactNativePackage.kt

@@ -0,0 +1,33 @@
+package app.screeb.reactnative
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import java.util.HashMap
+
+class ScreebReactNativePackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == ScreebReactNativeModule.NAME) {
+      ScreebReactNativeModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      moduleInfos[ScreebReactNativeModule.NAME] = ReactModuleInfo(
+        ScreebReactNativeModule.NAME,
+        ScreebReactNativeModule.NAME,
+        false,  // canOverrideExistingModule
+        false,  // needsEagerInit
+        false,  // isCxxModule
+        true // isTurboModule
+      )
+      moduleInfos
+    }
+  }
+}

package/ios/ScreebReactNative.m

@@ -0,0 +1,63 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE(ScreebReactNative, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(initSdk:(NSString *)channelId
+                  userId:(nullable NSString *)userId
+                  properties:(nullable NSDictionary *)properties
+                  hooks:(nullable NSDictionary *)hooks
+                  initOptions:(nullable NSDictionary *)initOptions
+                  language:(nullable NSString *)language)
+
+RCT_EXTERN_METHOD(setIdentity:(NSString *)userId
+                  properties:(nullable NSDictionary *)properties)
+
+RCT_EXTERN_METHOD(setProperties:(nullable NSDictionary *)properties)
+
+RCT_EXTERN_METHOD(assignGroup:(nullable NSString *)type
+                  name:(NSString *)name
+                  properties:(nullable NSDictionary *)properties)
+
+RCT_EXTERN_METHOD(unassignGroup:(nullable NSString *)type
+                  name:(NSString *)name
+                  properties:(nullable NSDictionary *)properties)
+
+RCT_EXTERN_METHOD(trackEvent:(NSString *)name
+                  properties:(nullable NSDictionary *)properties)
+
+RCT_EXTERN_METHOD(trackScreen:(NSString *)name
+                  properties:(nullable NSDictionary *)properties)
+
+RCT_EXTERN_METHOD(startSurvey:(NSString *)surveyId
+                  allowMultipleResponses:(BOOL)allowMultipleResponses
+                  hiddenFields:(nullable NSDictionary *)hiddenFields
+                  ignoreSurveyStatus:(BOOL)ignoreSurveyStatus
+                  hooks:(nullable NSDictionary *)hooks
+                  language:(nullable NSString *)language
+                  distributionId:(nullable NSString *)distributionId)
+
+RCT_EXTERN_METHOD(startMessage:(NSString *)messageId
+                  allowMultipleResponses:(BOOL)allowMultipleResponses
+                  hiddenFields:(nullable NSDictionary *)hiddenFields
+                  ignoreMessageStatus:(BOOL)ignoreMessageStatus
+                  hooks:(nullable NSDictionary *)hooks
+                  language:(nullable NSString *)language
+                  distributionId:(nullable NSString *)distributionId)
+
+RCT_EXTERN_METHOD(debug)
+
+RCT_EXTERN_METHOD(debugTargeting)
+
+RCT_EXTERN_METHOD(resetIdentity)
+
+RCT_EXTERN_METHOD(closeSdk)
+
+RCT_EXTERN_METHOD(closeSurvey:(nullable NSString *)surveyId)
+
+RCT_EXTERN_METHOD(closeMessage:(nullable NSString *)messageId)
+
+RCT_EXTERN_METHOD(onHookResult:(NSString *)hookId
+                  payload:(nullable NSDictionary *)payload)
+
+@end