summaryrefslogtreecommitdiff
path: root/wallet/src/main/res
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2022-09-07 16:28:04 -0300
committerTorsten Grote <t@grobox.de>2022-09-07 16:44:16 -0300
commite350d497abe560aeeef88081ae93d73135ece00f (patch)
tree0d13269331b16875e56fbafb8af8f9bdf3cfba77 /wallet/src/main/res
parent6876951cb30f057a852937a533d5d51d26645680 (diff)
downloadtaler-android-e350d497abe560aeeef88081ae93d73135ece00f.tar.gz
taler-android-e350d497abe560aeeef88081ae93d73135ece00f.tar.bz2
taler-android-e350d497abe560aeeef88081ae93d73135ece00f.zip
[wallet] implement prototype for handling incoming pay-pull URI
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r--wallet/src/main/res/navigation/nav_graph.xml18
-rw-r--r--wallet/src/main/res/values/strings.xml5
2 files changed, 21 insertions, 2 deletions
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index 3170216..f9060c5 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -131,7 +131,7 @@
<fragment
android:id="@+id/nav_peer_pull"
- android:name="net.taler.wallet.peer.PeerPullFragment"
+ android:name="net.taler.wallet.peer.OutgoingPullFragment"
android:label="@string/receive_peer_title">
<argument
android:name="amount"
@@ -142,7 +142,7 @@
<fragment
android:id="@+id/promptPullPayment"
- android:name="net.taler.wallet.peer.PullPaymentFragment"
+ android:name="net.taler.wallet.peer.IncomingPullPaymentFragment"
android:label="@string/pay_peer_title">
<action
android:id="@+id/action_promptPullPayment_to_nav_main"
@@ -151,6 +151,16 @@
</fragment>
<fragment
+ android:id="@+id/promptPushPayment"
+ android:name="net.taler.wallet.peer.IncomingPushPaymentFragment"
+ android:label="@string/receive_peer_payment_title">
+ <action
+ android:id="@+id/action_promptPushPayment_to_nav_main"
+ app:destination="@id/nav_main"
+ app:popUpTo="@id/nav_main" />
+ </fragment>
+
+ <fragment
android:id="@+id/nav_transactions"
android:name="net.taler.wallet.transactions.TransactionsFragment"
android:label="@string/transactions_title"
@@ -290,6 +300,10 @@
app:destination="@id/promptPullPayment" />
<action
+ android:id="@+id/action_global_prompt_push_payment"
+ app:destination="@id/promptPushPayment" />
+
+ <action
android:id="@+id/action_global_pending_operations"
app:destination="@id/nav_pending_operations" />
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 8601b14..ab8984c 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -99,6 +99,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="transaction_peer_push_debit">Push payment</string>
<string name="transaction_peer_pull_credit">Invoice</string>
<string name="transaction_peer_pull_debit">Invoice paid</string>
+ <string name="transaction_peer_push_credit">Push payment</string>
<string name="payment_title">Payment</string>
<string name="payment_fee">+%s payment fee</string>
@@ -127,9 +128,13 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="send_peer_create_button">Send funds now</string>
<string name="send_peer_warning">Warning: Funds will leave the wallet immediately.</string>
<string name="send_peer_payment_instruction">Let the payee scan this QR code to receive:</string>
+ <string name="send_peer_payment_amount_received">Amount received</string>
+ <string name="send_peer_payment_amount_sent">Amount sent</string>
<string name="pay_peer_title">Pay invoice</string>
<string name="pay_peer_intro">Do you want to pay this invoice?</string>
+ <string name="receive_peer_payment_title">Receive payment</string>
+ <string name="receive_peer_payment_intro">Do you want to receive this payment?</string>
<string name="withdraw_initiated">Withdrawal initiated</string>
<string name="withdraw_title">Withdrawal</string>