taler-ios

commit 3acaeac34e8f317cbf9848dd4feca2621f2714c5
parent e68c03adb34dfb8f844a839d8c24373012947a28
Author: Marc Stibane <marc@taler.net>
Date:   Wed, 28 Jun 2023 18:00:43 +0200

Scrollview

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

6 files changed, 9 insertions(+), 3 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)
 
-        ScrollView {
+        ScrollViewReader { scrollView in
             Text("from \(exchange.exchangeBaseUrl.trimURL())")
                 .font(.title3)
             CurrencyInputView(currencyField: currencyField,
diff --git a/TalerWallet1/Views/Payment/PaymentURIView.swift b/TalerWallet1/Views/Payment/PaymentURIView.swift
@@ -42,6 +42,7 @@ struct PaymentURIView: View {
 
     var body: some View {
         if let detailsForUri {
+          ScrollViewReader { scrollView in
             VStack {
                 let baseURL = detailsForUri.contractTerms.exchanges.first?.url
                 let raw = detailsForUri.amountRaw
@@ -62,6 +63,7 @@ struct PaymentURIView: View {
                 }
             }
             .navigationTitle(navTitle)
+          }
         } else {
             let badURL = "Error in URL: \(url)"
             WithdrawProgressView(message: url.host ?? badURL)
diff --git a/TalerWallet1/Views/Peer2peer/RequestPayment.swift b/TalerWallet1/Views/Peer2peer/RequestPayment.swift
@@ -28,7 +28,7 @@ struct RequestPayment: View {
         let navTitle = String(localized: "Request \(currency)")
         let currencyField = CurrencyField(value: $centsToTransfer, currency: currency)
 
-        ScrollView {
+        ScrollViewReader { scrollView in
             CurrencyInputView(currencyField: currencyField,
                               title: String(localized: "Amount to receive:"))
 
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)
-        ScrollView {
+        ScrollViewReader { scrollView in
             let available = amountAvailable.readableDescription
             Text("Available: \(available)")
                 .font(.title3)
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
@@ -27,6 +27,7 @@ struct P2pAcceptDone: View {
 #endif
         let navTitle = incoming ? String(localized: "Received P2P")
                                 : String(localized: "Paid P2P")
+      ScrollViewReader { scrollView in
         VStack {
             TransactionDetailView(transactionId: transactionId,
                                    reloadAction: reloadOneAction,
@@ -51,6 +52,7 @@ struct P2pAcceptDone: View {
                 GNU_Taler.playSound(0)
             }
         }
+      }
     }
 }
 // MARK: -
diff --git a/TalerWallet1/Views/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/WithdrawBankIntegrated/WithdrawAcceptDone.swift
@@ -27,6 +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 {
             if let transactionId {
                 TransactionDetailView(transactionId: transactionId,
@@ -55,6 +56,7 @@ struct WithdrawAcceptDone: View {
                 GNU_Taler.playSound(0)
             }
         }
+      }
     }
 }
 // MARK: -