taler-ios

commit 2ecdf4ae9327674d48009e918031b2733504f0a4
parent e2dd55954a12e4785b2543ae545f7a9b60c99933
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 19 Jul 2026 16:03:14 +0200

always with blue border

Diffstat:
M
TalerWallet1/Views/HelperViews/GradientBorder.swift
 | 
24
+++++++++---------------
M
TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
 | 
7
++++++-

2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/GradientBorder.swift b/TalerWallet1/Views/HelperViews/GradientBorder.swift
@@ -31,10 +31,11 @@ struct NFCbutton: View {
     let action: () -> Void
 
     @AppStorage("minimalistic") var minimalistic: Bool = false
+
     var body: some View {
         let logo = nfcLogo
-        let nfcButton = Button(minimalistic ? "\(logo)"
-                                            : "\(logo) \(title)") {
+        Button(minimalistic ? "\(logo)"
+                            : "\(logo) \(title)") {
             action()
         }.buttonStyle(TalerButtonStyle(type: .prominent))
     }
@@ -81,13 +82,8 @@ struct BorderWithHCE<Content: View>: View {
                                 .padding(.vertical, -4)
                         }
 //                        let screenWidth = UIScreen.screenWidth
-                        GradientBorder(size: size + 20.0,
-                                      color: WalletColors().primaryAccent,
-                                 background: WalletColors().backgroundColor)
-                        {
-                            content()
-                                .onTapGesture(count: 1) { tagEmulation.emulateTag(talerURI) }
-                        }
+                        content()
+                            .onTapGesture(count: 1) { tagEmulation.emulateTag(talerURI) }
                         hint
                     } else {
                         NFCbutton(title: String(localized: "Start NFC")) {
@@ -111,13 +107,11 @@ struct BorderWithHCE<Content: View>: View {
                     }
                 }
             }
+        } else if showQRcode {
+            content()
+            hint
         } else {
-            if showQRcode {
-                content()
-                hint
-            } else {
-                qrButton.buttonStyle(TalerButtonStyle(type: .prominent))
-            }
+            qrButton.buttonStyle(TalerButtonStyle(type: .prominent))
         }
     }
 }
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -70,8 +70,13 @@ struct QRCodeDetailView: View {
                 let logo = Image(TALER_LOGO_QR)
                 let size = 276.0            // 240.0
                 let logoSize = 60.0         // 88 is too big, Android phones don't recognize the QR code anymore
-                let qrView = QRGeneratorView(text: talerURI, size: size, logo: logo, logoSize: logoSize, image: $qrImage)
+                let qrView = GradientBorder(size: size + 20.0,
+                                           color: WalletColors().primaryAccent,
+                                      background: WalletColors().backgroundColor)
+                {
+                    QRGeneratorView(text: talerURI, size: size, logo: logo, logoSize: logoSize, image: $qrImage)
                         .frame(maxWidth: .infinity, alignment: .center)
+                }
                 if #available(iOS 17.7, *) {
                     BorderWithHCE(talerURI: talerURI, nfcHint: true, size: size, scanHints: scanLong) {
                         qrView