taler-ios

commit ff7f8a15431c9eb588d1a7e1cdffaa038dc8736b
parent 984421744423fbd77c5b38810391487162df73fe
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 21 Jun 2026 08:50:14 +0200

use Image+fallback

Diffstat:
M
TalerWallet1/Views/HelperViews/Buttons.swift
 | 
32
++++----------------------------
M
TalerWallet1/Views/HelperViews/GradientBorder.swift
 | 
12
++----------

2 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/Buttons.swift b/TalerWallet1/Views/HelperViews/Buttons.swift
@@ -214,12 +214,7 @@ struct ZoomInButton : View  {
 
     var body: some View {
         Button(action: action) {
-            let name = ICONNAME_ZOOM_IN
-            if UIImage(named: name) != nil {
-                Image(name)
-            } else {
-                Image(systemName: SYSTEM_ZOOM_IN)
-            }
+            Image(ICONNAME_ZOOM_IN, SYSTEM_ZOOM_IN)
         }
         .tint(.accentColor)
         .talerFont(.title)
@@ -233,12 +228,7 @@ struct ZoomOutButton : View  {
 
     var body: some View {
         Button(action: action) {
-            let name = ICONNAME_ZOOM_OUT
-            if UIImage(named: name) != nil {
-                Image(name)
-            } else {
-                Image(systemName: SYSTEM_ZOOM_OUT)
-            }
+            Image(ICONNAME_ZOOM_OUT, SYSTEM_ZOOM_OUT)
         }
         .tint(.accentColor)
         .talerFont(.title)
@@ -253,14 +243,7 @@ struct BackButton : View  {
         Button(action: action) {
             let name = ICONNAME_INCOMING + ICONNAME_FILL
             let sysName = SYSTEM_INCOMING4 + ICONNAME_FILL
-            if UIImage(named: name) != nil {
-                Image(name)
-            } else if UIImage(systemName: sysName) != nil {
-                Image(systemName: sysName)
-            } else {
-                // TODO: ultralight vs black
-                Image(systemName: FALLBACK_INCOMING)
-            }
+            Image(name, sysName, fallback: FALLBACK_INCOMING)
         }
         .tint(.accentColor)
         .talerFont(.largeTitle)
@@ -283,14 +266,7 @@ struct ForwardButton : View  {
                                     : ICONNAME_OUTGOING
             let sysName   = enabled ? SYSTEM_OUTGOING4 + ICONNAME_FILL
                                     : SYSTEM_OUTGOING4
-            if UIImage(named: imageName) != nil {
-                Image(imageName)
-            } else if UIImage(systemName: sysName) != nil {
-                Image(systemName: sysName)
-            } else {
-                // TODO: ultralight vs black
-                Image(systemName: FALLBACK_OUTGOING)
-            }
+            Image(imageName, sysName, fallback: FALLBACK_OUTGOING)
         }
         .tint(.accentColor)
         .talerFont(.largeTitle)
diff --git a/TalerWallet1/Views/HelperViews/GradientBorder.swift b/TalerWallet1/Views/HelperViews/GradientBorder.swift
@@ -128,16 +128,8 @@ struct BorderWithNFC<Content: View>: View {
     @State private var showTOTP = false
     @ObservedObject var nfcWriter = NFCWriter()
 
-    var lockImage: Image {
-        let name = ICONNAME_LOCKCLOCK
-        let sysName = SYSTEM_LOCKCLOCK                                          // 􂆉 "lock.badge.clock"
-        if UIImage(named: name) != nil {
-            return Image(name)
-        } else if UIImage(systemName: sysName) != nil {
-            return Image(systemName: sysName)
-        } else {
-            return Image(systemName: FALLBACK_LOCK)
-        }
+    var lockImage: Image {             // 􂆉 "lock.badge.clock"
+        Image(ICONNAME_LOCKCLOCK, SYSTEM_LOCKCLOCK, fallback: FALLBACK_LOCK)
     }
 
     private var MAGIC_HEADER: Data {