Merge pull request #629 from Syn-McJ/fix/large-qr-logo

fix: QR isn't recognized
dashpay · Dec 5, 2023 · 3a97d65 · 3a97d65
2 parents ebd0dc8 + db28d99
commit 3a97d65
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 44 deletions.
diff --git a/DashWallet/Sources/UI/Payments/Receive/Models/DWBaseReceiveModel.m b/DashWallet/Sources/UI/Payments/Receive/Models/DWBaseReceiveModel.m
@@ -51,40 +51,9 @@ static CGSize QRCodeSizeRequestAmount(void) {
     }
 }
 
-static CGSize HoleSize(BOOL hasAmount) {
-    if (IS_IPAD) {
-        return CGSizeMake(84.0, 84.0); // 2 + 80(logo size) + 2
-    }
-    else if (IS_IPHONE_5_OR_LESS) {
-        return CGSizeMake(48.0, 48.0);
-    }
-    else {
-        if (hasAmount) {
-            return CGSizeMake(58.0, 58.0);
-        }
-        else {
-            return CGSizeMake(84.0, 84.0);
-        }
-    }
-}
-
-static CGSize const LOGO_SMALL_SIZE = {54.0, 54.0};
-
-static BOOL ShouldResizeLogoToSmall(BOOL hasAmount) {
-    if (IS_IPAD) {
-        return NO;
-    }
-    if (IS_IPHONE_5_OR_LESS) {
-        return YES;
-    }
-    else {
-        return hasAmount;
-    }
-}
-
 @interface DWBaseReceiveModel ()
 
-@property (readonly, nonatomic, assign) CGSize holeSize;
+@property (readonly, nonatomic, assign) CGSize logoSize;
 
 @end
 
@@ -106,7 +75,9 @@ - (instancetype)initWithAmount:(uint64_t)amount {
         else {
             _qrCodeSize = QRCodeSizeBasic();
         }
-        _holeSize = HoleSize(hasAmount);
+
+        CGFloat logoSize = _qrCodeSize.height * 0.22;
+        _logoSize = CGSizeMake(logoSize, logoSize);
     }
     return self;
 }
@@ -123,15 +94,13 @@ - (UIImage *)qrCodeImageWithRawQRImage:(UIImage *)rawQRImage hasAmount:(BOOL)has
 #endif
 
     const BOOL shouldDrawUser = username != nil;
-
-    if (ShouldResizeLogoToSmall(hasAmount)) {
-        if (shouldDrawUser) {
-            size = LOGO_SMALL_SIZE;
-        }
-        else {
-            overlayImage = [overlayImage dw_resize:LOGO_SMALL_SIZE
-                          withInterpolationQuality:kCGInterpolationHigh];
-        }
+
+    if (shouldDrawUser) {
+        size = _logoSize;
+    }
+    else {
+        overlayImage = [overlayImage dw_resize:_logoSize
+                        withInterpolationQuality:kCGInterpolationHigh];
     }
 
     if (shouldDrawUser) {
@@ -181,7 +150,7 @@ - (UIImage *)qrCodeImageWithRawQRImage:(UIImage *)rawQRImage hasAmount:(BOOL)has
     }
 
     UIImage *resizedImage = [rawQRImage dw_resize:self.qrCodeSize withInterpolationQuality:kCGInterpolationNone];
-    resizedImage = [resizedImage dw_imageByCuttingHoleInCenterWithSize:self.holeSize];
+    resizedImage = [resizedImage dw_imageByCuttingHoleInCenterWithSize:self.logoSize];
 
     UIImage *qrCodeImage = [resizedImage dw_imageByMergingWithImage:overlayImage];
 

diff --git a/Shared/Sources/UIImage+Utils.m b/Shared/Sources/UIImage+Utils.m
@@ -38,7 +38,7 @@ + (instancetype)dw_imageWithQRCodeData:(NSData *)data color:(CIColor *)color {
              *filter = colorFilter;
 
     [qrFilter setValue:data forKey:@"inputMessage"];
-    [qrFilter setValue:@"M" forKey:@"inputCorrectionLevel"];
+    [qrFilter setValue:@"Q" forKey:@"inputCorrectionLevel"];
 
     if (color.alpha > DBL_EPSILON) {
         [invertFilter setValue:qrFilter.outputImage forKey:@"inputImage"];