diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.kt index 4575933434a65..d463e6a680e33 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.kt @@ -9,6 +9,8 @@ import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManager import com.shopify.reactnative.flash_list.ReactNativeFlashListPackage import com.shopify.reactnative.skia.RNSkiaPackage +import com.swmansion.gesturehandler.RNGestureHandlerPackage +import com.swmansion.gesturehandler.react.RNGestureHandlerModule import expo.modules.adapters.react.ReactModuleRegistryProvider import expo.modules.core.interfaces.Package import expo.modules.core.interfaces.SingletonModule @@ -26,8 +28,6 @@ import org.json.JSONException import versioned.host.exp.exponent.modules.api.* import versioned.host.exp.exponent.modules.api.cognito.RNAWSCognitoModule import versioned.host.exp.exponent.modules.api.components.datetimepicker.RNDateTimePickerPackage -import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerModule -import versioned.host.exp.exponent.modules.api.components.gesturehandler.RNGestureHandlerPackage import versioned.host.exp.exponent.modules.api.components.lottie.LottiePackage import versioned.host.exp.exponent.modules.api.components.maps.MapsPackage import versioned.host.exp.exponent.modules.api.components.maskedview.RNCMaskedViewPackage diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/reanimated/NativeProxy.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/reanimated/NativeProxy.java index 6d2ab5d7802cb..02fd6797927a9 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/reanimated/NativeProxy.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/reanimated/NativeProxy.java @@ -15,7 +15,8 @@ import com.facebook.react.turbomodule.core.CallInvokerHolderImpl; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.RCTEventEmitter; -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandlerStateManager; +import com.swmansion.common.GestureHandlerStateManager; + import versioned.host.exp.exponent.modules.api.reanimated.layoutReanimation.AnimationsManager; import versioned.host.exp.exponent.modules.api.reanimated.layoutReanimation.LayoutAnimations; import versioned.host.exp.exponent.modules.api.reanimated.layoutReanimation.NativeMethodsHolder; diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/build.gradle b/android/vendored/unversioned/react-native-gesture-handler/android/build.gradle new file mode 100644 index 0000000000000..59e09d694a166 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/build.gradle @@ -0,0 +1,229 @@ +import groovy.json.JsonSlurper +import java.nio.file.Paths + +buildscript { + def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion'] + + repositories { + mavenCentral() + } + + dependencies { + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") + } +} + +def isNewArchitectureEnabled() { + // To opt-in for the New Architecture, you can either: + // - Set `newArchEnabled` to true inside the `gradle.properties` file + // - Invoke gradle with `-newArchEnabled=true` + // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` + return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" +} + +static def findNodeModulePath(baseDir, packageName) { + def basePath = baseDir.toPath().normalize() + // Node's module resolution algorithm searches up to the root directory, + // after which the base path will be null + while (basePath) { + def candidatePath = Paths.get(basePath.toString(), "node_modules", packageName) + if (candidatePath.toFile().exists()) { + return candidatePath.toString() + } + basePath = basePath.getParent() + } + return null +} + +def findNodeModulePath(packageName) { + // Don't start in the project dir, as its path ends with node_modules/react-native-gesture-handler/android + // we want to go two levels up, so we end up in the first_node modules and eventually + // search upwards if the package is not found there + return findNodeModulePath(projectDir.toPath().parent.parent.toFile(), packageName) +} + +if (isNewArchitectureEnabled()) { + apply plugin: 'com.facebook.react' +} +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + +// Check whether Reanimated 2.3 or higher is installed alongside Gesture Handler +def shouldUseCommonInterfaceFromReanimated() { + def reanimated = rootProject.subprojects.find { it.name == 'react-native-reanimated' } + if (reanimated != null) { + def inputFile = new File(reanimated.projectDir, '../package.json') + def json = new JsonSlurper().parseText(inputFile.text) + def reanimatedVersion = json.version as String + def (major, minor, patch) = reanimatedVersion.tokenize('.') + return (Integer.parseInt(major) == 2 && Integer.parseInt(minor) >= 3) || Integer.parseInt(major) == 3 + } else { + return false + } +} + +def reactNativeArchitectures() { + def value = project.getProperties().get("reactNativeArchitectures") + return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] +} + +def shouldAssertNoMultipleInstances() { + if (rootProject.hasProperty("disableMultipleInstancesCheck")) { + return rootProject.property("disableMultipleInstancesCheck") != "true" + } else { + return true + } +} + +def noMultipleInstancesAssertion() { + Set files = fileTree(rootDir.parent) { + include "node_modules/**/react-native-gesture-handler/package.json" + exclude "**/.yarn/**" + }.files + + if (files.size() > 1) { + String parsedLocation = files.stream().map({ File file -> "- " + file.toString().replace("/package.json", "") }).collect().join("\n") + String exceptionMessage = "\n[Gesture Handler] Multiple instances of Gesture Handler were detected. Only one instance of react-native-gesture-handler can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-gesture-handler/docs/troubleshooting#multiple-instances-of-gesture-handler-were-detected \n\nConflict between: \n" + parsedLocation + "\n"; + throw new Exception(exceptionMessage); + } +} + +def REACT_NATIVE_DIR = findNodeModulePath("react-native") + +def assertionTask = task assertNoMultipleInstances { + onlyIf { shouldAssertNoMultipleInstances() } + doFirst { + noMultipleInstancesAssertion() + } +} + +tasks.preBuild { + dependsOn assertionTask +} + +repositories { + mavenCentral() +} + +android { + compileSdkVersion safeExtGet("compileSdkVersion", 28) + + // Used to override the NDK path/version on internal CI or by allowing + // users to customize the NDK path/version from their root project (e.g. for M1 support) + if (rootProject.hasProperty("ndkPath")) { + ndkPath rootProject.ext.ndkPath + } + if (rootProject.hasProperty("ndkVersion")) { + ndkVersion rootProject.ext.ndkVersion + } + + defaultConfig { + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 28) + versionCode 1 + versionName "1.0" + buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() + if (isNewArchitectureEnabled()) { + var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')} + externalNativeBuild { + cmake { + cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all" + arguments "-DAPP_BUILD_DIR=${appProject.buildDir}", + "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}", + "-DANDROID_STL=c++_shared" + abiFilters (*reactNativeArchitectures()) + } + } + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + if (isNewArchitectureEnabled()) { + externalNativeBuild { + cmake { + path "src/main/jni/CMakeLists.txt" + } + } + } + + packagingOptions { + // For some reason gradle only complains about the duplicated version of libreact_render libraries + // while there are more libraries copied in intermediates folder of the lib build directory, we exclude + // only the ones that make the build fail (ideally we should only include libgesturehandler but we + // are only allowed to specify exclude patterns) + exclude "**/libreact_render*.so" + } + + // Include "lib/" as sources, unfortunately react-native link can't handle + // setting up alternative gradle modules. We still have "lib" defined as a + // standalone gradle module just to be used in AndroidNativeExample + sourceSets.main { + java { + srcDirs += 'lib/src/main/java' + + // Include "common/" only when it's not provided by Reanimated to mitigate + // multiple definitions of the same class preventing build + if (shouldUseCommonInterfaceFromReanimated()) { + srcDirs += 'reanimated/src/main/java' + } else { + srcDirs += 'common/src/main/java' + srcDirs += 'noreanimated/src/main/java' + } + + if (isNewArchitectureEnabled()) { + srcDirs += 'src/fabric/java' + } else { + // this folder also includes files from codegen so the library can compile with + // codegen turned off + srcDirs += 'src/paper/java' + } + } + } +} + +def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlinVersion']) + +dependencies { + //noinspection GradleDynamicVersion + if (isNewArchitectureEnabled()) { + implementation project(':ReactAndroid') + } else { + implementation 'com.facebook.react:react-native:+' + } + + if (shouldUseCommonInterfaceFromReanimated()) { + // Include Reanimated as dependency to load the common interface + implementation (rootProject.subprojects.find { it.name == 'react-native-reanimated' }) { + exclude group:'com.facebook.fbjni' // resolves "Duplicate class com.facebook.jni.CppException" + } + } + + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation "androidx.core:core-ktx:1.6.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} + +if (isNewArchitectureEnabled()) { + // Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct". + tasks.whenTaskAdded { task -> + if (task.name.contains("configureCMakeDebug")) { + rootProject.getTasksByName("packageReactNdkDebugLibs", true).forEach { + task.dependsOn(it) + } + } + // We want to add a dependency for both configureCMakeRelease and configureCMakeRelWithDebInfo + if (task.name.contains("configureCMakeRel")) { + rootProject.getTasksByName("packageReactNdkReleaseLibs", true).forEach { + task.dependsOn(it) + } + } + } +} diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/common/GestureHandlerStateManager.kt b/android/vendored/unversioned/react-native-gesture-handler/android/common/src/main/java/com/swmansion/common/GestureHandlerStateManager.kt similarity index 58% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/common/GestureHandlerStateManager.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/common/src/main/java/com/swmansion/common/GestureHandlerStateManager.kt index 95b91702dbd37..4e754cdbf1a0d 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/common/GestureHandlerStateManager.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/common/src/main/java/com/swmansion/common/GestureHandlerStateManager.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.common interface GestureHandlerStateManager { fun setGestureHandlerState(handlerTag: Int, newState: Int) diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/gradle.properties b/android/vendored/unversioned/react-native-gesture-handler/android/gradle.properties new file mode 100644 index 0000000000000..bb5cbe32541a0 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/gradle.properties @@ -0,0 +1,19 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +RNGH_kotlinVersion=1.6.21 diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/AndroidManifest.xml b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000..5fa4c9c519414 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/Extensions.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/Extensions.kt similarity index 85% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/Extensions.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/Extensions.kt index 1033096d6a915..a0c959ddec9a9 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/Extensions.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/Extensions.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import com.facebook.react.bridge.ReactContext import com.facebook.react.modules.core.DeviceEventManagerModule diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/FlingGestureHandler.kt similarity index 97% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/FlingGestureHandler.kt index e1bb6fd828b33..fc2c8ed019bd0 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/FlingGestureHandler.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.os.Handler import android.os.Looper diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandler.kt similarity index 99% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandler.kt index c9602050d117b..f690e42efb771 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandler.kt @@ -1,5 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler -import host.exp.expoview.BuildConfig +package com.swmansion.gesturehandler import android.app.Activity import android.content.Context @@ -15,7 +14,7 @@ import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.UiThreadUtil import com.facebook.react.bridge.WritableArray import com.facebook.react.uimanager.PixelUtil -import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerTouchEvent +import com.swmansion.gesturehandler.react.RNGestureHandlerTouchEvent import java.lang.IllegalStateException import java.util.* diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerInteractionController.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerInteractionController.kt similarity index 86% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerInteractionController.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerInteractionController.kt index 4d3df1f7a0b43..c9dfa2ab4c3cf 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerInteractionController.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerInteractionController.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler interface GestureHandlerInteractionController { fun shouldWaitForHandlerFailure(handler: GestureHandler<*>, otherHandler: GestureHandler<*>): Boolean diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerOrchestrator.kt similarity index 99% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerOrchestrator.kt index f114a31c809de..d4380a2faaed8 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerOrchestrator.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.graphics.Matrix import android.graphics.PointF diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerRegistry.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerRegistry.kt similarity index 67% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerRegistry.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerRegistry.kt index d0f721b018970..f8f51723cd522 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerRegistry.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerRegistry.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.view.View import java.util.* diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureUtils.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureUtils.kt similarity index 94% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureUtils.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureUtils.kt index b7198c9e8087a..15f9c395c92ec 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureUtils.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/GestureUtils.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.view.MotionEvent diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/LongPressGestureHandler.kt similarity index 97% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/LongPressGestureHandler.kt index fe975593fa472..47a5222c25f09 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/LongPressGestureHandler.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.content.Context import android.os.Handler diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ManualGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ManualGestureHandler.kt similarity index 76% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ManualGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ManualGestureHandler.kt index 9d3a3f571f0a0..f55ecd68f4f40 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ManualGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ManualGestureHandler.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.view.MotionEvent diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/NativeViewGestureHandler.kt similarity index 99% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/NativeViewGestureHandler.kt index 5cc1c0bf47eef..1ab3048169087 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/NativeViewGestureHandler.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.os.SystemClock import android.view.MotionEvent diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/OnTouchEventListener.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/OnTouchEventListener.kt similarity index 79% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/OnTouchEventListener.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/OnTouchEventListener.kt index b82986a050e00..2bdd7fa75e632 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/OnTouchEventListener.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/OnTouchEventListener.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.view.MotionEvent diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PanGestureHandler.kt similarity index 97% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PanGestureHandler.kt index 84663192b50f4..7caf07fa55fc9 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PanGestureHandler.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.content.Context import android.os.Handler @@ -6,8 +6,8 @@ import android.os.Looper import android.view.MotionEvent import android.view.VelocityTracker import android.view.ViewConfiguration -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureUtils.getLastPointerX -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureUtils.getLastPointerY +import com.swmansion.gesturehandler.GestureUtils.getLastPointerX +import com.swmansion.gesturehandler.GestureUtils.getLastPointerY class PanGestureHandler(context: Context?) : GestureHandler() { var velocityX = 0f diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PinchGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PinchGestureHandler.kt similarity index 97% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PinchGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PinchGestureHandler.kt index e89904cc271e6..6f6afd72557da 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PinchGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PinchGestureHandler.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.graphics.PointF import android.view.MotionEvent diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PointerEventsConfig.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PointerEventsConfig.kt similarity index 84% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PointerEventsConfig.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PointerEventsConfig.kt index 90b400a388d6c..d85ef12f3607e 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PointerEventsConfig.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/PointerEventsConfig.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler enum class PointerEventsConfig { /** diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RotationGestureDetector.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureDetector.kt similarity index 98% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RotationGestureDetector.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureDetector.kt index 5fd4ff3a8fcbc..6da6049ddc4a8 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RotationGestureDetector.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureDetector.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.view.MotionEvent import kotlin.math.atan2 diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RotationGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureHandler.kt similarity index 91% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RotationGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureHandler.kt index a8e120704619d..e86c7447c1dad 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RotationGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureHandler.kt @@ -1,8 +1,8 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.graphics.PointF import android.view.MotionEvent -import versioned.host.exp.exponent.modules.api.components.gesturehandler.RotationGestureDetector.OnRotationGestureListener +import com.swmansion.gesturehandler.RotationGestureDetector.OnRotationGestureListener import kotlin.math.abs class RotationGestureHandler : GestureHandler() { diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ScaleGestureDetector.java b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ScaleGestureDetector.java similarity index 99% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ScaleGestureDetector.java rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ScaleGestureDetector.java index 087600881cf23..32c266367baf5 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ScaleGestureDetector.java +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ScaleGestureDetector.java @@ -5,7 +5,7 @@ * Modified line 189 to set initial min span to 0 instead of copying it from the system configuration */ -package versioned.host.exp.exponent.modules.api.components.gesturehandler; +package com.swmansion.gesturehandler; import android.content.Context; import android.os.Build; diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/TapGestureHandler.kt similarity index 94% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/TapGestureHandler.kt index 0242acafc9770..048abd7b1123d 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/TapGestureHandler.kt @@ -1,10 +1,10 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.os.Handler import android.os.Looper import android.view.MotionEvent -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureUtils.getLastPointerX -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureUtils.getLastPointerY +import com.swmansion.gesturehandler.GestureUtils.getLastPointerX +import com.swmansion.gesturehandler.GestureUtils.getLastPointerY import kotlin.math.abs class TapGestureHandler : GestureHandler() { diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ViewConfigurationHelper.kt b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ViewConfigurationHelper.kt similarity index 79% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ViewConfigurationHelper.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ViewConfigurationHelper.kt index 869aeafb63947..131f4869613e8 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ViewConfigurationHelper.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/main/java/com/swmansion/gesturehandler/ViewConfigurationHelper.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import android.view.View import android.view.ViewGroup diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/test/java/com/swmansion/gesturehandler/ExampleUnitTest.java b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/test/java/com/swmansion/gesturehandler/ExampleUnitTest.java new file mode 100644 index 0000000000000..b258220b8e2f3 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/lib/src/test/java/com/swmansion/gesturehandler/ExampleUnitTest.java @@ -0,0 +1,12 @@ +package com.swmansion.gesturehandler; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/noreanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt b/android/vendored/unversioned/react-native-gesture-handler/android/noreanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt new file mode 100644 index 0000000000000..6202cde89b3a9 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/noreanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt @@ -0,0 +1,10 @@ +package com.swmansion.gesturehandler + +import com.facebook.react.bridge.ReactContext +import com.facebook.react.uimanager.events.Event + +class ReanimatedEventDispatcher { + fun >sendEvent(event: T, reactApplicationContext: ReactContext) { + // no-op + } +} diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/reanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt b/android/vendored/unversioned/react-native-gesture-handler/android/reanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt new file mode 100644 index 0000000000000..3abd66529cd15 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/reanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt @@ -0,0 +1,17 @@ +package com.swmansion.gesturehandler + +import com.facebook.react.bridge.ReactContext +import com.facebook.react.uimanager.events.Event +import com.swmansion.reanimated.ReanimatedModule + +class ReanimatedEventDispatcher { + private var reanimatedModule: ReanimatedModule? = null + + fun >sendEvent(event: T, reactApplicationContext: ReactContext) { + if (reanimatedModule == null) { + reanimatedModule = reactApplicationContext.getNativeModule(ReanimatedModule::class.java) + } + + reanimatedModule?.nodesManager?.onEventDispatch(event) + } +} diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/settings.gradle b/android/vendored/unversioned/react-native-gesture-handler/android/settings.gradle new file mode 100644 index 0000000000000..c8e23f4979eb4 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/settings.gradle @@ -0,0 +1 @@ +include 'lib' \ No newline at end of file diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/src/fabric/java/com/swmansion/gesturehandler/RNGestureHandlerComponentsRegistry.java b/android/vendored/unversioned/react-native-gesture-handler/android/src/fabric/java/com/swmansion/gesturehandler/RNGestureHandlerComponentsRegistry.java new file mode 100644 index 0000000000000..44f6fc6ff31ed --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/fabric/java/com/swmansion/gesturehandler/RNGestureHandlerComponentsRegistry.java @@ -0,0 +1,29 @@ +package com.swmansion.gesturehandler.react; + +import com.facebook.jni.HybridData; +import com.facebook.proguard.annotations.DoNotStrip; +import com.facebook.react.fabric.ComponentFactory; +import com.facebook.soloader.SoLoader; + +@DoNotStrip +public class RNGestureHandlerComponentsRegistry { + static { + SoLoader.loadLibrary("fabricjni"); + SoLoader.loadLibrary("gesturehandler"); + } + + @DoNotStrip private final HybridData mHybridData; + + @DoNotStrip + private native HybridData initHybrid(ComponentFactory componentFactory); + + @DoNotStrip + private RNGestureHandlerComponentsRegistry(ComponentFactory componentFactory) { + mHybridData = initHybrid(componentFactory); + } + + @DoNotStrip + public static RNGestureHandlerComponentsRegistry register(ComponentFactory componentFactory) { + return new RNGestureHandlerComponentsRegistry(componentFactory); + } +} diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/src/fabric/java/com/swmansion/gesturehandler/ReactContextExtensions.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/fabric/java/com/swmansion/gesturehandler/ReactContextExtensions.kt new file mode 100644 index 0000000000000..bdc18b772df1d --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/fabric/java/com/swmansion/gesturehandler/ReactContextExtensions.kt @@ -0,0 +1,12 @@ +package com.swmansion.gesturehandler + +import com.facebook.react.bridge.ReactContext +import com.facebook.react.fabric.FabricUIManager +import com.facebook.react.uimanager.UIManagerHelper +import com.facebook.react.uimanager.common.UIManagerType +import com.facebook.react.uimanager.events.Event + +fun ReactContext.dispatchEvent(event: Event<*>) { + val fabricUIManager = UIManagerHelper.getUIManager(this, UIManagerType.FABRIC) as FabricUIManager + fabricUIManager.eventDispatcher.dispatchEvent(event) +} diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/src/main/AndroidManifest.xml b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000..5fa4c9c519414 --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt similarity index 57% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt index 065f0100e825d..d022eb381e86a 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt @@ -1,14 +1,13 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler -import host.exp.expoview.BuildConfig +package com.swmansion.gesturehandler import com.facebook.react.ReactPackage import com.facebook.react.bridge.NativeModule import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManager - -import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerModule -import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerRootViewManager -import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerButtonViewManager +import com.swmansion.gesturehandler.BuildConfig +import com.swmansion.gesturehandler.react.RNGestureHandlerModule +import com.swmansion.gesturehandler.react.RNGestureHandlerRootViewManager +import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager class RNGestureHandlerPackage : ReactPackage { override fun createNativeModules(reactContext: ReactApplicationContext): List { diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerButtonViewManager.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt similarity index 96% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerButtonViewManager.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt index 5fdf80ba84b41..7451e47a51382 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerButtonViewManager.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt @@ -1,5 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react -import host.exp.expoview.R +package com.swmansion.gesturehandler.react import android.annotation.SuppressLint import android.annotation.TargetApi @@ -28,8 +27,8 @@ import com.facebook.react.uimanager.ViewProps import com.facebook.react.uimanager.annotations.ReactProp import com.facebook.react.viewmanagers.RNGestureHandlerButtonManagerDelegate import com.facebook.react.viewmanagers.RNGestureHandlerButtonManagerInterface -import versioned.host.exp.exponent.modules.api.components.gesturehandler.NativeViewGestureHandler -import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerButtonViewManager.ButtonViewGroup +import com.swmansion.gesturehandler.NativeViewGestureHandler +import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager.ButtonViewGroup @ReactModule(name = RNGestureHandlerButtonViewManager.REACT_CLASS) class RNGestureHandlerButtonViewManager : ViewGroupManager(), RNGestureHandlerButtonManagerInterface { @@ -165,7 +164,7 @@ class RNGestureHandlerButtonViewManager : ViewGroupManager(), R * (e.g. move and up in one gesture; move and cancel) * * Reference: - * [versioned.host.exp.exponent.modules.api.components.gesturehandler.NativeViewGestureHandler.onHandle] */ + * [com.swmansion.gesturehandler.NativeViewGestureHandler.onHandle] */ @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent): Boolean { if (event.action == MotionEvent.ACTION_CANCEL) { diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEnabledRootView.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEnabledRootView.kt similarity index 91% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEnabledRootView.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEnabledRootView.kt index 5f922b4e8b352..471ce311ef518 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEnabledRootView.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEnabledRootView.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import android.content.Context import android.os.Bundle diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEvent.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEvent.kt similarity index 92% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEvent.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEvent.kt index ece0c0abe6512..10ca971db7daf 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEvent.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEvent.kt @@ -4,14 +4,14 @@ // ref: https://github.com/facebook/react-native/commit/2fbbdbb2ce897e8da3f471b08b93f167d566db1d @file:Suppress("DEPRECATION") -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import androidx.core.util.Pools import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.WritableMap import com.facebook.react.uimanager.events.Event import com.facebook.react.uimanager.events.RCTEventEmitter -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandler class RNGestureHandlerEvent private constructor() : Event() { private var extraData: WritableMap? = null diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEventDataExtractor.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEventDataExtractor.kt similarity index 51% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEventDataExtractor.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEventDataExtractor.kt index 70b4566250098..3a4ce05e83034 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerEventDataExtractor.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEventDataExtractor.kt @@ -1,7 +1,7 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import com.facebook.react.bridge.WritableMap -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandler interface RNGestureHandlerEventDataExtractor> { fun extractEventData(handler: T, eventData: WritableMap) diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerInteractionManager.kt similarity index 85% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerInteractionManager.kt index e44719523b273..682eeec010e89 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerInteractionManager.kt @@ -1,10 +1,10 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import android.util.SparseArray import com.facebook.react.bridge.ReadableMap -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandlerInteractionController -import versioned.host.exp.exponent.modules.api.components.gesturehandler.NativeViewGestureHandler +import com.swmansion.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandlerInteractionController +import com.swmansion.gesturehandler.NativeViewGestureHandler class RNGestureHandlerInteractionManager : GestureHandlerInteractionController { private val waitForRelations = SparseArray() diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerModule.kt similarity index 99% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerModule.kt index 3b10389ca544d..c710e85e1e823 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerModule.kt @@ -1,5 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react -import host.exp.expoview.BuildConfig +package com.swmansion.gesturehandler.react import android.content.Context import android.util.Log @@ -12,8 +11,8 @@ import com.facebook.react.uimanager.PixelUtil import com.facebook.react.uimanager.UIBlock import com.facebook.react.uimanager.events.Event import com.facebook.soloader.SoLoader -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandlerStateManager -import versioned.host.exp.exponent.modules.api.components.gesturehandler.* +import com.swmansion.common.GestureHandlerStateManager +import com.swmansion.gesturehandler.* import java.util.* // NativeModule.onCatalystInstanceDestroy() was deprecated in favor of NativeModule.invalidate() // ref: https://github.com/facebook/react-native/commit/18c8417290823e67e211bde241ae9dde27b72f17 diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRegistry.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRegistry.kt similarity index 91% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRegistry.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRegistry.kt index b517da0a5148c..6c100f37a1f36 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRegistry.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRegistry.kt @@ -1,10 +1,10 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import android.util.SparseArray import android.view.View import com.facebook.react.bridge.UiThreadUtil -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandlerRegistry +import com.swmansion.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandlerRegistry import java.util.* class RNGestureHandlerRegistry : GestureHandlerRegistry { diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootHelper.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt similarity index 94% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootHelper.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt index 3db1cf07785dc..2a3442e7c9f81 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootHelper.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import android.os.SystemClock import android.util.Log @@ -10,8 +10,8 @@ import com.facebook.react.bridge.UiThreadUtil import com.facebook.react.common.ReactConstants import com.facebook.react.uimanager.RootView import com.facebook.react.views.modal.ReactModalHostView -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandlerOrchestrator +import com.swmansion.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandlerOrchestrator class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView: ViewGroup) { private val orchestrator: GestureHandlerOrchestrator? diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootInterface.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootInterface.kt similarity index 53% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootInterface.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootInterface.kt index d85d88e83db71..5bed5489b8428 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootInterface.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootInterface.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react interface RNGestureHandlerRootInterface { val rootHelper: RNGestureHandlerRootHelper? diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootView.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt similarity index 96% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootView.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt index 6b36e18a8c5fe..da3098fd03218 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootView.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import android.content.Context import android.util.Log diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootViewManager.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootViewManager.kt similarity index 96% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootViewManager.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootViewManager.kt index ed698b17256f0..e310c04314b07 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerRootViewManager.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootViewManager.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import com.facebook.react.module.annotations.ReactModule import com.facebook.react.uimanager.ThemedReactContext diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt similarity index 93% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt index b9993f1cb1e6a..90aff4694145a 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt @@ -4,14 +4,14 @@ // ref: https://github.com/facebook/react-native/commit/2fbbdbb2ce897e8da3f471b08b93f167d566db1d @file:Suppress("DEPRECATION") -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import androidx.core.util.Pools import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.WritableMap import com.facebook.react.uimanager.events.Event import com.facebook.react.uimanager.events.RCTEventEmitter -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandler class RNGestureHandlerStateChangeEvent private constructor() : Event() { private var extraData: WritableMap? = null diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerTouchEvent.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerTouchEvent.kt similarity index 92% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerTouchEvent.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerTouchEvent.kt index 6a94c2e128b46..88f0ece7e5e00 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerTouchEvent.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerTouchEvent.kt @@ -1,11 +1,11 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import androidx.core.util.Pools import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.WritableMap import com.facebook.react.uimanager.events.Event import com.facebook.react.uimanager.events.RCTEventEmitter -import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler +import com.swmansion.gesturehandler.GestureHandler class RNGestureHandlerTouchEvent private constructor() : Event() { private var extraData: WritableMap? = null diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNViewConfigurationHelper.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt similarity index 86% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNViewConfigurationHelper.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt index 83b5e662bd9c3..d33c4f3034083 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNViewConfigurationHelper.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt @@ -1,12 +1,12 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler.react +package com.swmansion.gesturehandler.react import android.view.View import android.view.ViewGroup import com.facebook.react.uimanager.PointerEvents import com.facebook.react.uimanager.ReactPointerEventsView import com.facebook.react.views.view.ReactViewGroup -import versioned.host.exp.exponent.modules.api.components.gesturehandler.PointerEventsConfig -import versioned.host.exp.exponent.modules.api.components.gesturehandler.ViewConfigurationHelper +import com.swmansion.gesturehandler.PointerEventsConfig +import com.swmansion.gesturehandler.ViewConfigurationHelper class RNViewConfigurationHelper : ViewConfigurationHelper { override fun getPointerEventsConfigForView(view: View): PointerEventsConfig { diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/src/main/jni/CMakeLists.txt b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/jni/CMakeLists.txt new file mode 100644 index 0000000000000..af11fb44ecbaa --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/jni/CMakeLists.txt @@ -0,0 +1,59 @@ +project(GestureHandler) +cmake_minimum_required(VERSION 3.9.0) + +set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1") + +add_library(gesturehandler + SHARED + cpp-adapter.cpp +) + +set(REACT_ANDROID_DIR "${REACT_NATIVE_DIR}/ReactAndroid") +set(REACT_COMMON_DIR "${REACT_NATIVE_DIR}/ReactCommon") +set(REACT_NDK_EXPORT_DIR "${APP_BUILD_DIR}/react-ndk/exported") + +# copied from react-native/ReactAndroid/cmake-utils/Android-prebuilt.cmake + +## jsi +add_library(jsi SHARED IMPORTED GLOBAL) +set_target_properties(jsi + PROPERTIES + IMPORTED_LOCATION + ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libjsi.so) +target_include_directories(jsi INTERFACE ${REACT_COMMON_DIR}/jsi) + +## react_render_core +add_library(react_render_core SHARED IMPORTED GLOBAL) +set_target_properties(react_render_core + PROPERTIES + IMPORTED_LOCATION + ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_core.so) +target_include_directories(react_render_core + INTERFACE + ${REACT_COMMON_DIR} + ${REACT_COMMON_DIR}/react/renderer/core) + +## react_render_uimanager +add_library(react_render_uimanager SHARED IMPORTED GLOBAL) +set_target_properties(react_render_uimanager + PROPERTIES + IMPORTED_LOCATION + ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_uimanager.so) +target_include_directories(react_render_uimanager INTERFACE ${REACT_COMMON_DIR}/react/renderer/uimanager) + +target_include_directories( + gesturehandler + PRIVATE + "${REACT_ANDROID_DIR}/build/third-party-ndk/boost/boost_1_76_0" + "${REACT_ANDROID_DIR}/build/third-party-ndk/double-conversion" + "${REACT_ANDROID_DIR}/build/third-party-ndk/folly" +) + +target_link_libraries( + gesturehandler + jsi + react_render_uimanager + react_render_core +) diff --git a/android/vendored/unversioned/react-native-gesture-handler/android/src/main/jni/cpp-adapter.cpp b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/jni/cpp-adapter.cpp new file mode 100644 index 0000000000000..211f2f966769e --- /dev/null +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/main/jni/cpp-adapter.cpp @@ -0,0 +1,41 @@ +#include +#include + +#include + +using namespace facebook; +using namespace react; + +void decorateRuntime(jsi::Runtime &runtime) +{ + auto isFormsStackingContext = jsi::Function::createFromHostFunction( + runtime, + jsi::PropNameID::forAscii(runtime, "isFormsStackingContext"), + 1, + [](jsi::Runtime &runtime, + const jsi::Value &thisValue, + const jsi::Value *arguments, + size_t count) -> jsi::Value + { + if (!arguments[0].isObject()) + { + return jsi::Value::null(); + } + + auto shadowNode = arguments[0].asObject(runtime).getHostObject(runtime)->shadowNode; + bool isFormsStackingContext = shadowNode->getTraits().check(ShadowNodeTraits::FormsStackingContext); + + return jsi::Value(isFormsStackingContext); + }); + runtime.global().setProperty(runtime, "isFormsStackingContext", std::move(isFormsStackingContext)); +} + +extern "C" JNIEXPORT void JNICALL +Java_com_swmansion_gesturehandler_react_RNGestureHandlerModule_decorateRuntime(JNIEnv *env, jobject clazz, jlong jsiPtr) +{ + jsi::Runtime *runtime = reinterpret_cast(jsiPtr); + if (runtime) + { + decorateRuntime(*runtime); + } +} diff --git a/android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java b/android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java similarity index 100% rename from android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java rename to android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java diff --git a/android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java b/android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java similarity index 100% rename from android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java rename to android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java diff --git a/android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java b/android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java similarity index 100% rename from android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java rename to android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java diff --git a/android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java b/android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java similarity index 100% rename from android/expoview/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java rename to android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ReactContextExtensions.kt b/android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/swmansion/gesturehandler/ReactContextExtensions.kt similarity index 86% rename from android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ReactContextExtensions.kt rename to android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/swmansion/gesturehandler/ReactContextExtensions.kt index 9613d94920367..757956c9eaa7f 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/ReactContextExtensions.kt +++ b/android/vendored/unversioned/react-native-gesture-handler/android/src/paper/java/com/swmansion/gesturehandler/ReactContextExtensions.kt @@ -1,4 +1,4 @@ -package versioned.host.exp.exponent.modules.api.components.gesturehandler +package com.swmansion.gesturehandler import com.facebook.react.bridge.ReactContext import com.facebook.react.uimanager.UIManagerModule diff --git a/tools/src/vendoring/config/expoGoConfig.ts b/tools/src/vendoring/config/expoGoConfig.ts index 7bc326f022f8b..ac06e4239e4e3 100644 --- a/tools/src/vendoring/config/expoGoConfig.ts +++ b/tools/src/vendoring/config/expoGoConfig.ts @@ -58,6 +58,7 @@ const config: VendoringTargetConfig = { source: 'https://github.com/software-mansion/react-native-gesture-handler.git', semverPrefix: '~', ios: {}, + android: {}, }, 'react-native-reanimated': { source: 'https://github.com/software-mansion/react-native-reanimated.git',