diff --git a/packages/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThread.java b/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java similarity index 69% rename from packages/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThread.java rename to packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java index e6a4cd1c37b..b1ccdf8b59d 100644 --- a/packages/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThread.java +++ b/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThread.java @@ -1,9 +1,9 @@ -package com.swmansion.reanimated; +package com.swmansion.worklets; import com.facebook.proguard.annotations.DoNotStrip; @DoNotStrip -public class ReanimatedMessageQueueThread extends ReanimatedMessageQueueThreadBase { +public class WorkletsMessageQueueThread extends WorkletsMessageQueueThreadBase { @Override public boolean runOnQueue(Runnable runnable) { return messageQueueThread.runOnQueue(runnable); diff --git a/packages/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThreadBase.java b/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java similarity index 93% rename from packages/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThreadBase.java rename to packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java index ca7733d0cbc..ade92c5b8b2 100644 --- a/packages/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThreadBase.java +++ b/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsMessageQueueThreadBase.java @@ -1,4 +1,4 @@ -package com.swmansion.reanimated; +package com.swmansion.worklets; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.queue.MessageQueueThread; @@ -14,10 +14,10 @@ // The only method that has changed is `quitSynchronous()` (see comment above // function implementation for details). @DoNotStrip -public abstract class ReanimatedMessageQueueThreadBase implements MessageQueueThread { +public abstract class WorkletsMessageQueueThreadBase implements MessageQueueThread { protected final MessageQueueThreadImpl messageQueueThread; - public ReanimatedMessageQueueThreadBase() { + public WorkletsMessageQueueThreadBase() { messageQueueThread = MessageQueueThreadImpl.create( MessageQueueThreadSpec.mainThreadSpec(), diff --git a/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsModule.java b/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsModule.java index 31c74a6e560..62ca7713cdc 100644 --- a/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsModule.java +++ b/packages/react-native-reanimated/android/src/main/java/com/swmansion/worklets/WorkletsModule.java @@ -10,7 +10,6 @@ import com.facebook.react.module.annotations.ReactModule; import com.facebook.soloader.SoLoader; import com.swmansion.reanimated.NativeWorkletsModuleSpec; -import com.swmansion.reanimated.ReanimatedMessageQueueThread; import java.util.Objects; @ReactModule(name = WorkletsModule.NAME) @@ -30,8 +29,7 @@ protected HybridData getHybridData() { return mHybridData; } - private final ReanimatedMessageQueueThread mMessageQueueThread = - new ReanimatedMessageQueueThread(); + private final WorkletsMessageQueueThread mMessageQueueThread = new WorkletsMessageQueueThread(); /** * @noinspection JavaJniMissingFunction diff --git a/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm b/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm index eba24c8a15c..d99b0e97c99 100644 --- a/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm +++ b/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm @@ -22,7 +22,7 @@ #endif #import -#import +#import #ifdef RCT_NEW_ARCH_ENABLED #import diff --git a/packages/react-native-reanimated/apple/reanimated/apple/native/PlatformDepMethodsHolderImpl.mm b/packages/react-native-reanimated/apple/reanimated/apple/native/PlatformDepMethodsHolderImpl.mm index 4f2f3ac611b..65f5584a4c8 100644 --- a/packages/react-native-reanimated/apple/reanimated/apple/native/PlatformDepMethodsHolderImpl.mm +++ b/packages/react-native-reanimated/apple/reanimated/apple/native/PlatformDepMethodsHolderImpl.mm @@ -19,7 +19,7 @@ #endif #import -#import +#import #ifdef RCT_NEW_ARCH_ENABLED #import diff --git a/packages/react-native-reanimated/apple/worklets/apple/REAMessageThread.h b/packages/react-native-reanimated/apple/worklets/apple/WorkletsMessageThread.h similarity index 87% rename from packages/react-native-reanimated/apple/worklets/apple/REAMessageThread.h rename to packages/react-native-reanimated/apple/worklets/apple/WorkletsMessageThread.h index 16f47378a33..2ac8055a090 100644 --- a/packages/react-native-reanimated/apple/worklets/apple/REAMessageThread.h +++ b/packages/react-native-reanimated/apple/worklets/apple/WorkletsMessageThread.h @@ -10,7 +10,7 @@ namespace facebook { namespace react { -class REAMessageThread : public RCTMessageThread { +class WorkletsMessageThread : public RCTMessageThread { public: using RCTMessageThread::RCTMessageThread; virtual void quitSynchronous() override; diff --git a/packages/react-native-reanimated/apple/worklets/apple/REAMessageThread.mm b/packages/react-native-reanimated/apple/worklets/apple/WorkletsMessageThread.mm similarity index 72% rename from packages/react-native-reanimated/apple/worklets/apple/REAMessageThread.mm rename to packages/react-native-reanimated/apple/worklets/apple/WorkletsMessageThread.mm index 0df1e2f1794..b5e46a10e56 100644 --- a/packages/react-native-reanimated/apple/worklets/apple/REAMessageThread.mm +++ b/packages/react-native-reanimated/apple/worklets/apple/WorkletsMessageThread.mm @@ -1,4 +1,4 @@ -#import +#import #import #import @@ -11,9 +11,9 @@ namespace react { // Essentially the same as RCTMessageThread, but with public fields. -struct REAMessageThreadPublic { +struct WorkletsMessageThreadPublic { // I don't know why we need three vtables (if you know then feel free to#import - // explain it instead of this message), but this is what makes the casts + // explain it instead of this message), but this is what makes the casts // in quitSynchronous() work correctly. void *vtable1; void *vtable2; @@ -27,10 +27,10 @@ // is an assertion for that in the destructor of RCTMessageThread, but we have // to override quitSynchronous() as it would quit the main looper and freeze // the app. -void REAMessageThread::quitSynchronous() +void WorkletsMessageThread::quitSynchronous() { RCTMessageThread *rctThread = static_cast(this); - REAMessageThreadPublic *rctThreadPublic = reinterpret_cast(rctThread); + WorkletsMessageThreadPublic *rctThreadPublic = reinterpret_cast(rctThread); rctThreadPublic->m_shutdown = true; } diff --git a/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm b/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm index 622539ee20f..77f502ed825 100644 --- a/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm +++ b/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm @@ -1,6 +1,6 @@ #import #import -#import +#import #import #import @@ -36,7 +36,7 @@ @implementation WorkletsModule { { auto *bridge = self.bridge; auto &rnRuntime = *(jsi::Runtime *)bridge.runtime; - auto jsQueue = std::make_shared([NSRunLoop currentRunLoop], ^(NSError *error) { + auto jsQueue = std::make_shared([NSRunLoop currentRunLoop], ^(NSError *error) { throw error; }); nativeWorkletsModule_ = std::make_shared(std::string([valueUnpackerCode UTF8String]), jsQueue);