[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] branch master updated (05cf278 -> bb640f0)
|
From: |
gnunet |
|
Subject: |
[taler-taler-ios] branch master updated (05cf278 -> bb640f0) |
|
Date: |
Tue, 26 Sep 2023 15:07:48 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a change to branch master
in repository taler-ios.
from 05cf278 Split view (too complex for Intel MacBook), add CallStack
new 893ed89 unified style of buttons
new bb2afe2 Simplified QR code view
new 6820a55 Date/time smaller and with secondary color
new bb640f0 Link -> Button
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
TalerWallet1/Views/Exchange/ManualWithdraw.swift | 4 ++-
.../Views/HelperViews/QRCodeDetailView.swift | 39 +++++++++++-----------
TalerWallet1/Views/HelperViews/ToSButtonView.swift | 1 +
TalerWallet1/Views/Main/WalletEmptyView.swift | 14 ++++----
.../Views/Sheets/P2P_Sheets/P2pPayURIView.swift | 5 +--
.../Sheets/P2P_Sheets/P2pReceiveURIView.swift | 5 +--
.../WithdrawBankIntegrated/WithdrawURIView.swift | 5 +--
.../Views/Transactions/TransactionDetailView.swift | 3 +-
8 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/TalerWallet1/Views/Exchange/ManualWithdraw.swift
b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
index 5e45416..4d689c1 100644
--- a/TalerWallet1/Views/Exchange/ManualWithdraw.swift
+++ b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
@@ -58,7 +58,9 @@ struct ManualWithdraw: View {
// restrictAge: restrictAge)
}) {
Text("Confirm Withdrawal") //
VIEW_WITHDRAW_ACCEPT
- }.buttonStyle(TalerButtonStyle(type: .prominent))
+ }
+ .buttonStyle(TalerButtonStyle(type: .prominent))
+ .padding(.horizontal)
} else {
ToSButtonView(exchangeBaseUrl:
exchange.exchangeBaseUrl,
viewID: VIEW_WITHDRAW_TOS,
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
index 435e4ea..66438a6 100644
--- a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
+++ b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -15,38 +15,39 @@ struct QRCodeDetailView: View {
var body: some View {
if talerURI.count > 10 {
VStack (alignment: .leading) {
- Text("Either copy and send this link:")
+ Text("Either")
.multilineTextAlignment(.leading)
.accessibilityFont(.title3)
- .padding(.vertical)
-
- Text(talerURI)
- .accessibilityFont(.title3)
- .multilineTextAlignment(.center)
- .fixedSize(horizontal: false, vertical: true) //
wrap in scrollview
- .padding(.bottom)
+// .padding(.vertical)
CopyShare(textToCopy: talerURI)
.disabled(false)
- .padding(.bottom)
+// .padding(.bottom)
+
+ let otherParty = incoming ? String(localized: "payer")
+ : String(localized: "payee")
+ Text("the link to the \(otherParty), or", comment:
"(copy/share) the link to the other party (payer/payee), or")
+ .multilineTextAlignment(.leading)
+ .accessibilityFont(.title3)
+
+ HStack {
+ Spacer()
+ QRGeneratorView(text: talerURI)
+ Spacer()
+ }
// TODO: use currency formatter instead of .readableDescription
let amountStr = (amount == nil) ?
- (incoming ? String(localized: "or let the payer scan this
QR code to pay:")
- : String(localized: "or let the payee scan this
QR code to receive:"))
- : (incoming ? String(localized: "or let the payer scan this
QR code to pay \(amount!.readableDescription):",
+ (incoming ? String(localized: "let the payer scan this QR
code to pay.")
+ : String(localized: "let the payee scan this QR
code to receive."))
+ : (incoming ? String(localized: "let the payer scan this QR
code to pay \(amount!.readableDescription).",
comment: "amount.readableDescription:
5,3 €")
- : String(localized: "or let the payee scan this
QR code to receive \(amount!.readableDescription):",
+ : String(localized: "let the payee scan this QR
code to receive \(amount!.readableDescription).",
comment: "amount.readableDescription:
7.41 $"))
Text(amountStr)
.fixedSize(horizontal: false, vertical: true) //
wrap in scrollview
-// .padding(.top, 30)
.accessibilityFont(.title3)
- HStack {
- Spacer()
- QRGeneratorView(text: talerURI)
- Spacer()
- }
+ .padding(.top)
}
}
}
diff --git a/TalerWallet1/Views/HelperViews/ToSButtonView.swift
b/TalerWallet1/Views/HelperViews/ToSButtonView.swift
index 9799c5d..1bcfb76 100644
--- a/TalerWallet1/Views/HelperViews/ToSButtonView.swift
+++ b/TalerWallet1/Views/HelperViews/ToSButtonView.swift
@@ -27,6 +27,7 @@ struct ToSButtonView: View {
}) {
Text("Terms of Service") // VIEW_WITHDRAW_TOS
}.buttonStyle(TalerButtonStyle(type: .prominent))
+ .padding(.horizontal)
}
}
diff --git a/TalerWallet1/Views/Main/WalletEmptyView.swift
b/TalerWallet1/Views/Main/WalletEmptyView.swift
index e8b824e..1e691e6 100644
--- a/TalerWallet1/Views/Main/WalletEmptyView.swift
+++ b/TalerWallet1/Views/Main/WalletEmptyView.swift
@@ -16,15 +16,15 @@ struct WalletEmptyView: View {
List {
Section {
Text("There is no digital cash in your wallet.")
+ .accessibilityFont(.title3)
+ .listRowSeparator(.hidden)
+ Link("Get some test money", destination: URL(string:
DEMOBANK)!)
+ .buttonStyle(TalerButtonStyle(type: .prominent, narrow:
false, aligned: .center))
+ .padding(.vertical)
}
Section {
- Text("You can get some test money from the demo bank:")
- }
- Section {
- Link(DEMOBANK, destination: URL(string: DEMOBANK)!)
- }
- Section {
- Text("Just register a test account, then withdraw some
electronic cash.")
+ Text("Just register a test account in the demo bank, then
withdraw some electronic cash.")
+ .accessibilityFont(.body)
}
}
.listStyle(myListStyle.style).anyView
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
index 01529fe..30251d8 100644
--- a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
+++ b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
@@ -45,8 +45,9 @@ struct P2pPayURIView: View {
incoming: false)
}) {
Text("Confirm Payment", comment:"pay P2P
request/invoice") // SHEET_PAY_P2P
- }.buttonStyle(TalerButtonStyle(type: .prominent))
- .padding()
+ }
+ .buttonStyle(TalerButtonStyle(type: .prominent))
+ .padding(.horizontal)
} else {
WithdrawProgressView(message: url.host ?? "Yikes - no valid
URL")
.navigationTitle("Contacting Exchange")
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
index 9760a2b..6ff8f16 100644
--- a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
+++ b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
@@ -46,8 +46,9 @@ struct P2pReceiveURIView: View {
incoming: true)
}) {
Text("Accept P2P Receive") // SHEET_RCV_P2P_ACCEPT
- }.buttonStyle(TalerButtonStyle(type: .prominent))
- .padding()
+ }
+ .buttonStyle(TalerButtonStyle(type: .prominent))
+ .padding(.horizontal)
} else {
ToSButtonView(exchangeBaseUrl: nil,
viewID: SHEET_RCV_P2P_TOS,
diff --git
a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
index af90307..9388983 100644
--- a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
+++ b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift
@@ -56,8 +56,9 @@ struct WithdrawURIView: View {
url: url)
}) {
Text("Confirm Withdrawal") //
SHEET_WITHDRAW_ACCEPT
- }.buttonStyle(TalerButtonStyle(type: .prominent))
- .padding()
+ }
+ .buttonStyle(TalerButtonStyle(type: .prominent))
+ .padding(.horizontal)
} else {
ToSButtonView(exchangeBaseUrl: exchangeBaseUrl,
viewID: SHEET_WITHDRAW_TOS,
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
index 148d755..97953e5 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -67,7 +67,8 @@ struct TransactionDetailView: View {
} }
} // Suspend + Resume buttons
Text(dateString)
- .accessibilityFont(.title2)
+ .accessibilityFont(.body)
+ .foregroundColor(.secondary)
.listRowSeparator(.hidden)
HStack {
Text(verbatim: "|") // only reason for this
leading-aligned text is to get a nice full length listRowSeparator
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (05cf278 -> bb640f0),
gnunet <=