[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 04/09: ThreeAmounts
From: |
gnunet |
Subject: |
[taler-taler-ios] 04/09: ThreeAmounts |
Date: |
Fri, 07 Jul 2023 11:40:02 +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 c4e4ad0c52accf8261493cf4780065a7a834bca1
Author: Marc Stibane <marc@taler.net>
AuthorDate: Thu Jul 6 18:05:09 2023 +0200
ThreeAmounts
---
TalerWallet1/Views/HelperViews/AmountView.swift | 21 +++++++++++++-------
TalerWallet1/Views/Transactions/ThreeAmounts.swift | 23 +++++++++++++---------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/AmountView.swift
b/TalerWallet1/Views/HelperViews/AmountView.swift
index bf2b32f..1d059cb 100644
--- a/TalerWallet1/Views/HelperViews/AmountView.swift
+++ b/TalerWallet1/Views/HelperViews/AmountView.swift
@@ -9,16 +9,23 @@ struct AmountView: View {
let value: String
let color: Color
let large: Bool // set to false for QR or IBAN
+
var body: some View {
- VStack {
+ VStack(alignment: .leading) {
Text(title)
- .font(.title3)
- Text(value)
- .font(large ? .largeTitle : .title)
- .fontWeight(large ? .medium : .regular)
- .foregroundColor(color)
+ .multilineTextAlignment(.leading)
+ .font(.body)
+ HStack {
+ Spacer()
+ Text(value)
+ .multilineTextAlignment(.center)
+ .font(large ? .title : .title2)
+// .fontWeight(large ? .medium : .regular) //
@available(iOS 16.0, *)
+ .foregroundColor(color)
+ Spacer()
+ }
}
- .frame(maxWidth: .infinity, alignment: .center)
+ .frame(maxWidth: .infinity, alignment: .leading)
.listRowSeparator(.hidden)
}
}
diff --git a/TalerWallet1/Views/Transactions/ThreeAmounts.swift
b/TalerWallet1/Views/Transactions/ThreeAmounts.swift
index 5e60ce4..8d85c04 100644
--- a/TalerWallet1/Views/Transactions/ThreeAmounts.swift
+++ b/TalerWallet1/Views/Transactions/ThreeAmounts.swift
@@ -64,18 +64,23 @@ struct ThreeAmountsView: View {
color: foreColor,
large: large)
if let baseURL {
- VStack {
+ VStack(alignment: .leading) {
Text(incoming ? "from Exchange:" : "to Exchange:")
- .font(.title3)
- Text(baseURL.trimURL())
- .font(large ? .title : .title2)
- .fontWeight(large ? .medium : .regular)
- .foregroundColor(labelColor)
+ .multilineTextAlignment(.leading)
+ .font(.body)
+ HStack {
+ Spacer()
+ Text(baseURL.trimURL())
+ .multilineTextAlignment(.center)
+ .font(large ? .title : .title2)
+ // .fontWeight(large ? .medium
: .regular) // @available(iOS 16.0, *)
+ .foregroundColor(labelColor)
+ Spacer()
+ }
}
.padding(.top, 4)
- .frame(maxWidth: .infinity, alignment: .center)
+ .frame(maxWidth: .infinity, alignment: .leading)
.listRowSeparator(.hidden)
-
}
if let status {
HStack {
@@ -99,7 +104,7 @@ struct ThreeAmounts_Previews: PreviewProvider {
txActions: [])
Group {
List {
- ThreeAmountsSheet(common: common, topTitle: "Withdrawal",
baseURL: DEMOEXCHANGE, large: 1==1)
+ ThreeAmountsSheet(common: common, topTitle: "Withdrawal",
baseURL: DEMOEXCHANGE, large: 1==0)
.safeAreaInset(edge: .bottom) {
Button(String(localized: "Accept"), action: {})
.buttonStyle(TalerButtonStyle(type: .prominent))
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (f361428 -> ad57348), gnunet, 2023/07/07
- [taler-taler-ios] 01/09: TestFlight WhatToTest for Xcode Cloud, gnunet, 2023/07/07
- [taler-taler-ios] 05/09: shorter title, debug info, gnunet, 2023/07/07
- [taler-taler-ios] 02/09: Payment model uses transactionID, gnunet, 2023/07/07
- [taler-taler-ios] 03/09: List handling, gnunet, 2023/07/07
- [taler-taler-ios] 06/09: remove .travis.yml, gnunet, 2023/07/07
- [taler-taler-ios] 09/09: iOS: bump version to 0.9.3 (14), gnunet, 2023/07/07
- [taler-taler-ios] 08/09: tosStatus, gnunet, 2023/07/07
- [taler-taler-ios] 04/09: ThreeAmounts,
gnunet <=
- [taler-taler-ios] 07/09: Enhanced ToS plaintext formatting, gnunet, 2023/07/07