[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] branch master updated (5db5699 -> 4c12077)
|
From: |
gnunet |
|
Subject: |
[taler-taler-ios] branch master updated (5db5699 -> 4c12077) |
|
Date: |
Mon, 15 Apr 2024 13:22:36 +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 5db5699 Tri-State, less is more
new afb3506 Accessibility
new 4aafe04 Bump version to 0.10.0 (0.10.6)
new 4c12077 errorResponse
The 3 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:
TalerWallet.xcodeproj/project.pbxproj | 16 +++++-----
TalerWallet1/Backend/WalletBackendError.swift | 37 ++++++++++++++++------
TalerWallet1/Views/Balances/BalanceRowView.swift | 1 +
TalerWallet1/Views/Balances/TwoRowButtons.swift | 7 ++--
TalerWallet1/Views/Banking/DepositWithdrawV.swift | 1 +
TalerWallet1/Views/Banking/ManualWithdraw.swift | 3 ++
TalerWallet1/Views/HelperViews/AmountV.swift | 1 +
TalerWallet1/Views/Sheets/ErrorSheet.swift | 3 +-
.../Views/Transactions/ManualDetailsV.swift | 2 +-
TestFlight/WhatToTest.en-US.txt | 11 +++++--
10 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/TalerWallet.xcodeproj/project.pbxproj
b/TalerWallet.xcodeproj/project.pbxproj
index 417df6e..817c493 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -1384,7 +1384,7 @@
CODE_SIGN_ENTITLEMENTS =
"$(TARGET_NAME).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 0.10.6;
DEVELOPMENT_TEAM = GUDDQ9428Y;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -1402,7 +1402,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 0.9.7;
+ MARKETING_VERSION = 0.10.0;
PRODUCT_BUNDLE_IDENTIFIER =
"com.taler-systems.talerwallet-1";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1426,7 +1426,7 @@
CODE_SIGN_ENTITLEMENTS =
"$(TARGET_NAME).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 0.10.6;
DEVELOPMENT_TEAM = GUDDQ9428Y;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -1444,7 +1444,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 0.9.7;
+ MARKETING_VERSION = 0.10.0;
PRODUCT_BUNDLE_IDENTIFIER =
"com.taler-systems.talerwallet-1";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1585,7 +1585,7 @@
CODE_SIGN_ENTITLEMENTS =
"$(TARGET_NAME).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 0.10.6;
DEVELOPMENT_TEAM = GUDDQ9428Y;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -1603,7 +1603,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 0.9.7;
+ MARKETING_VERSION = 0.10.0;
PRODUCT_BUNDLE_IDENTIFIER =
"com.taler-systems.talerwallet-2";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1627,7 +1627,7 @@
CODE_SIGN_ENTITLEMENTS =
"$(TARGET_NAME).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 0.10.6;
DEVELOPMENT_TEAM = GUDDQ9428Y;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -1645,7 +1645,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 0.9.7;
+ MARKETING_VERSION = 0.10.0;
PRODUCT_BUNDLE_IDENTIFIER =
"com.taler-systems.talerwallet-2";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/TalerWallet1/Backend/WalletBackendError.swift
b/TalerWallet1/Backend/WalletBackendError.swift
index 1465988..0a2c693 100644
--- a/TalerWallet1/Backend/WalletBackendError.swift
+++ b/TalerWallet1/Backend/WalletBackendError.swift
@@ -7,6 +7,7 @@
* @author Iván Ávalos
*/
import Foundation
+import taler_swift
/// Errors for `WalletBackend`.
enum WalletBackendError: Error {
@@ -17,35 +18,53 @@ enum WalletBackendError: Error {
case walletCoreError(WalletBackendResponseError?)
}
+struct ErrorResponse: Codable {
+ var code: Int
+ /// English description of the error code.
+ var hint: String
+
+ /// Error details, type depends on `talerErrorCode`.
+ var detail: String? = nil
+}
+
/// Information supplied by the backend describing an error.
struct WalletBackendResponseError: Codable {
/// Numeric error code defined defined in the GANA gnu-taler-error-codes
registry.
var code: Int
-
+
+ var when: Timestamp
+
/// English description of the error code.
var hint: String
-
+
+ var requestUrl: String? = nil
+
+ var httpStatusCode: Int? = nil
+
+ var errorResponse: ErrorResponse? = nil
+
/// English diagnostic message that can give details for the instance of
the error.
var message: String? = nil
-
- /// Error details, type depends on `talerErrorCode`.
- var details: Data? = nil
}
extension WalletCore {
static func serializeRequestError() -> WalletBackendResponseError {
- return WalletBackendResponseError(code: -1, hint: "Could not serialize
request.", message: "")
+ return WalletBackendResponseError(code: -1, when: Timestamp.now(),
+ hint: "Could not serialize
request.", message: "")
}
static func parseResponseError() -> WalletBackendResponseError {
- return WalletBackendResponseError(code: -2, hint: "Could not parse
response.", message: "")
+ return WalletBackendResponseError(code: -2, when: Timestamp.now(),
+ hint: "Could not parse response.",
message: "")
}
static func parseFailureError() -> WalletBackendResponseError {
- return WalletBackendResponseError(code: -3, hint: "Could not parse
error detail.", message: "")
+ return WalletBackendResponseError(code: -3, when: Timestamp.now(),
+ hint: "Could not parse error
detail.", message: "")
}
static func walletError() -> WalletBackendResponseError {
- return WalletBackendResponseError(code: -4, hint: "Error detail.",
message: "")
+ return WalletBackendResponseError(code: -4, when: Timestamp.now(),
+ hint: "Error detail.", message: "")
}
}
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift
b/TalerWallet1/Views/Balances/BalanceRowView.swift
index ca0bd58..4a1b119 100644
--- a/TalerWallet1/Views/Balances/BalanceRowView.swift
+++ b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -93,6 +93,7 @@ struct BalanceRowView: View {
let twoRowButtons = TwoRowButtons(stack: stack.push(),
sendTitle: sendTitle,
recvTitle: requTitle,
+ recvA11y: requTitle.tabbed(oneLine:
true),
fitsSideBySide: false,
lineLimit: 5,
sendDisabled: amount.isZero,
diff --git a/TalerWallet1/Views/Balances/TwoRowButtons.swift
b/TalerWallet1/Views/Balances/TwoRowButtons.swift
index d9c0713..334f474 100644
--- a/TalerWallet1/Views/Balances/TwoRowButtons.swift
+++ b/TalerWallet1/Views/Balances/TwoRowButtons.swift
@@ -9,6 +9,7 @@ struct TwoRowButtons: View {
let stack: CallStack
let sendTitle: String
let recvTitle: String
+ let recvA11y: String
let fitsSideBySide: Bool
let lineLimit: Int
let sendDisabled: Bool
@@ -20,6 +21,7 @@ struct TwoRowButtons: View {
TwoRowButtons(stack: stack.push(),
sendTitle: sendTitle,
recvTitle: recvTitle,
+ recvA11y: recvA11y,
fitsSideBySide: fitsSideBySide,
lineLimit: lineLimit,
sendDisabled: sendDisabled,
@@ -40,9 +42,8 @@ struct TwoRowButtons: View {
disabled: sendDisabled,
aligned: .center))
let recvButtonTitle = recvTitle.tabbed(oneLine: !fitsSideBySide)
- let recvVoiceOverTitle = recvTitle.tabbed(oneLine: true)
Button(recvButtonTitle, action: recvAction)
- .accessibilityLabel(Text(recvVoiceOverTitle))
+ .accessibilityLabel(Text(recvA11y))
.lineLimit(lineLimit)
.disabled(false)
.buttonStyle(TalerButtonStyle(type: .bordered,
@@ -59,6 +60,7 @@ struct TwoRowButtons_Previews: PreviewProvider {
TwoRowButtons(stack: CallStack("Preview"),
sendTitle: "Send " + TESTCURRENCY,
recvTitle: "Request " + LONGCURRENCY,
+ recvA11y: "Request " + LONGCURRENCY,
fitsSideBySide: false,
lineLimit: 2, sendDisabled: true,
sendAction: {}, recvAction: {})
@@ -66,6 +68,7 @@ struct TwoRowButtons_Previews: PreviewProvider {
TwoRowButtons(stack: CallStack("Preview"),
sendTitle: "Send " + DEMOCURRENCY,
recvTitle: "Request " + DEMOCURRENCY,
+ recvA11y: "Request " + DEMOCURRENCY,
fitsSideBySide: true,
lineLimit: 2, sendDisabled: true,
sendAction: {}, recvAction: {})
diff --git a/TalerWallet1/Views/Banking/DepositWithdrawV.swift
b/TalerWallet1/Views/Banking/DepositWithdrawV.swift
index d538360..d38b283 100644
--- a/TalerWallet1/Views/Banking/DepositWithdrawV.swift
+++ b/TalerWallet1/Views/Banking/DepositWithdrawV.swift
@@ -68,6 +68,7 @@ struct DepositWithdrawV: View {
let twoRowButtons = TwoRowButtons(stack: stack.push(),
sendTitle: minimalistic ? depositTitle0
: depositTitle1,
recvTitle: minimalistic ? withdrawTitle0
: withdrawTitle1,
+ recvA11y:
withdrawTitle1.tabbed(oneLine: true),
fitsSideBySide: false,
lineLimit: 5,
sendDisabled: disableDeposit,
diff --git a/TalerWallet1/Views/Banking/ManualWithdraw.swift
b/TalerWallet1/Views/Banking/ManualWithdraw.swift
index 0499fc4..e8a0d13 100644
--- a/TalerWallet1/Views/Banking/ManualWithdraw.swift
+++ b/TalerWallet1/Views/Banking/ManualWithdraw.swift
@@ -45,6 +45,9 @@ struct ManualWithdraw: View {
let navTitle = String(localized: "NavTitle_Withdraw (currency)",
defaultValue: "Withdraw \(currencySymbol)",
comment: "NavTitle: Withdraw
'currencySymbol'")
+ let navA11y = String(localized: "NavTitle_Withdraw (currency)
A11y",
+ defaultValue: "Withdraw \(currency)",
+ comment: "NavTitle: Withdraw 'currency'")
// let agePicker = AgePicker(ageMenuList: $ageMenuList, selectedAge:
$selectedAge)
let someCoins = SomeCoins(details: withdrawalAmountDetails)
diff --git a/TalerWallet1/Views/HelperViews/AmountV.swift
b/TalerWallet1/Views/HelperViews/AmountV.swift
index 9e4b48a..f2bd5be 100644
--- a/TalerWallet1/Views/HelperViews/AmountV.swift
+++ b/TalerWallet1/Views/HelperViews/AmountV.swift
@@ -24,6 +24,7 @@ struct AmountV: View {
.talerFont(large ? .title : .title2)
// .fontWeight(large ? .medium : .regular) // @available(iOS
16.0, *)
.monospacedDigit()
+ .accessibilityLabel(amount.readableDescription)
}
}
extension AmountV {
diff --git a/TalerWallet1/Views/Sheets/ErrorSheet.swift
b/TalerWallet1/Views/Sheets/ErrorSheet.swift
index d6d2d1e..7b6fd69 100644
--- a/TalerWallet1/Views/Sheets/ErrorSheet.swift
+++ b/TalerWallet1/Views/Sheets/ErrorSheet.swift
@@ -6,6 +6,7 @@
* @author Iván Ávalos
*/
import SwiftUI
+import taler_swift
enum ErrorData {
case message(title: String, message: String)
@@ -119,7 +120,7 @@ struct ErrorSheet: View {
struct ErrorSheet_Previews: PreviewProvider {
static let error =
WalletBackendError.walletCoreError(WalletBackendResponseError(
- code: 7025,
+ code: 7025, when: Timestamp.now(),
hint: "A KYC step is required before withdrawal can proceed",
message: "A KYC step is required before withdrawal can proceed"))
diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift
b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
index 7c06807..fe1d858 100644
--- a/TalerWallet1/Views/Transactions/ManualDetailsV.swift
+++ b/TalerWallet1/Views/Transactions/ManualDetailsV.swift
@@ -36,7 +36,7 @@ struct SegmentControl: View {
let amount = detail.transferAmount
let bankName = detail.bankLabel
let amountStr = amount?.readableDescription ?? ""
- let a11yLabel = bankName != nil ? (bankName! + amountStr)
: amountStr
+ let a11yLabel = bankName != nil ? (bankName! + " " +
amountStr) : amountStr
VStack(spacing: 6) {
Text(amountStr)
.talerFont(.title3)
diff --git a/TestFlight/WhatToTest.en-US.txt b/TestFlight/WhatToTest.en-US.txt
index 0aa1baf..c61ab9f 100644
--- a/TestFlight/WhatToTest.en-US.txt
+++ b/TestFlight/WhatToTest.en-US.txt
@@ -1,7 +1,14 @@
-Version 0.9.7 (1)
+Version 0.10.0 (wallet-core 0.10.6)
+
+• Use segmented control instead of drop-down picker for bank selection in
manual withdrawal
+• Observability via LocalConsole
+- accessibility improvements
+
+
+Version 0.9.7 (wallet-core 0.10.6)
• better error handling
-- bugfix: wallet-core 0.10.6 cache handling, fee computations
+- bugfix: wallet-core cache handling & fee computations
Version 0.9.6 (1)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (5db5699 -> 4c12077),
gnunet <=