diff options
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/drawable/ic_history_black_24dp.xml | 25 | ||||
-rw-r--r-- | wallet/src/main/res/drawable/pending_border.xml | 6 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_main.xml (renamed from wallet/src/main/res/layout/fragment_show_balance.xml) | 1 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_pending_operations.xml | 2 | ||||
-rw-r--r-- | wallet/src/main/res/layout/list_item_pending_operation.xml (renamed from wallet/src/main/res/layout/pending_row.xml) | 0 | ||||
-rw-r--r-- | wallet/src/main/res/layout/list_item_transaction.xml (renamed from wallet/src/main/res/layout/transaction_row.xml) | 34 | ||||
-rw-r--r-- | wallet/src/main/res/layout/transaction_in.xml | 92 | ||||
-rw-r--r-- | wallet/src/main/res/layout/transaction_out.xml | 87 | ||||
-rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 2 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 7 |
10 files changed, 23 insertions, 233 deletions
diff --git a/wallet/src/main/res/drawable/ic_history_black_24dp.xml b/wallet/src/main/res/drawable/ic_history_black_24dp.xml deleted file mode 100644 index 5836444..0000000 --- a/wallet/src/main/res/drawable/ic_history_black_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. - ~ - ~ GNU Taler is free software; you can redistribute it and/or modify it under the - ~ terms of the GNU General Public License as published by the Free Software - ~ Foundation; either version 3, or (at your option) any later version. - ~ - ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License along with - ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" /> -</vector> diff --git a/wallet/src/main/res/drawable/pending_border.xml b/wallet/src/main/res/drawable/pending_border.xml index c858219..0e201dc 100644 --- a/wallet/src/main/res/drawable/pending_border.xml +++ b/wallet/src/main/res/drawable/pending_border.xml @@ -18,14 +18,14 @@ android:shape="rectangle"> <!-- View background color --> - <solid android:color="@android:color/transparent"></solid> + <solid android:color="@android:color/transparent"/> <!-- View border color and width --> <stroke android:width="1dp" - android:color="@color/colorPrimary"></stroke> + android:color="@color/colorPrimary"/> <!-- The radius makes the corners rounded --> - <corners android:radius="2dp"></corners> + <corners android:radius="2dp"/> </shape>
\ No newline at end of file diff --git a/wallet/src/main/res/layout/fragment_show_balance.xml b/wallet/src/main/res/layout/fragment_main.xml index 3f4aa2e..57fe73e 100644 --- a/wallet/src/main/res/layout/fragment_show_balance.xml +++ b/wallet/src/main/res/layout/fragment_main.xml @@ -46,6 +46,7 @@ android:layout_gravity="bottom|end" android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" + android:contentDescription="@string/button_scan_qr_code" android:src="@drawable/ic_scan_qr" app:backgroundTint="@color/colorPrimary" app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" diff --git a/wallet/src/main/res/layout/fragment_pending_operations.xml b/wallet/src/main/res/layout/fragment_pending_operations.xml index 775c89f..5030234 100644 --- a/wallet/src/main/res/layout/fragment_pending_operations.xml +++ b/wallet/src/main/res/layout/fragment_pending_operations.xml @@ -29,6 +29,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:listitem="@layout/pending_row" /> + tools:listitem="@layout/list_item_pending_operation" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/pending_row.xml b/wallet/src/main/res/layout/list_item_pending_operation.xml index bd606c3..bd606c3 100644 --- a/wallet/src/main/res/layout/pending_row.xml +++ b/wallet/src/main/res/layout/list_item_pending_operation.xml diff --git a/wallet/src/main/res/layout/transaction_row.xml b/wallet/src/main/res/layout/list_item_transaction.xml index ac6bdb7..a3ac980 100644 --- a/wallet/src/main/res/layout/transaction_row.xml +++ b/wallet/src/main/res/layout/list_item_transaction.xml @@ -32,9 +32,9 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_account_balance" app:tint="?android:colorControlNormal" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" + tools:src="@drawable/ic_cash_usd_outline" /> <TextView android:id="@+id/title" @@ -42,35 +42,33 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - app:layout_constraintEnd_toEndOf="parent" + android:layout_marginEnd="8dp" + app:layout_constraintEnd_toStartOf="@+id/amount" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:text="My Transaction" /> + tools:text="@string/transaction_payment" /> <TextView - android:id="@+id/info" - android:layout_width="0dp" + android:id="@+id/amount" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" + android:textSize="24sp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/time" - app:layout_constraintStart_toEndOf="@+id/icon" - app:layout_constraintTop_toBottomOf="@+id/title" - tools:text="TextView" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="- 1337.23" /> <TextView android:id="@+id/time" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:gravity="end" + android:layout_marginEnd="8dp" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/amount" + app:layout_constraintStart_toStartOf="@+id/title" app:layout_constraintTop_toBottomOf="@+id/title" - tools:text="3 days ago" /> + tools:text="23 min ago" /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/transaction_in.xml b/wallet/src/main/res/layout/transaction_in.xml deleted file mode 100644 index f116240..0000000 --- a/wallet/src/main/res/layout/transaction_in.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. - ~ - ~ GNU Taler is free software; you can redistribute it and/or modify it under the - ~ terms of the GNU General Public License as published by the Free Software - ~ Foundation; either version 3, or (at your option) any later version. - ~ - ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License along with - ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - --> - -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground" - android:paddingStart="16dp" - android:paddingTop="8dp" - android:paddingEnd="16dp" - android:paddingBottom="8dp"> - - <ImageView - android:id="@+id/icon" - android:layout_width="32dp" - android:layout_height="32dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/transaction_withdrawal" - app:tint="?android:colorControlNormal" - tools:ignore="ContentDescription" /> - - <TextView - android:id="@+id/title" - style="@style/TransactionTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="8dp" - android:text="@string/transaction_withdrawal" - app:layout_constraintEnd_toStartOf="@+id/amountWithdrawn" - app:layout_constraintStart_toEndOf="@+id/icon" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/summary" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" - app:layout_constrainedWidth="true" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/time" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toEndOf="@+id/icon" - app:layout_constraintTop_toBottomOf="@+id/title" - app:layout_constraintVertical_bias="0.0" - tools:text="exchange.taler.quite-long-domain-name.org" /> - - <TextView - android:id="@+id/amountWithdrawn" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/green" - android:textSize="16sp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="10 TESTKUDOS" /> - - <TextView - android:id="@+id/time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/summary" - app:layout_constraintTop_toBottomOf="@+id/amountWithdrawn" - app:layout_constraintVertical_bias="1.0" - tools:text="23 min. ago" /> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/transaction_out.xml b/wallet/src/main/res/layout/transaction_out.xml deleted file mode 100644 index 49f76b7..0000000 --- a/wallet/src/main/res/layout/transaction_out.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. - ~ - ~ GNU Taler is free software; you can redistribute it and/or modify it under the - ~ terms of the GNU General Public License as published by the Free Software - ~ Foundation; either version 3, or (at your option) any later version. - ~ - ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License along with - ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - --> - -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground" - android:paddingStart="16dp" - android:paddingTop="8dp" - android:paddingEnd="16dp" - android:paddingBottom="8dp"> - - <ImageView - android:id="@+id/icon" - android:layout_width="32dp" - android:layout_height="32dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?android:colorControlNormal" - tools:ignore="ContentDescription" - tools:src="@drawable/ic_cash_usd_outline" /> - - <TextView - android:id="@+id/title" - style="@style/TransactionTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="8dp" - app:layout_constraintEnd_toStartOf="@+id/amountPaidWithFees" - app:layout_constraintStart_toEndOf="@+id/icon" - app:layout_constraintTop_toTopOf="parent" - tools:text="@string/transaction_payment" /> - - <TextView - android:id="@+id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - app:layout_constrainedWidth="true" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/time" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toEndOf="@+id/icon" - app:layout_constraintTop_toBottomOf="@+id/title" - app:layout_constraintVertical_bias="0.0" - tools:text="Lots of books with very long titles" /> - - <TextView - android:id="@+id/amountPaidWithFees" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/red" - android:textSize="16sp" - app:layout_constraintBottom_toTopOf="@+id/time" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" - tools:text="0.2 TESTKUDOS" /> - - <TextView - android:id="@+id/time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - tools:text="23 min ago" /> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index f8927a6..ef0f48b 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -25,7 +25,7 @@ android:id="@+id/showBalance" android:name="net.taler.wallet.MainFragment" android:label="@string/balances_title" - tools:layout="@layout/fragment_show_balance"> + tools:layout="@layout/fragment_main"> <action android:id="@+id/action_showBalance_to_promptPayment" app:destination="@id/promptPayment" /> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index d2840de..e0b3183 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -47,24 +47,20 @@ <string name="transactions_empty">You don\'t have any transactions</string> <string name="transactions_error">Could not load transactions</string> <string name="transactions_detail_title">Transaction</string> + <string name="transactions_detail_title_balance">Balance: %s</string> <string name="transactions_detail_json">Show JSON</string> <!-- Transactions --> - <string name="history_event_exchange_added">Exchange Added</string> - <string name="history_event_exchange_updated">Exchange Updated</string> <string name="transaction_reserve_balance_updated">Reserve Balance Updated</string> <string name="transaction_payment">Payment</string> <string name="transaction_paid">Paid</string> <string name="transaction_order_total">Order Total</string> <string name="transaction_order">Order</string> <string name="transaction_order_id">Order Reference: %1$s</string> - <string name="transaction_payment_aborted">Payment Aborted</string> - <string name="transaction_withdrawal">Withdraw</string> <string name="transaction_order_accepted">Purchase Confirmed</string> <string name="transaction_order_refused">Purchase Cancelled</string> <string name="transaction_tip_accepted">Tip Accepted</string> <string name="transaction_tip_declined">Tip Declined</string> - <string name="transaction_order_redirected">Purchase Redirected</string> <string name="transaction_refund">Refund</string> <string name="transaction_refresh">Obtained change</string> <string name="transaction_refresh_reason_manual">because of manual request</string> @@ -73,7 +69,6 @@ <string name="transaction_refresh_reason_abort_pay">to abort payment</string> <string name="transaction_refresh_reason_recoup">to recoup funds</string> <string name="transaction_refresh_reason_backup_restored">because of restoring from backup</string> - <string name="transaction_unknown">Unknown Transaction</string> <string name="payment_fee">+%s payment fee</string> <string name="payment_button_confirm">Confirm Payment</string> |