diff options
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/layout/fragment_transaction_payment.xml | 14 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_transaction_withdrawal.xml | 14 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/wallet/src/main/res/layout/fragment_transaction_payment.xml b/wallet/src/main/res/layout/fragment_transaction_payment.xml index 20ba161..32aa6ed 100644 --- a/wallet/src/main/res/layout/fragment_transaction_payment.xml +++ b/wallet/src/main/res/layout/fragment_transaction_payment.xml @@ -116,11 +116,23 @@ style="@style/TransactionLabel" android:layout_marginBottom="16dp" android:text="@string/transaction_order_id" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/deleteButton" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/orderSummaryView" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/deleteButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/transactions_delete" + app:backgroundTint="@color/red" + app:icon="@drawable/ic_delete" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/orderIdView" /> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml index 8fe3247..78d1667 100644 --- a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml +++ b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml @@ -117,12 +117,24 @@ <TextView android:id="@+id/exchangeView" style="@style/TransactionContent" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/deleteButton" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/exchangeLabel" tools:text="exchange.demo.taler.net" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/deleteButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/transactions_delete" + app:backgroundTint="@color/red" + app:icon="@drawable/ic_delete" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/exchangeView" /> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index efaa7dd..d1a0c78 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -77,6 +77,9 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="transactions_detail_title_balance">Balance: %s</string> <string name="transactions_delete">Delete</string> <string name="transactions_select_all">Select All</string> + <string name="transactions_delete_dialog_title">Delete Transaction</string> + <string name="transactions_delete_dialog_message">Are you sure you want to remove this transaction from your wallet?</string> + <string name="transactions_cancel_dialog_message">Are you sure you want to cancel this withdrawal? Funds still in transit might get lost.</string> <!-- Transactions --> <string name="transaction_paid">Paid</string> |