From ea3250845fb266a2ecd5ebeba561bc99101bf3de Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 15 Apr 2020 11:26:51 -0300 Subject: [wallet] rename history to transactions --- .../main/res/drawable/history_payment_aborted.xml | 25 ------ wallet/src/main/res/drawable/history_refresh.xml | 28 ------- wallet/src/main/res/drawable/history_refund.xml | 25 ------ .../src/main/res/drawable/history_tip_accepted.xml | 25 ------ .../src/main/res/drawable/history_tip_declined.xml | 25 ------ wallet/src/main/res/drawable/history_withdrawn.xml | 25 ------ .../res/drawable/transaction_payment_aborted.xml | 25 ++++++ .../src/main/res/drawable/transaction_refresh.xml | 28 +++++++ .../src/main/res/drawable/transaction_refund.xml | 25 ++++++ .../main/res/drawable/transaction_tip_accepted.xml | 25 ++++++ .../main/res/drawable/transaction_tip_declined.xml | 25 ++++++ .../main/res/drawable/transaction_withdrawal.xml | 25 ++++++ wallet/src/main/res/layout/fragment_event_paid.xml | 30 +++---- .../main/res/layout/fragment_event_withdraw.xml | 12 +-- .../src/main/res/layout/fragment_show_history.xml | 46 ----------- .../src/main/res/layout/fragment_transactions.xml | 46 +++++++++++ wallet/src/main/res/layout/history_payment.xml | 87 -------------------- wallet/src/main/res/layout/history_receive.xml | 92 ---------------------- wallet/src/main/res/layout/history_row.xml | 76 ------------------ wallet/src/main/res/layout/transaction_in.xml | 92 ++++++++++++++++++++++ wallet/src/main/res/layout/transaction_out.xml | 87 ++++++++++++++++++++ wallet/src/main/res/layout/transaction_row.xml | 76 ++++++++++++++++++ wallet/src/main/res/menu/balance.xml | 19 ----- wallet/src/main/res/menu/fragment_main.xml | 19 +++++ wallet/src/main/res/menu/history.xml | 30 ------- wallet/src/main/res/menu/history_event.xml | 23 ------ wallet/src/main/res/menu/transactions.xml | 19 +++++ wallet/src/main/res/menu/transactions_detail.xml | 23 ++++++ wallet/src/main/res/navigation/nav_graph.xml | 21 +++-- wallet/src/main/res/values/strings.xml | 74 ++++++++--------- wallet/src/main/res/values/styles.xml | 8 +- wallet/src/main/res/xml/settings_main.xml | 2 +- 32 files changed, 584 insertions(+), 604 deletions(-) delete mode 100644 wallet/src/main/res/drawable/history_payment_aborted.xml delete mode 100644 wallet/src/main/res/drawable/history_refresh.xml delete mode 100644 wallet/src/main/res/drawable/history_refund.xml delete mode 100644 wallet/src/main/res/drawable/history_tip_accepted.xml delete mode 100644 wallet/src/main/res/drawable/history_tip_declined.xml delete mode 100644 wallet/src/main/res/drawable/history_withdrawn.xml create mode 100644 wallet/src/main/res/drawable/transaction_payment_aborted.xml create mode 100644 wallet/src/main/res/drawable/transaction_refresh.xml create mode 100644 wallet/src/main/res/drawable/transaction_refund.xml create mode 100644 wallet/src/main/res/drawable/transaction_tip_accepted.xml create mode 100644 wallet/src/main/res/drawable/transaction_tip_declined.xml create mode 100644 wallet/src/main/res/drawable/transaction_withdrawal.xml delete mode 100644 wallet/src/main/res/layout/fragment_show_history.xml create mode 100644 wallet/src/main/res/layout/fragment_transactions.xml delete mode 100644 wallet/src/main/res/layout/history_payment.xml delete mode 100644 wallet/src/main/res/layout/history_receive.xml delete mode 100644 wallet/src/main/res/layout/history_row.xml create mode 100644 wallet/src/main/res/layout/transaction_in.xml create mode 100644 wallet/src/main/res/layout/transaction_out.xml create mode 100644 wallet/src/main/res/layout/transaction_row.xml delete mode 100644 wallet/src/main/res/menu/balance.xml create mode 100644 wallet/src/main/res/menu/fragment_main.xml delete mode 100644 wallet/src/main/res/menu/history.xml delete mode 100644 wallet/src/main/res/menu/history_event.xml create mode 100644 wallet/src/main/res/menu/transactions.xml create mode 100644 wallet/src/main/res/menu/transactions_detail.xml (limited to 'wallet/src/main/res') diff --git a/wallet/src/main/res/drawable/history_payment_aborted.xml b/wallet/src/main/res/drawable/history_payment_aborted.xml deleted file mode 100644 index 8d47c26..0000000 --- a/wallet/src/main/res/drawable/history_payment_aborted.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/wallet/src/main/res/drawable/history_refresh.xml b/wallet/src/main/res/drawable/history_refresh.xml deleted file mode 100644 index 219b891..0000000 --- a/wallet/src/main/res/drawable/history_refresh.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/wallet/src/main/res/drawable/history_refund.xml b/wallet/src/main/res/drawable/history_refund.xml deleted file mode 100644 index 6c3d0a7..0000000 --- a/wallet/src/main/res/drawable/history_refund.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/wallet/src/main/res/drawable/history_tip_accepted.xml b/wallet/src/main/res/drawable/history_tip_accepted.xml deleted file mode 100644 index b945b53..0000000 --- a/wallet/src/main/res/drawable/history_tip_accepted.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/wallet/src/main/res/drawable/history_tip_declined.xml b/wallet/src/main/res/drawable/history_tip_declined.xml deleted file mode 100644 index 4bd1633..0000000 --- a/wallet/src/main/res/drawable/history_tip_declined.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/wallet/src/main/res/drawable/history_withdrawn.xml b/wallet/src/main/res/drawable/history_withdrawn.xml deleted file mode 100644 index 4fd64f5..0000000 --- a/wallet/src/main/res/drawable/history_withdrawn.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/wallet/src/main/res/drawable/transaction_payment_aborted.xml b/wallet/src/main/res/drawable/transaction_payment_aborted.xml new file mode 100644 index 0000000..8d47c26 --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_payment_aborted.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/wallet/src/main/res/drawable/transaction_refresh.xml b/wallet/src/main/res/drawable/transaction_refresh.xml new file mode 100644 index 0000000..219b891 --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_refresh.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/wallet/src/main/res/drawable/transaction_refund.xml b/wallet/src/main/res/drawable/transaction_refund.xml new file mode 100644 index 0000000..6c3d0a7 --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_refund.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/wallet/src/main/res/drawable/transaction_tip_accepted.xml b/wallet/src/main/res/drawable/transaction_tip_accepted.xml new file mode 100644 index 0000000..b945b53 --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_tip_accepted.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/wallet/src/main/res/drawable/transaction_tip_declined.xml b/wallet/src/main/res/drawable/transaction_tip_declined.xml new file mode 100644 index 0000000..4bd1633 --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_tip_declined.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/wallet/src/main/res/drawable/transaction_withdrawal.xml b/wallet/src/main/res/drawable/transaction_withdrawal.xml new file mode 100644 index 0000000..4fd64f5 --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_withdrawal.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/wallet/src/main/res/layout/fragment_event_paid.xml b/wallet/src/main/res/layout/fragment_event_paid.xml index 4485744..3f17464 100644 --- a/wallet/src/main/res/layout/fragment_event_paid.xml +++ b/wallet/src/main/res/layout/fragment_event_paid.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - tools:context=".history.HistoryEventFragment"> + tools:context=".transactions.TransactionDetailFragment"> + tools:context=".transactions.TransactionDetailFragment"> - - - - - - - - - - diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml new file mode 100644 index 0000000..a2aebcd --- /dev/null +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + diff --git a/wallet/src/main/res/layout/history_payment.xml b/wallet/src/main/res/layout/history_payment.xml deleted file mode 100644 index 33cb676..0000000 --- a/wallet/src/main/res/layout/history_payment.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/wallet/src/main/res/layout/history_receive.xml b/wallet/src/main/res/layout/history_receive.xml deleted file mode 100644 index 5f386a2..0000000 --- a/wallet/src/main/res/layout/history_receive.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/wallet/src/main/res/layout/history_row.xml b/wallet/src/main/res/layout/history_row.xml deleted file mode 100644 index 5eac44b..0000000 --- a/wallet/src/main/res/layout/history_row.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/wallet/src/main/res/layout/transaction_in.xml b/wallet/src/main/res/layout/transaction_in.xml new file mode 100644 index 0000000..f116240 --- /dev/null +++ b/wallet/src/main/res/layout/transaction_in.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + diff --git a/wallet/src/main/res/layout/transaction_out.xml b/wallet/src/main/res/layout/transaction_out.xml new file mode 100644 index 0000000..49f76b7 --- /dev/null +++ b/wallet/src/main/res/layout/transaction_out.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + diff --git a/wallet/src/main/res/layout/transaction_row.xml b/wallet/src/main/res/layout/transaction_row.xml new file mode 100644 index 0000000..ac6bdb7 --- /dev/null +++ b/wallet/src/main/res/layout/transaction_row.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/wallet/src/main/res/menu/balance.xml b/wallet/src/main/res/menu/balance.xml deleted file mode 100644 index d4568d4..0000000 --- a/wallet/src/main/res/menu/balance.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/wallet/src/main/res/menu/fragment_main.xml b/wallet/src/main/res/menu/fragment_main.xml new file mode 100644 index 0000000..d4568d4 --- /dev/null +++ b/wallet/src/main/res/menu/fragment_main.xml @@ -0,0 +1,19 @@ + + + + diff --git a/wallet/src/main/res/menu/history.xml b/wallet/src/main/res/menu/history.xml deleted file mode 100644 index bd50f5d..0000000 --- a/wallet/src/main/res/menu/history.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - diff --git a/wallet/src/main/res/menu/history_event.xml b/wallet/src/main/res/menu/history_event.xml deleted file mode 100644 index 45a1e0e..0000000 --- a/wallet/src/main/res/menu/history_event.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/wallet/src/main/res/menu/transactions.xml b/wallet/src/main/res/menu/transactions.xml new file mode 100644 index 0000000..d4568d4 --- /dev/null +++ b/wallet/src/main/res/menu/transactions.xml @@ -0,0 +1,19 @@ + + + + diff --git a/wallet/src/main/res/menu/transactions_detail.xml b/wallet/src/main/res/menu/transactions_detail.xml new file mode 100644 index 0000000..388e3c4 --- /dev/null +++ b/wallet/src/main/res/menu/transactions_detail.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index d4257b9..f8927a6 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -55,23 +55,22 @@ + android:label="Settings" /> + android:id="@+id/nav_transactions" + android:name="net.taler.wallet.transactions.TransactionsFragment" + android:label="@string/transactions_title" + tools:layout="@layout/fragment_transactions"> + android:id="@+id/action_nav_transactions_to_nav_transaction_detail" + app:destination="@id/nav_transactions_detail" /> Continue Scan Taler QR Code - History Settings - Reload balances - Developer Mode Retry Pending Operations my service my aid Balances - +%s - -%s + + %s + - %s Chosen Amount inbound There is no digital cash in your wallet.\n\nYou can get test money from the demo bank:\n\nhttps://bank.demo.taler.net - History - Show All - Reload History - The wallet history is empty - Could not load history - Transaction - Show JSON + Transactions + You don\'t have any transactions + Could not load transactions + Transaction + Show JSON - + Exchange Added Exchange Updated - Reserve Balance Updated - Payment - Paid - Order Total - Order - Order Reference: %1$s - Payment Aborted - Withdraw - Purchase Confirmed - Purchase Cancelled - Tip Accepted - Tip Declined - Purchase Redirected - Refund - Obtained change - because of manual request - for payment - for refund - to abort payment - to recoup funds - because of restoring from backup - Unknown Event + Reserve Balance Updated + Payment + Paid + Order Total + Order + Order Reference: %1$s + Payment Aborted + Withdraw + Purchase Confirmed + Purchase Cancelled + Tip Accepted + Tip Declined + Purchase Redirected + Refund + Obtained change + because of manual request + for payment + for refund + to abort payment + to recoup funds + because of restoring from backup + Unknown Transaction +%s payment fee Confirm Payment @@ -118,21 +113,18 @@ Timespan: %1$s - %2$s Wire Fee: %s Closing Fee: %s + Accept Terms of Service Pending Operations Refuse Proposal (no action) - Version Information - Accept Terms of Service - Backups - Export wallet to file - Import from file + Developer Mode + Shows more information intended for debugging Withdraw TESTKUDOS Get money for testing Reset Wallet (dangerous!) Throws away your money - Shows more information intended for debugging Error processing refund Refund received diff --git a/wallet/src/main/res/values/styles.xml b/wallet/src/main/res/values/styles.xml index 9ebcae5..c8a2c3b 100644 --- a/wallet/src/main/res/values/styles.xml +++ b/wallet/src/main/res/values/styles.xml @@ -33,12 +33,12 @@ - - -