[taler-taler-ios] 07/08: UI

[gnunet]

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 e8c47ad9826e08b882f09725fd9410e3c5abeb25
Author: Marc Stibane <marc@taler.net>
AuthorDate: Thu Dec 7 00:16:56 2023 +0100

    UI
---
 TalerWallet1/Views/Transactions/ManualDetailsV.swift | 20 +++++++++++---------
 .../Views/Transactions/TransactionDetailView.swift   | 13 ++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift 
b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
index e4400b9..42f827f 100644
--- a/TalerWallet1/Views/Transactions/ManualDetailsV.swift
+++ b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
@@ -20,8 +20,8 @@ struct ManualDetailsV: View {
             Group {
                 Text(iconOnly ? "Transfer \(amountStr) to the Exchange."
                               : "You need to transfer \(amountStr) from your 
regular bank account to the Exchange.")
-                Text(iconOnly ? "Step 1: Copy+Paste this subject:"
-                              : "Step 1: Copy this code and paste it into the 
subject/purpose field in your banking app or bank website:")
+                Text(iconOnly ? "**Step 1:** Copy+Paste this subject:"
+                              : "**Step 1:** Copy this code and paste it into 
the subject/purpose field in your banking app or bank website:")
                         .multilineTextAlignment(.leading)
                         .listRowSeparator(.hidden)
                 if !iconOnly {
@@ -40,9 +40,10 @@ struct ManualDetailsV: View {
                         .disabled(false)
                 }   .padding(.leading)
                     .listRowSeparator(.hidden)
-                Text(iconOnly ? "Step 2: Copy+Paste this IBAN:"
-                              : "Step 2: If you don't already have it in your 
banking favourites list, then copy and paste this IBAN into the receiver IBAN 
field in your banking app or website:")
+                Text(iconOnly ? "**Step 2:** Copy+Paste this IBAN:"
+                              : "**Step 2:** If you don't already have it in 
your banking favourites list, then copy and paste this IBAN into the receiver 
IBAN field in your banking app or website (and save it as favourite for the 
next time):")
                     .multilineTextAlignment(.leading)
+                    .padding(.top)
                     .listRowSeparator(.hidden)
                 HStack {
                     Text(iban)
@@ -55,14 +56,15 @@ struct ManualDetailsV: View {
                 }   .padding(.leading)
                     .padding(.top, -8)
                     .listRowSeparator(.hidden)
-                Text(iconOnly ? "Step 3: Transfer \(amountStr)."
-                              : "Step 3: Finish the wire transfer of 
\(amountStr) in your banking app or website, then this withdrawal will proceed 
automatically.")
+                Text(iconOnly ? "**Step 3:** Transfer \(amountStr)."
+                              : "**Step 3:** Finish the wire transfer of 
\(amountStr) in your banking app or website, then this withdrawal will proceed 
automatically.")
                     .multilineTextAlignment(.leading)
+                    .padding(.top)
                     .listRowSeparator(.visible)
-                Text(iconOnly ? "Or use this PayTo-Link:"
-                              : "Alternative: If your bank already supports 
PayTo, you can use this PayTo-Link instead:")
+                Text(iconOnly ? "**Alternative:** Use this PayTo-Link:"
+                              : "**Alternative:** If your bank already 
supports PayTo, you can use this PayTo-Link instead:")
                     .multilineTextAlignment(.leading)
-                    .padding(.top, 2)
+                    .padding(.top)
                     .listRowSeparator(.hidden)
                 HStack {
                     Text(verbatim: "|")       // only reason for this 
leading-aligned text is to get a nice full length listRowSeparator
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift 
b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
index d795ab5..4e68137 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -109,7 +109,7 @@ struct TransactionDetailView: View {
         let (dateString, date) = TalerDater.dateString(from: common.timestamp)
         let accessibilityDate = accessibilityDate(date) ?? dateString
         let navTitle2 = transaction.localizedType
-        Group {
+        VStack {
             List {
                 if developerMode {
                     if transaction.isSuspendable { if let suspendAction {
@@ -148,15 +148,14 @@ struct TransactionDetailView: View {
                     TransactionButton(transactionId: common.transactionId,
                                       command: .delete, action: deleteAction)
                 } } // Delete button
-            }.id(viewId)    // change viewId to enforce a draw update
-            .listStyle(myListStyle.style).anyView
-            .safeAreaInset(edge: .bottom) {
                 if let doneAction {
                     Button(transaction.shouldConfirm ? "Confirm later" : 
"Done", action: doneAction)
                         .buttonStyle(TalerButtonStyle(type: 
transaction.shouldConfirm ? .bordered : .prominent))
-                        .padding(.horizontal)
-                }
-            }
+                } // Done button
+            }.id(viewId)    // change viewId to enforce a draw update
+            .listStyle(myListStyle.style).anyView
+//            .safeAreaInset(edge: .bottom) {
+//            }
         } // Group
         .onNotification(.TransactionExpired) { notification in
             // TODO: Alert user that this tx just expired

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.