taler-ios

commit 27410a89b54d116b1f09120b95d2aef82af69d20
parent 87193d080ddfb1ef7050e1835639438976a98c98
Author: Marc Stibane <marc@taler.net>
Date:   Fri, 27 Jun 2025 09:46:47 +0200

TALER_LOGO

Diffstat:
M
TalerWallet1/Controllers/PublicConstants.swift
 | 
8
++++++++
M
TalerWallet1/Views/HelperViews/LaunchAnimationView.swift
 | 
9
+--------
M
TalerWallet1/Views/Main/MainView.swift
 | 
18
+++++-------------

3 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/TalerWallet1/Controllers/PublicConstants.swift b/TalerWallet1/Controllers/PublicConstants.swift
@@ -7,6 +7,14 @@
  */
 import Foundation
 
+#if TALER_WALLET
+let TALER_LOGO = "taler-logo-2023-blue"
+#elseif TALER_NIGHTLY
+let TALER_LOGO = "taler-logo-2023-black"
+#else   // GNU_TALER
+let TALER_LOGO = "taler-logo-2023-red"
+#endif
+
 public let MAXEXCHANGES = 1000          // per currency
 public let CHF_4217 = "CHF"             // ISO-4217 Swiss Francs
 public let EUR_4217 = "EUR"             // ISO-4217 Euro
diff --git a/TalerWallet1/Views/HelperViews/LaunchAnimationView.swift b/TalerWallet1/Views/HelperViews/LaunchAnimationView.swift
@@ -26,20 +26,13 @@ struct RotatingTaler: View {
 
     @Binding var rotationEnabled: Bool
     @State private var rotationDirection = false
-#if TALER_WALLET
-    let logo = "taler-logo-2023-blue"
-#elseif TALER_NIGHTLY
-    let logo = "taler-logo-2023-black"
-#else   // GNU_TALER
-    let logo = "taler-logo-2023-red"
-#endif
 
     private let animationTimer = Timer
         .publish(every: 1.6, on: .current, in: .common)
         .autoconnect()
 
     var body: some View {
-        Image(logo)
+        Image(TALER_LOGO)
             .resizable()
             .scaledToFit()
             .frame(width: size, height: size)
diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift
@@ -125,11 +125,10 @@ struct MainView: View {
                                 }
                             }
                     } else {
-                        Text("Authenticating...")
-                            .talerFont(.largeTitle)
-                            .foregroundStyle(WalletColors().talerColor)
-                            .padding()
-                            .background(WalletColors().backgroundColor)
+                        Image(TALER_LOGO)
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 100, height: 100)
                             .onAppear {
                                 biometricService.authenticateUser()
                             }
@@ -280,16 +279,9 @@ enum Tab: Int, Hashable, CaseIterable {
     }
 
     var image: Image {
-#if TALER_WALLET
-        let logo = "taler-logo-2023-blue"
-#elseif TALER_NIGHTLY
-        let logo = "taler-logo-2023-black"
-#else   // GNU_TALER
-        let logo = "taler-logo-2023-red"
-#endif
         switch self {
             case .balances: return Image(systemName: BALANCES)                  // 􀣉  "chart.bar.xaxis"
-            case .actions:  return Image(logo)
+            case .actions:  return Image(TALER_LOGO)
             case .settings: return Image(systemName: SETTINGS)                  // 􀍟 "gear"
         }
     }