commit e66877014f9baa104e5358fd12b0a543f6dfd1c0 parent d7ae7f02906798702f4e85f7aa83b2dd6947d8c5 Author: Marc Stibane <marc@taler.net> Date: Tue, 10 Mar 2026 15:07:58 +0100 Use system-icon symbolic names Diffstat:
15 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalanceCellV.swift b/TalerWallet1/Views/Balances/BalanceCellV.swift @@ -57,7 +57,7 @@ struct BalanceCellV: View { let hLayout = HStack { amountV .frame(maxWidth: .infinity, alignment: .trailing) - Text(Image(systemName: "chevron.forward")) + Text(Image(systemName: CHEVRON)) .talerFont(.table) .foregroundColor(.secondary) } diff --git a/TalerWallet1/Views/HelperViews/Buttons.swift b/TalerWallet1/Views/HelperViews/Buttons.swift @@ -24,8 +24,8 @@ struct HamburgerButton : View { var body: some View { Button(action: action) { - Image(systemName: "line.3.horizontal") -// Image(systemName: "sidebar.squares.leading") + Image(systemName: HAMBURGER) +// Image(systemName: "sidebar.squares.leading") // } .talerFont(.title) .accessibilityLabel(Text("Main Menu", comment: "a11y")) @@ -51,7 +51,7 @@ struct LinkButton: View { } Link(destination: destination) { HStack(spacing: 8.0) { - Image(systemName: "link") + Image(systemName: LINK) Text(buttonTitle) } } @@ -150,7 +150,7 @@ struct DoneButton : View { Text(titleStr) .tint(.accentColor) } else { - Image(systemName: "checkmark") + Image(systemName: CHECKMARK) // } } .tint(.accentColor) @@ -165,7 +165,7 @@ struct PlusButton : View { var body: some View { Button(action: action) { - Image(systemName: "plus") + Image(systemName: PLUS) } .tint(.accentColor) .talerFont(.title) @@ -268,7 +268,7 @@ struct ArrowUpButton : View { var body: some View { Button(action: action) { - Image(systemName: "arrow.up.to.line") + Image(systemName: ARROW_TOP) // } .tint(.accentColor) .talerFont(.title2) @@ -281,7 +281,7 @@ struct ArrowDownButton : View { var body: some View { Button(action: action) { - Image(systemName: "arrow.down.to.line") + Image(systemName: ARROW_BOT) // } .tint(.accentColor) .talerFont(.title2) @@ -295,7 +295,7 @@ struct ReloadButton : View { var body: some View { Button(action: action) { - Image(systemName: "arrow.clockwise") + Image(systemName: RELOAD) // } .tint(.accentColor) .talerFont(.title) diff --git a/TalerWallet1/Views/HelperViews/CopyShare.swift b/TalerWallet1/Views/HelperViews/CopyShare.swift @@ -69,7 +69,7 @@ struct CopyButton: View { var body: some View { Button(action: copyAction) { - let image = Image(systemName: "doc.on.doc") + let image = Image(systemName: COPY1) // .accessibility(hidden: true) if vertical { @@ -143,7 +143,7 @@ struct ShareButton: View { var body: some View { Button(action: shareAction) { HStack { - Image(systemName: "square.and.arrow.up") + Image(systemName: SHARE) // .accessibility(hidden: true) Text(title) } diff --git a/TalerWallet1/Views/HelperViews/CurrencyField.swift b/TalerWallet1/Views/HelperViews/CurrencyField.swift @@ -126,7 +126,7 @@ struct CurrencyTextfieldRepresentable: UIViewRepresentable { } func toolBar() -> UIToolbar { - let image = UIImage(systemName: "return") + let image = UIImage(systemName: RETURN) // let button = UIBarButtonItem(image: image, style: .done, target: textField, action: #selector(UITextField.resignFirstResponder)) let flexSpace = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.flexibleSpace, diff --git a/TalerWallet1/Views/HelperViews/ScopePicker.swift b/TalerWallet1/Views/HelperViews/ScopePicker.swift @@ -183,7 +183,7 @@ struct ScopeDropDown: View { var body: some View { let radius = 8.0 VStack { - let chevron = Image(systemName: "chevron.up") + let chevron = Image(systemName: CHEVRON_UP) // let foreColor = disabled ? Color.secondary : Color.primary let backColor = disabled ? WalletColors().backgroundColor : WalletColors().gray4 let otherBalances = controller.balances.filter { $0 != controller.balances[selection] } diff --git a/TalerWallet1/Views/Main/ErrorView.swift b/TalerWallet1/Views/Main/ErrorView.swift @@ -81,7 +81,7 @@ struct ErrorView: View { var body: some View { ScrollView { VStack { - Image(systemName: "exclamationmark.circle") + Image(systemName: EXCLAMATION) .resizable() .frame(width: 50, height: 50) .aspectRatio(contentMode: .fit) diff --git a/TalerWallet1/Views/OIM/ChartHistoryView.swift b/TalerWallet1/Views/OIM/ChartHistoryView.swift @@ -149,7 +149,7 @@ struct ChartHistoryView: View { PointMark(x: .value("x", xVal), y: .value("y", yVal)) .symbol(symbol: { - Image(systemName: "banknote.fill") // wallet.bifold.fill + Image(systemName: BANKNOTE) // wallet.bifold.fill .resizable() .scaledToFit() .frame(width: 25) diff --git a/TalerWallet1/Views/OIM/OIMcurrencyButton.swift b/TalerWallet1/Views/OIM/OIMcurrencyButton.swift @@ -35,7 +35,7 @@ struct OIMcurrencyImage { self.oHeight = uiImage.size.height self.image = Image(uiImage: uiImage) } else { - self.image = Image(systemName: "exclamationmark.triangle") + self.image = Image(systemName: WARNING) self.oWidth = 300 self.oHeight = 300 } diff --git a/TalerWallet1/Views/OIM/RiverHistoryView.swift b/TalerWallet1/Views/OIM/RiverHistoryView.swift @@ -196,8 +196,8 @@ struct RiverTileView: View { let amount = common.amountEffective let (dateString, date) = TalerDater.dateString(common.timestamp, true) let (day, month) = getDate(date) - let sunImage = Image(systemName: "sun.max.fill") - let moonImage = Image(systemName: "moon.fill") + let sunImage = Image(systemName: SUNFILL) + let moonImage = Image(systemName: MOONFILL) let sunText = Text("\(sunImage) \(day)") // verbatim: doesn't work here, will not show the image. Thus we must set this to "Don't translate" let moonText = Text("\(moonImage) \(month)") // " if common.isIncoming { diff --git a/TalerWallet1/Views/Settings/AboutView.swift b/TalerWallet1/Views/Settings/AboutView.swift @@ -55,7 +55,7 @@ struct AboutView: View { } SettingsItem(name: String(localized: "Visit the taler.net website"), id1: "web", - imageName: "link", + imageName: LINK, description: String(localized: "More info about GNU Taler in general...")) { } .accessibilityAddTraits(.isLink) .accessibilityRemoveTraits(.isStaticText) diff --git a/TalerWallet1/Views/Settings/Bank/BankListView.swift b/TalerWallet1/Views/Settings/Bank/BankListView.swift @@ -62,7 +62,7 @@ struct BankListView: View { } Section { depositHint - let plus = Image(systemName: "plus") + let plus = Image(systemName: PLUS) if !minimalistic { Text("Tap the \(plus) button to add an account.") .listRowSeparator(.hidden) diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift @@ -131,7 +131,7 @@ struct ExchangeListCommonV: View { .talerFont(.title3) } Section { - let plus = Image(systemName: "plus") + let plus = Image(systemName: PLUS) if !minimalistic { Text("Tap the \(plus) button to add a service.") .listRowSeparator(.hidden) diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeRowView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeRowView.swift @@ -32,7 +32,7 @@ struct ExchangeRowView: View { let delay: UInt = 0 #endif let baseURL = exchange.exchangeBaseUrl - let chevron = Text(Image(systemName: "chevron.forward")) + let chevron = Text(Image(systemName: CHEVRON)) .talerFont(.table) .foregroundColor(.secondary) diff --git a/TalerWallet1/Views/Sheets/QRSheet.swift b/TalerWallet1/Views/Sheets/QRSheet.swift @@ -102,7 +102,7 @@ struct QRSheet: View { Button { dismissTop(stack.push()) } label: { - Image(systemName: "xmark") + Image(systemName: XMARK) } .accessibilityHidden(true) // VoiceOver has its own "Dismiss Popup" button } @@ -112,7 +112,7 @@ struct QRSheet: View { Button { isTorchOn.toggle() } label: { - Image(systemName: isTorchOn ? "lightbulb.fill" : "lightbulb") + Image(systemName: isTorchOn ? LIGHT_ON : LIGHT_OFF) } .accessibilityLabel(Text("Torch for QR code scanning", comment: "a11y")) .accessibilityValue(Text(a11yValue)) diff --git a/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift b/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift @@ -69,7 +69,7 @@ struct TransferRestrictionsV: View { } .padding(.top) } else if let hint = restriction.human_hint { - let mark = Image(systemName: "exclamationmark.circle") + let mark = Image(systemName: EXCLAMATION) Text("\(mark) \(hint)") // verbatim: doesn't work here, will not show the image. Thus we must set this to "Don't translate" .padding(.top) } @@ -216,9 +216,10 @@ struct ManualDetailsWireV: View { : "**Step 1:** Copy this code and paste it into the subject/purpose field in your banking app or bank website:") .talerFont(.body) .multilineTextAlignment(.leading) + let warningIcon = Image(systemName: WARNING) let manda1 = String(localized: "This is mandatory, otherwise your money will not arrive in this wallet.") let manda2 = String(localized: "This is mandatory, otherwise the verification will fail.") - let mandatory = Text(debitIBAN == nil ? manda1 : manda2) + let mandatory = Text("\(warningIcon) " + (debitIBAN == nil ? manda1 : manda2)) .bold() .talerFont(.body) .multilineTextAlignment(.leading)