commit 5f261ad0771f0d0df7c3477a5cf0f597c4a85b68 parent fc29444c74e8b1e1ba8c4903b59102f8bd10e5d2 Author: Marc Stibane <marc@taler.net> Date: Tue, 3 Mar 2026 10:36:59 +0100 Logo in Empty-Wallet, Withdraw CHF Diffstat:
7 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/TalerWallet1/Controllers/PublicConstants.swift b/TalerWallet1/Controllers/PublicConstants.swift @@ -14,9 +14,10 @@ let TALER_LOGO = "taler-logo-2023-black" #else // GNU_TALER let TALER_LOGO = "taler-logo-2023-red" #endif -let SWISS_QR = "swiss_qr" +let TALER_LOGO_FULL = "taler-logo-full" let TALER_LOGO_QR = "taler-logo-qr" let EXCHANGE_LOGO = "Exchange-logo-blue" +let SWISS_QR = "swiss_qr" public let INVISIBLE = 0.001 public let MAXEXCHANGES = 1000 // per currency diff --git a/TalerWallet1/Resources/Assets.xcassets/taler-logo-full.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/taler-logo-full.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "taler-logo-full.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/TalerWallet1/Resources/Assets.xcassets/taler-logo-full.imageset/taler-logo-full.svg b/TalerWallet1/Resources/Assets.xcassets/taler-logo-full.imageset/taler-logo-full.svg @@ -0,0 +1,27 @@ +<?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"> + <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/Resources/Assets.xcassets/taler-logo-qr.imageset/taler-logo.svg b/TalerWallet1/Resources/Assets.xcassets/taler-logo-full.imageset/taler-logo-white.svg diff --git a/TalerWallet1/Resources/Assets.xcassets/taler-logo-qr.imageset/Contents.json b/TalerWallet1/Resources/Assets.xcassets/taler-logo-qr.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "taler-logo.svg", + "filename" : "taler-logo-qr.svg", "idiom" : "universal" } ], diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift b/TalerWallet1/Views/Balances/BalancesListView.swift @@ -46,8 +46,16 @@ struct BalancesListView: View { // Group { let count = controller.balances.count if controller.balances.isEmpty { + let talerLogo = Image(TALER_LOGO_FULL) + WalletEmptyView(stack: stack.push("isEmpty")) - .navigationTitle("Taler Wallet") +// .navigationTitle("Taler Wallet") + .toolbar { + ToolbarItem(placement: .principal) { + talerLogo + .padding(.top, 10) + } + } .refreshable { await refresh() } diff --git a/TalerWallet1/Views/Main/WalletEmptyView.swift b/TalerWallet1/Views/Main/WalletEmptyView.swift @@ -80,11 +80,11 @@ struct WalletEmptyView: View { } .buttonStyle(TalerButtonStyle(type: .prominent, narrow: false, disabled: withDrawStarted, aligned: .center)) .disabled(withDrawStarted) -// } header: { -// let secondHeader = String(localized: "Demo", comment: "section header") -// Text(secondHeader) -// .talerFont(.title3) -// .foregroundColor(WalletColors().secondary(colorScheme, colorSchemeContrast)) + } header: { + let secondHeader = String(localized: "Demo", comment: "section header") + Text(secondHeader) + .talerFont(.title3) + .foregroundColor(WalletColors().secondary(colorScheme, colorSchemeContrast)) } } .listStyle(myListStyle.style).anyView
