taler-ios

commit 297082c0fab60fb305d7ed96de4aa52532405d09
parent 8cdda2968af6419df1ac2f04102db22a43f8b7c0
Author: Marc Stibane <marc@taler.net>
Date:   Wed, 26 Jul 2023 11:09:56 +0200

ScrollViewReader

Diffstat:
M
TalerWallet1/Views/Exchange/ManualWithdraw.swift
 | 
2
+-
M
TalerWallet1/Views/Payment/PaymentURIView.swift
 | 
2
--
M
TalerWallet1/Views/Peer2peer/RequestPayment.swift
 | 
6
++----
M
TalerWallet1/Views/Peer2peer/SendAmount.swift
 | 
4
++--
M
TalerWallet1/Views/WithdrawBankIntegrated/WithdrawAcceptDone.swift
 | 
4
+---

5 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/TalerWallet1/Views/Exchange/ManualWithdraw.swift b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
@@ -30,7 +30,7 @@ struct ManualWithdraw: View {
         let currencyField = CurrencyField(value: $centsToTransfer, currency: currency) // becomeFirstResponder
 //        let agePicker = AgePicker(ageMenuList: $ageMenuList, selectedAge: $selectedAge)
 
-        ScrollViewReader { scrollView in
+        ScrollView {
             VStack {
                 CurrencyInputView(currencyField: currencyField,
                                   title: String(localized: "Amount to withdraw:"))
diff --git a/TalerWallet1/Views/Payment/PaymentURIView.swift b/TalerWallet1/Views/Payment/PaymentURIView.swift
@@ -42,7 +42,6 @@ struct PaymentURIView: View {
 
     var body: some View {
         if let preparePayResult {
-          ScrollViewReader { scrollView in
             let effective = preparePayResult.amountEffective
             List {
                 let baseURL = preparePayResult.contractTerms.exchanges.first?.url
@@ -85,7 +84,6 @@ struct PaymentURIView: View {
                 }
             }
             .navigationTitle(navTitle)
-          } // ScrollViewReader
         } else {
             let badURL = "Error in Link: \(url)"
             WithdrawProgressView(message: url.host ?? badURL)
diff --git a/TalerWallet1/Views/Peer2peer/RequestPayment.swift b/TalerWallet1/Views/Peer2peer/RequestPayment.swift
@@ -28,8 +28,7 @@ struct RequestPayment: View {
         let navTitle = String(localized: "Request \(currency)", comment: "Request currency, Dialog Title")
         let currencyField = CurrencyField(value: $centsToTransfer, currency: currency)
 
-        ScrollViewReader { scrollView in
-          VStack {
+        ScrollView { VStack {
             CurrencyInputView(currencyField: currencyField,
                               title: String(localized: "Amount to receive:"))
 
@@ -54,8 +53,7 @@ struct RequestPayment: View {
                 .disabled(disabled)
             }
             Spacer()
-          }
-        }
+        } }
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(.horizontal)
         .background(WalletColors().backgroundColor.edgesIgnoringSafeArea(.all))
diff --git a/TalerWallet1/Views/Peer2peer/SendAmount.swift b/TalerWallet1/Views/Peer2peer/SendAmount.swift
@@ -40,7 +40,7 @@ struct SendAmount: View {
         let currencyField = CurrencyField(value: $centsToTransfer, currency: currency)
 
         let fee = fee(ppCheck: peerPushCheck)
-//        ScrollViewReader { scrollView in
+        ScrollView {
             VStack(alignment: .trailing) {
                 let available = amountAvailable.readableDescription
                 Text("Available: \(available)")
@@ -66,7 +66,7 @@ struct SendAmount: View {
                     .disabled(disabled)
                 Spacer()
             }
-//        }
+        }
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(.horizontal)
         .background(WalletColors().backgroundColor.edgesIgnoringSafeArea(.all))
diff --git a/TalerWallet1/Views/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/WithdrawBankIntegrated/WithdrawAcceptDone.swift
@@ -27,8 +27,7 @@ struct WithdrawAcceptDone: View {
         let _ = Self._printChanges()
         let _ = symLog.vlog()       // just to get the # to compare it with .onAppear & onDisappear
 #endif
-      ScrollViewReader { scrollView in
-        VStack {
+        Group {
             if let transactionId {
                 TransactionDetailView(transactionId: transactionId,
                                        reloadAction: reloadOneAction,
@@ -62,7 +61,6 @@ struct WithdrawAcceptDone: View {
                 controller.playSound(0)
             }
         }
-      }
     }
 }
 // MARK: -