[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 16/25: ManualDetailsV, minimal
From: |
gnunet |
Subject: |
[taler-taler-ios] 16/25: ManualDetailsV, minimal |
Date: |
Mon, 06 Nov 2023 20:40:23 +0100 |
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 681ecf201912436204538356f541a4149f8af599
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sat Nov 4 20:04:49 2023 +0100
ManualDetailsV, minimal
---
TalerWallet.xcodeproj/project.pbxproj | 12 ++++----
.../{ManualDetails.swift => ManualDetailsV.swift} | 32 ++++++++++++++++------
.../Views/Transactions/TransactionDetailView.swift | 2 +-
3 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/TalerWallet.xcodeproj/project.pbxproj
b/TalerWallet.xcodeproj/project.pbxproj
index aee8ed1..16283e0 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -55,7 +55,7 @@
4E3EAE3B2A990778009F1BE8 /* TalerWallet1App.swift in Sources */
= {isa = PBXBuildFile; fileRef = 4EB094EC298979620043A8A1 /*
TalerWallet1App.swift */; };
4E3EAE3C2A990778009F1BE8 /* WithdrawTOSView.swift in Sources */
= {isa = PBXBuildFile; fileRef = 4EB095402989CBFE0043A8A1 /*
WithdrawTOSView.swift */; };
4E3EAE3D2A990778009F1BE8 /* Sheet.swift in Sources */ = {isa =
PBXBuildFile; fileRef = 4EEC157729F9032900D46A03 /* Sheet.swift */; };
- 4E3EAE3E2A990778009F1BE8 /* ManualDetails.swift in Sources */ =
{isa = PBXBuildFile; fileRef = 4E6EDD842A3615BE0031D520 /* ManualDetails.swift
*/; };
+ 4E3EAE3E2A990778009F1BE8 /* ManualDetailsV.swift in Sources */
= {isa = PBXBuildFile; fileRef = 4E6EDD842A3615BE0031D520 /*
ManualDetailsV.swift */; };
4E3EAE3F2A990778009F1BE8 /* View+dismissTop.swift in Sources */
= {isa = PBXBuildFile; fileRef = 4EB095082989CB7C0043A8A1 /*
View+dismissTop.swift */; };
4E3EAE402A990778009F1BE8 /* TransactionsListView.swift in
Sources */ = {isa = PBXBuildFile; fileRef = 4EB0952F2989CBFE0043A8A1 /*
TransactionsListView.swift */; };
4E3EAE412A990778009F1BE8 /* WalletBackendRequest.swift in
Sources */ = {isa = PBXBuildFile; fileRef = 4EB0951B2989CBCB0043A8A1 /*
WalletBackendRequest.swift */; };
@@ -153,7 +153,7 @@
4E605DB82AB05E48002FB9A7 /* View+flippedDirection.swift in
Sources */ = {isa = PBXBuildFile; fileRef = 4E605DB62AB05E48002FB9A7 /*
View+flippedDirection.swift */; };
4E605DBA2AB05FB6002FB9A7 /* BarGraph.swift in Sources */ = {isa
= PBXBuildFile; fileRef = 4E605DB92AB05FB6002FB9A7 /* BarGraph.swift */; };
4E605DBB2AB05FB6002FB9A7 /* BarGraph.swift in Sources */ = {isa
= PBXBuildFile; fileRef = 4E605DB92AB05FB6002FB9A7 /* BarGraph.swift */; };
- 4E6EDD852A3615BE0031D520 /* ManualDetails.swift in Sources */ =
{isa = PBXBuildFile; fileRef = 4E6EDD842A3615BE0031D520 /* ManualDetails.swift
*/; };
+ 4E6EDD852A3615BE0031D520 /* ManualDetailsV.swift in Sources */
= {isa = PBXBuildFile; fileRef = 4E6EDD842A3615BE0031D520 /*
ManualDetailsV.swift */; };
4E6EDD872A363D8D0031D520 /* ListStyle.swift in Sources */ =
{isa = PBXBuildFile; fileRef = 4E6EDD862A363D8D0031D520 /* ListStyle.swift */;
};
4E753A062A0952F8002D9328 /* DebugViewC.swift in Sources */ =
{isa = PBXBuildFile; fileRef = 4E753A052A0952F7002D9328 /* DebugViewC.swift */;
};
4E753A082A0B6A5F002D9328 /* ShareSheet.swift in Sources */ =
{isa = PBXBuildFile; fileRef = 4E753A072A0B6A5F002D9328 /* ShareSheet.swift */;
};
@@ -328,7 +328,7 @@
4E605DAE2AADDD13002FB9A7 /* UIScreen+screenSize.swift */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift;
path = "UIScreen+screenSize.swift"; sourceTree = "<group>"; };
4E605DB62AB05E48002FB9A7 /* View+flippedDirection.swift */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.swift; path = "View+flippedDirection.swift"; sourceTree = "<group>";
};
4E605DB92AB05FB6002FB9A7 /* BarGraph.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path
= BarGraph.swift; sourceTree = "<group>"; };
- 4E6EDD842A3615BE0031D520 /* ManualDetails.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path
= ManualDetails.swift; sourceTree = "<group>"; };
+ 4E6EDD842A3615BE0031D520 /* ManualDetailsV.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path
= ManualDetailsV.swift; sourceTree = "<group>"; };
4E6EDD862A363D8D0031D520 /* ListStyle.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path
= ListStyle.swift; sourceTree = "<group>"; };
4E753A042A08E720002D9328 /* transactions.json */ = {isa =
PBXFileReference; lastKnownFileType = text.json; path = transactions.json;
sourceTree = "<group>"; };
4E753A052A0952F7002D9328 /* DebugViewC.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path
= DebugViewC.swift; sourceTree = "<group>"; };
@@ -692,7 +692,7 @@
4EB095302989CBFE0043A8A1 /*
TransactionRowView.swift */,
4EB095312989CBFE0043A8A1 /*
TransactionDetailView.swift */,
4E87C8722A31CB7F001C6406 /*
TransactionsEmptyView.swift */,
- 4E6EDD842A3615BE0031D520 /* ManualDetails.swift
*/,
+ 4E6EDD842A3615BE0031D520 /*
ManualDetailsV.swift */,
4ED2F94A2A278F5100453B40 /* ThreeAmounts.swift
*/,
);
path = Transactions;
@@ -1078,7 +1078,7 @@
4E3EAE3B2A990778009F1BE8 /*
TalerWallet1App.swift in Sources */,
4E3EAE3C2A990778009F1BE8 /*
WithdrawTOSView.swift in Sources */,
4E3EAE3D2A990778009F1BE8 /* Sheet.swift in
Sources */,
- 4E3EAE3E2A990778009F1BE8 /* ManualDetails.swift
in Sources */,
+ 4E3EAE3E2A990778009F1BE8 /*
ManualDetailsV.swift in Sources */,
4E3EAE3F2A990778009F1BE8 /*
View+dismissTop.swift in Sources */,
4E3EAE402A990778009F1BE8 /*
TransactionsListView.swift in Sources */,
4E3EAE412A990778009F1BE8 /*
WalletBackendRequest.swift in Sources */,
@@ -1187,7 +1187,7 @@
4EB094ED298979620043A8A1 /*
TalerWallet1App.swift in Sources */,
4EB095652989CBFE0043A8A1 /*
WithdrawTOSView.swift in Sources */,
4EEC157829F9032900D46A03 /* Sheet.swift in
Sources */,
- 4E6EDD852A3615BE0031D520 /* ManualDetails.swift
in Sources */,
+ 4E6EDD852A3615BE0031D520 /*
ManualDetailsV.swift in Sources */,
4EB0950B2989CB7C0043A8A1 /*
View+dismissTop.swift in Sources */,
4EB095562989CBFE0043A8A1 /*
TransactionsListView.swift in Sources */,
4EB0951F2989CBCB0043A8A1 /*
WalletBackendRequest.swift in Sources */,
diff --git a/TalerWallet1/Views/Transactions/ManualDetails.swift
b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
similarity index 66%
rename from TalerWallet1/Views/Transactions/ManualDetails.swift
rename to TalerWallet1/Views/Transactions/ManualDetailsV.swift
index adc9e15..2b35934 100644
--- a/TalerWallet1/Views/Transactions/ManualDetails.swift
+++ b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
@@ -5,9 +5,12 @@
import SwiftUI
import taler_swift
-struct ManualDetails: View {
+struct ManualDetailsV: View {
var common : TransactionCommon
var details : WithdrawalDetails
+
+ @AppStorage("iconOnly") var iconOnly: Bool = false
+
var body: some View {
if let paytoUris = details.exchangePaytoUris {
let payto = paytoUris[0]
@@ -15,10 +18,18 @@ struct ManualDetails: View {
let iban = payURL?.iban ?? "unknown IBAN"
let amount = common.amountRaw.readableDescription
Group {
- Text("You need to transfer \(amount) from your regular bank
account to the Exchange.")
- Text("Step 1: Copy this code and paste it into the
subject/purpose field in your banking app or bank website.\nThis is mandatory,
otherwise your money will not arrive in this wallet.")
- .multilineTextAlignment(.leading)
- .listRowSeparator(.hidden)
+ Text(iconOnly ? "Transfer \(amount) to the Exchange."
+ : "You need to transfer \(amount) 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:")
+ .multilineTextAlignment(.leading)
+ .listRowSeparator(.hidden)
+ if !iconOnly {
+ Text("This is mandatory, otherwise your money will not
arrive in this wallet.")
+ .bold()
+ .multilineTextAlignment(.leading)
+ .listRowSeparator(.hidden)
+ }
HStack {
Text(details.reservePub)
.monospacedDigit()
@@ -29,7 +40,8 @@ struct ManualDetails: View {
.disabled(false)
} .padding(.leading)
.listRowSeparator(.hidden)
- Text("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:")
.multilineTextAlignment(.leading)
.listRowSeparator(.hidden)
HStack {
@@ -42,10 +54,12 @@ struct ManualDetails: View {
} .padding(.leading)
.padding(.top, -8)
.listRowSeparator(.hidden)
- Text("Step 3: Finish the wire transfer of \(amount) in your
banking app or website, then this withdrawal will proceed automatically.")
+ Text(iconOnly ? "Step 3: Transfer \(amount)."
+ : "Step 3: Finish the wire transfer of \(amount)
in your banking app or website, then this withdrawal will proceed
automatically.")
.multilineTextAlignment(.leading)
.listRowSeparator(.visible)
- Text("Alternative: If your bank already supports PayTo, you
can use this PayTo-Link instead:")
+ Text(iconOnly ? "Or use this PayTo-Link:"
+ : "Alternative: If your bank already supports
PayTo, you can use this PayTo-Link instead:")
.multilineTextAlignment(.leading)
.padding(.top, 2)
.listRowSeparator(.hidden)
@@ -78,7 +92,7 @@ struct ManualDetails_Previews: PreviewProvider {
let details = WithdrawalDetails(type: .manual, reservePub:
"ReSeRvEpUbLiC_KeY_FoR_WiThDrAwAl", reserveIsReady: false,
exchangePaytoUris:["payto://iban/SANDBOXX/DE159593?receiver-name=Exchange+Company"])
List {
- ManualDetails(common: common, details: details)
+ ManualDetailsV(common: common, details: details)
}
}
}
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
index a4ad34f..ce99a9d 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -206,7 +206,7 @@ struct TransactionDetailView: View {
let withdrawalDetails = details.withdrawalDetails
switch withdrawalDetails.type {
case .manual: // "Make a wire
transfer of \(amount) to"
- ManualDetails(common: common, details:
withdrawalDetails)
+ ManualDetailsV(common: common, details:
withdrawalDetails)
case .bankIntegrated: // "Confirm with
bank"
let confirmed =
withdrawalDetails.confirmed ?? false
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (101ccb8 -> e082595), gnunet, 2023/11/06
- [taler-taler-ios] 05/25: logger, gnunet, 2023/11/06
- [taler-taler-ios] 01/25: avoid unneccessary localizations, gnunet, 2023/11/06
- [taler-taler-ios] 16/25: ManualDetailsV, minimal,
gnunet <=
- [taler-taler-ios] 03/25: Purpose->Subject, cleanup, gnunet, 2023/11/06
- [taler-taler-ios] 06/25: L10N, gnunet, 2023/11/06
- [taler-taler-ios] 02/25: until Xcode 15.1 is final, gnunet, 2023/11/06
- [taler-taler-ios] 21/25: Accessibility, gnunet, 2023/11/06
- [taler-taler-ios] 04/25: No l10n for Debug, gnunet, 2023/11/06
- [taler-taler-ios] 13/25: Accessibility, gnunet, 2023/11/06
- [taler-taler-ios] 24/25: Accessibility: Contrast, gnunet, 2023/11/06
- [taler-taler-ios] 18/25: Default for Sound & Haptics ON, gnunet, 2023/11/06
- [taler-taler-ios] 23/25: L10N, EMPTYSTRING, gnunet, 2023/11/06
- [taler-taler-ios] 10/25: Use System Alert for iOS16+, gnunet, 2023/11/06