4.1.1 (#82)

* Bump Android SDK to 4.1.1, replace event listeners to use new API, package version update to 4.1.1

* AGP backward compatiblity

* README update

Author: SurvicatePawelGodlewski

README.md

@@ -49,7 +49,7 @@ allprojects {
 ```javascript
 import Survicate, {UserTrait} from '@survicate/react-native-survicate';
 
-Survicate.initialize();
+Survicate.initializeSdk();
 Survicate.invokeEvent("eventName");
 Survicate.enterScreen("screenName");
 Survicate.leaveScreen("screenName");
@@ -66,7 +66,7 @@ const listener: SurvicateEventListener = {
     onSurveyClosed(event: SurveyClosedEvent) {},
     onSurveyCompleted(event: SurveyCompletedEvent) {},
 }
-Survicate.addSurvicateEventListener(listener);
+const subscription = Survicate.addSurvicateEventListener(listener);
 Survicate.reset();
 ```
 

android/build.gradle

@@ -46,8 +46,29 @@ if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
+}
+
 android {
-    namespace "com.survicate.react"
+    if (supportsNamespace()) {
+        namespace "com.survicate.react"
+
+        sourceSets {
+            main {
+                manifest.srcFile "src/main/AndroidManifestNew.xml"
+            }
+        }
+    }
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     defaultConfig {
@@ -99,7 +120,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation ('com.survicate:survicate-sdk:4.1.0')
+    implementation ('com.survicate:survicate-sdk:4.1.1')
 }
 
 if (isNewArchitectureEnabled()) {

android/src/main/AndroidManifest.xml

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

android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

android/src/main/java/com/survicate/react/SurvicateModuleImpl.java

@@ -75,7 +75,7 @@ public void setWorkspaceKey(String workspaceKey) {
     @ReactMethod
     public void addListener(String eventName) {
         if (listenerCount == 0) {
-            Survicate.setEventListener(eventListener);
+            Survicate.addEventListener(eventListener);
         }
 
         listenerCount++;
@@ -86,7 +86,7 @@ public void removeListeners(int count) {
         listenerCount -= count;
 
         if (listenerCount == 0) {
-            Survicate.setEventListener(null);
+            Survicate.removeEventListener(eventListener);
         }
     }
 

ios/SurvicateBindings.mm

@@ -66,12 +66,12 @@ - (dispatch_queue_t)methodQueue
 
 - (void)startObserving {
     hasListeners = YES;
-    [[SurvicateSdk shared] setDelegate:self];
+    [[SurvicateSdk shared] addListener:self];
 }
 
 - (void)stopObserving {
     hasListeners = NO;
-    [[SurvicateSdk shared] setDelegate:nil];
+    [[SurvicateSdk shared] removeListener:self];
 }
 
 - (void)surveyDisplayedWithEvent:(SurveyDisplayedEvent * _Nonnull)event {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@survicate/react-native-survicate",
   "title": "React Native Survicate Bindings",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "React Native bindings for Survicate Mobile SDK",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",