taler-ios

commit d98cf41486adae8115904e0dbbfd03da0e272934
parent 445759b337b14688b25b2615694b3b7a707a95ea
Author: Marc Stibane <marc@taler.net>
Date:   Wed,  4 Nov 2026 06:49:43 +0100

cleanup

Diffstat:
M
TalerCommon/HelperViews/QRGeneratorView.swift
 | 
3
+--
M
TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
 | 
5
++---
M
TalerWallet1/Views/OIM/OIMp2pReadyView.swift
 | 
5
++---
M
TalerWallet1/Views/Transactions/ManualDetailsV.swift
 | 
1
-
M
TalerWallet1/Views/Transactions/QRcodesForPayto.swift
 | 
5
++---

5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/TalerCommon/HelperViews/QRGeneratorView.swift b/TalerCommon/HelperViews/QRGeneratorView.swift
@@ -36,11 +36,10 @@ public func QRCode(from text: String) -> UIImage? {
 }
 // MARK: -
 struct QRGeneratorView: View {
-    let text: String
+    let image: UIImage?
     let size: CGFloat
     let logo: Image?
     let logoSize: CGFloat
-    let image: UIImage?
 
     // a QR code which cannot be generated must not look like an empty area to scan
     private var failedText: Text {
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -82,9 +82,8 @@ struct QRCodeDetailView: View {
                     GradientBorder(size: size + 20.0,
                                   color: WalletColors().primaryAccent,
                              background: WalletColors().backgroundColor)
-                    QRGeneratorView(text: talerURI, size: size,
-                                    logo: logo, logoSize: logoSize,
-                                   image: qrImage)
+                    QRGeneratorView(image: qrImage, size: size,
+                                    logo: logo, logoSize: logoSize)
                         .frame(maxWidth: .infinity, alignment: .center)
                 }
                 if #available(iOS 17.7, *) {
diff --git a/TalerWallet1/Views/OIM/OIMp2pReadyView.swift b/TalerWallet1/Views/OIM/OIMp2pReadyView.swift
@@ -38,9 +38,8 @@ struct OIMp2pReadyView: View {
                                     VStack {
                                         Spacer()
                                         let size = 240.0
-                                        QRGeneratorView(text: talerURI, size: size,
-                                                        logo: nil, logoSize: size / 4,
-                                                       image: qrImage)
+                                        QRGeneratorView(image: qrImage, size: size,
+                                                        logo: nil, logoSize: size / 4)
                                             .frame(maxWidth: .infinity, alignment: .center)
                                             .accessibilityLabel(Text("QR Code", comment: "a11y"))
                                         Spacer()
diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
@@ -162,7 +162,6 @@ struct WireTransferView: View {
                                 let minTitle = String(localized: "Share PayTo", comment: "mini")
                                 // TODO: chQRr
                                 let textToShare = String("\(payto)\n\nIBAN: \(iban)\nReceiver: \(receiverStr)\nAmount: \(amountStr.1)\nSubject: \(reservePub)")
-            let _ = print(textToShare)
                                 ShareButton(textToShare, title: minimalistic ? minTitle : title)
                                     .frame(maxWidth: .infinity, alignment: .center)
                                     .accessibilityLabel(Text(title))
diff --git a/TalerWallet1/Views/Transactions/QRcodesForPayto.swift b/TalerWallet1/Views/Transactions/QRcodesForPayto.swift
@@ -36,9 +36,8 @@ struct QRcodeCopyShare: View {
                 let size = 276.0    // 46x46mm, swiss flag = 7x7mm plus border  276*9/46 = 54
                 let image = QRCode(from: qrCodeSpec.qrContent)
                 if let image {
-                    QRGeneratorView(text: qrCodeSpec.qrContent, size: size,
-                                    logo: logo, logoSize: size * 9 / 46,
-                                   image: image)
+                    QRGeneratorView(image: image, size: size,
+                                    logo: logo, logoSize: size * 9 / 46)
                         .frame(maxWidth: .infinity, alignment: .center)
                         .listRowSeparator(.hidden)
                 }