@momo-kits/qrcode 0.150.2-beta.10 → 0.150.2-beta.11

package/android/src/main/java/com/momokits/qrcode/RCTQRCodeView.kt

@@ -12,7 +12,6 @@ import java.util.*
 
 class RCTQRCodeView : ImageView {
   private var qrValue: String? = null
-  private var qrSize: Int = 200
   private var qrColor: Int = Color.BLACK
   private var qrBackgroundColor: Int = Color.WHITE
 
@@ -36,13 +35,15 @@ class RCTQRCodeView : ImageView {
     scaleType = ScaleType.FIT_CENTER
   }
 
-  fun setValue(value: String?) {
-    qrValue = value
-    generateQRCode()
+  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+    super.onSizeChanged(w, h, oldw, oldh)
+    if (w > 0 && h > 0) {
+      generateQRCode()
+    }
   }
 
-  fun setSize(size: Int) {
-    qrSize = size
+  fun setValue(value: String?) {
+    qrValue = value
     generateQRCode()
   }
 
@@ -62,13 +63,20 @@ class RCTQRCodeView : ImageView {
       return
     }
 
+    // Use view dimensions, with fallback to default size
+    val size = if (width > 0 && height > 0) {
+      minOf(width, height)
+    } else {
+      200 // Default size
+    }
+
     try {
       val writer = QRCodeWriter()
       val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
       hints[EncodeHintType.CHARACTER_SET] = "UTF-8"
       hints[EncodeHintType.MARGIN] = 1
 
-      val bitMatrix = writer.encode(qrValue, BarcodeFormat.QR_CODE, qrSize, qrSize, hints)
+      val bitMatrix = writer.encode(qrValue, BarcodeFormat.QR_CODE, size, size, hints)
       val width = bitMatrix.width
       val height = bitMatrix.height
       val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)

package/android/src/main/java/com/momokits/qrcode/RCTQRCodeViewManager.kt

@@ -22,11 +22,6 @@ class RCTQRCodeViewManager : SimpleViewManager<RCTQRCodeView>() {
     view.setValue(value)
   }
 
-  @ReactProp(name = "size", defaultFloat = 200f)
-  fun setSize(view: RCTQRCodeView, size: Float) {
-    view.setSize(size.toInt())
-  }
-
   @ReactProp(name = "color")
   fun setColor(view: RCTQRCodeView, color: String?) {
     color?.let {

package/ios/RCTQRCodeView.h

@@ -9,7 +9,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RCTQRCodeView : RCTViewComponentView
 
 - (void)setValue:(NSString *)value;
-- (void)setQrSize:(CGFloat)size;
+- (void)setColor:(NSString *)color;
+- (void)setBackgroundColor:(NSString *)backgroundColor;
 
 @end
 

package/ios/RCTQRCodeView.mm

@@ -5,7 +5,8 @@
 @implementation RCTQRCodeView {
     UIImageView *_qrImageView;
     NSString *_value;
-    CGFloat _size;
+    UIColor *_qrColor;
+    UIColor *_qrBackgroundColor;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -13,9 +14,11 @@
     if (self = [super initWithFrame:frame]) {
         _qrImageView = [[UIImageView alloc] init];
         _qrImageView.contentMode = UIViewContentModeScaleAspectFit;
-        _qrImageView.backgroundColor = [UIColor whiteColor];
         [self addSubview:_qrImageView];
-        _size = 200.0; // Default size
+
+        // Default colors
+        _qrColor = [UIColor blackColor];
+        _qrBackgroundColor = [UIColor whiteColor];
     }
     return self;
 }
@@ -51,14 +54,39 @@
     }
 }
 
-- (void)setQrSize:(CGFloat)size
+- (void)setColor:(NSString *)color
+{
+    if (color) {
+        _qrColor = [self colorFromHexString:color] ?: [UIColor blackColor];
+        [self generateQRCode];
+    }
+}
+
+- (void)setBackgroundColor:(NSString *)backgroundColor
 {
-    if (_size != size) {
-        _size = size;
+    if (backgroundColor) {
+        _qrBackgroundColor = [self colorFromHexString:backgroundColor] ?: [UIColor whiteColor];
         [self generateQRCode];
     }
 }
 
+- (UIColor *)colorFromHexString:(NSString *)hexString
+{
+    if (!hexString) return nil;
+
+    NSString *cleanString = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@""];
+    if ([cleanString length] != 6) return nil;
+
+    NSScanner *scanner = [NSScanner scannerWithString:cleanString];
+    unsigned hexValue = 0;
+    if (![scanner scanHexInt:&hexValue]) return nil;
+
+    return [UIColor colorWithRed:((hexValue & 0xFF0000) >> 16) / 255.0
+                           green:((hexValue & 0xFF00) >> 8) / 255.0
+                            blue:(hexValue & 0xFF) / 255.0
+                           alpha:1.0];
+}
+
 - (void)generateQRCode
 {
     if (!_value || _value.length == 0) {
@@ -78,8 +106,13 @@
         return;
     }
 
-    // Calculate scale based on desired size
-    CGFloat scale = _size / qrImage.extent.size.width;
+    // Use the view's bounds for sizing, with a minimum scale
+    CGFloat viewSize = MIN(self.bounds.size.width, self.bounds.size.height);
+    if (viewSize == 0) {
+        viewSize = 200.0; // Default size
+    }
+
+    CGFloat scale = viewSize / qrImage.extent.size.width;
 
     CIFilter *scaleFilter = [CIFilter filterWithName:@"CILanczosScaleTransform"];
     [scaleFilter setValue:qrImage forKey:@"inputImage"];
@@ -88,8 +121,16 @@
 
     CIImage *scaledImage = scaleFilter.outputImage;
 
+    // Apply colors using CIFilter
+    CIFilter *colorFilter = [CIFilter filterWithName:@"CIFalseColor"];
+    [colorFilter setValue:scaledImage forKey:@"inputImage"];
+    [colorFilter setValue:[CIColor colorWithCGColor:_qrColor.CGColor] forKey:@"inputColor0"];
+    [colorFilter setValue:[CIColor colorWithCGColor:_qrBackgroundColor.CGColor] forKey:@"inputColor1"];
+
+    CIImage *coloredImage = colorFilter.outputImage;
+
     CIContext *context = [CIContext context];
-    CGImageRef cgImage = [context createCGImage:scaledImage fromRect:scaledImage.extent];
+    CGImageRef cgImage = [context createCGImage:coloredImage fromRect:coloredImage.extent];
     UIImage *qrCodeImage = [UIImage imageWithCGImage:cgImage];
     CGImageRelease(cgImage);
 

package/ios/RCTQRCodeViewManager.mm

@@ -15,13 +15,7 @@ RCT_EXPORT_MODULE(RCTQRCodeView)
 }
 
 RCT_EXPORT_VIEW_PROPERTY(value, NSString)
-RCT_CUSTOM_VIEW_PROPERTY(size, NSNumber, RCTQRCodeView)
-{
-    if (json) {
-        [view setQrSize:[RCTConvert CGFloat:json]];
-    } else {
-        [view setQrSize:200.0];
-    }
-}
+RCT_EXPORT_VIEW_PROPERTY(color, NSString)
+RCT_EXPORT_VIEW_PROPERTY(backgroundColor, NSString)
 
 @end

package/lib/module/RCTQRCodeViewNativeComponent.ts

@@ -3,7 +3,6 @@ import type { ColorValue } from 'react-native';
 
 export interface NativeProps extends ViewProps {
   value?: string;
-  size?: number;
   backgroundColor?: ColorValue;
   color?: ColorValue;
 }

package/lib/typescript/src/RCTQRCodeViewNativeComponent.d.ts

@@ -2,7 +2,6 @@ import { type ViewProps } from 'react-native';
 import type { ColorValue } from 'react-native';
 export interface NativeProps extends ViewProps {
     value?: string;
-    size?: number;
     backgroundColor?: ColorValue;
     color?: ColorValue;
 }

package/lib/typescript/src/RCTQRCodeViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RCTQRCodeViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RCTQRCodeViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,UAAU,CAAC;IAC7B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;;AAED,wBAAoE"}
+{"version":3,"file":"RCTQRCodeViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RCTQRCodeViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,UAAU,CAAC;IAC7B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;;AAED,wBAAoE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/qrcode",
-  "version": "0.150.2-beta.10",
+  "version": "0.150.2-beta.11",
   "description": "RCTQRCode & RCTBarCode",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/RCTQRCodeViewNativeComponent.ts

@@ -3,7 +3,6 @@ import type { ColorValue } from 'react-native';
 
 export interface NativeProps extends ViewProps {
   value?: string;
-  size?: number;
   backgroundColor?: ColorValue;
   color?: ColorValue;
 }