commit 6eae305dfda4b2d16e97d1ae0c6b7a32154266d1
parent c4ba5d244243eb1566fd5ffee47437308ea9f153
Author: Marc Stibane <marc@taler.net>
Date: Wed, 24 Jun 2026 09:58:19 +0200
Full Taler logo for QR
Diffstat:
3 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/TalerWallet1/Resources/Assets.xcassets/taler-logo-qr.imageset/taler-logo-qr.svg b/TalerWallet1/Resources/Assets.xcassets/taler-logo-qr.imageset/taler-logo-qr.svg
@@ -1,21 +1,28 @@
-<?xml version="1.0"?>
-<svg viewBox="-20 20 240 180" xmlns="http://www.w3.org/2000/svg">
-<rect x="-15" y="20" width="240" height="180" rx="50" ry="50" fill="white"/>
-<g id="aa" style="fill:#0042b3;fill-rule:evenodd">
-<!-- 90% -->
-<path d="M62.6 53.4
-c-25.5 4.3-44.9 28-44.9 56.5 0 31.5 23.9 57.2 53.3 57.2
-s53.3-25.6 53.3-57.2
-c0-15.4-5.7-29.3-14.9-39.6
-c1.6-1.9 6.3-4.8 6.4-4.6 10 11.6 16.1 27.2 16.1 44.2 0 36-27.3 65.3-60.9 65.3-33.6 0-60.9-29.3-60.9-65.3
-s27.3-65.3 60.9-65.3
-c1.7 0 5.7.3 5.5.4-4.3 2.3-9.7 5.4-13.9 8.5"/>
-<!-- 40% -->
-<path d="M65.8 159.8
-c-13.4-12-22-29.9-22-50 0-36 27.4-65.2 61.1-65.2 1.5 0 3 .1 4.5.2
-a67.6 67.6 0 0 0-13.4 8.6
-c-25.4 4.5-44.7 28.1-44.7 56.4 0 21.3 11 40 27.3 49.8
-a45.9 45.9 0 0 1-12.7.3z"/>
-</g>
-<use transform="translate(210,220) rotate(180)" href="#aa"/>
-</svg>
-\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="196.2"
+ height="87.3"
+ viewBox="-25 -30 250 150"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <rect x="-20" y="-30" width="240" height="150" rx="40" ry="40" fill="white"/>
+ <g
+ fill="#0042b3"
+ fill-rule="evenodd"
+ stroke-width="0.3"
+ id="g3"
+ transform="translate(-1,-1.1)">
+ <path
+ d="m 86.7,1.1 c 15.6,0 29,9.4 36,23.2 h -5.9 A 35.1,35.1 0 0 0 86.7,6.5 C 67,6.5 51,23.6 51,44.7 c 0,10.4 3.8,19.7 10,26.6 a 31.4,31.4 0 0 1 -4.2,3 A 45.2,45.2 0 0 1 46,44.7 C 46,20.7 64.2,1.1 86.7,1.1 Z m 35.8,64.3 a 40.4,40.4 0 0 1 -39,22.8 c 3,-1.5 6,-3.5 8.6,-5.7 a 35.6,35.6 0 0 0 24.6,-17.1 z"
+ id="path1" />
+ <path
+ d="m 64.2,1.1 3.1,0.1 C 64.3,2.8 61.4,4.7 58.8,7 A 37.5,37.5 0 0 0 28.6,44.7 c 0,14.3 7.3,26.7 18,33.3 a 29.6,29.6 0 0 1 -8.5,0.2 c -9,-8 -14.6,-20 -14.6,-33.5 0,-24 18.2,-43.6 40.7,-43.6 z m 5.4,81.4 A 35.6,35.6 0 0 0 94.2,65.4 h 5.9 a 40.4,40.4 0 0 1 -39,22.8 c 3,-1.5 5.9,-3.5 8.5,-5.7 z M 94.4,24.3 A 37,37 0 0 0 81.8,11.5 29.6,29.6 0 0 1 90.3,11.3 c 4,3.6 7.4,8 9.9,13 z"
+ id="path2" />
+ <path
+ d="m 41.8,1.1 c 1,0 2,0 3.1,0.2 -3,1.5 -5.9,3.4 -8.5,5.6 A 37.5,37.5 0 0 0 6.1,44.7 c 0,21.1 16,38.3 35.7,38.3 12.6,0 23.6,-7 30,-17.6 h 5.8 a 40.4,40.4 0 0 1 -35.8,23 C 19.3,88.4 1,68.8 1,44.7 1,20.7 19.2,1.1 41.7,1.1 Z m 30.1,23.2 a 38.1,38.1 0 0 0 -4.5,-6.1 c 1.3,-1.2 2.7,-2.2 4.3,-3 2.3,2.7 4.4,5.8 6,9.1 z"
+ id="path3" />
+ </g>
+ <path
+ d="m 75.1,33.3 h 9.2 v -5 H 60.9 v 5 H 70 v 26 h 5.1 z m 16.5,18.5 h 13.7 l 3,7.4 h 5.3 L 100.9,28 H 96.2 L 83.5,59.2 h 5.2 z m 11.8,-4.9 h -9.9 l 5,-12.4 z m 19.4,-18.6 h -4.6 v 31 h 20.6 v -5 h -16 z m 42.7,0 H 144 v 31 h 21.6 v -5 H 149 V 46 h 14.5 V 41.1 H 149 v -8 h 16.4 z m 24.7,10.1 c 0,1.6 -0.5,2.8 -1.6,3.8 -1.1,1 -2.6,1.4 -4.4,1.4 h -7.4 V 33.2 h 7.4 c 1.9,0 3.4,0.4 4.4,1.3 1,0.9 1.6,2.2 1.6,3.9 z m 6,20.8 -7.7,-11.7 c 1,-0.3 1.9,-0.7 2.7,-1.3 a 8.8,8.8 0 0 0 3.6,-4.6 c 0.4,-1 0.5,-2.2 0.5,-3.5 0,-1.5 -0.2,-2.9 -0.7,-4.1 a 8.4,8.4 0 0 0 -2.1,-3.1 c -1,-0.8 -2,-1.5 -3.4,-2 -1.3,-0.4 -2.8,-0.6 -4.5,-0.6 h -12.9 v 31 h 5 v -11 h 6.5 l 7,10.8 z"
+ id="path4" />
+</svg>
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -69,7 +69,7 @@ struct QRCodeDetailView: View {
: (sending(amountStr.0), sending(amountStr.1))
let logo = Image(TALER_LOGO_QR)
let size = 276.0 // 240.0
- let logoSize = 72.0 // 88 is too big, Android phones don't recognize the QR code anymore
+ 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)
.frame(maxWidth: .infinity, alignment: .center)
if #available(iOS 17.7, *) {
diff --git a/TalerWallet1/Views/HelperViews/QRGeneratorView.swift b/TalerWallet1/Views/HelperViews/QRGeneratorView.swift
@@ -40,7 +40,7 @@ struct QRGeneratorView: View {
logo
.resizable()
.scaledToFit()
- .frame(width: logoSize, height: logoSize)
+ .frame(width: logoSize * 2, height: logoSize)
}
} else {
EmptyView()
