diff options
Diffstat (limited to 'wallet/src/main/res')
| -rw-r--r-- | wallet/src/main/res/layout/fragment_payment_successful.xml | 63 | ||||
| -rw-r--r-- | wallet/src/main/res/layout/fragment_withdraw_successful.xml | 63 | ||||
| -rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 25 | ||||
| -rw-r--r-- | wallet/src/main/res/values/strings.xml | 4 |
4 files changed, 9 insertions, 146 deletions
diff --git a/wallet/src/main/res/layout/fragment_payment_successful.xml b/wallet/src/main/res/layout/fragment_payment_successful.xml deleted file mode 100644 index 1c45622..0000000 --- a/wallet/src/main/res/layout/fragment_payment_successful.xml +++ /dev/null @@ -1,63 +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:id="@+id/frameLayout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="16dp" - tools:context=".payment.PaymentSuccessfulFragment"> - - <ImageView - android:id="@+id/successImageView" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="32dp" - android:src="@drawable/ic_check_circle" - app:layout_constraintBottom_toTopOf="@+id/successTextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:ignore="ContentDescription" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/successTextView" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginBottom="16dp" - android:text="@string/payment_successful" - android:textAlignment="center" - android:textColor="@color/green" - app:autoSizeMaxTextSize="48sp" - app:autoSizeMinTextSize="10sp" - app:autoSizeTextType="uniform" - app:layout_constraintBottom_toTopOf="@+id/backButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/successImageView" /> - - <Button - android:id="@+id/backButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="@string/payment_back_button" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/fragment_withdraw_successful.xml b/wallet/src/main/res/layout/fragment_withdraw_successful.xml deleted file mode 100644 index a422492..0000000 --- a/wallet/src/main/res/layout/fragment_withdraw_successful.xml +++ /dev/null @@ -1,63 +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="match_parent" - tools:context=".withdraw.WithdrawSuccessfulFragment"> - - <TextView - android:id="@+id/withdrawHeadlineView" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="16dp" - android:gravity="center_horizontal|bottom" - android:text="@string/withdraw_accepted" - android:textColor="@color/green" - app:autoSizeMaxTextSize="40sp" - app:autoSizeTextType="uniform" - app:layout_constraintBottom_toTopOf="@+id/withdrawInfoView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/withdrawInfoView" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="16dp" - android:text="@string/withdraw_success_info" - android:textAlignment="center" - android:textAppearance="@style/TextAppearance.AppCompat.Medium" - app:layout_constraintBottom_toTopOf="@+id/backButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/withdrawHeadlineView" /> - - <Button - android:id="@+id/backButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/button_continue" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/withdrawInfoView" /> - -</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 5523d8b..a06abad 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -42,19 +42,14 @@ android:label="Review Payment" tools:layout="@layout/fragment_prompt_payment"> <action - android:id="@+id/action_promptPayment_to_paymentSuccessful" - app:destination="@id/paymentSuccessful" + android:id="@+id/action_promptPayment_to_nav_main" + app:destination="@id/nav_main" app:popUpTo="@id/nav_main" /> <action android:id="@+id/action_promptPayment_to_alreadyPaid" app:destination="@id/alreadyPaid" app:popUpTo="@id/nav_main" /> </fragment> - <fragment - android:id="@+id/paymentSuccessful" - android:name="net.taler.wallet.payment.PaymentSuccessfulFragment" - android:label="Payment Successful" - tools:layout="@layout/fragment_payment_successful" /> <fragment android:id="@+id/nav_settings" @@ -85,28 +80,22 @@ android:label="@string/nav_prompt_withdraw" tools:layout="@layout/fragment_prompt_withdraw"> <action + android:id="@+id/action_promptWithdraw_to_selectExchangeFragment" + app:destination="@id/selectExchangeFragment" /> + <action android:id="@+id/action_promptWithdraw_to_reviewExchangeTOS" app:destination="@id/reviewExchangeTOS" /> <action - android:id="@+id/action_promptWithdraw_to_withdrawSuccessful" - app:destination="@id/withdrawSuccessful" + android:id="@+id/action_promptWithdraw_to_nav_main" + app:destination="@id/nav_main" app:popUpTo="@id/nav_main" /> <action android:id="@+id/action_promptWithdraw_to_errorFragment" app:destination="@id/errorFragment" app:popUpTo="@id/nav_main" /> - <action - android:id="@+id/action_promptWithdraw_to_selectExchangeFragment" - app:destination="@id/selectExchangeFragment" /> </fragment> <fragment - android:id="@+id/withdrawSuccessful" - android:name="net.taler.wallet.withdraw.WithdrawSuccessfulFragment" - android:label="@string/withdraw_accepted" - tools:layout="@layout/fragment_withdraw_successful" /> - - <fragment android:id="@+id/reviewExchangeTOS" android:name="net.taler.wallet.withdraw.ReviewExchangeTosFragment" android:label="@string/nav_exchange_tos" diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index 44b2dad..58b432a 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -99,12 +99,12 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="payment_balance_insufficient">Balance insufficient!</string> <string name="payment_show_details">Show Details</string> <string name="payment_hide_details">Hide Details</string> - <string name="payment_successful">Payment was successful</string> + <string name="payment_initiated">Payment initiated</string> <string name="payment_back_button">OK</string> <string name="payment_already_paid_title">Already paid</string> <string name="payment_already_paid">You\'ve already paid for this purchase.</string> - <string name="withdraw_accepted">Withdrawal accepted</string> + <string name="withdraw_initiated">Withdrawal initiated</string> <string name="withdraw_success_info">The wire transfer now needs to be confirmed with the bank. Once the wire transfer is complete, the digital cash will automatically show in this wallet.</string> <string name="withdraw_total">Withdraw</string> <string name="withdraw_fees">Fee</string> |