diff options
author | Torsten Grote <t@grobox.de> | 2022-09-06 18:18:47 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2022-09-06 18:18:47 -0300 |
commit | 4fe04766fbf5328d0816f7cd862228a71690fd1c (patch) | |
tree | 289e2c4fbfbd5462b0d4d2e2067227c68b840efa /wallet/src/main/res | |
parent | 3d3108dd40cd8d3395434905463a91b4b3a71d5a (diff) | |
download | taler-android-4fe04766fbf5328d0816f7cd862228a71690fd1c.tar.gz taler-android-4fe04766fbf5328d0816f7cd862228a71690fd1c.tar.bz2 taler-android-4fe04766fbf5328d0816f7cd862228a71690fd1c.zip |
[wallet] implement prototype for outgoing peer transactions
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 48 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 18 |
2 files changed, 65 insertions, 1 deletions
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index 871ba53..e3d526e 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -34,6 +34,23 @@ </fragment> <fragment + android:id="@+id/receiveFunds" + android:name="net.taler.wallet.ReceiveFundsFragment" + android:label="@string/transactions_receive_funds"> + <action + android:id="@+id/action_receiveFunds_to_nav_exchange_manual_withdrawal" + app:destination="@id/nav_exchange_manual_withdrawal" /> + <action + android:id="@+id/action_receiveFunds_to_nav_peer_pull" + app:destination="@id/nav_peer_pull" /> + </fragment> + + <fragment + android:id="@+id/sendFunds" + android:name="net.taler.wallet.SendFundsFragment" + android:label="@string/transactions_send_funds" /> + + <fragment android:id="@+id/promptTip" android:name="net.taler.wallet.tip.PromptTipFragment" android:label="Review Tip" @@ -91,6 +108,10 @@ <action android:id="@+id/action_nav_exchange_manual_withdrawal_to_promptWithdraw" app:destination="@id/promptWithdraw" /> + <argument + android:name="amount" + app:argType="string" + app:nullable="false" /> </fragment> <fragment @@ -109,10 +130,21 @@ android:label="@string/nav_settings_backup" /> <fragment + android:id="@+id/nav_peer_pull" + android:name="net.taler.wallet.peer.PeerPullFragment" + android:label="@string/receive_peer_title"> + <argument + android:name="amount" + android:defaultValue="@null" + app:argType="string" + app:nullable="true" /> + </fragment> + + <fragment android:id="@+id/nav_transactions" android:name="net.taler.wallet.transactions.TransactionsFragment" android:label="@string/transactions_title" - tools:layout="@layout/fragment_transactions" > + tools:layout="@layout/fragment_transactions"> <action android:id="@+id/action_nav_transactions_to_nav_uri_input" app:destination="@id/nav_uri_input" /> @@ -147,6 +179,12 @@ tools:layout="@layout/fragment_transaction_withdrawal" /> <fragment + android:id="@+id/nav_transactions_detail_peer" + android:name="net.taler.wallet.transactions.TransactionPeerFragment" + android:label="@string/transactions_detail_title" + tools:layout="@layout/fragment_transaction_payment" /> + + <fragment android:id="@+id/alreadyAccepted" android:name="net.taler.wallet.tip.AlreadyAcceptedFragment" android:label="@string/tip_already_accepted" @@ -218,6 +256,14 @@ tools:layout="@layout/fragment_error" /> <action + android:id="@+id/action_global_receiveFunds" + app:destination="@id/receiveFunds" /> + + <action + android:id="@+id/action_global_sendFunds" + app:destination="@id/sendFunds" /> + + <action android:id="@+id/action_global_promptWithdraw" app:destination="@id/promptWithdraw" /> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index 4fdfd4f..96a3453 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -46,6 +46,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="button_scan_qr_code">Scan Taler QR Code</string> <string name="enter_uri">Enter Taler URI</string> <string name="copy" tools:override="true">Copy</string> + <string name="copy_uri">Copy Taler URI</string> <string name="paste">Paste</string> <string name="paste_invalid">Clipboard contains an invalid data type</string> <string name="uri_invalid">Not a valid Taler URI</string> @@ -95,6 +96,8 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="transaction_refund_from">Refund from %s</string> <string name="transaction_pending">PENDING</string> <string name="transaction_refresh">Coin expiry change fee</string> + <string name="transaction_peer_push_debit">Push payment</string> + <string name="transaction_peer_pull_credit">Invoice</string> <string name="payment_title">Payment</string> <string name="payment_fee">+%s payment fee</string> @@ -109,6 +112,21 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="payment_already_paid_title">Already paid</string> <string name="payment_already_paid">You\'ve already paid for this purchase.</string> + <string name="receive_amount">Amount to receive</string> + <string name="receive_amount_invalid">Amount invalid</string> + <string name="receive_intro">Choose where to receive money from:</string> + <string name="receive_withdraw">Withdraw from bank account</string> + <string name="receive_peer">Invoice another wallet</string> + <string name="receive_peer_title">Request payment</string> + <string name="receive_peer_create_button">Create invoice</string> + <string name="receive_peer_invoice_instruction">Let the payer scan this QR code to pay:</string> + <string name="receive_peer_invoice_uri">Alternatively, copy and send this URI:</string> + + <string name="send_peer_amount">Amount to send</string> + <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="withdraw_initiated">Withdrawal initiated</string> <string name="withdraw_title">Withdrawal</string> <string name="withdraw_total">Withdraw</string> |