Merge pull request #3 from mtb-bank/development

Fix frame color Android
howljs · Oct 18, 2022 · a7f7e82 · a7f7e82
2 parents 2690555 + 006c55c
commit a7f7e82
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,4 +63,5 @@ buck-out/
 # generated by bob
 lib/
 .cxx
-.externalNativeBuild
+.externalNativeBuild
+.history
diff --git a/android/src/main/java/com/reactnativecardscanner/CardScannerViewManager.java b/android/src/main/java/com/reactnativecardscanner/CardScannerViewManager.java
@@ -42,11 +42,12 @@ public ScannerView createViewInstance(@NonNull ThemedReactContext reactContext)
   }
 
   @ReactProp(name = "frameColor")
-  public void setFrameColor(ScannerView view, int color) {
-    if (color == 0) {
+  public void setFrameColor(ScannerView view, String color) {
+    int parsedColor = Color.parseColor(color);
+    if (parsedColor == 0) {
       view.resetFrameColor();
     } else {
-      view.setFrameColor(color);
+      view.setFrameColor(parsedColor);
     }
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rn-card-scanner",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Credit card scanner for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",