2.0.0

Author: Splicer97

README.md

@@ -10,6 +10,7 @@ Since version 1.0.0 the library can only be used on the new architecture
 | ------- | -------------------- |
 | < 1.0.0 | < 0.76.0             |
 | 1.0.0+  | 0.76.0+              |
+| 2.0.0+  | 0.77.0+              |
 
 ## Installation
 
@@ -52,13 +53,9 @@ MyTracker.bufferingPeriod(30);
 
 MyTracker.forcingPeriod(30);
 
-//for IOS:
-// 0 = MRLocationTrackingModeNone — location is not tracked
-// 1 = MRLocationTrackingModeCached — uses the system's cached value
-// 2 = MRLocationTrackingModeActive — uses a request for the current location (default)
-// for Android:
-// 0 = false - do not track the user's location (default)
-// 1 or 2 = true - track the user's location
+// 0  — location is not tracked
+// 1  — uses the system's cached value
+// 2  — uses a request for the current location (default)
 MyTracker.trackLocation(0);
 
 MyTracker.setDebugMode(false);

android/build.gradle

@@ -110,7 +110,7 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
-  implementation 'com.my.tracker:mytracker-sdk:3.3.2'
+  implementation 'com.my.tracker:mytracker-sdk:3.4.1'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 

android/src/main/java/com/mytracker/MytrackerModule.kt

@@ -1,18 +1,11 @@
 package com.mytracker
 
 import com.facebook.react.module.annotations.ReactModule
-import com.mytracker.MytrackerModule
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
 import android.app.Application
-import androidx.annotation.WorkerThread
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactMethod
 import com.my.tracker.MyTracker
 import com.facebook.react.bridge.ReadableMap
 import java.util.HashMap
-import com.my.tracker.MyTrackerParams
-import com.my.tracker.MyTrackerConfig
 
 @ReactModule(name = MytrackerModule.NAME)
 class MytrackerModule(reactContext: ReactApplicationContext) :
@@ -43,7 +36,7 @@ class MytrackerModule(reactContext: ReactApplicationContext) :
 
 
   override fun trackLoginEventWithParams(userId: String, vkConnectId: String?, attributes: ReadableMap) {
-        val map: Map<String, Any> = attributes.toHashMap()
+        val map: HashMap<String, Any?> = attributes.toHashMap()
         val params: MutableMap<String, String> = HashMap()
         for ((key, value) in map) {
             if (value is String) {
@@ -55,7 +48,7 @@ class MytrackerModule(reactContext: ReactApplicationContext) :
 
 
    override fun trackEventWithParams(name: String, attributes: ReadableMap) {
-        val map: Map<String, Any> = attributes.toHashMap()
+        val map: HashMap<String, Any?> = attributes.toHashMap()
         val params: MutableMap<String, String> = HashMap()
         for ((key, value) in map) {
             if (value is String) {
@@ -78,7 +71,7 @@ class MytrackerModule(reactContext: ReactApplicationContext) :
 
 
    override fun trackInviteEventWithParams(attributes: ReadableMap) {
-        val map: Map<String, Any> = attributes.toHashMap()
+        val map: HashMap<String, Any?> = attributes.toHashMap()
         val params: MutableMap<String, String> = HashMap()
         for ((key, value) in map) {
             if (value is String) {
@@ -104,7 +97,7 @@ class MytrackerModule(reactContext: ReactApplicationContext) :
         vkConnectId: String?,
         attributes: ReadableMap
     ) {
-        val map: Map<String, Any> = attributes.toHashMap()
+        val map: HashMap<String, Any?> = attributes.toHashMap()
         val params: MutableMap<String, String> = HashMap()
         for ((key, value) in map) {
             if (value is String) {
@@ -126,7 +119,7 @@ class MytrackerModule(reactContext: ReactApplicationContext) :
 
 
    override fun trackLevelWithLevelWithParams(level: Double, attributes: ReadableMap) {
-        val map: Map<String, Any> = attributes.toHashMap()
+        val map: HashMap<String, Any?> = attributes.toHashMap()
         val params: MutableMap<String, String> = HashMap()
         for ((key, value) in map) {
             if (value is String) {
@@ -169,12 +162,7 @@ class MytrackerModule(reactContext: ReactApplicationContext) :
 
    override fun trackLocation(number: Double) {
         val trackerConfig = MyTracker.getTrackerConfig()
-        if (number.toInt() == 0) {
-            trackerConfig.isTrackingLocationEnabled = false
-        }
-        if (number.toInt() == 1 || number.toInt() == 2) {
-            trackerConfig.isTrackingLocationEnabled = true
-        }
+        trackerConfig.setLocationTrackingMode(number.toInt())
     }
 
 

example/android/build.gradle

@@ -4,8 +4,8 @@ buildscript {
         minSdkVersion = 24
         compileSdkVersion = 35
         targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()

example/ios/MytrackerExample/AppDelegate.mm

@@ -1,6 +1,7 @@
 #import "AppDelegate.h"
 
 #import <React/RCTBundleURLProvider.h>
+#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
 
 @implementation AppDelegate
 
@@ -9,6 +10,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   self.moduleName = @"MytrackerExample";
   // You can add your custom initial props in the dictionary below.
   // They will be passed down to the ViewController used by React Native.
+  self.dependencyProvider = [RCTAppDependencyProvider new];
   self.initialProps = @{};
 
   return [super application:application didFinishLaunchingWithOptions:launchOptions];