From 9ca6aade2b6d30bdb3d9b62f74d1aac1a6c8da33 Mon Sep 17 00:00:00 2001 From: Matej Simota Date: Wed, 17 Sep 2025 16:03:55 +0200 Subject: [PATCH] update qrCode package --- Package.resolved | 14 +++++++------- Package.swift | 2 +- .../Screens/ConnectWallet/QRCodeView.swift | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Package.resolved b/Package.resolved index 04f412308..f22cb069f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -3,11 +3,11 @@ "pins": [ { "package": "QRCode", - "repositoryURL": "https://github.com/WalletConnect/QRCode", + "repositoryURL": "https://github.com/dagronf/QRCode.git", "state": { "branch": null, - "revision": "263f280d2c8144adfb0b6676109846cfc8dd552b", - "version": "14.3.1" + "revision": "ea4047a7777bae470adc140cd94bfa5396a96202", + "version": "27.11.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/dagronf/swift-qrcode-generator", "state": { "branch": null, - "revision": "5ca09b6a2ad190f94aa3d6ddef45b187f8c0343b", - "version": "1.0.3" + "revision": "2b1980b825f08a81ccc762b0c4d17fcde9d5e953", + "version": "2.0.2" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/dagronf/SwiftImageReadWrite", "state": { "branch": null, - "revision": "5596407d1cf61b953b8e658fa8636a471df3c509", - "version": "1.1.6" + "revision": "42ace2412279f18bc264bc306e96b51c36e12a33", + "version": "1.9.2" } }, { diff --git a/Package.swift b/Package.swift index 9fb257872..5149cca86 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let yttriumDebug = false // Define dependencies array var dependencies: [Package.Dependency] = [ .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"), - .package(url: "https://github.com/WalletConnect/QRCode", from: "14.3.1"), + .package(url: "https://github.com/dagronf/QRCode.git", from: "27.11.0"), .package(name: "CoinbaseWalletSDK", url: "https://github.com/MobileWalletProtocol/wallet-mobile-sdk", .upToNextMinor(from: "1.1.0")), // .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", .upToNextMinor(from: "1.10.0")), ] diff --git a/Sources/ReownAppKit/Screens/ConnectWallet/QRCodeView.swift b/Sources/ReownAppKit/Screens/ConnectWallet/QRCodeView.swift index 169792f5c..defb6a7ed 100644 --- a/Sources/ReownAppKit/Screens/ConnectWallet/QRCodeView.swift +++ b/Sources/ReownAppKit/Screens/ConnectWallet/QRCodeView.swift @@ -25,10 +25,10 @@ struct QRCodeView: View { } @MainActor private func render(content: String, size: CGSize) -> Image { - let doc = QRCode.Document( + guard let doc = try? QRCode.Document( utf8String: content, errorCorrection: .quantize - ) + ) else {return Image(systemName: "x.mark")} doc.design.shape.eye = QRCode.EyeShape.Squircle2() doc.design.shape.onPixels = QRCode.PixelShape.Vertical( insetFraction: 0.15, @@ -62,11 +62,11 @@ struct QRCodeView: View { inset: 20 ) } - return doc.imageUI( + return (try? doc.imageUI( size.applying(.init(scaleX: 3, y: 3)), dpi: 72 * 3, label: Text("QR code with URI") - )! + )) ?? Image(systemName: "x.mark") } } @@ -115,6 +115,7 @@ struct QRCodeView_Previews: PreviewProvider { extension QRCode.EyeShape { /// A 'squircle' eye style @objc(QRCodeEyeShapeSquircle2) class Squircle2: NSObject, QRCodeEyeShapeGenerator { + @objc public static let Name = "squircle" @objc public static var Title: String { "Squircle2" } @objc public static func Create(_ settings: [String: Any]?) -> QRCodeEyeShapeGenerator { @@ -149,6 +150,10 @@ extension QRCode.EyeShape { private static let _defaultPupil = QRCode.PupilShape.Squircle2() public func defaultPupil() -> QRCodePupilShapeGenerator { Self._defaultPupil } + + func reset() { + + } } } @@ -183,5 +188,9 @@ extension QRCode.PupilShape { return path } + + func reset() { + + } } }