@nativescript-community/gesturehandler 2.0.33 → 2.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/gesturehandler",
-    "version": "2.0.33",
+    "version": "2.0.36",
     "description": "Declarative API exposing platform native touch and gesture system to NativeScript.",
     "main": "gesturehandler",
     "sideEffects": false,
@@ -48,5 +48,5 @@
     "dependencies": {
         "@nativescript-community/observable": "^2.0.10"
     },
-    "gitHead": "7440d31cc0a96749a7a739b887626ade9e7c9a38"
+    "gitHead": "4614ed6c22844728637d162d6d0f2becd6d08861"
 }

package/platforms/android/include.gradle

@@ -1,22 +1,32 @@
 import groovy.json.JsonSlurper
-dependencies {
-    if (project.hasProperty("tempBuild")) {
-        implementation(name:'widgets-release', ext:'aar')
+
+// for now we support only @nativescript/core and @akylas/nativescript
+// we should have a more generic way
+def widgetsDir = "$USER_PROJECT_ROOT/node_modules/@nativescript/core/platforms/android"
+def appPackageJsonFile = file("$USER_PROJECT_ROOT/package.json")
+if (appPackageJsonFile.exists()) {
+    def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)
+    if (appPackageJson.dependencies['@akylas/nativescript'] != null) {
+        widgetsDir = "$USER_PROJECT_ROOT/node_modules/@akylas/nativescript/platforms/android"
     }
-    implementation "androidx.annotation:annotation:1.1.0"
 }
-repositories {
+
+dependencies {
+    implementation "androidx.annotation:annotation:1.1.0"
+
     if (project.hasProperty("tempBuild")) {
-        def widgetsDir = "$USER_PROJECT_ROOT/node_modules/@nativescript/core/platforms/android"
-        def appPackageJsonFile = file("$USER_PROJECT_ROOT/package.json")
-        if (appPackageJsonFile.exists()) {
-            def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)
-            if (appPackageJson.dependencies['@akylas/nativescript'] != null) {
-                widgetsDir = "$USER_PROJECT_ROOT/node_modules/@akylas/nativescript/platforms/android"
-            }
+        // if ui-mobile-base is provided as source the name is nativescript.aar
+        if (file("$widgetsDir/nativescript.aar").exists()) {
+            implementation(name:'nativescript', ext:'aar')
         }
-        flatDir {
-            dirs "$widgetsDir"
+        // if ui-mobile-base is provided as aar the name is widget-release.aar
+        if (file("$widgetsDir/widget-release.aar").exists()) {
+            implementation(name:'widget-release', ext:'aar')
         }
     }
-}
+}
+repositories {
+    flatDir {
+        dirs "$widgetsDir"
+    }
+}

package/platforms/android/java/com/swmansion/gesturehandler/GestureHandler.java

@@ -226,20 +226,20 @@ public class GestureHandler<T extends GestureHandler> {
     if (isTrackingPointer(pointerId)) {
       return;
     }
-    trackedPointerIDs[pointerId] = findNextLocalPointerId();
-    trackedPointersIDsCount++;
+    mTrackedPointerIDs[pointerId] = findNextLocalPointerId();
+    mTrackedPointersCount++;
   }
 
   public void stopTrackingPointer(int pointerId) {
     if (!isTrackingPointer(pointerId)) {
       return;
     }
-    trackedPointerIDs[pointerId] = -1;
-    trackedPointersIDsCount--;
+    mTrackedPointerIDs[pointerId] = -1;
+    mTrackedPointersCount--;
   }
 
   private boolean isTrackingPointer(int pointerId) {
-    return trackedPointerIDs[pointerId] != -1;
+    return mTrackedPointerIDs[pointerId] != -1;
   }
 
   private boolean needAdapt(MotionEvent event) {