π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Keep iOS QR scans within visible frame
Neeraj Gupta16156bb7987d
diff --git a/mobile/apps/auth/lib/ui/scanner_gauth_page.dart b/mobile/apps/auth/lib/ui/scanner_gauth_page.dartindex ed89355daa..238a2de349 100644--- a/mobile/apps/auth/lib/ui/scanner_gauth_page.dart+++ b/mobile/apps/auth/lib/ui/scanner_gauth_page.dart@@ -45,6 +45,7 @@ class ScannerGoogleAuthPageState extends State<ScannerGoogleAuthPage> {child: ScannerCameraView(overlay: EnteQrScannerOverlay(borderColor: getEnteColorScheme(context).primary700,+ cutOutSize: 320,overlayColor: Colors.black.withValues(alpha: 0.45),),onScannerCreated: _onScannerCreated,diff --git a/mobile/apps/auth/lib/ui/scanner_page.dart b/mobile/apps/auth/lib/ui/scanner_page.dartindex c4486bc6f3..a37f06e116 100644--- a/mobile/apps/auth/lib/ui/scanner_page.dart+++ b/mobile/apps/auth/lib/ui/scanner_page.dart@@ -85,7 +85,7 @@ class ScannerPageState extends State<ScannerPage> {child: ScannerCameraView(overlay: EnteQrScannerOverlay(borderColor: colorScheme.primary700,- cutOutSize: 260,+ cutOutSize: 320,overlayColor: Colors.black.withValues(alpha: 0.45),),onScannerCreated: _onScannerCreated,diff --git a/mobile/packages/ente_qr_scanner/ios/Classes/EnteQrScannerView.swift b/mobile/packages/ente_qr_scanner/ios/Classes/EnteQrScannerView.swiftindex 1f140b7c1b..7f77a81548 100644--- a/mobile/packages/ente_qr_scanner/ios/Classes/EnteQrScannerView.swift+++ b/mobile/packages/ente_qr_scanner/ios/Classes/EnteQrScannerView.swift@@ -2,6 +2,18 @@ import AVFoundationimport Flutterimport UIKit+private struct EnteQrScannerOverlay {+ let cutOutSize: CGFloat++ static func from(_ args: Any?) -> EnteQrScannerOverlay {+ guard let map = args as? [String: Any] else {+ return EnteQrScannerOverlay(cutOutSize: 260)+ }+ let cutOutSize = (map["cutOutSize"] as? NSNumber)?.doubleValue ?? 260+ return EnteQrScannerOverlay(cutOutSize: CGFloat(cutOutSize))+ }+}+private final class EnteQrScannerPreviewView: UIView {var onLayout: (() -> Void)?@@ -14,11 +26,11 @@ private final class EnteQrScannerPreviewView: UIView {final class EnteQrScannerView: NSObject, FlutterPlatformView, AVCaptureMetadataOutputObjectsDelegate {private let containerView: EnteQrScannerPreviewViewprivate let channel: FlutterMethodChannel+ private let overlay: EnteQrScannerOverlayprivate let session = AVCaptureSession()private let sessionQueue = DispatchQueue(label: "io.ente.qr_scanner.session")private let metadataQueue = DispatchQueue(label: "io.ente.qr_scanner.metadata")private var previewLayer: AVCaptureVideoPreviewLayer?- private var metadataOutput: AVCaptureMetadataOutput?private var captureDevice: AVCaptureDevice?private var isConfigured = falseprivate var isPaused = false@@ -33,6 +45,7 @@ final class EnteQrScannerView: NSObject, FlutterPlatformView, AVCaptureMetadataOargs: Any?,messenger: FlutterBinaryMessenger) {+ overlay = EnteQrScannerOverlay.from(args)containerView = EnteQrScannerPreviewView(frame: frame)channel = FlutterMethodChannel(name: "io.ente.qr_scanner/view_\(platformViewId)",@@ -138,6 +151,7 @@ final class EnteQrScannerView: NSObject, FlutterPlatformView, AVCaptureMetadataOreturn}session.addOutput(output)+ output.rectOfInterest = CGRect(x: 0, y: 0, width: 1, height: 1)output.setMetadataObjectsDelegate(self, queue: metadataQueue)let enabledMetadataTypes = supportedMetadataTypes.filter {output.availableMetadataObjectTypes.contains($0)@@ -148,7 +162,6 @@ final class EnteQrScannerView: NSObject, FlutterPlatformView, AVCaptureMetadataOreturn}output.metadataObjectTypes = enabledMetadataTypes- metadataOutput = outputsession.commitConfiguration()isConfigured = true@@ -221,7 +234,16 @@ final class EnteQrScannerView: NSObject, FlutterPlatformView, AVCaptureMetadataO}previewLayer?.frame = containerView.bounds- metadataOutput?.rectOfInterest = CGRect(x: 0, y: 0, width: 1, height: 1)+ }++ private func scanRect(in bounds: CGRect) -> CGRect {+ let side = min(max(overlay.cutOutSize, 0), min(bounds.width, bounds.height))+ return CGRect(+ x: bounds.midX - side / 2,+ y: bounds.midY - side / 2,+ width: side,+ height: side+ )}private func pause() {@@ -292,21 +314,50 @@ final class EnteQrScannerView: NSObject, FlutterPlatformView, AVCaptureMetadataOdidOutput metadataObjects: [AVMetadataObject],from connection: AVCaptureConnection) {+ guard !isDisposed, !isPaused, !metadataObjects.isEmpty else {+ return+ }+ DispatchQueue.main.async { [weak self] in+ self?.handle(metadataObjects)+ }+ }++ private func handle(_ metadataObjects: [AVMetadataObject]) {guard!isDisposed,!isPaused,- let readableObject = metadataObjects- .compactMap({ $0 as? AVMetadataMachineReadableCodeObject })- .first,- supportedMetadataTypes.contains(readableObject.type),- let payload = readableObject.stringValue,- !payload.isEmpty+ let previewLayer = previewLayerelse {return}++ let scanRect = scanRect(in: containerView.bounds)+ let scanCenter = CGPoint(x: scanRect.midX, y: scanRect.midY)+ let readableObject = metadataObjects+ .compactMap {+ previewLayer.transformedMetadataObject(for: $0)+ as? AVMetadataMachineReadableCodeObject+ }+ .filter {+ supportedMetadataTypes.contains($0.type)+ && scanRect.contains(CGPoint(x: $0.bounds.midX, y: $0.bounds.midY))+ }+ .min {+ squaredDistance(from: $0.bounds, to: scanCenter)+ < squaredDistance(from: $1.bounds, to: scanCenter)+ }+ guard let payload = readableObject?.stringValue, !payload.isEmpty else {+ return+ }emitCode(payload)}+ private func squaredDistance(from bounds: CGRect, to point: CGPoint) -> CGFloat {+ let xDistance = bounds.midX - point.x+ let yDistance = bounds.midY - point.y+ return xDistance * xDistance + yDistance * yDistance+ }+private func emitCode(_ text: String) {let now = Date()if lastEmittedText == text && now.timeIntervalSince(lastEmittedAt) < 1.5 {