[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 29/32: Bugfix: List mustn't be in ScrollView
From: |
gnunet |
Subject: |
[taler-taler-ios] 29/32: Bugfix: List mustn't be in ScrollView |
Date: |
Sun, 14 Jul 2024 00:19:38 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit b9e61e56b8bacec8576aa317d99c842b7b1cd754
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sat Jul 13 23:43:29 2024 +0200
Bugfix: List mustn't be in ScrollView
---
TalerWallet1/Views/HelperViews/AmountInputV.swift | 4 ++--
TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift | 3 ++-
.../Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift | 6 ++++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/AmountInputV.swift
b/TalerWallet1/Views/HelperViews/AmountInputV.swift
index cec9d75..d02f62b 100644
--- a/TalerWallet1/Views/HelperViews/AmountInputV.swift
+++ b/TalerWallet1/Views/HelperViews/AmountInputV.swift
@@ -57,7 +57,7 @@ struct AmountInputV: View {
let insufficientLabel = String(localized: "You don't have enough
\(currency).")
let available = amountAvailable?.formatted(currencyInfo) ?? nil
let flags = checkAvailable(amount: amountToTransfer)
- ScrollView { VStack(alignment: .trailing) {
+ VStack(alignment: .trailing) {
if summary.count > 0 {
Text(summary)
.talerFont(.body)
@@ -91,7 +91,7 @@ struct AmountInputV: View {
Button("Next") { buttonAction() }
.buttonStyle(TalerButtonStyle(type: .prominent, disabled:
flags.disabled))
.disabled(flags.disabled)
- }.padding(.horizontal) } // ScrollVStack
+ }.padding(.horizontal)
.frame(maxWidth: .infinity, alignment: .leading)
.background(WalletColors().backgroundColor.edgesIgnoringSafeArea(.all))
.onAppear() {
diff --git a/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift
b/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift
index c8ddf3a..f21d79a 100644
--- a/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift
+++ b/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift
@@ -153,7 +153,8 @@ struct PayTemplateV: View {
{ EmptyView() }.frame(width:
0).opacity(0).hidden()
)
}
- } else { // both template contract amount
and summary are fixed => directly show the payment
+ } else { // both template contract amount and summary are fixed
=> directly show the payment
+ // Attention: contains a List, thus mustn't be included in a
ScrollView
PaymentView(stack: stack.push(),
url: url,
template: true,
diff --git
a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
old mode 100644
new mode 100755
index c777517..77ea17b
--- a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
+++ b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
@@ -58,7 +58,7 @@ struct WithdrawURIView: View {
var body: some View {
if possibleExchanges.count > 0 {
if let defaultBaseUrl = defaultExchangeBaseUrl ??
possibleExchanges.first?.exchangeBaseUrl {
- ScrollView { VStack {
+ VStack {
let title = String(localized: "Exchange")
if possibleExchanges.count > 1 {
Picker(title, selection: $selectedExchange) {
@@ -87,6 +87,7 @@ struct WithdrawURIView: View {
amountToTransfer:
$amountToTransfer,
exchange:
$exchange)
if amountIsEditable { // amountToTransfer.isZero {
+ ScrollView {
let shortcutDestination = LazyView {
WithdrawAcceptView(stack: stack.push(), url: url,
amountToTransfer: $amountShortcut,
@@ -113,10 +114,11 @@ struct WithdrawURIView: View {
.background(NavigationLink(destination:
acceptDestination, isActive: $buttonSelected)
{ EmptyView() }.frame(width:
0).opacity(0).hidden()
)
+ }
} else {
acceptDestination
}
- } } // ScrollVStack
+ }
.navigationTitle(navTitle)
.onAppear() {
symLog.log("onAppear")
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 17/32: showUpDown if 25 entries, (continued)
- [taler-taler-ios] 17/32: showUpDown if 25 entries, gnunet, 2024/07/13
- [taler-taler-ios] 13/32: comment out payto scheme, gnunet, 2024/07/13
- [taler-taler-ios] 10/32: QR button smaller, gnunet, 2024/07/13
- [taler-taler-ios] 12/32: disable hintNetworkAvailability, logging, gnunet, 2024/07/13
- [taler-taler-ios] 24/32: cleanup, gnunet, 2024/07/13
- [taler-taler-ios] 32/32: Spend button with icon, gnunet, 2024/07/13
- [taler-taler-ios] 16/32: hints for P2P expiration, gnunet, 2024/07/13
- [taler-taler-ios] 23/32: IconBadge, gnunet, 2024/07/13
- [taler-taler-ios] 11/32: L10N, gnunet, 2024/07/13
- [taler-taler-ios] 14/32: VIEW_OVERVIEW, gnunet, 2024/07/13
- [taler-taler-ios] 29/32: Bugfix: List mustn't be in ScrollView,
gnunet <=
- [taler-taler-ios] 19/32: View+Condition, gnunet, 2024/07/13
- [taler-taler-ios] 22/32: iconName, gnunet, 2024/07/13
- [taler-taler-ios] 21/32: ArrowShapes, gnunet, 2024/07/13