taler-ios

commit cfd6c037afeea4321a261c527875c14a32cee405
parent 07efeedc7ff8932153dcae4855343a400f51b06b
Author: Marc Stibane <marc@taler.net>
Date:   Wed, 29 Nov 2023 16:17:28 +0100

cleanup

Diffstat:
M
TalerWallet1/Views/Balances/BalanceRowView.swift
 | 
1
-
M
TalerWallet1/Views/Balances/BalancesSectionView.swift
 | 
2
+-
M
TalerWallet1/Views/Exchange/ExchangeRowView.swift
 | 
4
++--
M
TalerWallet1/Views/Exchange/ExchangeSectionView.swift
 | 
4
++--
M
TalerWallet1/Views/Transactions/TransactionDetailView.swift
 | 
5
+----

5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -30,7 +30,6 @@ struct BalanceButton: View {
                         Text(title)
                             .accessibilityFont(.title2)
                             .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
-//                            .foregroundColor(moreContrast ? .primary : .secondary)
                     }
                 }
             }
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -113,7 +113,7 @@ extension BalancesSectionView: View {
                 if !iconOnly {
                     Text("Recent transactions")
                         .accessibilityFont(.callout)
-//                        .foregroundColor(moreContrast ? .primary : .secondary)
+//                        .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
                 }
             }
         } // recent transactions
diff --git a/TalerWallet1/Views/Exchange/ExchangeRowView.swift b/TalerWallet1/Views/Exchange/ExchangeRowView.swift
@@ -88,7 +88,7 @@ struct ExchangeRowView: View {
 // MARK: -
 #if DEBUG
 fileprivate struct ExchangeRow_Container : View {
-    @State private var amountToTransfer = Amount(currency: LONGCURRENCY, cent: 1234)
+    @State private var amountToPreview = Amount(currency: LONGCURRENCY, cent: 1234)
 
 //    let amount = Amount(currency: LONGCURRENCY, cent: 123456)
     var body: some View {
@@ -109,7 +109,7 @@ fileprivate struct ExchangeRow_Container : View {
         ExchangeRowView(stack: CallStack("Preview"),
                      exchange: exchange1,
                      currency: LONGCURRENCY,
-             amountToTransfer: $amountToTransfer)
+             amountToTransfer: $amountToPreview)
     }
 }
 
diff --git a/TalerWallet1/Views/Exchange/ExchangeSectionView.swift b/TalerWallet1/Views/Exchange/ExchangeSectionView.swift
@@ -41,7 +41,7 @@ struct ExchangeSectionView: View {
 #if DEBUG
 fileprivate struct ExchangeSection_Previews: PreviewProvider {
 fileprivate struct ExchangeRow_Container : View {
-    @State private var amountToTransfer = Amount(currency: LONGCURRENCY, cent: 1234)
+    @State private var amountToPreview = Amount(currency: LONGCURRENCY, cent: 1234)
 
 //    let amount = Amount(currency: LONGCURRENCY, cent: 123456)
     var body: some View {
@@ -61,7 +61,7 @@ fileprivate struct ExchangeRow_Container : View {
                            ageRestrictionOptions: [])
         ExchangeSectionView(stack: CallStack("Preview"), currency: LONGCURRENCY,
                             exchanges: [exchange1, exchange2],
-                            amountToTransfer: $amountToTransfer)
+                            amountToTransfer: $amountToPreview)
     }
 }
 
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -126,7 +126,6 @@ struct TransactionDetailView: View {
                     .accessibilityFont(.body)
                     .accessibilityLabel(accessibilityDate)
                     .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
-//                    .foregroundColor(moreContrast ? .primary : .secondary)
                     .listRowSeparator(.hidden)
                 HStack {
                     Text(verbatim: "|")   // only reason for this leading-aligned text is to get a nice full length listRowSeparator
@@ -279,9 +278,7 @@ struct TransactionDetailView: View {
                     case .payment(let paymentTransaction):
                         let details = paymentTransaction.details
                         Text(details.info.summary)
-                            .accessibilityFont(.title2)
-                            .lineLimit(4)
-                            .padding(.bottom)
+                            .accessibilityFont(.title3)
                         ThreeAmountsSheet(common: common, topAbbrev: String(localized: "Pay:"),
                                         topTitle: String(localized: "Sum to be paid:"),
                                          baseURL: nil, large: true)     // TODO: baseURL