[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 03/08: don't show Up+Down for pending and uncompleted
From: |
gnunet |
Subject: |
[taler-taler-ios] 03/08: don't show Up+Down for pending and uncompleted |
Date: |
Mon, 03 Jul 2023 10:27:39 +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 467894526a0479cca5b8e31f43dd657ce4c8d0b9
Author: Marc Stibane <marc@taler.net>
AuthorDate: Mon Jul 3 06:30:44 2023 +0200
don't show Up+Down for pending and uncompleted
---
TalerWallet1/Views/Balances/BalancesSectionView.swift | 3 +++
.../Views/Transactions/TransactionsListView.swift | 18 +++++++++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift
b/TalerWallet1/Views/Balances/BalancesSectionView.swift
index e16015b..5cd273a 100644
--- a/TalerWallet1/Views/Balances/BalancesSectionView.swift
+++ b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -103,6 +103,7 @@ struct BalancesSectionView: View {
NavigationLink(destination: LazyView {
TransactionsListView(navTitle: String(localized:
"Transactions"), currency: currency,
transactions: completedTransactions,
+ showUpDown: true,
reloadAllAction: reloadCompleted,
reloadOneAction: reloadOneAction)
}, tag: 3, selection: $buttonSelected
@@ -125,6 +126,7 @@ struct BalancesSectionView: View {
LazyView {
TransactionsListView(navTitle: String(localized:
"Pending"), currency: currency,
transactions: pendingTransactions,
+ showUpDown: false,
reloadAllAction: reloadPending,
reloadOneAction: reloadOneAction)
}
@@ -152,6 +154,7 @@ struct BalancesSectionView: View {
LazyView {
TransactionsListView(navTitle: String(localized:
"Uncompleted"), currency: currency,
transactions:
uncompletedTransactions,
+ showUpDown: false,
reloadAllAction: reloadUncompleted,
reloadOneAction: reloadOneAction)
}
diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift
b/TalerWallet1/Views/Transactions/TransactionsListView.swift
index 2b1a281..ac27eea 100644
--- a/TalerWallet1/Views/Transactions/TransactionsListView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionsListView.swift
@@ -12,6 +12,7 @@ struct TransactionsListView: View {
let currency: String
let transactions: [Transaction]
+ let showUpDown: Bool
let reloadAllAction: () async -> ()
let reloadOneAction: ((_ transactionId: String) async throws ->
Transaction)
@@ -27,6 +28,7 @@ struct TransactionsListView: View {
Content(symLog: symLog,
currency: currency,
transactions: transactions,
+ showUpDown: showUpDown,
myListStyle: $myListStyle,
reloadAllAction: reloadAllAction,
reloadOneAction: reloadOneAction)
@@ -48,6 +50,7 @@ extension TransactionsListView {
let symLog: SymLogV?
let currency: String
let transactions: [Transaction]
+ let showUpDown: Bool
@Binding var myListStyle: MyListStyle
let reloadAllAction: () async -> ()
let reloadOneAction: ((_ transactionId: String) async throws ->
Transaction)
@@ -114,9 +117,11 @@ extension TransactionsListView {
}.id(viewId)
.listStyle(myListStyle.style).anyView
.onAppear {
- upAction = { withAnimation { scrollView.scrollTo(0) }}
- downAction = { withAnimation {
scrollView.scrollTo(transactions.count - 1) }}
- downAction()
+ if showUpDown {
+ upAction = { withAnimation { scrollView.scrollTo(0) }}
+ downAction = { withAnimation {
scrollView.scrollTo(transactions.count - 1) }}
+ downAction()
+ }
}
.overlay {
if transactions.isEmpty {
@@ -125,8 +130,11 @@ extension TransactionsListView {
}
}
.navigationBarItems(trailing: HStack {
- ArrowUpButton(action: upAction)
- ArrowDownButton(action: downAction)
+ EmptyView()
+ if showUpDown {
+ ArrowUpButton(action: upAction)
+ ArrowDownButton(action: downAction)
+ }
})
}
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (f7f01e5 -> 53fe45f), gnunet, 2023/07/03
- [taler-taler-ios] 03/08: don't show Up+Down for pending and uncompleted,
gnunet <=
- [taler-taler-ios] 04/08: accessibility, gnunet, 2023/07/03
- [taler-taler-ios] 02/08: playSound, wording, gnunet, 2023/07/03
- [taler-taler-ios] 01/08: Localization issues, gnunet, 2023/07/03
- [taler-taler-ios] 07/08: playSound, gnunet, 2023/07/03
- [taler-taler-ios] 05/08: Profile for Testers, gnunet, 2023/07/03
- [taler-taler-ios] 08/08: iOS: bump version to 0.9.3 (11), gnunet, 2023/07/03
- [taler-taler-ios] 06/08: Confirm later instead of Done for bank-integrated withdrawals, gnunet, 2023/07/03