feat(added): add new architecture support (#209)

* feat(added): add new architecture support

Author: tr3v3r

android/build.gradle

@@ -57,7 +57,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 
   buildTypes {
@@ -74,6 +74,19 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  sourceSets {
+    main {
+      if (isNewArchitectureEnabled()) {
+          java.srcDirs += [
+            "generated/java",
+            "generated/jni"
+          ]
+      } else {
+              java.srcDirs += ['src/oldarch']
+      }
+    }
+  }
 }
 
 repositories {
@@ -91,3 +104,10 @@ implementation 'com.google.android.gms:play-services-location:21.0.1'
 implementation "com.facebook.react:react-native:+"
 }
 
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "RNEspPosPrinterSpec"
+    codegenJavaPackageName = "com.escposprinter"
+  }
+}

android/src/main/java/com/reactnativeescposprinter/EposStringHelper.java

@@ -19,6 +19,7 @@
 
 public class EposStringHelper {
 private static int ERR_INIT = -1;
+private static int CONSTANT_NOT_SUPPORTED_FOR_PLATFORM = -404;
 
 
 
@@ -66,8 +67,14 @@ public static Map<String, Object> getDiscoveryConstants() {
       constants.put("TYPE_OTHER_PERIPHERAL", Discovery.TYPE_OTHER_PERIPHERAL);
       constants.put("FILTER_NAME", Discovery.FILTER_NAME);
       constants.put("FILTER_NONE", Discovery.FILTER_NONE);
-      constants.put("TRUE", Discovery.TRUE);
-      constants.put("FALSE", Discovery.FALSE);
+      constants.put("PRINTER_TRUE", Discovery.TRUE);
+      constants.put("PRINTER_FALSE", Discovery.FALSE);
+      // stub constants for cross-platform compatibility (iOS only)
+      constants.put("PORTTYPE_BLUETOOTH_LE", CONSTANT_NOT_SUPPORTED_FOR_PLATFORM);
+      constants.put("BT_ERR_PARAM", CONSTANT_NOT_SUPPORTED_FOR_PLATFORM);
+      constants.put("BT_ERR_UNSUPPORTED", CONSTANT_NOT_SUPPORTED_FOR_PLATFORM);
+      constants.put("BT_ERR_CANCEL", CONSTANT_NOT_SUPPORTED_FOR_PLATFORM);
+      constants.put("BT_ERR_ILLEGAL_DEVICE", CONSTANT_NOT_SUPPORTED_FOR_PLATFORM);
       // return values
       constants.put("ERR_PARAM", Epos2Exception.ERR_PARAM);
       constants.put("ERR_ILLEGAL", Epos2Exception.ERR_ILLEGAL);
@@ -140,6 +147,7 @@ public static Map<String, Object> getPrinterConstants() {
       constants.put("CODE_ERR_PROCESSING", Epos2CallbackCode.CODE_ERR_PROCESSING);
       constants.put("CODE_ERR_ILLEGAL", Epos2CallbackCode.CODE_ERR_ILLEGAL);
       constants.put("CODE_ERR_DEVICE_BUSY", Epos2CallbackCode.CODE_ERR_DEVICE_BUSY);
+      constants.put("CODE_ERR_PARAM", Epos2CallbackCode.CODE_ERR_PARAM);
 
           // get printer settings
 
@@ -186,8 +194,8 @@ public static Map<String, Object> getPrinterConstants() {
 
       // printer status
 
-      constants.put("TRUE", Printer.TRUE);
-      constants.put("FALSE", Printer.FALSE);
+      constants.put("PRINTER_TRUE", Printer.TRUE);
+      constants.put("PRINTER_FALSE", Printer.FALSE);
       constants.put("UNKNOWN", Printer.UNKNOWN);
       constants.put("PAPER_OK", Printer.PAPER_OK);
       constants.put("PAPER_NEAR_END", Printer.PAPER_NEAR_END);

android/src/main/java/com/reactnativeescposprinter/EscPosPrinterDiscoveryModule.java

@@ -40,13 +40,14 @@
 import com.google.android.gms.common.ConnectionResult;
 
 import com.escposprinter.EposStringHelper;
+import com.escposprinter.NativeEscPosPrinterDiscoverySpec;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 @ReactModule(name = EscPosPrinterDiscoveryModule.NAME)
-public class EscPosPrinterDiscoveryModule extends ReactContextBaseJavaModule implements ActivityEventListener {
+public class EscPosPrinterDiscoveryModule extends NativeEscPosPrinterDiscoverySpec implements ActivityEventListener {
 
   private Context mContext;
 
@@ -63,8 +64,7 @@ public EscPosPrinterDiscoveryModule(ReactApplicationContext reactContext) {
     reactContext.addActivityEventListener(this);
   }
 
-  @Override
-  public Map<String, Object> getConstants() {
+  protected Map<String, Object> getTypedExportedConstants() {
     return EposStringHelper.getDiscoveryConstants();
   }
 
@@ -78,11 +78,19 @@ public String getName() {
   @Override
   public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
     if (data != null && resultCode == Activity.RESULT_OK) {
-      reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-          .emit("enableLocationSettingSuccess", "Success");
+      if(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        emitEnableLocationSettingSuccess();
+      } else {
+        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit("enableLocationSettingSuccess", "Success");
+      }
     } else {
+      if(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        emitEnableLocationSettingFailure();
+      } else {
       reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
           .emit("enableLocationSettingFailure", "Failure");
+      }
     }
   }
 
@@ -153,11 +161,15 @@ public void onFailure(@NonNull Exception e) {
   }
 
   private void sendEvent(ReactApplicationContext reactContext, String eventName, @Nullable WritableArray params) {
-    reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, params);
+    if(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+     emitOnDiscovery(params);
+    } else {
+     reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, params);
+    }
   }
 
   @ReactMethod
-  private void startDiscovery(final ReadableMap paramsMap, Promise promise) {
+  public void startDiscovery(final ReadableMap paramsMap, Promise promise) {
     mDeviceList.clear();
     FilterOption mFilterOption = getFilterOptionsFromParams(paramsMap);
 
@@ -173,7 +185,7 @@ private void startDiscovery(final ReadableMap paramsMap, Promise promise) {
   }
 
   @ReactMethod
-  private void stopDiscovery(Promise promise) {
+  public void stopDiscovery(Promise promise) {
       try {
         Discovery.stop();
         promise.resolve(null);
@@ -241,4 +253,8 @@ public synchronized void run() {
       });
     }
   };
+
+  public void pairBluetoothDevice(String macAddress, Promise promise) {
+
+  }
 }