Skip to content

feat: support new arch with backward compatibility #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 36 additions & 26 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,38 +1,48 @@
def safeExtGet(prop, fallback) {
def isNewArchitectureEnabled() {
return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
}
buildscript {
ext.safeExtGet = {prop, fallback ->
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
}
repositories {
google()
gradlePluginPortal()
}
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
}
}

apply plugin: 'com.android.library'
apply plugin: 'com.facebook.react'

android {
compileSdkVersion safeExtGet('compileSdkVersion', 30)
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
compileSdkVersion safeExtGet('compileSdkVersion', 33)
namespace "com.clipsub.RNShake"

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 18)
versionCode 4
versionName "4.0.0"
}
lintOptions {
warning 'InvalidPackage'
defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 21)
targetSdkVersion safeExtGet('targetSdkVersion', 33)
buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
}

sourceSets {
main {
if(isNewArchitectureEnabled()) {
java.srcDirs += ['src/newarch/java']
} else {
java.srcDirs += ['src/oldarch/java']
}
}
}
}

dependencies {
implementation "com.facebook.react:react-native:+"
repositories {
mavenCentral()
google()
}

allprojects {
repositories {
maven { url "https://jitpack.io" }
mavenLocal()
jcenter()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
maven {
url "https://maven.google.com"
}
}
}
dependencies {
implementation 'com.facebook.react:react-native'
}
3 changes: 0 additions & 3 deletions android/src/main/AndroidManifest.xml

This file was deleted.

44 changes: 0 additions & 44 deletions android/src/main/java/com/clipsub/RNShake/RNShakeEventModule.java

This file was deleted.

26 changes: 0 additions & 26 deletions android/src/main/java/com/clipsub/RNShake/RNShakeEventPackage.java

This file was deleted.

37 changes: 37 additions & 0 deletions android/src/main/java/com/clipsub/RNShake/RNShakeModuleImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.clipsub.RNShake;

import android.content.Context;
import android.hardware.SensorManager;

import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.modules.core.DeviceEventManagerModule;

public class RNShakeModuleImpl {
private final ReactApplicationContext reactContext;

public static final String NAME = "RNShake";
public final String EVENT_NAME = "ShakeEvent";

private CustomShakeDetector mCustomShakeDetector = null;

public RNShakeModuleImpl(ReactApplicationContext reactContext){
this.reactContext = reactContext;
}

public void onInitialize() {
mCustomShakeDetector = new CustomShakeDetector(this::sendEvent);

mCustomShakeDetector.start(
(SensorManager) reactContext.getSystemService(Context.SENSOR_SERVICE));
}

public void onInvalidate() {
mCustomShakeDetector.stop();
mCustomShakeDetector = null;
}

private void sendEvent(){
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
.emit(EVENT_NAME, null);
}
}
45 changes: 45 additions & 0 deletions android/src/main/java/com/clipsub/RNShake/RNShakePackage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.clipsub.RNShake;

import androidx.annotation.Nullable;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.module.model.ReactModuleInfo;
import com.facebook.react.module.model.ReactModuleInfoProvider;
import com.facebook.react.TurboReactPackage;

import java.util.HashMap;
import java.util.Map;

public class RNShakePackage extends TurboReactPackage {

@Nullable
@Override
public NativeModule getModule(String name, ReactApplicationContext reactContext) {
if(name.equals(RNShakeModuleImpl.NAME)){
return new RNShakeModule(reactContext);
} else {
return null;
}
}

@Override
public ReactModuleInfoProvider getReactModuleInfoProvider() {
return () -> {
boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
moduleInfos.put(
RNShakeModuleImpl.NAME,
new ReactModuleInfo(
RNShakeModuleImpl.NAME,
RNShakeModuleImpl.NAME,
false,
false,
true,
false,
isTurboModule
)
);
return moduleInfos;
};
}
}
42 changes: 42 additions & 0 deletions android/src/newarch/java/com/clipsub/RNShake/RNShakeModule.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.clipsub.RNShake;

import androidx.annotation.NonNull;

import com.facebook.react.bridge.ReactApplicationContext;

public class RNShakeModule extends NativeRNShakeSpec {
private RNShakeModuleImpl moduleImpl;

public RNShakeModule(ReactApplicationContext reactContext){
super(reactContext);
moduleImpl = new RNShakeModuleImpl(reactContext);
}

@Override
public void initialize() {
super.initialize();
moduleImpl.onInitialize();
}

@Override
public void invalidate() {
super.invalidate();
moduleImpl.onInvalidate();
}

@Override
public void addListener(String eventName) {

}

@Override
public void removeListeners(double count) {

}

@NonNull
@Override
public String getName() {
return RNShakeModuleImpl.NAME;
}
}
44 changes: 44 additions & 0 deletions android/src/oldarch/java/com/clipsub/RNShake/RNShakeModule.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.clipsub.RNShake;

import androidx.annotation.NonNull;

import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.module.annotations.ReactModule;

@ReactModule(name = RNShakeModuleImpl.NAME)
public class RNShakeModule extends ReactContextBaseJavaModule {
private final RNShakeModuleImpl moduleImpl;

public RNShakeModule(ReactApplicationContext reactContext) {
super(reactContext);
moduleImpl = new RNShakeModuleImpl(reactContext);
}

@NonNull
@Override
public String getName() {
return RNShakeModuleImpl.NAME;
}

@Override
public void initialize() {
super.initialize();
moduleImpl.onInitialize();
}

@Override
public void invalidate() {
super.invalidate();
moduleImpl.onInvalidate();
}

@ReactMethod
public void addListener(String eventName) {
}

@ReactMethod
public void removeListeners(double count) {
}
}
5 changes: 5 additions & 0 deletions ios/RNShake.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#import <React/RCTEventEmitter.h>

@interface RNShake : RCTEventEmitter

@end
64 changes: 64 additions & 0 deletions ios/RNShake.mm
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#import "RNShake.h"
#import "RNShakeImpl.h"

#if RCT_NEW_ARCH_ENABLED

#import "RNShakeSpec.h"

@interface RNShake () <NativeRNShakeSpec>
@end

#endif

@interface RNShake () <RNShakeImplDelegate>
@end

@implementation RNShake{
RNShakeImpl *moduleImpl;
BOOL hasListeners;
}

RCT_EXPORT_MODULE(RNShake)

-(instancetype)init {
self = [super init];
if(self){
moduleImpl = [RNShakeImpl new];
moduleImpl.delegate = self;
}
return self;
}

- (void)handleEventWithName:(NSString * _Nonnull)name {
if(hasListeners){
[self sendEventWithName:name body:nil];
}
}

- (NSArray<NSString *> *)supportedEvents
{
return [RNShakeImpl supportedEvents];
}

- (void)startObserving
{
hasListeners = YES;
}

-(void)stopObserving
{
hasListeners = NO;
}

+ (BOOL)requiresMainQueueSetup
{
return YES;
}

#if RCT_NEW_ARCH_ENABLED
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
return std::make_shared<facebook::react::NativeRNShakeSpecJSI>(params);
}
#endif

@end
Loading