From bedd7b05eb0b5ee69cd5f35b283e713cf8af29dc Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 14 May 2020 10:36:29 -0300 Subject: [wallet] render transaction list from new transactions API --- wallet/src/main/res/layout/fragment_event_paid.xml | 124 ------------------ .../main/res/layout/fragment_event_withdraw.xml | 143 --------------------- .../res/layout/fragment_transaction_payment.xml | 124 ++++++++++++++++++ .../res/layout/fragment_transaction_withdrawal.xml | 143 +++++++++++++++++++++ .../src/main/res/layout/list_item_transaction.xml | 89 +++++++++++++ wallet/src/main/res/menu/transactions_detail.xml | 4 - wallet/src/main/res/navigation/nav_graph.xml | 2 +- wallet/src/main/res/values/strings.xml | 6 +- 8 files changed, 361 insertions(+), 274 deletions(-) delete mode 100644 wallet/src/main/res/layout/fragment_event_paid.xml delete mode 100644 wallet/src/main/res/layout/fragment_event_withdraw.xml create mode 100644 wallet/src/main/res/layout/fragment_transaction_payment.xml create mode 100644 wallet/src/main/res/layout/fragment_transaction_withdrawal.xml create mode 100644 wallet/src/main/res/layout/list_item_transaction.xml (limited to 'wallet/src/main/res') diff --git a/wallet/src/main/res/layout/fragment_event_paid.xml b/wallet/src/main/res/layout/fragment_event_paid.xml deleted file mode 100644 index 3f17464..0000000 --- a/wallet/src/main/res/layout/fragment_event_paid.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wallet/src/main/res/layout/fragment_event_withdraw.xml b/wallet/src/main/res/layout/fragment_event_withdraw.xml deleted file mode 100644 index 5d30fcf..0000000 --- a/wallet/src/main/res/layout/fragment_event_withdraw.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wallet/src/main/res/layout/fragment_transaction_payment.xml b/wallet/src/main/res/layout/fragment_transaction_payment.xml new file mode 100644 index 0000000..3f17464 --- /dev/null +++ b/wallet/src/main/res/layout/fragment_transaction_payment.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml new file mode 100644 index 0000000..5d30fcf --- /dev/null +++ b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wallet/src/main/res/layout/list_item_transaction.xml b/wallet/src/main/res/layout/list_item_transaction.xml new file mode 100644 index 0000000..058b170 --- /dev/null +++ b/wallet/src/main/res/layout/list_item_transaction.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + diff --git a/wallet/src/main/res/menu/transactions_detail.xml b/wallet/src/main/res/menu/transactions_detail.xml index 388e3c4..d4568d4 100644 --- a/wallet/src/main/res/menu/transactions_detail.xml +++ b/wallet/src/main/res/menu/transactions_detail.xml @@ -16,8 +16,4 @@ - diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index 8e717c1..5523d8b 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -71,7 +71,7 @@ android:id="@+id/nav_transactions_detail" android:name="net.taler.wallet.transactions.TransactionDetailFragment" android:label="@string/transactions_detail_title" - tools:layout="@layout/fragment_event_withdraw" /> + tools:layout="@layout/fragment_transaction_withdrawal" /> Purchase Cancelled Tip Accepted Tip Declined - Refund - Obtained change + Tip from %s + Refund from %s + PENDING + Coin expiry change fee because of manual request for payment for refund -- cgit v1.2.3