diff options
Diffstat (limited to 'wallet/src/main/res')
55 files changed, 2225 insertions, 1209 deletions
diff --git a/wallet/src/main/res/drawable/ic_archive.xml b/wallet/src/main/res/drawable/ic_archive.xml new file mode 100644 index 0000000..58a032c --- /dev/null +++ b/wallet/src/main/res/drawable/ic_archive.xml @@ -0,0 +1,21 @@ +<!-- + ~ This file is part of GNU Taler + ~ (C) 2023 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 android:height="24dp" android:tint="?attr/colorControlNormal" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/> +</vector> diff --git a/wallet/src/main/res/drawable/ic_baseline_account_tree.xml b/wallet/src/main/res/drawable/ic_baseline_account_tree.xml deleted file mode 100644 index 7067bd3..0000000 --- a/wallet/src/main/res/drawable/ic_baseline_account_tree.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M22,11V3h-7v3H9V3H2v8h7V8h2v10h4v3h7v-8h-7v3h-2V8h2v3z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_baseline_backup.xml b/wallet/src/main/res/drawable/ic_baseline_backup.xml deleted file mode 100644 index 006b014..0000000 --- a/wallet/src/main/res/drawable/ic_baseline_backup.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_baseline_vpn_key.xml b/wallet/src/main/res/drawable/ic_baseline_vpn_key.xml deleted file mode 100644 index 7b554c9..0000000 --- a/wallet/src/main/res/drawable/ic_baseline_vpn_key.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_fail.xml b/wallet/src/main/res/drawable/ic_fail.xml new file mode 100644 index 0000000..a25c5ed --- /dev/null +++ b/wallet/src/main/res/drawable/ic_fail.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M14.69,2.21L4.33,11.49c-0.64,0.58 -0.28,1.65 0.58,1.73L13,14l-4.85,6.76c-0.22,0.31 -0.19,0.74 0.08,1.01h0c0.3,0.3 0.77,0.31 1.08,0.02l10.36,-9.28c0.64,-0.58 0.28,-1.65 -0.58,-1.73L11,10l4.85,-6.76c0.22,-0.31 0.19,-0.74 -0.08,-1.01l0,0C15.47,1.93 15,1.92 14.69,2.21z"/> +</vector> diff --git a/wallet/src/main/res/drawable/ic_resume.xml b/wallet/src/main/res/drawable/ic_resume.xml new file mode 100644 index 0000000..e3fd2e9 --- /dev/null +++ b/wallet/src/main/res/drawable/ic_resume.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/> +</vector> diff --git a/wallet/src/main/res/drawable/ic_retry.xml b/wallet/src/main/res/drawable/ic_retry.xml new file mode 100644 index 0000000..98469ca --- /dev/null +++ b/wallet/src/main/res/drawable/ic_retry.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> +</vector> diff --git a/wallet/src/main/res/drawable/ic_suspend.xml b/wallet/src/main/res/drawable/ic_suspend.xml new file mode 100644 index 0000000..938bd7f --- /dev/null +++ b/wallet/src/main/res/drawable/ic_suspend.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/> +</vector> diff --git a/wallet/src/main/res/drawable/ic_unarchive.xml b/wallet/src/main/res/drawable/ic_unarchive.xml new file mode 100644 index 0000000..8a48bba --- /dev/null +++ b/wallet/src/main/res/drawable/ic_unarchive.xml @@ -0,0 +1,26 @@ +<!-- + ~ This file is part of GNU Taler + ~ (C) 2022 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:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF000000" + android:pathData="M20.55,5.22l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6C5.53,3 5.12,3.21 4.85,3.55L3.46,5.22C3.17,5.57 3,6.01 3,6.5V19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5C21,6.01 20.83,5.57 20.55,5.22zM12,9.5l5.5,5.5H14v2h-4v-2H6.5L12,9.5zM5.12,5l0.82,-1h12l0.93,1H5.12z" /> +</vector> diff --git a/wallet/src/main/res/drawable/transaction_loss.xml b/wallet/src/main/res/drawable/transaction_loss.xml new file mode 100644 index 0000000..ffc9a2e --- /dev/null +++ b/wallet/src/main/res/drawable/transaction_loss.xml @@ -0,0 +1,26 @@ +<!-- + ~ This file is part of GNU Taler + ~ (C) 2024 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:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF000000" + android:pathData="M17.12,9.88C16.56,9.32 15.8,9 15,9S13.44,9.32 12.88,9.88C12.32,10.44 12,11.2 12,12S12.32,13.56 12.88,14.12 14.2,15 15,15 16.56,14.68 17.12,14.12 18,12.8 18,12 17.68,10.44 17.12,9.88M7,6V18H23V6H7M21,14C20.47,14 19.96,14.21 19.59,14.59C19.21,14.96 19,15.47 19,16H11C11,15.47 10.79,14.96 10.41,14.59C10.04,14.21 9.53,14 9,14V10C9.53,10 10.04,9.79 10.41,9.41C10.79,9.04 11,8.53 11,8H19C19,8.53 19.21,9.04 19.59,9.41C19.96,9.79 20.47,10 21,10V14M5,8H3C2.45,8 2,7.55 2,7C2,6.45 2.45,6 3,6H5V8M5,13H2C1.45,13 1,12.55 1,12C1,11.45 1.45,11 2,11H5V13M5,18H1C0.448,18 0,17.55 0,17C0,16.45 0.448,16 1,16H5V18Z"/> +</vector> diff --git a/wallet/src/main/res/layout/app_content_main.xml b/wallet/src/main/res/layout/app_content_main.xml index 6937e59..71fbcd4 100644 --- a/wallet/src/main/res/layout/app_content_main.xml +++ b/wallet/src/main/res/layout/app_content_main.xml @@ -36,20 +36,42 @@ style="@style/AppTheme.Toolbar" android:layout_width="0dp" android:layout_height="wrap_content" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/Widget.Material3.ActionBar.Solid" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" /> + <FrameLayout + android:id="@+id/offline_banner" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:background="?attr/colorPrimary" + app:layout_constraintTop_toBottomOf="@id/toolbar" + app:layout_constraintBottom_toTopOf="@id/progress_bar" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + android:animateLayoutChanges="true" + android:visibility="gone" + tools:visibility="visible"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:textAlignment="center" + android:textColor="?attr/colorOnPrimary" + android:text="@string/offline_banner" /> + </FrameLayout> + <me.zhanghai.android.materialprogressbar.MaterialProgressBar android:id="@+id/progress_bar" - style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" + style="@style/Widget.MaterialProgressBar.ProgressBar" android:layout_width="0dp" android:layout_height="4dp" android:elevation="4dp" android:indeterminate="true" android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="@+id/toolbar" + app:layout_constraintBottom_toBottomOf="@+id/offline_banner" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:mpb_progressStyle="horizontal" diff --git a/wallet/src/main/res/layout/dialog_exchange_add.xml b/wallet/src/main/res/layout/dialog_exchange_add.xml index dfa0f70..bf90177 100644 --- a/wallet/src/main/res/layout/dialog_exchange_add.xml +++ b/wallet/src/main/res/layout/dialog_exchange_add.xml @@ -22,7 +22,7 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/urlLayout" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="16dp" diff --git a/wallet/src/main/res/layout/fragment_already_accepted.xml b/wallet/src/main/res/layout/fragment_already_accepted.xml deleted file mode 100644 index b1a7bb1..0000000 --- a/wallet/src/main/res/layout/fragment_already_accepted.xml +++ /dev/null @@ -1,52 +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/> - --> - -<LinearLayout 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" - android:layout_margin="15dp" - android:orientation="vertical" - tools:context=".tip.AlreadyAcceptedFragment"> - - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_gravity="center" - android:text="@string/tip_already_accepted" - android:textAlignment="center" - android:textColor="@android:color/holo_green_dark" - app:autoSizeTextType="uniform" /> - - - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - - <Button - android:id="@+id/backButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/button_back" /> - -</LinearLayout> diff --git a/wallet/src/main/res/layout/fragment_already_paid.xml b/wallet/src/main/res/layout/fragment_already_paid.xml deleted file mode 100644 index 18ce0b5..0000000 --- a/wallet/src/main/res/layout/fragment_already_paid.xml +++ /dev/null @@ -1,52 +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/> - --> - -<LinearLayout 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" - android:layout_margin="15dp" - android:orientation="vertical" - tools:context=".payment.AlreadyPaidFragment"> - - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_gravity="center" - android:text="@string/payment_already_paid" - android:textAlignment="center" - android:textColor="@android:color/holo_green_dark" - app:autoSizeTextType="uniform" /> - - - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - - <Button - android:id="@+id/backButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/button_back" /> - -</LinearLayout> diff --git a/wallet/src/main/res/layout/fragment_error.xml b/wallet/src/main/res/layout/fragment_error.xml index b9f585f..2af166a 100644 --- a/wallet/src/main/res/layout/fragment_error.xml +++ b/wallet/src/main/res/layout/fragment_error.xml @@ -29,13 +29,13 @@ android:alpha="0.56" android:src="@drawable/ic_error" app:layout_constraintBottom_toTopOf="@+id/errorTitle" - app:layout_constraintDimensionRatio="1:1" + app:layout_constraintDimensionRatio="1.5:1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_chainStyle="packed" - app:tint="@color/red" + app:tint="?colorError" tools:ignore="ContentDescription" /> <TextView @@ -45,7 +45,7 @@ android:layout_margin="16dp" android:gravity="center_horizontal|top" android:minHeight="64dp" - android:textColor="@color/red" + android:textColor="?colorError" app:autoSizeMaxTextSize="40sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toTopOf="@+id/errorMessage" @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:gravity="center" - android:textAppearance="@style/TextAppearance.AppCompat.Medium" + android:textAppearance="@style/TextAppearance.Material3.TitleMedium" app:layout_constraintBottom_toTopOf="@+id/errorDevMessage" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -74,7 +74,7 @@ android:layout_margin="16dp" android:fontFamily="monospace" android:gravity="center" - android:textColor="@color/red" + android:textColor="?colorError" android:textIsSelectable="true" android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/backButton" diff --git a/wallet/src/main/res/layout/fragment_exchange_fees.xml b/wallet/src/main/res/layout/fragment_exchange_fees.xml index 6f8814f..03d69f5 100644 --- a/wallet/src/main/res/layout/fragment_exchange_fees.xml +++ b/wallet/src/main/res/layout/fragment_exchange_fees.xml @@ -44,7 +44,7 @@ app:layout_constraintStart_toEndOf="@+id/withdrawFeeLabel" app:layout_constraintTop_toTopOf="@+id/withdrawFeeLabel" tools:text="-0.23 TESTKUDOS" - tools:textColor="@color/red" /> + tools:textColor="?colorError" /> <TextView android:id="@+id/overheadLabel" @@ -64,7 +64,7 @@ app:layout_constraintStart_toEndOf="@+id/overheadLabel" app:layout_constraintTop_toTopOf="@+id/overheadLabel" tools:text="-0.42 TESTKUDOS" - tools:textColor="@color/red" /> + tools:textColor="?colorError" /> <TextView android:id="@+id/expirationLabel" diff --git a/wallet/src/main/res/layout/fragment_main.xml b/wallet/src/main/res/layout/fragment_main.xml index 3f680ba..6f9e693 100644 --- a/wallet/src/main/res/layout/fragment_main.xml +++ b/wallet/src/main/res/layout/fragment_main.xml @@ -23,13 +23,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <com.google.android.material.floatingactionbutton.FloatingActionButton + <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton android:id="@+id/mainFab" style="@style/FabStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/button_scan_qr_code" - android:src="@drawable/ic_scan_qr" + android:text="@string/button_scan_qr_code_label" + app:icon="@drawable/ic_scan_qr" app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/wallet/src/main/res/layout/fragment_manual_withdraw.xml b/wallet/src/main/res/layout/fragment_manual_withdraw.xml index ec176ff..6d5f78b 100644 --- a/wallet/src/main/res/layout/fragment_manual_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_manual_withdraw.xml @@ -14,104 +14,109 @@ ~ 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" +<ScrollView + 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"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <com.google.android.material.button.MaterialButton + android:id="@+id/qrCodeButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="32dp" + app:icon="@drawable/ic_scan_qr" + app:iconTint="?colorOnPrimary" + android:text="@string/button_scan_qr_code" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" + tools:ignore="RtlHardcoded" /> - <Button - android:id="@+id/qrCodeButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:drawableLeft="@drawable/ic_scan_qr" - android:text="@string/button_scan_qr_code" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:ignore="RtlHardcoded" /> - - <TextView - android:id="@+id/orView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:text="@string/or" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/qrCodeButton" /> - - <TextView - android:id="@+id/manualWithdrawIntro" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:text="@string/withdraw_manual_title" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orView" /> + <TextView + android:id="@+id/orView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="32dp" + android:text="@string/or" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/qrCodeButton" /> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/amountLayout" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginEnd="16dp" - android:minWidth="128dp" - app:boxBackgroundMode="outline" - app:endIconDrawable="@drawable/ic_cancel" - app:endIconMode="clear_text" - app:layout_constraintEnd_toStartOf="@+id/currencyView" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/manualWithdrawIntro"> + <TextView + android:id="@+id/manualWithdrawIntro" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="32dp" + android:text="@string/withdraw_manual_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/orView" /> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/amountView" + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/amountLayout" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:inputType="numberDecimal" /> + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:minWidth="128dp" + app:boxBackgroundMode="outline" + app:endIconDrawable="@drawable/ic_cancel" + app:endIconMode="clear_text" + app:layout_constraintEnd_toStartOf="@+id/currencyView" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manualWithdrawIntro"> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/amountView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:inputType="numberDecimal" /> - <TextView - android:id="@+id/currencyView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_constraintBottom_toBottomOf="@+id/amountLayout" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/amountLayout" - app:layout_constraintTop_toTopOf="@+id/amountLayout" - tools:text="TESTKUDOS123" /> + </com.google.android.material.textfield.TextInputLayout> - <TextView - android:id="@+id/paymentOptionsLabel" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:text="@string/withdraw_manual_payment_options" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/amountLayout" /> + <TextView + android:id="@+id/currencyView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintBottom_toBottomOf="@+id/amountLayout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/amountLayout" + app:layout_constraintTop_toTopOf="@+id/amountLayout" + tools:text="TESTKUDOS123" /> - <Button - android:id="@+id/checkFeesButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:text="@string/withdraw_manual_check_fees" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/paymentOptionsLabel" - app:layout_constraintVertical_bias="0.0" /> + <TextView + android:id="@+id/paymentOptionsLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="32dp" + android:layout_marginEnd="16dp" + android:text="@string/withdraw_manual_payment_options" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/amountLayout" /> + + <Button + android:id="@+id/checkFeesButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="32dp" + android:layout_marginEnd="16dp" + android:text="@string/withdraw_manual_check_fees" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/paymentOptionsLabel" + app:layout_constraintVertical_bias="0.0" /> -</androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> +</ScrollView>
\ No newline at end of file diff --git a/wallet/src/main/res/layout/fragment_pending_operations.xml b/wallet/src/main/res/layout/fragment_pending_operations.xml deleted file mode 100644 index 5030234..0000000 --- a/wallet/src/main/res/layout/fragment_pending_operations.xml +++ /dev/null @@ -1,34 +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"> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/list_pending" - android:layout_width="0dp" - android:layout_height="0dp" - android:scrollbars="vertical" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:listitem="@layout/list_item_pending_operation" /> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/fragment_prompt_tip.xml b/wallet/src/main/res/layout/fragment_prompt_tip.xml deleted file mode 100644 index d96ef60..0000000 --- a/wallet/src/main/res/layout/fragment_prompt_tip.xml +++ /dev/null @@ -1,257 +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=".tip.PromptTipFragment"> - - <TextView - android:id="@+id/introView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="8dp" - android:gravity="center" - android:text="@string/tip_total" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:visibility="visible" /> - - <TextView - android:id="@+id/effectiveAmountView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:gravity="center" - android:textColor="@color/green" - android:textSize="24sp" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/introView" - tools:text="9.8 TESTKUDOS" - tools:visibility="visible" /> - - <TextView - android:id="@+id/chosenAmountLabel" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:gravity="center" - android:text="@string/amount_chosen" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/chosenAmountView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView" - tools:visibility="visible" /> - - <TextView - android:id="@+id/chosenAmountView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" - android:gravity="center" - android:textSize="20sp" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/feeLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel" - tools:text="10 TESTKUDOS" - tools:visibility="visible" /> - - <TextView - android:id="@+id/feeLabel" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:gravity="center" - android:text="@string/tip_fees" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/feeView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chosenAmountView" - tools:visibility="visible" /> - - <TextView - android:id="@+id/feeView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" - android:gravity="center" - android:textColor="@color/red" - android:textSize="20sp" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeLabel" - tools:text="-0.2 TESTKUDOS" - tools:visibility="visible" /> - - <TextView - android:id="@+id/exchangeIntroView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="8dp" - android:gravity="center" - android:text="@string/tip_exchange" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/withdrawExchangeUrl" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeView" - tools:visibility="visible" /> - - <TextView - android:id="@+id/withdrawExchangeUrl" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginBottom="8dp" - android:layout_marginEnd="8dp" - android:gravity="center" - android:textSize="24sp" - android:visibility="invisible" - app:layout_constrainedWidth="true" - app:layout_constraintBottom_toTopOf="@+id/merchantIntroView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/exchangeIntroView" - tools:text="demo.taler.net" - tools:visibility="visible" /> - - <TextView - android:id="@+id/merchantIntroView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="8dp" - android:gravity="center" - android:text="@string/tip_merchant_url" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/withdrawMerchantUrl" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/withdrawExchangeUrl" - tools:visibility="visible" /> - - - <TextView - android:id="@+id/withdrawMerchantUrl" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="8dp" - android:gravity="center" - android:textSize="24sp" - android:visibility="invisible" - app:layout_constrainedWidth="true" - app:layout_constraintBottom_toTopOf="@+id/withdrawCard" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.502" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/merchantIntroView" - tools:text="merchant.demo.taler.net" - tools:visibility="visible" /> - - <ProgressBar - android:id="@+id/progressBar" - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <com.google.android.material.card.MaterialCardView - android:id="@+id/withdrawCard" - style="@style/BottomCard" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - tools:visibility="visible"> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="8dp"> - - <Button - android:id="@+id/confirmWithdrawButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:backgroundTint="@color/green" - android:enabled="false" - android:text="@string/tip_button_confirm" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toStartOf="parent" - tools:enabled="true" - tools:text="@string/tip_button_confirm" /> - - <ProgressBar - android:id="@+id/confirmProgressBar" - style="?android:attr/progressBarStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="@+id/confirmWithdrawButton" - app:layout_constraintEnd_toEndOf="@+id/confirmWithdrawButton" - app:layout_constraintStart_toStartOf="@+id/confirmWithdrawButton" - app:layout_constraintTop_toTopOf="@+id/confirmWithdrawButton" - tools:visibility="visible" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - - </com.google.android.material.card.MaterialCardView> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml index 372163b..44d95de 100644 --- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml @@ -22,106 +22,108 @@ tools:context=".withdraw.PromptWithdrawFragment"> <TextView - android:id="@+id/introView" + android:id="@+id/chosenAmountLabel" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" + android:layout_marginTop="32dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="8dp" android:gravity="center" - android:text="@string/withdraw_total" + android:text="@string/amount_chosen" android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView" + app:layout_constraintBottom_toTopOf="@+id/chosenAmountView" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" tools:visibility="visible" /> <TextView - android:id="@+id/effectiveAmountView" + android:id="@+id/chosenAmountView" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" + android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:gravity="center" - android:textColor="@color/green" - android:textSize="24sp" + android:textSize="20sp" android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel" + app:layout_constraintBottom_toTopOf="@+id/feeLabel" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/introView" - tools:text="9.8 TESTKUDOS" + app:layout_constraintTop_toBottomOf="@id/chosenAmountLabel" + tools:text="10 TESTKUDOS" tools:visibility="visible" /> <TextView - android:id="@+id/chosenAmountLabel" + android:id="@+id/feeLabel" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="32dp" android:layout_marginEnd="16dp" android:gravity="center" - android:text="@string/amount_chosen" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/chosenAmountView" + android:text="@string/withdraw_fees" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/feeView" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView" + app:layout_constraintTop_toBottomOf="@+id/chosenAmountView" tools:visibility="visible" /> <TextView - android:id="@+id/chosenAmountView" + android:id="@+id/feeView" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:gravity="center" + android:textColor="?colorError" android:textSize="20sp" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/feeLabel" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/introView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel" - tools:text="10 TESTKUDOS" + app:layout_constraintTop_toBottomOf="@+id/feeLabel" + tools:text="-0.2 TESTKUDOS" tools:visibility="visible" /> <TextView - android:id="@+id/feeLabel" + android:id="@+id/introView" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="32dp" android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" android:gravity="center" - android:text="@string/withdraw_fees" + android:text="@string/withdraw_total" android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/feeView" + app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chosenAmountView" + app:layout_constraintTop_toBottomOf="@id/feeView" tools:visibility="visible" /> <TextView - android:id="@+id/feeView" + android:id="@+id/effectiveAmountView" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:gravity="center" - android:textColor="@color/red" - android:textSize="20sp" + android:textColor="@color/green" + android:textSize="24sp" android:visibility="invisible" app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeLabel" - tools:text="-0.2 TESTKUDOS" + app:layout_constraintTop_toBottomOf="@+id/introView" + tools:text="9.8 TESTKUDOS" tools:visibility="visible" /> <TextView @@ -139,7 +141,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeView" + app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView" tools:visibility="visible" /> <TextView @@ -152,7 +154,7 @@ android:textSize="24sp" android:visibility="invisible" app:layout_constrainedWidth="true" - app:layout_constraintBottom_toTopOf="@+id/withdrawCard" + app:layout_constraintBottom_toTopOf="@+id/ageLabel" app:layout_constraintEnd_toStartOf="@+id/selectExchangeButton" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" @@ -176,6 +178,40 @@ app:tint="?attr/colorOnPrimary" tools:visibility="visible" /> + <TextView + android:id="@+id/ageLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="32dp" + android:layout_marginEnd="16dp" + android:gravity="center" + android:text="@string/withdraw_restrict_age" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/ageSelector" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/withdrawExchangeUrl" + tools:visibility="visible" /> + + <Spinner + android:id="@+id/ageSelector" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:gravity="center" + android:spinnerMode="dropdown" + android:textSize="20sp" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/withdrawCard" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ageLabel" + tools:visibility="visible" /> + <ProgressBar android:id="@+id/progressBar" style="?android:attr/progressBarStyleLarge" diff --git a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml index ec8d996..20c1013 100644 --- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml +++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:gravity="center" - android:textColor="@color/red" + android:textColor="?colorError" android:textSize="16sp" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" diff --git a/wallet/src/main/res/layout/fragment_transaction_payment.xml b/wallet/src/main/res/layout/fragment_transaction_payment.xml deleted file mode 100644 index 20ba161..0000000 --- a/wallet/src/main/res/layout/fragment_transaction_payment.xml +++ /dev/null @@ -1,126 +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/> - --> - -<ScrollView 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" - android:fillViewport="true" - tools:context=".transactions.TransactionDetailFragment"> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/timeView" - style="@style/TransactionLabel.Time" - app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:text="23 March 2020 23:42pm" /> - - <TextView - android:id="@+id/amountPaidWithFeesLabel" - style="@style/TransactionLabel" - android:text="@string/transaction_paid" - app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/timeView" /> - - <TextView - android:id="@+id/amountPaidWithFeesView" - style="@style/TransactionContent" - android:textColor="@color/red" - app:layout_constraintBottom_toTopOf="@+id/orderAmountLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/amountPaidWithFeesLabel" - tools:text="-23.42 TESTKUDOS" /> - - <TextView - android:id="@+id/orderAmountLabel" - style="@style/TransactionLabel" - android:text="@string/transaction_order_total" - app:layout_constraintBottom_toTopOf="@+id/orderAmountView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/amountPaidWithFeesView" /> - - <TextView - android:id="@+id/orderAmountView" - style="@style/TransactionContent" - app:layout_constraintBottom_toTopOf="@+id/feeLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orderAmountLabel" - tools:text="23 TESTKUDOS" /> - - <TextView - android:id="@+id/feeLabel" - style="@style/TransactionLabel" - android:text="@string/withdraw_fees" - app:layout_constraintBottom_toTopOf="@+id/feeView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orderAmountView" /> - - <TextView - android:id="@+id/feeView" - style="@style/TransactionContent" - android:textColor="@color/red" - app:layout_constraintBottom_toTopOf="@+id/orderSummaryLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeLabel" - tools:text="-0.42 TESTKUDOS" /> - - <TextView - android:id="@+id/orderSummaryLabel" - style="@style/TransactionLabel" - android:text="@string/transaction_order" - app:layout_constraintBottom_toTopOf="@+id/orderSummaryView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeView" /> - - <TextView - android:id="@+id/orderSummaryView" - style="@style/TransactionContent" - android:textColor="?android:textColorPrimary" - app:layout_constraintBottom_toTopOf="@+id/orderIdView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orderSummaryLabel" - tools:text="Some Product that was bought and can have quite a long label" /> - - <TextView - android:id="@+id/orderIdView" - style="@style/TransactionLabel" - android:layout_marginBottom="16dp" - android:text="@string/transaction_order_id" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orderSummaryView" /> - - </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 deleted file mode 100644 index 8fe3247..0000000 --- a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml +++ /dev/null @@ -1,128 +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/> - --> - -<ScrollView 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" - android:fillViewport="true" - tools:context=".transactions.TransactionDetailFragment"> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/timeView" - style="@style/TransactionLabel.Time" - app:layout_constraintBottom_toTopOf="@+id/effectiveAmountLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:text="23 March 2020 23:42pm" /> - - <TextView - android:id="@+id/effectiveAmountLabel" - style="@style/TransactionLabel" - app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/timeView" - tools:text="@string/withdraw_total" /> - - <TextView - android:id="@+id/effectiveAmountView" - style="@style/TransactionContent" - android:textColor="@color/green" - app:layout_constraintBottom_toTopOf="@+id/confirmWithdrawalButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/effectiveAmountLabel" - tools:text="23.42 TESTKUDOS" /> - - <Button - android:id="@+id/confirmWithdrawalButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_account_balance" - android:text="@string/withdraw_button_confirm_bank" - app:drawableTint="?attr/colorOnPrimarySurface" - app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView" - tools:ignore="RtlHardcoded" /> - - <TextView - android:id="@+id/chosenAmountLabel" - style="@style/TransactionLabel" - app:layout_constraintBottom_toTopOf="@+id/chosenAmountView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/confirmWithdrawalButton" - tools:text="@string/amount_chosen" /> - - <TextView - android:id="@+id/chosenAmountView" - style="@style/TransactionContent" - app:layout_constraintBottom_toTopOf="@+id/feeLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel" - tools:text="24 TESTKUDOS" /> - - <TextView - android:id="@+id/feeLabel" - style="@style/TransactionLabel" - android:text="@string/withdraw_fees" - app:layout_constraintBottom_toTopOf="@+id/feeView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chosenAmountView" /> - - <TextView - android:id="@+id/feeView" - style="@style/TransactionContent" - android:textColor="@color/red" - app:layout_constraintBottom_toTopOf="@+id/exchangeLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeLabel" - tools:text="-0.38 TESTKUDOS" /> - - <TextView - android:id="@+id/exchangeLabel" - style="@style/TransactionLabel" - android:text="@string/withdraw_exchange" - app:layout_constraintBottom_toTopOf="@+id/exchangeView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeView" /> - - <TextView - android:id="@+id/exchangeView" - style="@style/TransactionContent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/exchangeLabel" - tools:text="exchange.demo.taler.net" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - -</ScrollView> diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml index aaf638c..8fa46f5 100644 --- a/wallet/src/main/res/layout/fragment_transactions.xml +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -14,29 +14,108 @@ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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"> + <com.google.android.material.button.MaterialButton + android:id="@+id/sendButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:text="@string/transactions_send_funds" + app:layout_constraintBottom_toTopOf="@+id/divider" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/receiveButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="10dp" + android:text="@string/transactions_receive_funds" + app:layout_constraintBottom_toTopOf="@+id/divider" + app:layout_constraintEnd_toStartOf="@+id/amount" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toEndOf="@+id/sendButton" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/balanceLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:text="@string/transactions_balance" + android:textSize="14sp" + app:layout_constraintBottom_toTopOf="@+id/amount" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toEndOf="@+id/receiveButton" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/amount" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toTopOf="@+id/divider" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/receiveButton" + app:layout_constraintTop_toBottomOf="@+id/balanceLabel" + tools:text="23.42" + tools:visibility="visible" /> + + <androidx.constraintlayout.widget.Barrier + android:id="@+id/topBarrier" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:barrierDirection="bottom" + app:constraint_referenced_ids="sendButton,receiveButton,amount" /> + + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/topBarrier" /> + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="0dp" android:scrollbars="vertical" android:visibility="invisible" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider" tools:listitem="@layout/list_item_transaction" tools:visibility="visible" /> <TextView android:id="@+id/emptyState" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center" + android:layout_margin="16dp" + android:gravity="center" android:text="@string/transactions_empty" + android:textSize="16sp" android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider" tools:visibility="visible" /> <ProgressBar @@ -46,6 +125,22 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider" tools:visibility="visible" /> -</FrameLayout> + <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton + android:id="@+id/mainFab" + style="@style/FabStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/button_scan_qr_code" + android:text="@string/button_scan_qr_code_label" + app:icon="@drawable/ic_scan_qr" + app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/fragment_uri_input.xml b/wallet/src/main/res/layout/fragment_uri_input.xml index 1e9934f..95c2297 100644 --- a/wallet/src/main/res/layout/fragment_uri_input.xml +++ b/wallet/src/main/res/layout/fragment_uri_input.xml @@ -22,7 +22,7 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/uriLayout" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="16dp" @@ -42,7 +42,7 @@ </com.google.android.material.textfield.TextInputLayout> - <Button + <com.google.android.material.button.MaterialButton android:id="@+id/pasteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -50,9 +50,10 @@ android:layout_marginTop="16dp" android:layout_marginEnd="16dp" android:layout_weight="1" - android:drawableLeft="@drawable/ic_content_paste" android:text="@string/paste" - app:drawableTint="?attr/colorOnPrimarySurface" + android:textColor="?colorOnPrimary" + app:icon="@drawable/ic_content_paste" + app:iconTint="?colorOnPrimary" app:layout_constraintEnd_toStartOf="@+id/okButton" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" @@ -68,6 +69,7 @@ android:layout_marginEnd="16dp" android:backgroundTint="@color/green" android:text="@string/ok" + android:textColor="@android:color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/pasteButton" app:layout_constraintTop_toBottomOf="@+id/uriLayout" /> diff --git a/wallet/src/main/res/layout/list_item_age.xml b/wallet/src/main/res/layout/list_item_age.xml new file mode 100644 index 0000000..2d3a6e5 --- /dev/null +++ b/wallet/src/main/res/layout/list_item_age.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2023 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/> + --> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + style="?android:attr/spinnerItemStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:padding="8dp" + android:singleLine="true" + android:textAlignment="inherit" + android:textSize="20sp" /> diff --git a/wallet/src/main/res/layout/list_item_balance.xml b/wallet/src/main/res/layout/list_item_balance.xml index 475e7d6..53e3d89 100644 --- a/wallet/src/main/res/layout/list_item_balance.xml +++ b/wallet/src/main/res/layout/list_item_balance.xml @@ -27,8 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:textSize="40sp" - app:layout_constraintEnd_toStartOf="@+id/balanceCurrencyView" + style="?textAppearanceDisplaySmall" + app:layout_constraintEnd_toStartOf="@+id/pendingView" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" @@ -36,17 +36,18 @@ tools:text="100.50" /> <TextView - android:id="@+id/balanceCurrencyView" - android:layout_width="wrap_content" + android:id="@+id/scopeView" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:textSize="20sp" - app:layout_constrainedWidth="true" - app:layout_constraintBottom_toBottomOf="@+id/balanceAmountView" - app:layout_constraintEnd_toStartOf="@+id/pendingView" - app:layout_constraintStart_toEndOf="@+id/balanceAmountView" - app:layout_constraintTop_toTopOf="@+id/balanceAmountView" - tools:text="TESTKUDOS" /> + android:layout_marginBottom="8dp" + style="?textAppearanceBodyMedium" + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/balanceAmountView" + app:layout_constraintBottom_toTopOf="@id/balanceInboundAmount" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/pendingView" + tools:text="@string/balance_scope_exchange" + tools:visibility="visible"/> <TextView android:id="@+id/balanceInboundAmount" @@ -54,12 +55,13 @@ android:layout_height="wrap_content" android:textColor="@color/green" android:textSize="20sp" + style="?textAppearanceBodyLarge" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/balanceInboundLabel" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/balanceAmountView" + app:layout_constraintTop_toBottomOf="@+id/scopeView" tools:text="+10 TESTKUDOS" tools:visibility="visible" /> @@ -70,6 +72,7 @@ android:layout_marginStart="8dp" android:text="@string/balances_inbound_label" android:textColor="@color/green" + style="?textAppearanceBodyMedium" app:layout_constraintBottom_toBottomOf="@+id/balanceInboundAmount" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/balanceInboundAmount" diff --git a/wallet/src/main/res/layout/list_item_pending_operation.xml b/wallet/src/main/res/layout/list_item_pending_operation.xml deleted file mode 100644 index bd606c3..0000000 --- a/wallet/src/main/res/layout/list_item_pending_operation.xml +++ /dev/null @@ -1,47 +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/> - --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/pending_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="3dp" - android:background="@drawable/pending_border" - android:orientation="vertical" - android:padding="3dp"> - - <TextView - android:id="@+id/pending_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="24sp" - tools:text="My Pending Operation" /> - - <Button - android:id="@+id/button_pending_action_1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - tools:text="Cancel Operation" /> - - <TextView - android:id="@+id/pending_subtext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - tools:text="My further details" /> - -</LinearLayout>
\ No newline at end of file diff --git a/wallet/src/main/res/layout/list_item_transaction.xml b/wallet/src/main/res/layout/list_item_transaction.xml index ed031c3..ad792ae 100644 --- a/wallet/src/main/res/layout/list_item_transaction.xml +++ b/wallet/src/main/res/layout/list_item_transaction.xml @@ -17,13 +17,14 @@ <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/root" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:paddingStart="16dp" - android:paddingTop="8dp" + android:paddingTop="12dp" android:paddingEnd="16dp" - android:paddingBottom="8dp"> + android:paddingBottom="12dp"> <ImageView android:id="@+id/icon" @@ -49,11 +50,11 @@ <TextView android:id="@+id/extraInfoView" + style="@style/TransactionSubtitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:textSize="14sp" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/barrier" app:layout_constraintStart_toStartOf="@+id/title" @@ -63,11 +64,11 @@ <TextView android:id="@+id/time" + style="@style/TransactionTimestamp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/barrier" app:layout_constraintStart_toStartOf="@+id/title" @@ -83,9 +84,9 @@ <TextView android:id="@+id/amount" + style="@style/TransactionAmount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="24sp" app:layout_constraintBottom_toTopOf="@+id/pendingView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/wallet/src/main/res/layout/nav_header_main.xml b/wallet/src/main/res/layout/nav_header_main.xml index e70e80f..6837814 100644 --- a/wallet/src/main/res/layout/nav_header_main.xml +++ b/wallet/src/main/res/layout/nav_header_main.xml @@ -39,7 +39,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:text="@string/nav_header_title" - android:textAppearance="@style/TextAppearance.AppCompat.Body1" + android:textAppearance="@style/TextAppearance.Material3.BodyLarge" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/talerLogoView" /> diff --git a/wallet/src/main/res/menu/activity_main_drawer.xml b/wallet/src/main/res/menu/activity_main_drawer.xml index d1cc462..42e4311 100644 --- a/wallet/src/main/res/menu/activity_main_drawer.xml +++ b/wallet/src/main/res/menu/activity_main_drawer.xml @@ -39,10 +39,7 @@ <group android:id="@+id/nav_group_dev" android:checkableBehavior="single"> - <item - android:id="@+id/nav_pending_operations" - android:icon="@drawable/ic_sync" - android:title="@string/pending_operations_title" /> + <!-- Future dev options go here --> </group> </menu> </item> diff --git a/wallet/src/main/res/menu/exchange.xml b/wallet/src/main/res/menu/exchange.xml index 85ec08f..d99ff00 100644 --- a/wallet/src/main/res/menu/exchange.xml +++ b/wallet/src/main/res/menu/exchange.xml @@ -18,4 +18,13 @@ <item android:id="@+id/action_manual_withdrawal" android:title="@string/exchange_menu_manual_withdraw" /> + <item + android:id="@+id/action_receive_peer" + android:title="@string/receive_peer" /> + <item + android:id="@+id/action_reload" + android:title="@string/exchange_reload" /> + <item + android:id="@+id/action_delete" + android:title="@string/transactions_delete" /> </menu> diff --git a/wallet/src/main/res/menu/pending_operations.xml b/wallet/src/main/res/menu/exchange_list.xml index b632021..21c028d 100644 --- a/wallet/src/main/res/menu/pending_operations.xml +++ b/wallet/src/main/res/menu/exchange_list.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. + ~ (C) 2024 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 @@ -16,9 +16,10 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> + <item - android:id="@+id/retry_pending" - android:orderInCategory="100" - android:title="@string/menu_retry_pending_operations" + android:id="@+id/action_add_dev_exchanges" + android:title="@string/exchange_list_add_dev" app:showAsAction="never" /> + </menu> diff --git a/wallet/src/main/res/menu/global_dev.xml b/wallet/src/main/res/menu/global_dev.xml new file mode 100644 index 0000000..d6f73b9 --- /dev/null +++ b/wallet/src/main/res/menu/global_dev.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2024 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/> + --> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_show_logs" + android:title="@string/show_logs" + android:icon="@drawable/ic_bug_report" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index ac94b34..0648fb4 100644 --- a/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/ic_launcher_background" /> <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon>
\ No newline at end of file diff --git a/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index ac94b34..0648fb4 100644 --- a/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/wallet/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -2,4 +2,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/ic_launcher_background" /> <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon>
\ No newline at end of file diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index b3f96c5..f6c90ab 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -26,46 +26,120 @@ android:label="@string/balances_title" tools:layout="@layout/fragment_balances"> <action - android:id="@+id/action_nav_main_to_promptPayment" - app:destination="@id/promptPayment" /> - <action android:id="@+id/action_nav_main_to_nav_transactions" app:destination="@id/nav_transactions" /> <action android:id="@+id/action_nav_main_to_nav_uri_input" app:destination="@id/nav_uri_input" /> - <action - android:id="@+id/action_nav_main_to_promptTip" - app:destination="@id/promptTip" /> </fragment> <fragment - android:id="@+id/promptTip" - android:name="net.taler.wallet.tip.PromptTipFragment" - android:label="Review Tip" - tools:layout="@layout/fragment_prompt_tip"> + android:id="@+id/handleUri" + android:name="net.taler.wallet.HandleUriFragment" + android:label="@string/handle_uri_title"> + <argument + android:name="uri" + app:argType="string" + app:nullable="false" /> + <argument + android:name="from" + app:argType="string" + app:nullable="false" /> + <action - android:id="@+id/action_promptTip_to_nav_main" - app:destination="@id/nav_main" + android:id="@+id/action_handleUri_to_receiveFunds" + app:destination="@id/receiveFunds" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_sendFunds" + app:destination="@id/sendFunds" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_promptWithdraw" + app:destination="@id/promptWithdraw" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_manualWithdrawal" + app:destination="@id/nav_exchange_manual_withdrawal" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_promptPayment" + app:destination="@id/promptPayment" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_promptPullPayment" + app:destination="@id/promptPullPayment" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_promptPushPayment" + app:destination="@id/promptPushPayment" + app:popUpTo="@id/nav_main" /> + + <action + android:id="@+id/action_handleUri_to_promptPayTemplate" + app:destination="@id/promptPayTemplate" app:popUpTo="@id/nav_main" /> + <action - android:id="@+id/action_promptTip_to_alreadyAccepted" - app:destination="@id/alreadyAccepted" + android:id="@+id/action_handleUri_to_nav_payto_uri" + app:destination="@id/nav_payto_uri" app:popUpTo="@id/nav_main" /> </fragment> <fragment + android:id="@+id/receiveFunds" + android:name="net.taler.wallet.ReceiveFundsFragment" + android:label="@string/transactions_receive_funds"> + <action + android:id="@+id/action_receiveFunds_to_nav_prompt_withdraw" + app:destination="@id/promptWithdraw" /> + <action + android:id="@+id/action_receiveFunds_to_nav_peer_pull" + app:destination="@id/nav_peer_pull" /> + </fragment> + + <fragment + android:id="@+id/sendFunds" + android:name="net.taler.wallet.SendFundsFragment" + android:label="@string/transactions_send_funds"> + <action + android:id="@+id/action_sendFunds_to_nav_deposit" + app:destination="@id/nav_deposit" /> + <action + android:id="@+id/action_sendFunds_to_nav_peer_push" + app:destination="@id/nav_peer_push" /> + </fragment> + + <fragment + android:id="@+id/nav_payto_uri" + android:name="net.taler.wallet.deposit.PayToUriFragment" + android:label="@string/transactions_send_funds"> + <argument + android:name="uri" + app:argType="string" /> + <action + android:id="@+id/action_nav_payto_uri_to_nav_deposit" + app:destination="@id/nav_deposit" /> + </fragment> + + <fragment android:id="@+id/promptPayment" android:name="net.taler.wallet.payment.PromptPaymentFragment" - android:label="Review Payment" + android:label="@string/payment_prompt_title" tools:layout="@layout/fragment_prompt_payment"> <action 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" + android:id="@+id/action_promptPayment_to_nav_transactions_detail_payment" + app:destination="@id/nav_transactions_detail_payment" app:popUpTo="@id/nav_main" /> </fragment> @@ -76,9 +150,6 @@ <action android:id="@+id/action_nav_settings_to_nav_settings_exchanges" app:destination="@id/nav_settings_exchanges" /> - <action - android:id="@+id/action_nav_settings_to_nav_settings_backup" - app:destination="@id/nav_settings_backup" /> </fragment> <fragment @@ -92,16 +163,20 @@ <fragment android:id="@+id/nav_exchange_manual_withdrawal" - android:name="net.taler.wallet.withdraw.ManualWithdrawFragment" + android:name="net.taler.wallet.withdraw.manual.ManualWithdrawFragment" android:label="@string/withdraw_title"> <action android:id="@+id/action_nav_exchange_manual_withdrawal_to_promptWithdraw" app:destination="@id/promptWithdraw" /> + <argument + android:name="amount" + app:argType="string" + app:nullable="false" /> </fragment> <fragment android:id="@+id/nav_exchange_manual_withdrawal_success" - android:name="net.taler.wallet.withdraw.ManualWithdrawSuccessFragment" + android:name="net.taler.wallet.withdraw.manual.ManualWithdrawSuccessFragment" android:label="@string/withdraw_title"> <action android:id="@+id/action_nav_exchange_manual_withdrawal_success_to_nav_main" @@ -110,21 +185,114 @@ </fragment> <fragment - android:id="@+id/nav_settings_backup" - android:name="net.taler.wallet.settings.BackupSettingsFragment" - android:label="@string/nav_settings_backup" /> + android:id="@+id/nav_deposit" + android:name="net.taler.wallet.deposit.DepositFragment" + android:label="@string/send_deposit_title"> + <argument + android:name="amount" + app:argType="string" + app:nullable="false" /> + <argument + android:name="IBAN" + android:defaultValue="@null" + app:argType="string" + app:nullable="true" /> + <argument + android:name="receiverName" + android:defaultValue="@null" + app:argType="string" + app:nullable="true" /> + <action + android:id="@+id/action_nav_deposit_to_nav_main" + app:destination="@id/nav_main" + app:popUpTo="@id/nav_main" /> + </fragment> + + <fragment + android:id="@+id/nav_peer_pull" + android:name="net.taler.wallet.peer.OutgoingPullFragment" + android:label="@string/receive_peer_title"> + <argument + android:name="amount" + android:defaultValue="@null" + app:argType="string" + app:nullable="true" /> + <action + android:id="@+id/action_nav_peer_pull_to_nav_main" + app:destination="@id/nav_main" + app:popUpTo="@id/nav_main" /> + <action + android:id="@+id/action_nav_peer_pull_to_nav_transactions_detail_peer" + app:destination="@id/nav_transactions_detail_peer" + app:popUpTo="@id/nav_main" /> + </fragment> + + <fragment + android:id="@+id/nav_peer_push" + android:name="net.taler.wallet.peer.OutgoingPushFragment" + android:label="@string/send_peer_title"> + <argument + android:name="amount" + android:defaultValue="@null" + app:argType="string" + app:nullable="true" /> + <action + android:id="@+id/action_nav_peer_push_to_nav_main" + app:destination="@id/nav_main" + app:popUpTo="@id/nav_main" /> + <action + android:id="@+id/action_nav_peer_push_to_nav_transactions_detail_peer" + app:destination="@id/nav_transactions_detail_peer" + app:popUpTo="@id/nav_main" /> + </fragment> + + <fragment + android:id="@+id/promptPullPayment" + android:name="net.taler.wallet.peer.IncomingPullPaymentFragment" + android:label="@string/pay_peer_title"> + <action + android:id="@+id/action_promptPullPayment_to_nav_main" + app:destination="@id/nav_main" + app:popUpTo="@id/nav_main" /> + </fragment> + + <fragment + android:id="@+id/promptPushPayment" + android:name="net.taler.wallet.peer.IncomingPushPaymentFragment" + android:label="@string/receive_peer_payment_title"> + <action + android:id="@+id/action_promptPushPayment_to_nav_main" + app:destination="@id/nav_main" + app:popUpTo="@id/nav_main" /> + </fragment> + + <fragment + android:id="@+id/promptPayTemplate" + android:name="net.taler.wallet.payment.PayTemplateFragment" + android:label="@string/payment_pay_template_title"> + <action + android:id="@+id/action_promptPayTemplate_to_promptPayment" + app:destination="@+id/promptPayment" + app:popUpTo="@id/nav_main" /> + <argument + android:name="uri" + app:argType="string" /> + </fragment> <fragment android:id="@+id/nav_transactions" android:name="net.taler.wallet.transactions.TransactionsFragment" android:label="@string/transactions_title" - tools:layout="@layout/fragment_transactions" /> + tools:layout="@layout/fragment_transactions"> + <action + android:id="@+id/action_nav_transactions_to_nav_uri_input" + app:destination="@id/nav_uri_input" /> + </fragment> <fragment android:id="@+id/nav_transactions_detail_withdrawal" android:name="net.taler.wallet.transactions.TransactionWithdrawalFragment" - android:label="@string/transactions_detail_title" - tools:layout="@layout/fragment_transaction_withdrawal"> + android:label="@string/transactions_detail_title"> <action android:id="@+id/action_nav_transactions_detail_withdrawal_to_nav_exchange_manual_withdrawal_success" app:destination="@id/nav_exchange_manual_withdrawal_success" /> @@ -133,32 +301,37 @@ <fragment android:id="@+id/nav_transactions_detail_payment" android:name="net.taler.wallet.transactions.TransactionPaymentFragment" - android:label="@string/transactions_detail_title" - tools:layout="@layout/fragment_transaction_payment" /> + android:label="@string/transactions_detail_title" /> <fragment android:id="@+id/nav_transactions_detail_refund" android:name="net.taler.wallet.transactions.TransactionRefundFragment" - android:label="@string/transactions_detail_title" - tools:layout="@layout/fragment_transaction_payment" /> + android:label="@string/transactions_detail_title" /> <fragment android:id="@+id/nav_transactions_detail_refresh" android:name="net.taler.wallet.transactions.TransactionRefreshFragment" - android:label="@string/transactions_detail_title" - tools:layout="@layout/fragment_transaction_withdrawal" /> + android:label="@string/transactions_detail_title" /> + + <fragment + android:id="@+id/nav_transactions_detail_deposit" + android:name="net.taler.wallet.transactions.TransactionDepositFragment" + android:label="@string/transactions_detail_title" /> <fragment - android:id="@+id/alreadyAccepted" - android:name="net.taler.wallet.tip.AlreadyAcceptedFragment" - android:label="@string/tip_already_accepted" - tools:layout="@layout/fragment_already_accepted" /> + android:id="@+id/nav_transactions_detail_peer" + android:name="net.taler.wallet.transactions.TransactionPeerFragment" + android:label="@string/transactions_detail_title" /> <fragment - android:id="@+id/alreadyPaid" - android:name="net.taler.wallet.payment.AlreadyPaidFragment" - android:label="@string/payment_already_paid_title" - tools:layout="@layout/fragment_already_paid" /> + android:id="@+id/nav_transactions_detail_loss" + android:name="net.taler.wallet.transactions.TransactionLossFragment" + android:label="@string/transactions_detail_title" /> + + <fragment + android:id="@+id/nav_transactions_detail_dummy" + android:name="net.taler.wallet.transactions.TransactionDummyFragment" + android:label="@string/transactions_detail_title" /> <fragment android:id="@+id/promptWithdraw" @@ -166,9 +339,6 @@ 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 @@ -180,6 +350,10 @@ app:destination="@id/nav_exchange_manual_withdrawal_success" app:popUpTo="@id/nav_main" /> <action + android:id="@+id/action_promptWithdraw_to_nav_transactions_detail_withdrawal" + app:destination="@id/nav_transactions_detail_withdrawal" + app:popUpTo="@id/nav_main" /> + <action android:id="@+id/action_promptWithdraw_to_errorFragment" app:destination="@id/errorFragment" app:popUpTo="@id/nav_main" /> @@ -195,17 +369,6 @@ app:destination="@id/promptWithdraw" app:popUpTo="@id/nav_main" /> </fragment> - <fragment - android:id="@+id/selectExchangeFragment" - android:name="net.taler.wallet.exchanges.SelectExchangeFragment" - android:label="@string/nav_exchange_select" - tools:layout="@layout/fragment_exchange_list" /> - - <fragment - android:id="@+id/nav_pending_operations" - android:name="net.taler.wallet.pending.PendingOperationsFragment" - android:label="@string/pending_operations_title" - tools:layout="@layout/fragment_pending_operations" /> <fragment android:id="@+id/nav_uri_input" @@ -220,16 +383,20 @@ tools:layout="@layout/fragment_error" /> <action - android:id="@+id/action_global_promptWithdraw" - app:destination="@id/promptWithdraw" /> + android:id="@+id/action_global_handle_uri" + app:destination="@id/handleUri" /> <action - android:id="@+id/action_global_promptPayment" - app:destination="@id/promptPayment" /> + android:id="@+id/action_global_receiveFunds" + app:destination="@id/receiveFunds" /> + + <action + android:id="@+id/action_global_sendFunds" + app:destination="@id/sendFunds" /> <action - android:id="@+id/action_global_pending_operations" - app:destination="@id/nav_pending_operations" /> + android:id="@+id/action_global_promptPayment" + app:destination="@id/promptPayment" /> <action android:id="@+id/action_nav_transactions_detail_withdrawal" @@ -247,4 +414,12 @@ android:id="@+id/action_nav_transactions_detail_refresh" app:destination="@id/nav_transactions_detail_refresh" /> + <action + android:id="@+id/action_nav_transactions_detail_deposit" + app:destination="@id/nav_transactions_detail_deposit" /> + + <action + android:id="@+id/action_nav_payto_uri" + app:destination="@id/nav_payto_uri" /> + </navigation> diff --git a/wallet/src/main/res/values-ca/strings.xml b/wallet/src/main/res/values-ca/strings.xml new file mode 100644 index 0000000..591820b --- /dev/null +++ b/wallet/src/main/res/values-ca/strings.xml @@ -0,0 +1,265 @@ +<?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/> + --><resources xmlns:tools="http://schemas.android.com/tools"> + <string name="app_name">Cartera Taler</string> + <string name="google_play_title" tools:keep="@string/google_play_title">Cartera Taler (experimental)</string> + <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler et permet fer transaccions privades, fàcil i ràpidament.</string> + <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Aquesta aplicació és una cartera per al GNU Taler. És altament experimental i encara no està llesta per a l\'ús quotidià seriós. GNUTaler és un sistema de pagament respectuós amb la privadesa. Els clients es poden mantenir anònims, però els comerciants no poden amagar els seus ingressos fets amb GNU Taler. Això ajuda a evitar l\'evasió d\'impostos i el blanqueig de diners. L\'ús principal de GNU Taler és fer pagaments; no com a bé de refugi o d\'especulació. Els pagaments sempre estan recolzats per una divisa ja existent. Els pagaments es fan després de canviar diners existents per diners digitals amb l\'ajuda d\'un servei d\'intercanvi; és a dir, un proveïdor de serveis de pagament per al Taler. Per a fer un pagament, el client només necessita una cartera carregada de diners. El comerciant pot acceptar els pagaments sense fer que el client es registri al seu lloc web. El GNU Taler és immune a molts tipus de frau, com el «phishing» de dades bancàries o el frau de devolució. En cas de pèrdua o robament, només la quantitat limitada de diners que quedin a la cartera podrien ser perduts.</string> + <string name="nav_header_title">GNU Taler</string> + <string name="nav_header_subtitle">Cartera</string> + <string name="nav_prompt_withdraw">Retira diners digitals</string> + <string name="nav_exchange_tos">Termes de servei de l\'intercanvi</string> + <string name="nav_exchange_select">Selecciona l\'intercanvi</string> + <string name="nav_exchange_fees">Comissions d\'intercanvi</string> + <string name="nav_error">Error</string> + <string name="button_back">Ves enrere</string> + <string name="button_scan_qr_code">Escaneja el codi QR de Taler</string> + <string name="enter_uri">Entra l\'URI de Taler</string> + <string name="copy" tools:override="true">Copia</string> + <string name="copy_uri">Copia l\'URI de Taler</string> + <string name="paste">Enganxa</string> + <string name="paste_invalid">El portaretalls conté un tipus invàlid de dada</string> + <string name="uri_invalid">No és una URI de Taler vàlida</string> + <string name="ok">D\'acord</string> + <string name="cancel">Cancel·la</string> + <string name="search">Cerca</string> + <string name="menu">Menú</string> + <string name="or">o bé</string> + <string name="currency">Divisa</string> + <!-- The count should be mirrored in RTL languages --> + <string name="char_count">%1$d/%2$d</string> + <string name="offline">L\'operació requereix accés a internet. Si us plau, assegura\'t que la connexió a internet funciona i torna a intentar-ho.</string> + <string name="error_unsupported_uri">Error: Aquesta URI de Taler no està suportada.</string> + <string name="menu_settings">Paràmetres</string> + <string name="menu_retry_pending_operations">Reintenta les operacions pendents</string> + <string name="host_apdu_service_desc">Pagaments de Taler per NFC</string> + <string name="balances_title">Saldos</string> + <string name="amount_positive">+%s</string> + <string name="amount_negative">-%s</string> + <string name="amount_chosen">Quantitat escollida</string> + <string name="balances_inbound_label">entrant</string> + <string name="balances_empty_state">No hi ha diners digitals a la teva cartera. +\n +\nPots aconseguir diners de prova del banc de demostració: +\n +\nhttps://bank.demo.taler.net</string> + <string name="transactions_title">Transaccions</string> + <string name="transactions_balance">Saldo</string> + <string name="transactions_send_funds">Envia +\nFons</string> + <string name="transactions_receive_funds">Rep +\nFons</string> + <string name="transactions_empty">No tens cap transacció</string> + <string name="transactions_empty_search">No s\'han trobat transaccions. Prova una cerca diferent.</string> + <string name="transactions_error">No s\'han pogut carregar transaccions +\n +\n%s</string> + <string name="transactions_detail_title">Transacció</string> + <string name="transactions_detail_title_currency">%s Transaccions</string> + <string name="transactions_delete">Esborrar</string> + <string name="transactions_select_all">Seleccionar-ho tot</string> + <string name="transactions_delete_dialog_title">Esborrar la transacció</string> + <string name="transactions_delete_dialog_message">Estàs segur que vols eliminar aquesta transacció de la teva cartera\?</string> + <string name="transactions_delete_selected_dialog_message">Estàs segur que vols eliminar les transaccions seleccionades de la teva cartera\?</string> + <string name="transactions_cancel_dialog_message">Estàs segur que vols cancel·lar aquesta retirada\? Podries perdre els diners que encara estiguin en trànsit.</string> + <!-- Transactions --> + <string name="transaction_paid">Pagat</string> + <string name="transaction_order_total">Total</string> + <string name="transaction_order">Compra</string> + <string name="transaction_order_id">Rebut #%1$s</string> + <string name="transaction_tip_from">Recompensa de %s</string> + <string name="transaction_refund">Reemborsament</string> + <string name="transaction_refund_from">Reemborsament de %s</string> + <string name="transaction_pending">PENDENT</string> + <string name="transaction_refresh">Comissió de canvi de venciment de monedes</string> + <string name="transaction_deposit">Dipòsit</string> + <string name="transaction_peer_push_debit">Pagament anticipat</string> + <string name="transaction_peer_pull_credit">Factura</string> + <string name="transaction_peer_pull_debit">Factura pagada</string> + <string name="transaction_peer_push_credit">Pagament anticipat</string> + <string name="transaction_action_kyc">Completa KYC (política \'Know Your Customer\')</string> + <string name="payment_title">Pagament</string> + <string name="payment_fee">+%s comissió de pagament</string> + <string name="payment_button_confirm">Confirma el pagament</string> + <string name="payment_label_amount_total">Quantitat total:</string> + <string name="payment_label_order_summary">Compra</string> + <string name="payment_error">Error: %s</string> + <string name="payment_balance_insufficient">Saldo insuficient!</string> + <string name="payment_aborted">Avortat</string> + <string name="payment_failed">Ha fallat</string> + <string name="payment_initiated">Pagament començat</string> + <string name="payment_already_paid_title">Ja pagat</string> + <string name="payment_already_paid">Ja has pagat aquesta compra.</string> + <string name="receive_amount">Quantitat a rebre</string> + <string name="receive_amount_invalid">Quantitat invàlida</string> + <string name="receive_intro">Tria d\'on rebre els diners:</string> + <string name="receive_withdraw">Retirar diners d\'un compte bancari</string> + <string name="receive_peer">Factura una altra cartera</string> + <string name="receive_peer_title">Sol·licitud de pagament</string> + <string name="receive_peer_create_button">Crea factura</string> + <string name="receive_peer_invoice_instruction">Fes que el client escanegi aquest codi QR per pagar:</string> + <string name="receive_peer_invoice_uri">Alternativament, copia i envia aquesta URI:</string> + <string name="send_amount">Quantitat a enviar</string> + <string name="send_intro">Tria on vols enviar els diners:</string> + <string name="send_deposit">A un compte bancari</string> + <string name="send_deposit_bitcoin">A una cartera de Bitcoin</string> + <string name="send_deposit_title">Deposita a un compte bancari</string> + <string name="send_deposit_iban">IBAN</string> + <string name="send_deposit_bic">BIC/SWIFT</string> + <string name="send_deposit_name">Titular del compte</string> + <string name="send_deposit_bitcoin_address">Adreça de Bitcoin</string> + <string name="send_deposit_check_fees_button">Despeses de comprovació</string> + <string name="send_deposit_amount_effective">Quantitat efectiva</string> + <string name="send_deposit_create_button">Fes un dipòsit</string> + <string name="send_deposit_bitcoin_create_button">Transferir Bitcoin</string> + <string name="send_peer">A una altra cartera</string> + <string name="send_peer_bitcoin">A una altra cartera de Taler</string> + <string name="send_peer_title">Envia diners a una altra cartera</string> + <string name="send_peer_create_button">Envia diners ara</string> + <string name="send_peer_warning">Avís: Els diners sortiran de la cartera immediatament.</string> + <string name="send_peer_payment_instruction">Fes que el beneficiari escanegi aquest codi QR per rebre:</string> + <string name="send_peer_payment_amount_received">Quantitat rebuda</string> + <string name="send_peer_payment_amount_sent">Quantitat enviada</string> + <string name="send_peer_expiration_period">Expira en</string> + <string name="send_peer_expiration_1d">1 dia</string> + <string name="send_peer_expiration_7d">7 dies</string> + <string name="send_peer_expiration_30d">30 dies</string> + <string name="send_peer_expiration_custom">Personalitzat</string> + <string name="send_peer_expiration_days">Dies</string> + <string name="send_peer_expiration_hours">Hores</string> + <string name="send_peer_purpose">Propòsit</string> + <string name="pay_peer_title">Factura de pagament</string> + <string name="pay_peer_intro">Vols pagar aquesta factura\?</string> + <string name="receive_peer_payment_title">Rebre un pagament</string> + <string name="receive_peer_payment_intro">Vols rebre aquest pagament\?</string> + <string name="withdraw_initiated">Retirada iniciada</string> + <string name="withdraw_title">Retirada</string> + <string name="withdraw_total">Retirar</string> + <string name="withdraw_fees">Comissió</string> + <string name="withdraw_restrict_age">Restringeix l\'ús a l\'edat de</string> + <string name="withdraw_restrict_age_unrestricted">No restringit</string> + <string name="withdraw_exchange">Intercanvi</string> + <string name="withdraw_button_confirm">Confirmar retirada de diners</string> + <string name="withdraw_button_confirm_bank">Confirma amb el banc</string> + <string name="withdraw_button_tos">Comprova els termes</string> + <string name="withdraw_waiting_confirm">Esperant confirmació</string> + <string name="withdraw_manual_title">Fes una transferència manual a l\'intercanvi</string> + <string name="withdraw_amount">Quant vols retirar\?</string> + <string name="withdraw_amount_error">Insereix una quantitat vàlida</string> + <string name="withdraw_manual_payment_options">Les opcions de pagament estan suportades per %1$s: +\n +\n%2$s</string> + <string name="withdraw_manual_check_fees">Comprova la comissió</string> + <string name="withdraw_manual_ready_title">L\'intercanvi està llest perquè retiris els diners!</string> + <string name="withdraw_manual_ready_intro">Per completar el procés necessites transferir %s al teu compte bancari</string> + <string name="withdraw_manual_ready_details_intro">Detalls de transferència bancària</string> + <string name="withdraw_manual_bitcoin_title">L\'intercanvi de Bitcoin està llest perquè retiris els dieners</string> + <string name="withdraw_manual_bitcoin_intro">Ara fes una transacció dividida amb aquestes tres sortides.</string> + <string name="withdraw_manual_ready_iban">IBAN</string> + <string name="withdraw_manual_ready_subject">Concepte</string> + <string name="withdraw_manual_ready_bank_button">Obre en una app bancària</string> + <string name="withdraw_manual_ready_cancel">Cancel·la la retidada de diners</string> + <string name="withdraw_manual_ready_warning">Assegura\'t d\'emprar el concepte correcte, del contrari els diners no arribaran a la cartera.</string> + <string name="withdraw_error_title">Error retirant els diners</string> + <string name="withdraw_error_message">Retirar diners no és possible ara mateix. Si us plau, intenta-ho més tard!</string> + <string name="withdraw_error_test">Error retirant TESTKUDOS</string> + <string name="exchange_settings_title">Canvis</string> + <string name="exchange_settings_summary">Gestionar la llista de canvis coneguts per a aquesta cartera</string> + <string name="exchange_list_title">Canvis</string> + <string name="exchange_list_empty">No es coneixen canvis +\n +\nAfegeix-ne un manualment o retira diners digitals!</string> + <string name="exchange_list_currency">Divisa: %s</string> + <string name="exchange_list_add">Afegeix un canvi</string> + <string name="exchange_add_url">Afegeix adreça de canvi</string> + <string name="exchange_add_error">No s\'ha pogut afegir el canvi</string> + <string name="exchange_menu_manual_withdraw">Retirar</string> + <string name="exchange_fee_withdrawal_fee_label">Comissió de retirament:</string> + <string name="exchange_fee_overhead_label"/> + <string name="exchange_fee_coin_expiration_label"/> + <string name="exchange_fee_coin_fees_label"/> + <string name="exchange_fee_wire_fees_label"/> + <plurals name="exchange_fee_coin"> + <item quantity="one"/> + <item quantity="other"/> + </plurals> + <string name="exchange_fee_withdraw_fee"/> + <string name="exchange_fee_deposit_fee"/> + <string name="exchange_fee_refresh_fee"/> + <string name="exchange_fee_refund_fee"/> + <string name="exchange_fee_wire_fee_timespan"/> + <string name="exchange_fee_wire_fee_wire_fee"/> + <string name="exchange_fee_wire_fee_closing_fee"/> + <string name="exchange_tos_accept"/> + <string name="exchange_tos_error"/> + <string name="pending_operations_title"/> + <string name="pending_operations_refuse"/> + <string name="pending_operations_no_action"/> + <string name="settings_dev_mode"/> + <string name="settings_dev_mode_summary"/> + <string name="settings_withdraw_testkudos"/> + <string name="settings_withdraw_testkudos_summary"/> + <string name="settings_logcat"/> + <string name="settings_logcat_summary"/> + <string name="settings_logcat_error"/> + <string name="settings_logcat_success"/> + <string name="settings_db_export"/> + <string name="settings_db_export_summary"/> + <string name="settings_db_export_error"/> + <string name="settings_db_export_success"/> + <string name="settings_version_app"/> + <string name="settings_version_core"/> + <string name="settings_version_protocol_exchange"/> + <string name="settings_version_protocol_merchant"/> + <string name="settings_version_unknown"/> + <string name="settings_reset"/> + <string name="settings_reset_summary"/> + <string name="nav_settings_backup"/> + <string name="backup_last"/> + <string name="refund_title"/> + <string name="refund_error"/> + <string name="refund_success"/> + <string name="tip_title"/> + <string name="tip_already_accepted"/> + <string name="tip_total"/> + <string name="tip_fees"/> + <string name="tip_exchange"/> + <string name="tip_merchant_url"/> + <string name="tip_button_confirm"/> + <string name="tip_received"/> + <string name="wifi_disabled_error"/> + <string name="wifi_connect_error"/> + <string name="transaction_dummy_title">Transacció desconeguda</string> + <string name="send_deposit_iban_error">L\'IBAN és invàlid</string> + <string name="send_deposit_bic_error">El BIC és invàlid</string> + <string name="button_scan_qr_code_label">Escaneja el codi QR</string> + <string name="payment_prompt_title">Revisar pagament</string> + <string name="payment_pay_template_title">Personalitza la teva comanda</string> + <string name="payment_create_order">Crea una comanda</string> + <string name="payment_confirmation_code">Codi de confirmació</string> + <string name="payment_template_error">Error creant la comanda</string> + <string name="transactions_retry">Reintentar</string> + <string name="transactions_abort">Avortar</string> + <string name="transactions_fail">Matar</string> + <string name="transactions_suspend">Suspendre</string> + <string name="transactions_fail_dialog_title">Matar transacció</string> + <string name="transactions_fail_dialog_message">Estàs segur que vols matar aquesta transacció\? Els diners en transit ES PERDRAN.</string> + <string name="transactions_resume">Continuar</string> + <string name="transactions_abort_dialog_title">Avortar transacció</string> + <string name="transactions_abort_dialog_message">Estàs segur que vols avortar aquesta transacció\? Els diners en trànsit es podrien perdre.</string> + <string name="offline_banner">Ni hi ha accés a internet</string> + <string name="exchange_list_error">No s\'han pogut llistar serveis de canvi</string> +</resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-de/strings.xml b/wallet/src/main/res/values-de/strings.xml index 8460f65..f4e3fed 100644 --- a/wallet/src/main/res/values-de/strings.xml +++ b/wallet/src/main/res/values-de/strings.xml @@ -2,16 +2,16 @@ <resources xmlns:tools="http://schemas.android.com/tools"> <string name="amount_chosen">Gewählter Betrag</string> <string name="settings_version_app">App-Version</string> - <string name="host_apdu_service_desc">Taler NFC-Zahlungen</string> - <string name="exchange_settings_title">Taler-Exchanges</string> + <string name="host_apdu_service_desc">Taler-NFC-Zahlungen</string> + <string name="exchange_settings_title">Zahlungsdienstleister</string> <string name="balances_inbound_label">Eingehend</string> <string name="or">oder</string> - <string name="offline">Internetzugang erforderlich. Bitte stellen Sie sicher, daß Ihre Internetverbindung funktioniert und versuchen Sie es noch einmal.</string> + <string name="offline">Internetzugang erforderlich. Bitte stellen Sie sicher, dass Ihre Internetverbindung funktioniert, und versuchen Sie es noch einmal.</string> <string name="error_unsupported_uri">Fehler: Dieser Taler-URI wird nicht unterstützt.</string> <string name="menu_settings">Einstellungen</string> - <string name="menu_retry_pending_operations">Wiederholen Sie ausstehende Vorgänge</string> + <string name="menu_retry_pending_operations">Ausstehende Vorgänge wiederholen</string> <string name="balances_title">Salden</string> - <string name="app_name">Taler-Wallet</string> + <string name="app_name">Taler Wallet</string> <string name="transactions_title">Transaktionen</string> <string name="transactions_empty">Sie haben keine Transaktionen</string> <string name="transactions_empty_search">Keine Transaktion gefunden. Versuchen Sie eine andere Suche.</string> @@ -42,12 +42,12 @@ <string name="withdraw_title">Abhebung</string> <string name="withdraw_total">Abheben</string> <string name="withdraw_fees">Gebühr</string> - <string name="withdraw_exchange">Taler-Exchange</string> + <string name="withdraw_exchange">Zahlungsdienstleister</string> <string name="withdraw_button_confirm">Abhebung bestätigen</string> <string name="withdraw_button_confirm_bank">Bestätigen mit</string> <string name="withdraw_button_tos">Nutzungsbedingungen überprüfen</string> <string name="withdraw_waiting_confirm">Warte auf Bestätigung</string> - <string name="withdraw_manual_title">Führen Sie eine manuelle Einzahlung an die Geldbörse durch</string> + <string name="withdraw_manual_title">Manuelle Überweisung an den Zahlungsdienstleister</string> <string name="withdraw_amount">Wie viel soll abgehoben werden\?</string> <string name="withdraw_amount_error">Gültigen Betrag eingeben</string> <string name="withdraw_manual_payment_options">Zahlungsoptionen unterstützt von %1$s: @@ -57,33 +57,33 @@ <string name="withdraw_error_title">Auszahlungsfehler</string> <string name="withdraw_error_message">Ein Abheben ist derzeit nicht möglich. Bitte zu einem späteren Zeitpunkt erneut versuchen!</string> <string name="withdraw_error_test">Fehler beim Abheben von TESTKUDOS aufgetreten</string> - <string name="exchange_settings_summary">Verwalten Sie die Liste der Exchanges, die dieser Geldbörse bekannt sind</string> + <string name="exchange_settings_summary">Verwaltung der Zahlungsdienstleister, die diesem Wallet bekannt sind</string> <string name="payment_fee">+%s Zahlungsgebühr</string> - <string name="exchange_list_title">Liste von Exchanges</string> - <string name="exchange_list_empty">Keine Exchanges bekannt + <string name="exchange_list_title">Liste von Zahlungsdienstleistern</string> + <string name="exchange_list_empty">Keine Zahlungsdienstleister bekannt \n -\nFügen Sie einen Exchange manuell hinzu oder heben Sie digitales Geld ab!</string> +\nFügen Sie einen Zahlungsdienstleister manuell hinzu oder heben Sie digitales Bargeld ab!</string> <string name="exchange_list_currency">Währung: %s</string> - <string name="exchange_list_add">Ein Exchange hinzufügen</string> - <string name="exchange_add_error">Exchange konnte nicht hinzugefügt werden</string> + <string name="exchange_list_add">Zahlungsdienstleister hinzufügen</string> + <string name="exchange_add_error">Zahlungsdienstleister konnte nicht hinzugefügt werden</string> <string name="exchange_menu_manual_withdraw">Abheben</string> - <string name="exchange_fee_withdrawal_fee_label">Abhebungsgebühr:</string> + <string name="exchange_fee_withdrawal_fee_label">Abhebegebühr:</string> <string name="exchange_fee_overhead_label">Rundungsverlust:</string> - <string name="exchange_fee_coin_expiration_label">Frühester Münzablauf:</string> - <string name="exchange_fee_coin_fees_label">Münzgebühren</string> - <string name="exchange_fee_wire_fees_label">Übermittlungsgebühren</string> + <string name="exchange_fee_coin_expiration_label">Frühestes Gültigkeitsende:</string> + <string name="exchange_fee_coin_fees_label">Münzgebühr</string> + <string name="exchange_fee_wire_fees_label">Überweisungsgebühr</string> <plurals name="exchange_fee_coin"> <item quantity="one">Münze: %s (verwendet %d Mal)</item> <item quantity="other">Münze: %s (verwendet %d Male)</item> </plurals> - <string name="exchange_fee_withdraw_fee">Abhebungsgebühr: %s</string> - <string name="exchange_fee_deposit_fee">Einzahlungsgebühr: %s</string> - <string name="exchange_fee_refresh_fee">Änderungsgebühr: %s</string> + <string name="exchange_fee_withdraw_fee">Abhebegebühr: %s</string> + <string name="exchange_fee_deposit_fee">Einlösegebühr: %s</string> + <string name="exchange_fee_refresh_fee">Wechselgebühr: %s</string> <string name="exchange_fee_refund_fee">Rückerstattungsgebühr: %s</string> - <string name="exchange_fee_wire_fee_timespan">Zeitspanne: %1$s - %2$s</string> - <string name="exchange_fee_wire_fee_wire_fee">Übermittlungsgebühren: %s</string> - <string name="exchange_fee_wire_fee_closing_fee">Abschlussgebühr: %s</string> - <string name="exchange_tos_accept">Nutzungsbedingungen akzeptieren</string> + <string name="exchange_fee_wire_fee_timespan">Zeitraum: %1$s - %2$s</string> + <string name="exchange_fee_wire_fee_wire_fee">Überweisungsgebühr: %s</string> + <string name="exchange_fee_wire_fee_closing_fee">Rücküberweisungsgebühr: %s</string> + <string name="exchange_tos_accept">Allgemeine Geschäftsbedingungen akzeptieren</string> <string name="pending_operations_title">Schwebende Vorgänge</string> <string name="pending_operations_refuse">Vorschlag ablehnen</string> <string name="pending_operations_no_action">(keine Aktion)</string> @@ -92,7 +92,7 @@ <string name="settings_withdraw_testkudos">TESTKUDOS abheben</string> <string name="settings_withdraw_testkudos_summary">Geld für Testen bereitstellen</string> <string name="settings_logcat">Fehlerprotokoll</string> - <string name="settings_logcat_summary">Internes Protokoll anzeigen / senden</string> + <string name="settings_logcat_summary">Internes Protokoll speichern</string> <string name="settings_version_core">Wallet Core-Version</string> <string name="settings_version_protocol_merchant">Unterstützte Händler-Versionen</string> <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler ermöglicht schnelle und einfache Online-Transaktionen mit Datenschutz.</string> @@ -104,23 +104,23 @@ <string name="backup_last">Letzte Sicherung: %s</string> <string name="refund_title">Erstattung</string> <string name="refund_error">Fehler bei der Verarbeitung der Rückerstattung</string> - <string name="refund_success">Rückerstattung erhalten: %s</string> + <string name="refund_success">Rückerstattung erhalten!</string> <string name="tip_title">Trinkgeld</string> <string name="wifi_disabled_error">Schalten Sie Wi-Fi ein, um kostenloses Wi-Fi zu erhalten</string> <string name="wifi_connect_error">Es konnte keine Verbindung zu kostenlosem WLAN hergestellt werden: %s</string> - <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Diese App ist eine Geldbörse für GNU Taler (Wallet). Die Anwendung läuft zurzeit in experimentellem Stadium und dient nur zu Demonstrationszwecken. Taler bieten allen Zahlenden ein Bezahlsystem mit Datenschutz. Die Käufer bleiben anonym. Händler müssen dagegen ihr Einkommen vor Auditoren offenlegen. Dadurch werden Steuerhinterziehung und Geldwäsche vermieden. Die Hauptfunktion von GNU Taler ist die Abwicklung von Zahlungsvorgängen; es ist kein Mittel zur Geldaufbewahrung. Alle Zahlungen werden durch eine existierende Währung gedeckt. Zahlungen werden mit Hilfe eines Taler-Exchange durchgeführt, indem die Käufer Geld an den Exchange überweisen und dieser elektronische Zahlungsmittel (Coins) in die Wallets der Käufer überträgt. Um eine Zahlung durchzuführen benötigen Kunden nur ausreichende Coin-Werte im Wallet. Verkäufer können Zahlungen akzeptieren ohne Kunden zur Registrierung auf Webseiten zu zwingen. GNU Taler ist immun gegen viele Formen von Betrug wie z.B. Phishing von Kreditkartendaten oder Betrug durch Rückbuchungen. Im Fall von Verlust oder Diebstahl von Wallets verliert man höchstens den Geldbetrag, welcher sich noch im Wallet befindet.</string> + <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Diese App ist eine Geldbörse für GNU Taler (Wallet). Taler ist ein Bezahlsystem mit Datenschutz für die Käufer. Die Käufer bleiben anonym, das Einkommen der Händler hingegen ist offengelegt. Dies vermindert systematisch die Möglichkeit von Steuerhinterziehung und Geldwäsche. Die Hauptfunktion von GNU Taler ist die Abwicklung von Zahlungsvorgängen; es ist kein Mittel zur Geldaufbewahrung. Alle Zahlungen werden durch eine existierende Währung gedeckt. Zahlungen werden mit Hilfe eines Taler-Zahlungsdiensts (Exchange) durchgeführt, indem die Käufer Geld an den Zahlungsdienst überweisen und dieser elektronische Zahlungsmittel (Coins, Token) in die Wallets überträgt. Um eine Zahlung durchzuführen, benötigen Kunden ausreichende Coin-Werte im Wallet. Verkäufer können Zahlungen akzeptieren, ohne Kunden zur Registrierung auf Webseiten zwingen zu müssen. GNU Taler ist immun gegen viele Formen von Betrug wie z.B. Phishing von Kreditkartendaten oder Betrug durch Rückbuchungen. Im Fall von Verlust oder Diebstahl von Wallets verliert man höchstens die Werte, welche sich noch im Wallet befinden.</string> <string name="nav_header_title">GNU Taler</string> <string name="nav_header_subtitle">Wallet</string> <string name="nav_prompt_withdraw">Digitales Bargeld abheben</string> - <string name="nav_exchange_tos">Nutzungsbedingungen des Exchange</string> - <string name="nav_exchange_select">Exchange auswählen</string> - <string name="nav_exchange_fees">Exchange Gebühren</string> + <string name="nav_exchange_tos">Allgemeine Geschäftsbedingungen des Zahlungsdienstleisters</string> + <string name="nav_exchange_select">Zahlungsdienstleister auswählen</string> + <string name="nav_exchange_fees">Gebühren des Zahlungsdienstleisters</string> <string name="enter_uri">Geben Sie die Taler-URI ein</string> <string name="paste">Einfügen</string> <string name="paste_invalid">Die Zwischenablage enthält einen ungültigen Datentyp</string> <string name="uri_invalid">Keine gültige Taler-URI</string> - <string name="ok">OK</string> - <string name="cancel">Abbrechen</string> + <string name="ok">Bestätigen</string> + <string name="cancel">Zurück</string> <string name="search">Suche</string> <string name="menu">Menü</string> <string name="nav_error">Fehler</string> @@ -132,20 +132,135 @@ <string name="transactions_error">Transaktionen konnten nicht geladen werden \n \n%s</string> - <string name="exchange_tos_error">Fehler beim Anzeigen der Nutzungsbedingungen: %s</string> + <string name="exchange_tos_error">Fehler beim Anzeigen der AGB: %s</string> <string name="settings_version_protocol_exchange">Unterstützte Exchange-Versionen</string> <string name="amount_negative">- %s</string> - <string name="amount_positive">+ %s</string> + <string name="amount_positive">+%s</string> <string name="transaction_tip_from">Trinkgeld von %s</string> - <string name="exchange_add_url">Adresse des Exchange eingeben</string> + <string name="exchange_add_url">Adresse des Zahlungsdienstleisters eingeben</string> <string name="button_back">Zurück</string> - <string name="button_scan_qr_code">Taler QR Code Einscannen</string> + <string name="button_scan_qr_code">Taler-QR-Code einscannen</string> <string name="withdraw_manual_ready_iban">IBAN</string> - <string name="withdraw_manual_ready_title">Der Exchange ist für den Abhebevorgang eingerichtet!</string> - <string name="withdraw_manual_ready_intro">Um den Abhebevorgang durchführen zu lassen, müssen Sie %s auf das Bankkonto des Exchange überweisen</string> + <string name="withdraw_manual_ready_title">Der Zahlungsdienstleister ist für den Abhebevorgang bereit!</string> + <string name="withdraw_manual_ready_intro">Zum Abschluss des Abhebevorgangs müssen Sie %s auf das Bankkonto des Zahlungsdienstleisters überweisen</string> <string name="withdraw_manual_ready_details_intro">Details der Überweisung</string> <string name="withdraw_manual_ready_subject">Überweisungsvermerk</string> <string name="withdraw_manual_ready_bank_button">In Banking-App öffnen</string> <string name="withdraw_manual_ready_cancel">Abhebevorgang abbrechen</string> <string name="withdraw_manual_ready_warning">Bitte vergewissern Sie sich, dass Sie den Überweisungsvermerk richtig angeben, da sonst der überwiesene Betrag nicht im Wallet ankommt.</string> + <string name="reset">Zurücksetzen</string> + <string name="payment_prompt_title">Zahlung überprüfen</string> + <string name="send_deposit_iban_error">IBAN ist ungültig</string> + <string name="send_peer_create_button">Jetzt Geld senden</string> + <string name="send_peer_title">Geld an ein anderes Wallet senden</string> + <string name="send_deposit_bitcoin_address">Bitcoin-Adresse</string> + <string name="transaction_action_kyc">KYC abschließen</string> + <string name="withdraw_restrict_age">Nutzung auf Alter beschränken</string> + <string name="send_deposit_bitcoin_create_button">Bitcoin übertragen</string> + <string name="settings_db_export">Datenbank exportieren</string> + <string name="transactions_delete_dialog_message">Sind Sie sicher, dass Sie diese Transaktion aus Ihrem Wallet entfernen möchten?</string> + <string name="transactions_delete_dialog_title">Transaktion löschen</string> + <string name="receive_peer_payment_intro">Möchten Sie diese Zahlung erhalten?</string> + <string name="transactions_abort">Abbruch ausführen</string> + <string name="payment_pay_template_title">Passen Sie Ihre Bestellung an</string> + <string name="send_intro">Wählen Sie aus, wohin Sie Geld senden möchten:</string> + <string name="send_deposit_title">Einzahlung auf ein Bankkonto</string> + <string name="withdraw_bank">Bank</string> + <string name="withdraw_manual_ready_account">Konto</string> + <string name="withdraw_manual_ready_receiver">Name des Empfängers</string> + <string name="withdraw_transfer">Überweisung</string> + <string name="exchange_delete_force">Löschung erzwingen (bereinigen)</string> + <string name="settings_db_export_summary">Interne Datenbank speichern</string> + <string name="settings_db_clear_error">Fehler beim Bereinigen der Datenbank</string> + <string name="settings_alert_reset_canceled">Zurücksetzen abgebrochen</string> + <string name="exchange_not_contacted">Zahlungsdienstleister nicht kontaktiert</string> + <string name="send_peer_expiration_1d">1Tag</string> + <string name="settings_test">Integrationstest durchführen</string> + <string name="settings_test_summary">Führt Test-Transaktionen mit Demo-Setup durch</string> + <string name="copy" tools:override="true">Kopieren</string> + <string name="copy_uri">Taler-URI kopieren</string> + <string name="transaction_peer_pull_debit">Rechnung bezahlt</string> + <string name="transaction_peer_pull_credit">Rechnung</string> + <string name="transactions_receive_funds">Geld +\nempfangen</string> + <string name="send_amount">Zu sendender Betrag</string> + <string name="pay_peer_title">Rechnung bezahlen</string> + <string name="pay_peer_intro">Möchten Sie diese Rechnung bezahlen?</string> + <string name="receive_peer_payment_title">Zahlung erhalten</string> + <string name="send_peer_expiration_hours">Stunden</string> + <string name="share_payment">Zahlungs-Link teilen</string> + <string name="offline_banner">Kein Internetzugang</string> + <string name="transactions_fail_dialog_title">Transaktion sofort abbrechen</string> + <string name="transaction_dummy_title">Unbekannte Transaktion</string> + <string name="receive_peer_title">Zahlung anfordern</string> + <string name="send_deposit">Auf ein Bankkonto</string> + <string name="send_peer_bitcoin">An ein anderes Taler-Wallet</string> + <string name="send_peer_expiration_custom">Benutzerdefiniert</string> + <string name="exchange_delete">Zahlungsdienstleister löschen</string> + <string name="settings_db_export_success">Datenbank in Datei exportiert</string> + <string name="receive_peer_create_button">Rechnung erstellen</string> + <string name="receive_peer_invoice_uri">Alternativ kopieren und senden Sie diesen URI:</string> + <string name="receive_peer_invoice_instruction">Lassen Sie die Käufer diesen QR-Code scannen, um den Betrag zu bezahlen:</string> + <string name="button_scan_qr_code_label">QR-Code scannen</string> + <string name="send_deposit_check_fees_button">Gebühren prüfen</string> + <string name="send_deposit_name">Kontoinhaber/in</string> + <string name="transactions_send_funds">Geld +\nsenden</string> + <string name="currency">Währung</string> + <string name="transactions_balance">Guthaben</string> + <string name="withdraw_restrict_age_unrestricted">Uneingeschränkt</string> + <string name="settings_logcat_success">Protokoll wurde in Datei exportiert</string> + <string name="settings_logcat_error">Fehler beim Exportieren des Protokolls</string> + <string name="transactions_delete_selected_dialog_message">Sind Sie sicher, dass Sie die ausgewählten Transaktionen aus Ihrem Wallet entfernen möchten?</string> + <string name="transactions_resume">Fortsetzen</string> + <string name="transactions_abort_dialog_title">Transaktion abbrechen</string> + <string name="transactions_cancel_dialog_message">Sind Sie sicher, dass Sie diese Abhebung stornieren möchten? Gelder, die gerade noch übertragen werden, könnten verloren gehen.</string> + <string name="send_deposit_bic">BIC / SWIFT</string> + <string name="send_peer">An ein anderes Wallet</string> + <string name="payment_confirmation_code">Bestätigungscode</string> + <string name="send_deposit_iban">IBAN</string> + <string name="send_deposit_bic_error">BIC ist ungültig</string> + <string name="withdraw_subtitle">Ziel-Bankkonto auswählen</string> + <string name="settings_db_import">Datenbank importieren</string> + <string name="settings_db_import_summary">Datenbank aus Datei wiederherstellen</string> + <string name="settings_db_export_error">Fehler beim Exportieren der Datenbank</string> + <string name="settings_db_import_error">Fehler beim Importieren der Datenbank</string> + <string name="settings_dialog_import_message">Dieser Vorgang überschreibt Ihre vorhandene Datenbank. Möchten Sie fortfahren?</string> + <string name="settings_dialog_reset_message">Möchten Sie das Wallet wirklich zurücksetzen und alle Münzen und Einkäufe verlieren?</string> + <string name="settings_alert_reset_done">Wallet wurde zurückgesetzt</string> + <string name="send_deposit_bitcoin">An ein Bitcoin-Wallet</string> + <string name="send_peer_purpose">Zweck</string> + <string name="exchange_list_select">Zahlungsdienstleister auswählen</string> + <string name="exchange_dialog_delete_message">Sind Sie sicher, dass Sie diesen Zahlungsdienstleister löschen möchten? Wenn Sie diesen Vorgang erzwingen, führt dies zu einem Geldverlust.</string> + <string name="settings_db_import_success">Datenbank aus Datei importiert</string> + <string name="error_broken_uri">Fehler: Diese Taler-URI funktioniert (im Moment) nicht.</string> + <string name="settings_alert_import_canceled">Import abgebrochen</string> + <string name="import_db">Importieren</string> + <string name="transactions_detail_title_currency">%s Transaktionen</string> + <string name="receive_withdraw">Vom Bankkonto abheben</string> + <string name="send_deposit_amount_effective">Effektiver Betrag</string> + <string name="send_deposit_create_button">Einzahlung tätigen</string> + <string name="receive_amount">Zu erhaltender Betrag</string> + <string name="receive_amount_invalid">Betrag ungültig</string> + <string name="receive_intro">Wählen Sie aus, woher Sie Geld erhalten möchten:</string> + <string name="amount_sent">Gesendeter Betrag</string> + <string name="amount_received">Empfangener Betrag</string> + <string name="payment_pending">Zahlung nicht abgeschlossen - sie wird erneut versucht</string> + <string name="receive_peer_amount_invoiced">Rechnungsbetrag</string> + <string name="send_peer_payment_instruction">Lassen Sie den Geldempfänger diesen QR-Code scannen, um den Wert zu erhalten:</string> + <string name="transaction_deposit">Einlösen</string> + <string name="exchange_list_error">Es konnten keine Zahlungsdienstleister angezeigt werden</string> + <string name="withdraw_conversion_support">Dieser Zahlungsdienstleister unterstützt Währungsumtausch</string> + <string name="exchange_list_add_dev">Zahlungsdienstleister im Entwicklermodus hinzufügen</string> + <string name="send_peer_expiration_30d">30 Tage</string> + <string name="send_peer_expiration_7d">7 Tage</string> + <string name="balance_scope_exchange">Zahlungsdienstleister: %1$s</string> + <string name="balance_scope_auditor">Auditor: %1$s</string> + <string name="receive_peer">Rechnung an anderes Wallet stellen</string> + <string name="char_count">%1$d/%2$d</string> + <string name="withdraw_manual_bitcoin_title">Bitcoin-Exchange zur Auszahlung bereit</string> + <string name="transactions_retry">Wiederholen</string> + <string name="send_peer_expiration_period">Läuft ab in</string> + <string name="transactions_suspend">Aussetzen</string> + <string name="transactions_abort_dialog_message">Sind Sie sicher, dass Sie diese Transaktion abbrechen möchten? Gelder, die gerade noch übertragen werden, könnten verloren gehen.</string> </resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-es/strings.xml b/wallet/src/main/res/values-es/strings.xml index 5f68132..bcc216d 100644 --- a/wallet/src/main/res/values-es/strings.xml +++ b/wallet/src/main/res/values-es/strings.xml @@ -1,143 +1,273 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:tools="http://schemas.android.com/tools"> <string name="google_play_title" tools:keep="@string/google_play_title">Cartera Taler (experimental)</string> - <string name="nav_prompt_withdraw">Retirar Efectivo Digital</string> - <string name="nav_exchange_tos">Términos de servicio del Exchange</string> - <string name="nav_exchange_select">Seleccionar Exchange</string> - <string name="button_back">Volver atrás</string> - <string name="enter_uri">Insertar URI Taler</string> + <string name="nav_prompt_withdraw">Retirar efectivo digital</string> + <string name="nav_exchange_tos">Términos de servicio del cambiario</string> + <string name="nav_exchange_select">Seleccionar cambiario</string> + <string name="button_back">Regresar</string> + <string name="enter_uri">Ingresa la URI de Taler</string> <string name="paste">Pegar</string> - <string name="paste_invalid">El portapapeles contiene un tipo de datos inválido</string> + <string name="paste_invalid">El portapapeles contiene un tipo de dato inválido</string> <string name="ok">OK</string> <string name="cancel">Cancelar</string> <string name="search">Buscar</string> <string name="menu">Menú</string> <string name="or">o</string> - <string name="error_unsupported_uri">Error: Esta URI de Taler no está soportada.</string> + <string name="error_unsupported_uri">Error: esta URI de Taler no está soportada.</string> <string name="menu_settings">Ajustes</string> - <string name="balances_title">Saldo</string> - <string name="amount_positive">+ %s</string> - <string name="amount_chosen">Elegir Cantidad</string> + <string name="balances_title">Saldos</string> + <string name="amount_positive">+%s</string> + <string name="amount_chosen">Monto elegido</string> <string name="balances_inbound_label">entrada</string> <string name="transactions_empty">No tienes ninguna transacción</string> <string name="transactions_detail_title">Transacción</string> - <string name="transactions_delete">Borrar</string> - <string name="transactions_select_all">Seleccionar Todo</string> + <string name="transactions_delete">Eliminar</string> + <string name="transactions_select_all">Seleccionar todo</string> <string name="transaction_paid">Pagado</string> <string name="transaction_order_total">Total</string> <string name="transaction_order_id">Recibo #%1$s</string> - <string name="transaction_tip_from">Propina de %s</string> + <string name="transaction_tip_from">Premio de %s</string> <string name="transaction_refund">Devolución</string> <string name="transaction_refund_from">Devolución de %s</string> <string name="transaction_pending">PENDIENTE</string> <string name="transaction_refresh">Comisión de cambio por expiración de moneda</string> <string name="payment_title">Pago</string> - <string name="payment_button_confirm">Confirmar Pago</string> - <string name="payment_label_amount_total">Cantidad Total:</string> + <string name="payment_button_confirm">Confirmar pago</string> + <string name="payment_label_amount_total">Monto total:</string> <string name="payment_label_order_summary">Compra</string> <string name="payment_error">Error: %s</string> - <string name="payment_balance_insufficient">Balance insuficiente!</string> + <string name="payment_balance_insufficient">¡Saldo insuficiente!</string> <string name="payment_aborted">Abortado</string> <string name="payment_failed">Fallido</string> - <string name="payment_already_paid_title">Ya pagado</string> + <string name="payment_already_paid_title">Ya fue pagado</string> <string name="payment_already_paid">Ya has pagado por esta compra.</string> - <string name="withdraw_initiated">Retirada iniciada</string> - <string name="withdraw_title">Retirada</string> + <string name="withdraw_initiated">Retiro iniciado</string> + <string name="withdraw_title">Retiro</string> <string name="withdraw_total">Retirar</string> <string name="withdraw_fees">Comisión</string> - <string name="withdraw_exchange">Exchange</string> - <string name="withdraw_button_confirm">Confirmar Retirada</string> - <string name="withdraw_button_tos">Revisar Términos</string> + <string name="withdraw_exchange">Cambiario</string> + <string name="withdraw_button_confirm">Confirmar retiro</string> + <string name="withdraw_button_tos">Revisar términos</string> <string name="withdraw_waiting_confirm">Esperando confirmación</string> - <string name="withdraw_manual_title">Realizar transferencia manual al exchange</string> - <string name="withdraw_amount">¿Cuanto quieres retirar\?</string> + <string name="withdraw_manual_title">Realizar transferencia manual al cambiario</string> + <string name="withdraw_amount">¿Cuánto deseas retirar\?</string> <string name="withdraw_manual_check_fees">Comisiones por cheque</string> - <string name="withdraw_error_title">Error en la retirada</string> + <string name="withdraw_error_title">Error en el retiro</string> <string name="withdraw_error_test">Error retirando TESTKUDOS</string> - <string name="exchange_settings_title">Intercambios</string> - <string name="exchange_settings_summary">Gestionar la lista de exchanges conocidos en esta cartera</string> - <string name="exchange_list_title">Intercambios</string> - <string name="exchange_list_empty">Sin exchanges conocidos + <string name="exchange_settings_title">Cambiarios</string> + <string name="exchange_settings_summary">Gestionar la lista de cambiarios conocidos en esta cartera</string> + <string name="exchange_list_title">Cambiarios</string> + <string name="exchange_list_empty">Sin cambiarios conocidos \n -\nAñade uno manualmente para retirar efectivo digital!</string> - <string name="exchange_list_currency">Divisa:%s</string> - <string name="exchange_list_add">Añadir exchange</string> - <string name="exchange_add_url">Inserta la dirección del exchange</string> - <string name="exchange_add_error">No se pudo añadir el exchange</string> - <string name="exchange_fee_withdrawal_fee_label">Comisión Retirada:</string> - <string name="exchange_fee_overhead_label">Pérdida Redondeo:</string> +\nAñade uno manualmente or retira efectivo digital.</string> + <string name="exchange_list_currency">Divisa: %s</string> + <string name="exchange_list_add">Añadir cambiario</string> + <string name="exchange_add_url">Ingresa dirección del cambiario</string> + <string name="exchange_add_error">No se pudo añadir el cambiario</string> + <string name="exchange_fee_withdrawal_fee_label">Comisión por retiro:</string> + <string name="exchange_fee_overhead_label">Pérdida por redondeo:</string> <string name="exchange_fee_coin_expiration_label">Expiración de moneda más temprana:</string> - <string name="exchange_fee_coin_fees_label">Comisiones Moneda</string> - <string name="exchange_fee_wire_fees_label">Comisiones Transferencia</string> - <string name="exchange_fee_withdraw_fee">Comisión Retirada:%s</string> - <string name="exchange_fee_deposit_fee">Comisión Depósito:%s</string> - <string name="exchange_fee_refresh_fee">Comisión Cambio:%s</string> - <string name="exchange_fee_refund_fee">Comisión devolución: %s</string> - <string name="exchange_fee_wire_fee_wire_fee">Comisión Transferencia: %s</string> - <string name="exchange_fee_wire_fee_closing_fee">Comisión Cierre: %s</string> - <string name="exchange_tos_accept">Aceptar Términos de Servicio</string> - <string name="exchange_tos_error">Error mostrando los Términos de Servicio: %s</string> - <string name="pending_operations_title">Operaciones Pendientes</string> - <string name="pending_operations_refuse">Rechazar Propuesta</string> + <string name="exchange_fee_coin_fees_label">Comisiones de moneda</string> + <string name="exchange_fee_wire_fees_label">Comisiones de transferencia</string> + <string name="exchange_fee_withdraw_fee">Comisión por retiro: %s</string> + <string name="exchange_fee_deposit_fee">Comisión por depósito: %s</string> + <string name="exchange_fee_refresh_fee">Comisión por cambio: %s</string> + <string name="exchange_fee_refund_fee">Comisión por devolución: %s</string> + <string name="exchange_fee_wire_fee_wire_fee">Comisión por transferencia: %s</string> + <string name="exchange_fee_wire_fee_closing_fee">Comisión por cierre: %s</string> + <string name="exchange_tos_accept">Aceptar términos de servicio</string> + <string name="exchange_tos_error">Error mostrando los términos de servicio: %s</string> + <string name="pending_operations_title">Operaciones pendientes</string> + <string name="pending_operations_refuse">Rechazar propuesta</string> <string name="pending_operations_no_action">(sin acción)</string> - <string name="settings_dev_mode">Modo Desarrollador</string> + <string name="settings_dev_mode">Modo desarrollador</string> <string name="settings_withdraw_testkudos">Retirar TESTKUDOS</string> - <string name="settings_withdraw_testkudos_summary">Obtener dinero para realizar pruebas</string> - <string name="settings_logcat">Log de Depuración</string> - <string name="settings_dev_mode_summary">Muestra más información intencionada para depuración</string> - <string name="settings_logcat_summary">Ver/enviar log interno</string> - <string name="settings_version_app">Versión App</string> - <string name="settings_version_core">Cartera Versión Principal</string> - <string name="settings_version_protocol_exchange">Exchange Versiones Soportadas</string> - <string name="settings_version_protocol_merchant">Versiones Soportadas Comerciantes</string> + <string name="settings_withdraw_testkudos_summary">Obtener dinero para pruebas</string> + <string name="settings_logcat">Bitácora de depuración</string> + <string name="settings_dev_mode_summary">Muestra más información de depuración</string> + <string name="settings_logcat_summary">Guardar bitácora interna</string> + <string name="settings_version_app">Versión de la aplicación</string> + <string name="settings_version_core">Versión de Wallet Core</string> + <string name="settings_version_protocol_exchange">Versiones de Exchange soportadas</string> + <string name="settings_version_protocol_merchant">Versiones de Merchant soportadas</string> <string name="settings_version_unknown">Desconocido</string> - <string name="settings_reset">Resetear Cartera (¡peligroso!)</string> - <string name="settings_reset_summary">Tira tu dinero</string> + <string name="settings_reset">Reiniciar cartera (¡peligroso!)</string> + <string name="settings_reset_summary">Se deshace de tu dinero</string> <string name="nav_settings_backup">Copia de seguridad</string> - <string name="backup_last">Última copia de seguridad:%s</string> + <string name="backup_last">Última copia de seguridad: %s</string> <string name="refund_title">Devolución</string> <string name="refund_error">Error procesando la devolución</string> - <string name="refund_success">Devolución recibida:%s</string> - <string name="tip_title">Consejo</string> - <string name="wifi_disabled_error">Conecta tu Wi-Fi para obtener Wi-Fi gratis</string> - <string name="wifi_connect_error">No se pudo conectar a la Wi-Fi gratuita:%s</string> + <string name="refund_success">Devolución recibida: %s</string> + <string name="tip_title">Premio</string> + <string name="wifi_disabled_error">Enciende tu Wi-Fi para obtener Wi-Fi gratis</string> + <string name="wifi_connect_error">No se pudo conectar al Wi-Fi gratis: %s</string> <string name="app_name">Cartera Taler</string> - <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler hace transacciones online con privacidad-amigable, de forma rápida y sencilla.</string> - <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Esta App es una cartera para GNU Taler. Es altamente experimental, y no está lista para producción todavía. GNU Taler es un sistema de pago con preservación de la privacidad. Los clientes pueden permanecer anónimos, pero los comerciantes no pueden esconder sus ingresos a través de GNU Taler. Eso ayuda a evitar la evasión de impuestos y el lavado de dinero. El uso principal de GNU Taler son los pagos;no es la intención la acumulación de valor. Los pagos son siempre respaldados por una divisa existente. El pago es realizado después de cambiar dinero existente en dinero electrónico con la ayuda de un servicio de Exchange que es, un proveedor de servicios de pago para Taler. Cuando se realiza un pago, los clientes solo necesitan una cartera cargada. Un comerciante puede aceptar pagos sin hacer registrarse a sus cliente en su página Web. GNU Taler es inmune contra varios tipos de fraude, como el phising de información de tarjetas de crédito o el fraude por devolución. En caso de pérdida o robo, solo una cantidad limitada de dinero dejado en la cartera podría perderse.</string> + <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler hace transacciones en línea amigables con la privacidad, de forma rápida y sencilla.</string> + <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Esta aplicación es una cartera para GNU Taler. Es altamente experimental, y aún no está lista para producción. GNU Taler es un sistema de pago que preserva la privacidad. Los clientes pueden permanecer anónimos, pero los comerciantes no pueden esconder sus ingresos a través de GNU Taler. Esto ayuda a evitar la evasión de impuestos y el lavado de dinero. El uso principal de GNU Taler son los pagos; su intención no es servir como reserva de valor. Los pagos siempre están respaldados por una divisa existente. El pago se realiza después de cambiar dinero existente por dinero electrónico con la ayuda de un servicio de cambiario, que es un proveedor de servicios de pagos para Taler. Cuando se realiza un pago, los clientes solo necesitan una cartera con fondos. Un comerciante puede aceptar pagos sin hacer que sus clientes se registren en su página Web. GNU Taler es inmune contra varios tipos de fraude, como el phising de información de tarjetas de crédito o el fraude por devolución. En caso de pérdida o robo, solo una cantidad limitada de dinero guardado en la cartera podría perderse.</string> <string name="nav_header_title">GNU Taler</string> <string name="nav_header_subtitle">Cartera</string> - <string name="nav_exchange_fees">Comisiones del Exchange</string> + <string name="nav_exchange_fees">Comisiones del cambiario</string> <string name="nav_error">Error</string> - <string name="button_scan_qr_code">Escanear código QR Taler</string> - <string name="uri_invalid">Taler URI no válida</string> + <string name="button_scan_qr_code">Escanear código QR de Taler</string> + <string name="uri_invalid">URI de Taler inválida</string> <string name="offline">La operación requiere acceso a Internet. Por favor asegúrate que tu conexión a Internet funcione y prueba de nuevo.</string> - <string name="menu_retry_pending_operations">Reintentar Operaciones Pendientes</string> - <string name="amount_negative">- %s</string> + <string name="menu_retry_pending_operations">Reintentar operaciones pendientes</string> + <string name="amount_negative">-%s</string> <string name="balances_empty_state">No hay efectivo digital en tu cartera. \n -\nPuedes coger dinero de prueba desde el banco demo: +\nPuedes obtener dinero de prueba desde el banco demostrativo: \n \nhttps://bank.demo.taler.net</string> <string name="transactions_title">Transacciones</string> <string name="transactions_empty_search">No se han encontrado transacciones. Prueba una búsqueda diferente.</string> - <string name="transactions_error">No pudo cargar transacciones + <string name="transactions_error">No se pudo cargar las transacciones \n \n%s</string> <string name="transactions_detail_title_balance">Balance: %s</string> <string name="transaction_order">Compra</string> - <string name="payment_fee">+%s comisión por pago</string> + <string name="payment_fee">+%s de comisión por pago</string> <string name="payment_initiated">Pago iniciado</string> <string name="withdraw_button_confirm_bank">Confirmar con el banco</string> - <string name="withdraw_amount_error">Inserta una cantidad válida</string> + <string name="withdraw_amount_error">Inserta un monto válido</string> <string name="withdraw_manual_payment_options">Opciones de pago soportadas por %1$s: \n \n%2$s</string> - <string name="withdraw_error_message">La retirada ahora mismo no es posible. Por favor prueba de nuevo más tarde!</string> + <string name="withdraw_error_message">El retiro no es posible ahora mismo. Por favor prueba de nuevo más tarde.</string> <string name="exchange_menu_manual_withdraw">Retirar</string> <plurals name="exchange_fee_coin"> <item quantity="one">Moneda: %s (usada %d vez)</item> - <item quantity="other">Moneda: %s (usadas %d veces)</item> + <item quantity="many">Moneda: %s (usada %d veces)</item> + <item quantity="other">Moneda: %s (usada %d veces)</item> </plurals> <string name="exchange_fee_wire_fee_timespan">Intervalo de tiempo: %1$s - %2$s</string> <string name="host_apdu_service_desc">Pagos Taler con NFC</string> + <string name="transactions_delete_dialog_title">Eliminar transacción</string> + <string name="transactions_delete_dialog_message">¿Estás seguro de que deseas eliminar esta transacción de tu cartera\?</string> + <string name="withdraw_manual_ready_cancel">Cancelar retiro</string> + <string name="tip_already_accepted">Este premio ya fue aceptado.</string> + <string name="transaction_deposit">Depósito</string> + <string name="transaction_peer_pull_debit">Cobro pagado</string> + <string name="transaction_peer_push_credit">Pago push</string> + <string name="transaction_peer_pull_credit">Cobro</string> + <string name="receive_peer_invoice_instruction">Muestra este código QR a quien pagará:</string> + <string name="receive_peer_invoice_uri">O bien, copia y envía esta URI:</string> + <string name="receive_peer_create_button">Crear cobro</string> + <string name="pay_peer_title">Pagar factura</string> + <string name="send_peer_create_button">Enviar fondos ahora</string> + <string name="send_peer_warning">Los fondos saldrán de esta cartera inmediatamente.</string> + <string name="send_peer_payment_instruction">Muestra este código a quien deba recibir el dinero:</string> + <string name="tip_exchange">Cambiario</string> + <string name="tip_merchant_url">URL de comerciante</string> + <string name="withdraw_manual_ready_title">¡El cambiario está listo para el retiro!</string> + <string name="withdraw_manual_ready_details_intro">Detalles de la transferencia bancaria</string> + <string name="copy" tools:override="true">Copiar</string> + <string name="transactions_balance">Saldo</string> + <string name="withdraw_manual_ready_bank_button">Abrir en aplicación de banco</string> + <string name="copy_uri">Copiar URI de Taler</string> + <string name="transactions_send_funds">Enviar +\nfondos</string> + <string name="transactions_receive_funds">Recibir +\nfondos</string> + <string name="transactions_cancel_dialog_message">¿Estás seguro de que deseas cancelar este retiro\? Los fondos que están en tránsito podrían perderse.</string> + <string name="transactions_detail_title_currency">Transacciones de %s</string> + <string name="receive_peer_title">Solicitar pago</string> + <string name="receive_amount">Monto a recibir</string> + <string name="receive_intro">Elige desde dónde recibir el dinero:</string> + <string name="receive_peer">Cobrar a otra cartera</string> + <string name="receive_amount_invalid">Monto inválido</string> + <string name="receive_withdraw">Retiro desde cuenta de banco</string> + <string name="send_deposit_create_button">Hacer un depósito</string> + <string name="send_deposit_name">Titular de la cuenta</string> + <string name="send_deposit_amount_effective">Monto efectivo</string> + <string name="send_amount">Monto a enviar</string> + <string name="send_intro">Elige hacia dónde enviar el dinero:</string> + <string name="send_deposit">A una cuenta de banco</string> + <string name="send_deposit_title">Deposita a una cuenta de banco</string> + <string name="send_deposit_iban">IBAN</string> + <string name="send_deposit_bic">BIC/SWIFT</string> + <string name="receive_peer_payment_title">Recibir pago</string> + <string name="currency">Divisa</string> + <string name="send_peer">A otra cartera</string> + <string name="send_peer_title">Enviar dinero a otra cartera</string> + <string name="transaction_peer_push_debit">Pago push</string> + <string name="send_peer_payment_amount_received">Monto recibido</string> + <string name="send_peer_payment_amount_sent">Monto enviado</string> + <string name="pay_peer_intro">¿Quieres pagar este cobro\?</string> + <string name="receive_peer_payment_intro">¿Quieres recibir este pago\?</string> + <string name="withdraw_manual_bitcoin_intro">Ahora haz una transacción dividida con las siguientes tres salidas.</string> + <string name="withdraw_manual_ready_subject">Sujeto</string> + <string name="settings_logcat_error">Error exportando bitácora</string> + <string name="settings_logcat_success">Bitácora exportada al archivo</string> + <string name="tip_total">Total</string> + <string name="send_peer_purpose">Motivo</string> + <string name="send_peer_bitcoin">A otra cartera de Taler</string> + <string name="withdraw_manual_ready_intro">Para completar el proceso, necesitas transferir %s a la cuenta bancaria del cambiario</string> + <string name="withdraw_manual_bitcoin_title">Cambiario de Bitcoin listo para el retiro</string> + <string name="settings_db_export_summary">Guardar base de datos interna</string> + <string name="settings_db_export_success">Base de datos exportada al archivo</string> + <string name="tip_button_confirm">Aceptar premio</string> + <string name="tip_received">Premio recibido</string> + <string name="tip_fees">Comisión</string> + <string name="send_deposit_bitcoin">A una cartera de Bitcoin</string> + <string name="settings_db_export">Exportar base de datos</string> + <string name="settings_db_export_error">Error exportando base de datos</string> + <string name="withdraw_manual_ready_warning">Asegúrate de usar el sujeto correcto; de lo contrario, el dinero no llegará a esta cartera.</string> + <string name="transaction_action_kyc">Completar KYC</string> + <string name="withdraw_restrict_age">Restringir uso a edad</string> + <string name="withdraw_restrict_age_unrestricted">Sin restricciones</string> + <string name="withdraw_manual_ready_iban">IBAN</string> + <string name="send_deposit_check_fees_button">Revisar comisiones</string> + <string name="char_count">%1$d/%2$d</string> + <string name="transactions_delete_selected_dialog_message">¿Estás seguro de que deseas eliminar las transacciones seleccionadas de tu cartera\?</string> + <string name="send_deposit_bitcoin_address">Dirección Bitcoin</string> + <string name="send_deposit_bitcoin_create_button">Transferir Bitcoin</string> + <string name="transaction_dummy_title">Transacción desconocida</string> + <string name="send_deposit_bic_error">BIC es inválido</string> + <string name="send_peer_expiration_period">Expira en</string> + <string name="send_peer_expiration_1d">1 día</string> + <string name="send_peer_expiration_7d">7 días</string> + <string name="settings_test_summary">Realizar transacciones de prueba con el banco demostrativo</string> + <string name="settings_test">Ejecutar pruebas de integración</string> + <string name="button_scan_qr_code_label">Escanear código QR</string> + <string name="send_deposit_iban_error">IBAN es inválido</string> + <string name="send_peer_expiration_30d">30 días</string> + <string name="send_peer_expiration_custom">Personalizado</string> + <string name="send_peer_expiration_days">Días</string> + <string name="send_peer_expiration_hours">Horas</string> + <string name="exchange_list_error">No se pudo listar los cambiarios</string> + <string name="payment_prompt_title">Revisar pago</string> + <string name="payment_pay_template_title">Personaliza tu orden</string> + <string name="payment_create_order">Crear orden</string> + <string name="payment_confirmation_code">Código de confirmación</string> + <string name="payment_template_error">Error creando orden</string> + <string name="transactions_retry">Reintentar</string> + <string name="transactions_abort">Abortar</string> + <string name="transactions_fail">Matar</string> + <string name="transactions_suspend">Suspender</string> + <string name="transactions_resume">Resumir</string> + <string name="transactions_abort_dialog_title">Abortar transacción</string> + <string name="transactions_fail_dialog_message">¿Estás seguro de que deseas matar esta transacción\? Los fondos en tránsito SE PERDERÁN.</string> + <string name="exchange_not_contacted">Cambiario aún no contactado</string> + <string name="transactions_fail_dialog_title">Matar transacción</string> + <string name="transactions_abort_dialog_message">¿Estás seguro de que deseas abortar esta transacción\? Los fondos en tránsito podrían perderse.</string> + <string name="offline_banner">Sin acceso a internet</string> + <string name="error_broken_uri">Error: Este URI taler no funciona actualmente.</string> + <string name="withdraw_subtitle">Seleccione un cuenta bancaria destino</string> + <string name="withdraw_account">Cuenta #%1$d</string> + <string name="withdraw_account_currency">Cuenta #%1$d (%2$s)</string> + <string name="withdraw_transfer">Transferencia</string> + <string name="withdraw_conversion">Conversión</string> + <string name="withdraw_conversion_support">Este exchange soporta conversión de moneda</string> + <string name="exchange_list_add_dev">Agregar exchange de desarrollo</string> + <string name="settings_db_import">Importar base de datos</string> + <string name="settings_db_import_summary">Restaurar base de datos desde archivo</string> + <string name="settings_db_import_error">Error al importar la base de datos</string> + <string name="settings_db_import_success">Base de datos importada desde archivo</string> + <string name="settings_dialog_reset_message">Realmente quieres reiniciar la biiletera y perder todas las monedas y compras?</string> + <string name="settings_dialog_import_message">Esta operación sobreescribirá toda tu base de datos. Realmente quieres continuar?</string> + <string name="settings_alert_reset_done">La billetera ha sido reiniciada</string> + <string name="settings_alert_reset_canceled">Reinicio cancelado</string> + <string name="settings_alert_import_canceled">Importación cancelada</string> + <string name="import_db">Importar</string> + <string name="reset">Reiniciar</string> </resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-fi/strings.xml b/wallet/src/main/res/values-fi/strings.xml new file mode 100644 index 0000000..7e88596 --- /dev/null +++ b/wallet/src/main/res/values-fi/strings.xml @@ -0,0 +1,288 @@ +<?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/> + --><resources xmlns:tools="http://schemas.android.com/tools"> + <string name="app_name">Taler lompakko</string> + <string name="google_play_title" tools:keep="@string/google_play_title">Taler lompakko (kokeilu)</string> + <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler mahdollistaa yksityisyyttä kunnioittavat verkkomaksut nopeasti ja helposti.</string> + <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Tämä sovellus on lompakko GNU Talerille. Se on erittäin kokeellinen eikä vielä valmis tuotantokäyttöön. GNU Taler on yksityisyyttä kunnioittava maksujärjestelmä. Asiakkaat voivat pysyä anonyymeinä, mutta kauppiaat eivät voi piilottaa tulojaan maksujen avulla GNU Talerilla. Tämä auttaa välttämään veronkiertoa ja rahanpesua. GNU Talerin ensisijainen käyttötarkoitus on maksut; sitä ei tarkoiteta arvon säilyttämiseen. Maksut ovat aina tuettuja olemassa olevalla valuutalla. Maksut suoritetaan vaihtamalla olemassa oleva raha sähköiseksi rahaksi Exchange-palvelun avulla, eli Talerin maksupalveluntarjoajan avulla. Maksua tehdessään asiakkaat tarvitsevat vain ladatun lompakon. Kauppias voi hyväksyä maksut ilman, että asiakkaiden tarvitsee rekisteröityä kauppiaan verkkosivustolle. GNU Taler on immuuni monille huijauksen muodoille, kuten luottokorttitietojen kalastelu tai palautuspetos. Jos lompakko katoaa tai varastetaan, vain lompakossa oleva rajoitettu rahasumma voi kadota.</string> + <string name="nav_header_title">GNU Taler</string> + <string name="nav_header_subtitle">Lompakko</string> + <string name="nav_prompt_withdraw">Nosta sähköistä käteistä</string> + <string name="nav_exchange_tos">Vaidon käyttöehdot</string> + <string name="nav_exchange_select">Valitse vaihto</string> + <string name="nav_exchange_fees">Vaihdon maksut</string> + <string name="nav_error">Virhe</string> + <string name="button_back">Takaisin</string> + <string name="button_scan_qr_code">Skannaa Taler QR koodi</string> + <string name="button_scan_qr_code_label">Saknnaa QR koodi</string> + <string name="enter_uri">Syötä Taler URI</string> + <string name="copy" tools:override="true">Kopioi</string> + <string name="copy_uri">Kopioi Taler URI</string> + <string name="paste">Liitä</string> + <string name="paste_invalid">Leikepöytä sisältää virheellisen tietotyypin</string> + <string name="uri_invalid">Taler URI ei ole kelvollinen</string> + <string name="ok">OK</string> + <string name="cancel">Hylkää</string> + <string name="search">Haku</string> + <string name="menu">Valikko</string> + <string name="or">tai</string> + <string name="currency">Valuutta</string> + <!-- The count should be mirrored in RTL languages --> + <string name="char_count">%1$d/%2$d</string> + <string name="import_db">Tuonti</string> + <string name="reset">Nollaa</string> + <string name="share_payment">Jaa maksu linkki</string> + <string name="offline">Toiminta vaatii Internetyhteyden. Varmista, että internetyhteytesi toimii ja yritä uudelleen.</string> + <string name="offline_banner">Ei yhteyttä</string> + <string name="error_unsupported_uri">Virhe: Tätä Taler URI:a ei tueta.</string> + <string name="error_broken_uri">Virhe: Tämä Taler URI ei (tällä hetkellä) toimi.</string> + <string name="menu_settings">Asetukset</string> + <string name="menu_retry_pending_operations">Yritä uudelleen odottavia toimintoja</string> + <string name="host_apdu_service_desc">Taler NFC maksut</string> + <string name="balances_title">Saldot</string> + <string name="amount_positive">+%s</string> + <string name="amount_negative">-%s</string> + <string name="amount_chosen">Valittu summa</string> + <string name="amount_sent">Summa lähetetty</string> + <string name="amount_received">Summa saatu</string> + <string name="balances_inbound_label">saapuva</string> + <string name="balances_empty_state">Lompakossasi ei ole sähköistä rahaa. +\n +\nVoit saada testirahaa demopankista: +\n +\nhttps://bank.demo.taler.net</string> + <string name="balance_scope_exchange">Vaihda:%1$s</string> + <string name="balance_scope_auditor">Tarkastaja: %1$s</string> + <string name="transactions_title">Tapahtumat</string> + <string name="transactions_balance">Saldo</string> + <string name="transactions_send_funds">Lähetä +\nVarat</string> + <string name="transactions_receive_funds">Vastaanota +\nVarat</string> + <string name="transactions_empty">Sinulla ei ole tapahtumia</string> + <string name="transactions_empty_search">Tapahtumia ei löytynyt. Yritä toista hakua.</string> + <string name="transactions_error">Tapahtumaa ei voinut ladata +\n +\n%s</string> + <string name="transactions_detail_title">Tapahtuma</string> + <string name="transactions_detail_title_currency">%s Tapahtumat</string> + <string name="transactions_delete">Poista</string> + <string name="transactions_retry">Yritä uudelleen</string> + <string name="transactions_abort">Peruuta</string> + <string name="transactions_fail">Lopeta</string> + <string name="transactions_suspend">Keskeytä</string> + <string name="transactions_resume">Jatka</string> + <string name="transactions_select_all">Valitse kaikki</string> + <string name="transactions_delete_dialog_title">Poista tapahtuma</string> + <string name="transactions_delete_dialog_message">Haluatko varmasti poistaa tämän tapahtuman lompakostasi?</string> + <string name="transactions_delete_selected_dialog_message">Haluatko varmasti poistaa valitut tapahtumat lompakostasi?</string> + <string name="transactions_abort_dialog_title">Peruuta tapahtuma</string> + <string name="transactions_abort_dialog_message">Haluatko varmasti keskeyttää tämän tapahtuman? Siirrettävät varat saattavat kadota.</string> + <string name="transactions_fail_dialog_title">Lopeta tapahtuma</string> + <string name="transactions_fail_dialog_message">Haluatko varmasti lopettaa tämän tapahtuman? Vielä siirrettävät varat MENETÄÄN.</string> + <string name="transactions_cancel_dialog_message">Haluatko varmasti peruuttaa tämän noston? Siirrettävät varat saattavat kadota.</string> + <!-- Transactions --> + <string name="transaction_paid">Maksettu</string> + <string name="transaction_order_total">Yhteensä</string> + <string name="transaction_order">Osto</string> + <string name="transaction_order_id">Kuitti #%1$s</string> + <string name="transaction_refund">Maksun palautus</string> + <string name="transaction_refund_from">Maksun palautus %s</string> + <string name="transaction_pending">ODOTTAA</string> + <string name="transaction_refresh">Kolikon voimassaolon vaihtomaksu</string> + <string name="transaction_deposit">Talletus</string> + <string name="transaction_peer_push_debit">Siirrä maksua</string> + <string name="transaction_peer_pull_credit">Lasku</string> + <string name="transaction_peer_pull_debit">Lasku maksettu</string> + <string name="transaction_peer_push_credit">Siirrä maksua</string> + <string name="transaction_action_kyc">Täydellinen KYC</string> + <string name="transaction_dummy_title">Tuntematon tapahtuma</string> + <string name="payment_title">Maksu</string> + <string name="payment_prompt_title">Näytä maksu</string> + <string name="payment_fee">+%s maksun käsittelymaksu</string> + <string name="payment_button_confirm">Vahvista maksu</string> + <string name="payment_label_amount_total">Kokonais summa:</string> + <string name="payment_label_order_summary">Osta</string> + <string name="payment_error">Virhe: %s</string> + <string name="payment_pending">Maksua ei suoritettu, sitä yritetään uudelleen</string> + <string name="payment_balance_insufficient">Saldo ei riitä!</string> + <string name="payment_aborted">Peruutettu</string> + <string name="payment_failed">Epäonnistui</string> + <string name="payment_initiated">Maksu aloitettu</string> + <string name="payment_already_paid_title">Jo maskettu</string> + <string name="payment_already_paid">Olet jo maksanut tämän ostoksen.</string> + <string name="payment_pay_template_title">Muokkaa tilausta</string> + <string name="payment_create_order">Luo tilaus</string> + <string name="payment_confirmation_code">Vahvistuskoodi</string> + <string name="payment_template_error">Virhe tilausken tekemisessä</string> + <string name="receive_amount">Vastaanotettava summa</string> + <string name="receive_amount_invalid">Virrheellinen summa</string> + <string name="receive_intro">Valitse mistä saat rahaa:</string> + <string name="receive_withdraw">Nosto pankkitililtä</string> + <string name="receive_peer">Laskuta toista lompakkoa</string> + <string name="receive_peer_title">Pyydä maksu</string> + <string name="receive_peer_create_button">Luo lasku</string> + <string name="receive_peer_invoice_instruction">Anna maksajan skannata tämä QR koodi maksaakseen:</string> + <string name="receive_peer_invoice_uri">Vaihtoehtoisesti kopioi ja lähetä tämä URI:</string> + <string name="receive_peer_amount_invoiced">Summa laskutettu</string> + <string name="send_amount">Lähetettävä summa</string> + <string name="send_intro">Valitse mihin lähetät rahaa:</string> + <string name="send_deposit">Pankkitilille</string> + <string name="send_deposit_bitcoin">Bitcoin lompakkoon</string> + <string name="send_deposit_title">Talletus pankkitilille</string> + <string name="send_deposit_iban">IBAN</string> + <string name="send_deposit_iban_error">IBAN on virheellinen</string> + <string name="send_deposit_bic_error">BIC on virheellinen</string> + <string name="send_deposit_bic">BIC/SWIFT</string> + <string name="send_deposit_name">Tilin haltija</string> + <string name="send_deposit_bitcoin_address">Bitcoin osoite</string> + <string name="send_deposit_check_fees_button">Tarkista maksut</string> + <string name="send_deposit_amount_effective">Todellinen summa</string> + <string name="send_deposit_create_button">Tee talletus</string> + <string name="send_deposit_bitcoin_create_button">Siirrä Bitcoineja</string> + <string name="send_peer">Toiseen lompakkoon</string> + <string name="send_peer_bitcoin">Toiseen Taler lompakkoon</string> + <string name="send_peer_title">Lähetä rahaa toiseen lompakkoon</string> + <string name="send_peer_create_button">Lähetä varat nyt</string> + <string name="send_peer_payment_instruction">Anna maksunsaajan skannata tämä QR-koodi saadaksesi:</string> + <string name="send_peer_expiration_period">Vanhenee</string> + <string name="send_peer_expiration_1d">1 päivässä</string> + <string name="send_peer_expiration_7d">7 päivässä</string> + <string name="send_peer_expiration_30d">30 päivässä</string> + <string name="send_peer_expiration_custom">Mukautettu</string> + <string name="send_peer_expiration_days">Päivässä</string> + <string name="send_peer_expiration_hours">tunnissa</string> + <string name="send_peer_purpose">Tarkoitus</string> + <string name="pay_peer_title">Maksa lasku</string> + <string name="pay_peer_intro">Haluatko maksaa tämän laskun?</string> + <string name="receive_peer_payment_title">Vastaanota maksu</string> + <string name="receive_peer_payment_intro">Haluatko vastaanottaa tämän maksun?</string> + <string name="withdraw_initiated">Nosto aloitettu</string> + <string name="withdraw_title">Nosto</string> + <string name="withdraw_subtitle">Valiste kohdepankkitili</string> + <string name="withdraw_total">Nosta</string> + <string name="withdraw_fees">Maksu</string> + <string name="withdraw_restrict_age">Ikärajoitus</string> + <string name="withdraw_restrict_age_unrestricted">Rajoittamaton</string> + <string name="withdraw_exchange">Vaihto</string> + <string name="withdraw_bank">Pankki</string> + <string name="withdraw_button_confirm">Vahvista nosto</string> + <string name="withdraw_button_confirm_bank">Vahvista pankilla</string> + <string name="withdraw_button_tos">Tarkista ehdot</string> + <string name="withdraw_waiting_confirm">Odottaa vahvistusta</string> + <string name="withdraw_manual_title">Tee manuaalinen siirto vaihtoon</string> + <string name="withdraw_amount">Kuinka paljon nostetaan?</string> + <string name="withdraw_amount_error">Syötä kelvollinen summa</string> + <string name="withdraw_manual_payment_options">%1$s:n tukemat maksuvaihtoehdot: +\n +\n%2$s</string> + <string name="withdraw_manual_check_fees">Tarkista maksut</string> + <string name="withdraw_manual_ready_title">Vaihto on valmis nostettavaksi!</string> + <string name="withdraw_manual_ready_intro">Suorittaaksesi prosessin sinun on siirrettävä %s vaihtopankkitilille</string> + <string name="withdraw_manual_ready_details_intro">Pankkisiirtotiedot</string> + <string name="withdraw_manual_bitcoin_title">Bitcoin vaihto valmis nostettavaksi</string> + <string name="withdraw_manual_bitcoin_intro">Tee nyt jaettu tapahtuma seuraavalla kolmella ulostulolla.</string> + <string name="withdraw_manual_ready_iban">IBAN</string> + <string name="withdraw_manual_ready_account">Tili</string> + <string name="withdraw_manual_ready_receiver">Vastaanotajan nimi</string> + <string name="withdraw_manual_ready_subject">Aihe</string> + <string name="withdraw_manual_ready_bank_button">Avaa pankkisovelluksessa</string> + <string name="withdraw_manual_ready_cancel">Peruuta nosto</string> + <string name="withdraw_manual_ready_warning">Varmista, että käytät oikeaa aihetta, muuten rahat eivät tule tähän lompakkoon.</string> + <string name="withdraw_error_title">Nosto virhe</string> + <string name="withdraw_error_message">Nosto ei ole tällä hetkellä mahdollista. Yritä uudelleen myöhemmin!</string> + <string name="withdraw_error_test">Virhe nostaessa TESTKUDOS</string> + <string name="withdraw_account">Tili #%1$d</string> + <string name="withdraw_account_currency">Tili #%1$d (%2$s)</string> + <string name="withdraw_transfer">Vaihda</string> + <string name="withdraw_conversion">Muuntaminen</string> + <string name="withdraw_conversion_support">Tämä vaihto tukee valuutan muuntamista</string> + <string name="exchange_settings_title">Vaihdot</string> + <string name="exchange_settings_summary">Hallinnoi tämän lompakon tuntemien vaihtojen luetteloa</string> + <string name="exchange_list_title">Vaihdot</string> + <string name="exchange_list_empty">Vaihtoja ei tiedossa +\n +\nLisää yksi manuaalisesti tai nosta digitaalista käteistä!</string> + <string name="exchange_list_currency">Valuutta: %s</string> + <string name="exchange_list_add">Lisää vaihto</string> + <string name="exchange_list_select">Valitse vaihto</string> + <string name="exchange_delete">Poista vaihto</string> + <string name="exchange_delete_force">Pakota poisto (puhdistus)</string> + <string name="exchange_dialog_delete_message">Haluatko varmasti poistaa tämän vaihdon? Tämän toimenpiteen pakottaminen johtaa varojen menetykseen.</string> + <string name="exchange_not_contacted">Vaihtoon ei otettu yhteyttä</string> + <string name="exchange_add_url">Anna vaihton osoite</string> + <string name="exchange_add_error">Vaihtoa ei voitu lisätä</string> + <string name="exchange_list_error">Vaihtoja ei voitu luetteloida</string> + <string name="exchange_list_add_dev">Lisää kehitysvaihtoja</string> + <string name="exchange_menu_manual_withdraw">Nosta</string> + <string name="exchange_fee_withdrawal_fee_label">Noston maksu:</string> + <string name="exchange_fee_overhead_label">Pyöristystappio:</string> + <string name="exchange_fee_coin_expiration_label">Aikaisin kolikon vanheneminen:</string> + <string name="exchange_fee_coin_fees_label">Kolikon maksut</string> + <string name="exchange_fee_wire_fees_label">Sirtomaksut</string> + <plurals name="exchange_fee_coin"> + <item quantity="one">Kolikko: %s (Käytetty %d kerran)</item> + <item quantity="other">Kolikko: %s (Käytetty %d kertaa)</item> + </plurals> + <string name="exchange_fee_withdraw_fee">Nostomaksu: %s</string> + <string name="exchange_fee_deposit_fee">Talletus maksu: %s</string> + <string name="exchange_fee_refresh_fee">Vahto maksu: %s</string> + <string name="exchange_fee_refund_fee">Hyvitysmaksu: %s</string> + <string name="exchange_fee_wire_fee_timespan">Ajanjakso: %1$s - %2$s</string> + <string name="exchange_fee_wire_fee_wire_fee">Siirtomaksu: %s</string> + <string name="exchange_fee_wire_fee_closing_fee">Sulkemismaksu: %s</string> + <string name="exchange_tos_accept">Hyväksy käyttöehdot</string> + <string name="exchange_tos_error">Virhe näytettäessä käyttöehtoja: %s</string> + <string name="pending_operations_title">Odottavat toiminnot</string> + <string name="pending_operations_refuse">Hylkää ehdotus</string> + <string name="pending_operations_no_action">(ei toimintaa)</string> + <string name="settings_dev_mode">Kehittäjätila</string> + <string name="settings_dev_mode_summary">Näyttää enemmän virheenkorjaukseen tarkoitettuja tietoja</string> + <string name="settings_withdraw_testkudos">Nosta TESTKUDOS</string> + <string name="settings_withdraw_testkudos_summary">Hanki rahaa testauksesta</string> + <string name="settings_logcat">Virheenkorjausloki</string> + <string name="settings_logcat_summary">Tallenna sisäinen loki</string> + <string name="settings_logcat_error">Virhe lokin viemisessä</string> + <string name="settings_logcat_success">Loki viety tiedostoon</string> + <string name="settings_db_export">Vie tietokanta</string> + <string name="settings_db_export_summary">Tallenna sisäinen tietokanta</string> + <string name="settings_db_import">Tuo tietokanta</string> + <string name="settings_db_import_summary">Palauta tietokanta tiedostosta</string> + <string name="settings_db_export_error">Virhe vietäessä tietokantaa</string> + <string name="settings_db_import_error">Virhe tietokannan tuonnissa</string> + <string name="settings_db_clear_error">Virhe tietokannan puhdistuksessa</string> + <string name="settings_db_export_success">Tietokanta viety tiedostoon</string> + <string name="settings_db_import_success">Tietokanta tuotu tiedostosta</string> + <string name="settings_version_app">Sovelluksen versio</string> + <string name="settings_version_core">Lompakon ydinversio</string> + <string name="settings_version_protocol_exchange">Tuetut Exchange-versiot</string> + <string name="settings_version_protocol_merchant">Tuetut kauppiasversiot</string> + <string name="settings_version_unknown">Tuntematon</string> + <string name="settings_test">Suorita integrointitesti</string> + <string name="settings_test_summary">Suorittaa testitapahtumia demoasetuksella</string> + <string name="settings_reset">Nollaa lompakko (vaarallista!)</string> + <string name="settings_reset_summary">Heittää rahasi pois</string> + <string name="settings_dialog_reset_message">Haluatko todella nollata lompakon ja menettää kaikki kolikot ja ostokset?</string> + <string name="settings_dialog_import_message">Tämä toiminto korvaa olemassa olevan tietokantasi. Haluatko jatkaa?</string> + <string name="settings_alert_reset_done">Lompakko on nollattu</string> + <string name="settings_alert_reset_canceled">Nollaus peruutettu</string> + <string name="settings_alert_import_canceled">Tuonti peruutettu</string> + <string name="refund_title">Palautus</string> + <string name="refund_error">Palautuksen käsittelyssä tapahtui virhe</string> + <string name="refund_success">Palautus saatu!</string> + <string name="wifi_disabled_error">Ota Wi-Fi käyttöön saadaksesi ilmaisen Wi-Fi-yhteyden</string> + <string name="wifi_connect_error">Ei voitu muodostaa yhteyttä ilmaiseen Wi-Fi-verkkoon: %s</string> +</resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-fr/strings.xml b/wallet/src/main/res/values-fr/strings.xml index 7d260a6..e4ea6c8 100644 --- a/wallet/src/main/res/values-fr/strings.xml +++ b/wallet/src/main/res/values-fr/strings.xml @@ -1,50 +1,50 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:tools="http://schemas.android.com/tools"> <string name="menu_retry_pending_operations">Réessayer les opérations en attente</string> - <string name="balances_empty_state">Il n\'y a pas d\'argent éléctronique dans votre portefeuille. + <string name="balances_empty_state">Il n\'y a pas d\'argent numérique dans votre portefeuille. \n \nVous pouvez obtenir de l\'argent de test auprès de la banque de démonstration : \n \nhttps://bank.demo.taler.net</string> - <string name="withdraw_error_message">Pour l\'instant il n\'est pas possible de retirer. Veuillez réessayer plus tard !</string> + <string name="withdraw_error_message">Le retrait n\'est actuellement pas possible. Veuillez réessayer plus tard !</string> <string name="settings_dev_mode">Mode développeur</string> - <string name="menu_settings">Réglages</string> + <string name="menu_settings">Paramètres</string> <string name="settings_reset">Réinitialiser le portefeuille (dangereux!)</string> <string name="app_name">Portefeuille Taler</string> <string name="google_play_title" tools:keep="@string/google_play_title">Portefeuille Taler (expérimental)</string> - <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler facilite et accélère les transactions en ligne respectueuses de la vie privée.</string> + <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">GNU Taler rend les transactions en ligne respectueuses de la vie privée, rapides et faciles.</string> <string name="button_scan_qr_code">Scanner le QR code Taler</string> <string name="balances_title">Soldes</string> <string name="amount_positive">+ %s</string> <string name="amount_chosen">Montant choisi</string> <string name="balances_inbound_label">entrant</string> - <string name="transactions_title">Opérations de transaction</string> + <string name="transactions_title">Transactions</string> <string name="transactions_empty">Vous n\'avez aucune transaction</string> <string name="transactions_error">Impossible de charger les transactions\n\n%s</string> - <string name="transactions_detail_title">Opération de transaction</string> + <string name="transactions_detail_title">Transaction</string> <string name="transactions_detail_title_balance">Solde : %s</string> <string name="transactions_delete">Supprimer</string> <string name="transactions_select_all">Tout sélectionner</string> <string name="transaction_paid">Payé</string> <string name="transaction_order_total">Total</string> - <string name="transaction_order">Acheter</string> - <string name="transaction_order_id">Reçu numéro %1$s</string> + <string name="transaction_order">Achat</string> + <string name="transaction_order_id">Reçu #%1$s</string> <string name="transaction_refund">Remboursement</string> - <string name="transaction_refresh">Frais d\'expiration de taux de change</string> + <string name="transaction_refresh">Frais de change pour la monnaie expirée</string> <string name="payment_fee">+%s frais de transaction</string> <string name="payment_button_confirm">Confirmer le paiement</string> <string name="nav_exchange_fees">Frais de change</string> <string name="amount_negative">- %s</string> <string name="nav_header_title">GNU Taler</string> <string name="nav_header_subtitle">Portefeuille</string> - <string name="nav_prompt_withdraw">Retirer de l\'argent électronique</string> - <string name="nav_exchange_tos">Conditions générale d\'utilisation du change</string> + <string name="nav_prompt_withdraw">Retirer de l\'argent numérique</string> + <string name="nav_exchange_tos">Conditions générales d\'utilisation du service d\'échange</string> <string name="nav_error">Erreur</string> - <string name="button_back">Retour</string> + <string name="button_back">Retour en arrière</string> <string name="payment_label_order_summary">Achat</string> <string name="payment_balance_insufficient">Solde insuffisant !</string> <string name="payment_already_paid_title">Déjà payé</string> - <string name="payment_already_paid">Vous avez déjà payé cet achat.</string> + <string name="payment_already_paid">Vous avez déjà payé pour cet achat.</string> <string name="withdraw_total">Retirer</string> <string name="withdraw_fees">Frais</string> <string name="withdraw_exchange">Change</string> @@ -62,7 +62,7 @@ <string name="exchange_fee_wire_fee_timespan">Durée : %1$s - %2$s</string> <string name="exchange_fee_wire_fee_wire_fee">Frais de virement : %s</string> <string name="exchange_fee_wire_fee_closing_fee">Frais de clôture : %s</string> - <string name="exchange_tos_accept">Accepter les conditions générales d\'utilisations</string> + <string name="exchange_tos_accept">Accepter les conditions générales d\'utilisation</string> <string name="exchange_tos_error">Erreur lors de l\'affichage des conditions générales d\'utilisation : %s</string> <string name="pending_operations_title">Opérations en attente</string> <string name="pending_operations_refuse">Refuser la proposition</string> @@ -74,24 +74,24 @@ <string name="refund_error">Erreur lors du traitement du remboursement</string> <string name="refund_success">Remboursement reçu : %s</string> <string name="payment_error">Erreur : %s</string> - <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Cette application est un portefeuille pour GNU Taler. Elle est très expérimentale et n\'est pas encore prête à être utilisée en production. GNU Taler est un système de paiement préservant la vie privée. Les clients peuvent rester anonymes, mais les commerçants ne peuvent pas cacher leurs revenus avec GNU Taler. Cela permet d\'éviter l\'évasion fiscale et le blanchiment d\'argent. Le principal cas d\'utilisation de GNU Taler est celui des paiements ; il ne s\'agit pas d\'une réserve de valeur. Les paiements sont toujours garantis par une devise existante. Les paiements sont effectués après avoir échangé l\'argent existant en monnaie électronique avec l\'aide d\'un service d\'échange, c\'est-à-dire un fournisseur de services de paiement pour Taler. Pour effectuer un paiement, les clients n\'ont besoin que d\'un portefeuille chargé. Un commerçant peut accepter des paiements sans que ses clients ne s\'inscrivent sur son site web. GNU Taler est immunisé contre de nombreux types de fraude, tels que le hameçonnage des informations relatives aux cartes de crédit ou la fraude par rétro-facturation. En cas de perte ou de vol, seule la quantité limitée d\'argent restant dans le portefeuille peut disparaître.</string> + <string name="google_play_full_desc" tools:keep="@string/google_play_full_desc">Cette application est un portefeuille pour GNU Taler. Cette dernière est expérimentale et n\'est pas encore prête à être utilisée en production. GNU Taler est un système de paiement préservant la vie privée. Les clients peuvent rester anonymes, mais les commerçants ne peuvent pas cacher leurs revenus avec GNU Taler. Cela permet d\'éviter l\'évasion fiscale et le blanchiment d\'argent. Le principal cas d\'utilisation de GNU Taler est celui des paiements ; il ne s\'agit pas d\'une réserve de valeur. Les paiements sont toujours garantis par une devise existante. Les paiements sont effectués après avoir échangé l\'argent existant en monnaie électronique avec l\'aide d\'un service d\'échange, qui est un prestataire de services de paiement pour Taler. Pour effectuer un paiement, les clients n\'ont besoin que d\'un portefeuille chargé. Un commerçant peut accepter des paiements sans demander à ses clients de s\'inscrire sur son site web. GNU Taler est immunisé contre de nombreux types de fraude, tels que l\'hameçonnage de cartes de crédit ou la fraude par rétrofacturation. En cas de perte ou de vol, seul le montant limité d\'argent restant dans le portefeuille peut être perdu.</string> <string name="payment_label_amount_total">Montant total :</string> <string name="exchange_fee_coin_expiration_label">Expiration de monnaie prochaine :</string> <string name="ok">OK</string> <string name="cancel">Annuler</string> - <string name="offline">L\'opération nécessite un accès Internet. Veuillez vérifier que votre connection internet fonctionne et réessayez.</string> + <string name="offline">L\'opération nécessite un accès Internet. Veuillez vous assurer que votre connexion internet fonctionne et réessayez.</string> <string name="error_unsupported_uri">Erreur : Cet URI Taler n\'est pas pris en charge.</string> <string name="transactions_empty_search">Aucune transaction trouvée. Essayez une recherche différente.</string> <string name="transaction_refund_from">Remboursement %s</string> <string name="transaction_pending">EN ATTENTE</string> <string name="payment_title">Paiement</string> - <string name="payment_aborted">Abandonné</string> + <string name="payment_aborted">Annulé</string> <string name="payment_initiated">Paiement initié</string> - <string name="nav_exchange_select">Sélectionnez Change</string> - <string name="enter_uri">Entrez l\'URI de Taler</string> + <string name="nav_exchange_select">Sélectionner le change</string> + <string name="enter_uri">Entrer l\'URI de Taler</string> <string name="paste">Coller</string> <string name="paste_invalid">Le presse-papiers contient un type de données non valide</string> - <string name="uri_invalid">Pas un URI Taler valide</string> + <string name="uri_invalid">URI Taler non valide</string> <string name="search">Rechercher</string> <string name="menu">Menu</string> <string name="or">ou</string> @@ -107,7 +107,7 @@ \n \n%2$s</string> <string name="withdraw_manual_check_fees">Vérifier les frais</string> - <string name="host_apdu_service_desc">Paiements Taler CCP</string> + <string name="host_apdu_service_desc">Paiements Taler NFC</string> <string name="withdraw_manual_title">Effectuer un transfert manuel vers la bourse</string> <string name="exchange_settings_title">Échanges</string> <string name="exchange_settings_summary">Gérer la liste des échanges connus par ce portefeuille</string> @@ -134,4 +134,71 @@ <string name="settings_version_protocol_merchant">Versions commerçantes compatibles</string> <string name="settings_version_core">Version Wallet Core</string> <string name="settings_version_protocol_exchange">Versions Echange compatibles</string> + <string name="transaction_action_kyc">Compléter le KYC</string> + <string name="transactions_cancel_dialog_message">Êtes-vous sûr de vouloir annuler ce retrait \? Les fonds encore en transit peuvent être perdus.</string> + <string name="transaction_deposit">Dépôt</string> + <string name="receive_withdraw">Retrait du compte bancaire</string> + <string name="receive_peer">Facture d\'un autre portefeuille</string> + <string name="receive_peer_title">Demande de paiement</string> + <string name="receive_peer_create_button">Créer une facture</string> + <string name="transactions_delete_dialog_title">Supprimer une transaction</string> + <string name="transactions_delete_dialog_message">Êtes-vous sûr de vouloir supprimer cette transaction de votre portefeuille \?</string> + <string name="receive_amount_invalid">Montant invalide</string> + <string name="receive_intro">Choisir où recevoir l\'argent :</string> + <string name="receive_peer_invoice_instruction">Laissez le payeur scanner ce QR code pour payer :</string> + <string name="copy" tools:override="true">Copier</string> + <string name="transactions_balance">Solde</string> + <string name="transaction_peer_pull_debit">Facture payée</string> + <string name="transaction_peer_push_credit">Paiement push</string> + <string name="copy_uri">Copier l\'URI de Taler</string> + <string name="transaction_peer_push_debit">Paiement push</string> + <string name="transaction_peer_pull_credit">Facture</string> + <string name="receive_amount">Montant à recevoir</string> + <string name="send_amount">Montant à envoyer</string> + <string name="send_intro">Choisir où envoyer l\'argent :</string> + <string name="transactions_detail_title_currency">%s Transactions</string> + <string name="currency">Devise</string> + <string name="transactions_receive_funds">Recevoir +\ndes fonds</string> + <string name="transactions_send_funds">Envoyer +\ndes fonds</string> + <string name="char_count">%1$d/%2$d</string> + <string name="transactions_delete_selected_dialog_message">Êtes-vous sûr de vouloir supprimer les transactions sélectionnées de votre portefeuille \?</string> + <string name="receive_peer_invoice_uri">Sinon, copier et envoyer cet URI :</string> + <string name="send_deposit_bic">BIC/SWIFT</string> + <string name="send_deposit_name">Titulaire du compte</string> + <string name="send_deposit_bitcoin_address">Adresse Bitcoin</string> + <string name="send_deposit_bitcoin_create_button">Transfert de Bitcoin</string> + <string name="send_peer_title">Envoyer de l\'argent vers un autre portefeuille</string> + <string name="send_peer_payment_amount_received">Montant reçu</string> + <string name="send_peer_payment_amount_sent">Montant envoyé</string> + <string name="withdraw_restrict_age">Limiter l\'utilisation selon l\'âge</string> + <string name="pay_peer_title">Payer la facture</string> + <string name="send_peer_warning">Avertissement : Les fonds quittent immédiatement le portefeuille.</string> + <string name="send_peer_payment_instruction">Laissez le bénéficiaire scanner ce code QR pour recevoir :</string> + <string name="send_deposit_check_fees_button">Vérifier les frais</string> + <string name="send_deposit_amount_effective">Montant effectif</string> + <string name="send_deposit_create_button">Effectuer un dépôt</string> + <string name="send_peer">Vers un autre portefeuille</string> + <string name="pay_peer_intro">Voulez-vous payer cette facture \?</string> + <string name="receive_peer_payment_title">Recevoir le paiement</string> + <string name="receive_peer_payment_intro">Voulez-vous recevoir ce paiement \?</string> + <string name="send_peer_purpose">Objectif</string> + <string name="send_deposit_bitcoin">Vers un portefeuille Bitcoin</string> + <string name="send_peer_bitcoin">Vers un autre portefeuille Taler</string> + <string name="send_peer_create_button">Envoyer des fonds maintenant</string> + <string name="send_deposit">Vers un compte bancaire</string> + <string name="send_deposit_title">Dépôt sur un compte bancaire</string> + <string name="send_deposit_iban">IBAN</string> + <string name="withdraw_restrict_age_unrestricted">Sans restriction</string> + <string name="withdraw_manual_ready_subject">Sujet</string> + <string name="withdraw_manual_ready_cancel">Annuler le retrait</string> + <string name="withdraw_manual_bitcoin_title">Le change de Bitcoin prêt pour les retraits</string> + <string name="withdraw_manual_bitcoin_intro">Effectuez maintenant une transaction fractionnée avec les trois sorties suivantes.</string> + <string name="withdraw_manual_ready_bank_button">Ouvrir dans l\'application bancaire</string> + <string name="withdraw_manual_ready_title">Le change est prêt pour le retrait !</string> + <string name="withdraw_manual_ready_intro">Pour compléter le processus, vous devez virer %s sur le compte bancaire de change</string> + <string name="withdraw_manual_ready_details_intro">Détails du virement bancaire</string> + <string name="withdraw_manual_ready_iban">IBAN</string> + <string name="withdraw_manual_ready_warning">Assurez-vous d\'utiliser le bon sujet, sinon l\'argent n\'arrivera pas dans ce portefeuille.</string> </resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-it/strings.xml b/wallet/src/main/res/values-it/strings.xml index 7f43827..fdc4594 100644 --- a/wallet/src/main/res/values-it/strings.xml +++ b/wallet/src/main/res/values-it/strings.xml @@ -49,14 +49,14 @@ <string name="transaction_paid">Pagato</string> <string name="transaction_order_total">Totale</string> <string name="transaction_order">Acquisto</string> - <string name="transaction_tip_from">Suggerimento di %s</string> + <string name="transaction_tip_from">Ricompensa da %s</string> <string name="transaction_refund">Rimborso</string> <string name="transaction_refund_from">Rimborso di %s</string> - <string name="transaction_pending">In sospeso</string> + <string name="transaction_pending">IN ATTESA</string> <string name="payment_title">Pagamento</string> <string name="transactions_empty_search">Nessun transazione trovata. Prova una ricerca diversa.</string> <string name="transaction_order_id">Ricevuta #%1$s</string> - <string name="transaction_refresh">Commissione per cambio scadenza moneta</string> + <string name="transaction_refresh">Commissione per cambio della moneta a scadenza</string> <string name="payment_fee">+%s tassa di commissione</string> <string name="payment_button_confirm">Confermare pagamento</string> <string name="payment_already_paid">Hai già pagato questo ordine.</string> @@ -67,7 +67,7 @@ <item quantity="other">Moneta: %s (usate %d volte)</item> </plurals> <string name="settings_withdraw_testkudos">Ritirare TESTKUDOS</string> - <string name="settings_logcat_summary">Vedere/Inviare log interno</string> + <string name="settings_logcat_summary">Salvare log interno</string> <string name="settings_reset_summary">Scarta il tuo denaro</string> <string name="wifi_disabled_error">Accendi il Wi-Fi per avere Wi-Fi gratis</string> <string name="payment_label_amount_total">Quantità totale:</string> @@ -137,7 +137,106 @@ <string name="refund_title">Rimborso</string> <string name="refund_error">Errore nel processare il rimborso</string> <string name="refund_success">Rimborso ricevuto: %s</string> - <string name="tip_title">Consiglio</string> + <string name="tip_title">Ricompensa</string> <string name="wifi_connect_error">Impossibile connettersi alla Wi-Fi gratuita: %s</string> <string name="withdraw_manual_title">Effettuare un trasferimento manuale per lo scambio</string> + <string name="exchange_list_error">Impossibile elencare i cambi</string> + <string name="tip_total">Totale</string> + <string name="tip_already_accepted">Questa ricompensa è già stata accettata.</string> + <string name="receive_peer">Fattura un altro portafoglio</string> + <string name="transaction_dummy_title">Transazione Sconosciuta</string> + <string name="receive_peer_title">Richiedi pagamento</string> + <string name="send_deposit_iban_error">IBAN non valido</string> + <string name="send_deposit_bic_error">BIC non valido</string> + <string name="send_deposit_name">Titolare del conto</string> + <string name="pay_peer_title">Paga fattura</string> + <string name="send_peer_purpose">Causale</string> + <string name="withdraw_restrict_age_unrestricted">Senza restrizioni</string> + <string name="settings_db_export_success">Banca dati esportata nel file</string> + <string name="tip_received">Ricompensa ricevuta</string> + <string name="transactions_retry">Riprova</string> + <string name="transactions_suspend">Sospendi</string> + <string name="transactions_resume">Riprendi</string> + <string name="send_deposit_bic">BIC/SWIFT</string> + <string name="send_peer_title">Invia denaro ad un altro portafoglio</string> + <string name="send_peer_create_button">Invia fondi adesso</string> + <string name="send_peer_warning">Attenzione: I fondi lasceranno il portafogli immediatamente.</string> + <string name="withdraw_manual_ready_title">Lo scambio è pronto per essere prelevato!</string> + <string name="withdraw_manual_ready_details_intro">Dettagli del trasferimento bancario</string> + <string name="withdraw_manual_ready_subject">Soggetto</string> + <string name="transaction_action_kyc">Completa KYC</string> + <string name="pay_peer_intro">Vuoi pagare questa fattura\?</string> + <string name="transactions_delete_dialog_title">Rimuovi Transazione</string> + <string name="transactions_delete_dialog_message">Sei sicuro di voler rimuovere questa transazione dal tuo portafogli?</string> + <string name="transaction_deposit">Deposita</string> + <string name="receive_peer_payment_title">Ricevi pagamento</string> + <string name="receive_peer_payment_intro">Vuoi ricevere questo pagamento\?</string> + <string name="withdraw_manual_ready_iban">IBAN</string> + <string name="transactions_send_funds">Invia +\nFondi</string> + <string name="withdraw_manual_ready_warning">Assicurati di usare il soggetto corretto, altrimenti il denaro non arriverà in questo portafogli.</string> + <string name="settings_db_export">Banca dati</string> + <string name="withdraw_manual_ready_intro">Per completare il processo devi trasferire %s al tuo conto bancario di cambio</string> + <string name="send_peer_expiration_1d">1 giorno</string> + <string name="send_peer_expiration_7d">7 giorni</string> + <string name="send_peer_expiration_period">Scade in</string> + <string name="send_peer_expiration_custom">Personalizzato</string> + <string name="send_peer_expiration_30d">30 giorni</string> + <string name="send_peer_expiration_days">Giorni</string> + <string name="send_peer_expiration_hours">Ore</string> + <string name="withdraw_manual_ready_bank_button">Apri nell\'applicazione bancaria</string> + <string name="settings_db_export_summary">Salva banca dati interna</string> + <string name="settings_test_summary">Realizza transazioni di prova con la configurazione demo</string> + <string name="settings_test">Avvia test d\'integrazione</string> + <string name="copy" tools:override="true">Copia</string> + <string name="transactions_receive_funds">Ricevi +\nFondi</string> + <string name="transaction_peer_pull_credit">Fattura</string> + <string name="send_amount">Importo da inviare</string> + <string name="withdraw_manual_ready_cancel">Cancella prelievo</string> + <string name="currency">Valuta</string> + <string name="send_peer_payment_amount_sent">Importo inviato</string> + <string name="send_peer_payment_amount_received">Importo ricevuto</string> + <string name="settings_logcat_error">Errore di espostazione del log</string> + <string name="settings_logcat_success">Log esportato nel file</string> + <string name="tip_fees">Commissione</string> + <string name="tip_merchant_url">URL del commerciante</string> + <string name="button_scan_qr_code_label">Scannerizza codice QR</string> + <string name="transaction_peer_pull_debit">Fattura pagata</string> + <string name="receive_intro">Scegli da dove ricevere il denaro:</string> + <string name="receive_withdraw">Preleva dall\'account bancario</string> + <string name="receive_peer_create_button">Crea fattura</string> + <string name="receive_peer_invoice_instruction">Fai scansionare al pagante questo codice QR per pagare:</string> + <string name="receive_peer_invoice_uri">In alternativa, copia e invia questo URI:</string> + <string name="send_intro">Scegli dove inviare il denaro:</string> + <string name="send_deposit">Ad un conto bancario</string> + <string name="send_deposit_title">Deposita ad un conto bancario</string> + <string name="send_deposit_iban">IBAN</string> + <string name="tip_button_confirm">Accetta ricompensa</string> + <string name="send_deposit_bitcoin">Ad un portafoglio Bitcoin</string> + <string name="send_peer_bitcoin">Ad un altro portafogli Taler</string> + <string name="transactions_delete_selected_dialog_message">Sei sicuro di voler rimuovere le transazioni selezionate dal tuo portafogli?</string> + <string name="transactions_cancel_dialog_message">Sei sicuro di voler cancellare questo prelievo? I fondi in transito potrebbero andare persi.</string> + <string name="send_deposit_bitcoin_address">Indirizzo Bitcoin</string> + <string name="send_deposit_check_fees_button">Controlla commissioni</string> + <string name="send_deposit_amount_effective">Importo Effetivo</string> + <string name="send_deposit_create_button">Fai un deposito</string> + <string name="send_deposit_bitcoin_create_button">Trasferisci Bitcoin</string> + <string name="send_peer">Ad un altro portafoglio</string> + <string name="settings_db_export_error">Errore nell\'esportazione della banca dati</string> + <string name="transactions_abort">Annulla</string> + <string name="transactions_fail">Arresta</string> + <string name="transactions_abort_dialog_title">Annulla la Transazione</string> + <string name="transactions_fail_dialog_title">Annulla la Transazione</string> + <string name="transactions_fail_dialog_message">Sei sicuro di voler annullare questa transazione? I fondi ancora in transito ANDRANNO PERSI.</string> + <string name="transactions_abort_dialog_message">Sei sicuro di voler annullare questa transazione? I fondi ancora in transito potrebbero andare persi.</string> + <string name="copy_uri">Copia URI Taler</string> + <string name="transactions_balance">Saldo</string> + <string name="offline_banner">Nessun accesso ad internet</string> + <string name="transaction_peer_push_debit">Pagamento Push</string> + <string name="transactions_detail_title_currency">%sTransazioni</string> + <string name="char_count">%1$d/%2$d</string> + <string name="error_broken_uri">Errore: Questo URI Taler è ( al momento ) non funzionante.</string> + <string name="import_db">Importa</string> + <string name="reset">Resetta</string> </resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-night/styles.xml b/wallet/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..d61986e --- /dev/null +++ b/wallet/src/main/res/values-night/styles.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2023 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/> + --> + + +<resources xmlns:tools="http://schemas.android.com/tools"> + + <style name="AppTheme" parent="AppTheme.Dark"> + <item name="windowActionModeOverlay">true</item> + <item name="android:statusBarColor">?colorSurface</item> + <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> + <item name="android:navigationBarColor">?colorSurface</item> + <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item> + </style> + +</resources> diff --git a/wallet/src/main/res/menu/transactions_detail.xml b/wallet/src/main/res/values-nl/strings.xml index d4568d4..f23dced 100644 --- a/wallet/src/main/res/menu/transactions_detail.xml +++ b/wallet/src/main/res/values-nl/strings.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?><!-- +<?xml version="1.0" encoding="utf-8"?> +<!-- ~ This file is part of GNU Taler ~ (C) 2020 Taler Systems S.A. ~ @@ -13,7 +14,5 @@ ~ 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/> --> - -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> -</menu> +<resources> +</resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-tr/strings.xml b/wallet/src/main/res/values-tr/strings.xml index 6360667..18c098b 100644 --- a/wallet/src/main/res/values-tr/strings.xml +++ b/wallet/src/main/res/values-tr/strings.xml @@ -27,8 +27,8 @@ <string name="menu_retry_pending_operations">Bekleyen İşlemleri Yeniden Deneyin</string> <string name="host_apdu_service_desc">Taler NFC Ödemeleri</string> <string name="balances_title">Bakiyeler</string> - <string name="amount_positive">+ %s</string> - <string name="amount_negative">- %s</string> + <string name="amount_positive">+. %s</string> + <string name="amount_negative">-. %s</string> <string name="amount_chosen">Seçilen Miktar</string> <string name="balances_inbound_label">gelen</string> <string name="transactions_title">İşlemler</string> @@ -148,4 +148,13 @@ <item quantity="one">Madeni para: %s (%d kez kullanıldı)</item> <item quantity="other">Madeni paralar: %s (%d kez kullanıldılar)</item> </plurals> + <string name="transactions_send_funds">Gönder +\nFonlar</string> + <string name="transactions_receive_funds">Al +\nFonlar</string> + <string name="transactions_detail_title_currency">%s İşlemleri</string> + <string name="transactions_retry">Tekrar Dene</string> + <string name="transactions_abort">İptal Et</string> + <string name="transactions_cancel_dialog_message">Bu çekimi iptal etmek istediğinizden emin misiniz? Transit halindeki fonlar kaybolabilir.</string> + <string name="transactions_balance">Bakiye</string> </resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values-v27/styles.xml b/wallet/src/main/res/values-v27/styles.xml new file mode 100644 index 0000000..5a21b91 --- /dev/null +++ b/wallet/src/main/res/values-v27/styles.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2023 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/> + --> + +<resources> + + <style name="AppTheme" parent="AppTheme.Light"> + <item name="android:statusBarColor">?colorSurface</item> + <item name="android:windowLightStatusBar">true</item> + <item name="android:navigationBarColor">?colorSurface</item> + <item name="android:windowLightNavigationBar">true</item> + </style> + +</resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values/colors.xml b/wallet/src/main/res/values/colors.xml index ba2804e..ce76c1d 100644 --- a/wallet/src/main/res/values/colors.xml +++ b/wallet/src/main/res/values/colors.xml @@ -18,4 +18,67 @@ <color name="colorPrimary">#3047a3</color> <color name="colorPrimaryDark">#152238</color> <color name="colorAccent">#BB1D24</color> + + <!-- Material 3 theme builder --> + <color name="seed">#3047a3</color> + <color name="md_theme_light_primary">#4157B4</color> + <color name="md_theme_light_onPrimary">#FFFFFF</color> + <color name="md_theme_light_primaryContainer">#DDE1FF</color> + <color name="md_theme_light_onPrimaryContainer">#001355</color> + <color name="md_theme_light_secondary">#2B5EA7</color> + <color name="md_theme_light_onSecondary">#FFFFFF</color> + <color name="md_theme_light_secondaryContainer">#D7E3FF</color> + <color name="md_theme_light_onSecondaryContainer">#001B3E</color> + <color name="md_theme_light_tertiary">#B91B23</color> + <color name="md_theme_light_onTertiary">#FFFFFF</color> + <color name="md_theme_light_tertiaryContainer">#FFDAD7</color> + <color name="md_theme_light_onTertiaryContainer">#410004</color> + <color name="md_theme_light_error">#BA1A1A</color> + <color name="md_theme_light_errorContainer">#FFDAD6</color> + <color name="md_theme_light_onError">#FFFFFF</color> + <color name="md_theme_light_onErrorContainer">#410002</color> + <color name="md_theme_light_background">#F8FDFF</color> + <color name="md_theme_light_onBackground">#001F25</color> + <color name="md_theme_light_surface">#F8FDFF</color> + <color name="md_theme_light_onSurface">#001F25</color> + <color name="md_theme_light_surfaceVariant">#E2E1EC</color> + <color name="md_theme_light_onSurfaceVariant">#45464F</color> + <color name="md_theme_light_outline">#767680</color> + <color name="md_theme_light_inverseOnSurface">#D6F6FF</color> + <color name="md_theme_light_inverseSurface">#00363F</color> + <color name="md_theme_light_inversePrimary">#B8C3FF</color> + <color name="md_theme_light_shadow">#000000</color> + <color name="md_theme_light_surfaceTint">#4157B4</color> + <color name="md_theme_light_outlineVariant">#C6C5D0</color> + <color name="md_theme_light_scrim">#000000</color> + <color name="md_theme_dark_primary">#B8C3FF</color> + <color name="md_theme_dark_onPrimary">#042584</color> + <color name="md_theme_dark_primaryContainer">#263E9A</color> + <color name="md_theme_dark_onPrimaryContainer">#DDE1FF</color> + <color name="md_theme_dark_secondary">#AAC7FF</color> + <color name="md_theme_dark_onSecondary">#002F65</color> + <color name="md_theme_dark_secondaryContainer">#00458E</color> + <color name="md_theme_dark_onSecondaryContainer">#D7E3FF</color> + <color name="md_theme_dark_tertiary">#FFB3AD</color> + <color name="md_theme_dark_onTertiary">#680009</color> + <color name="md_theme_dark_tertiaryContainer">#930012</color> + <color name="md_theme_dark_onTertiaryContainer">#FFDAD7</color> + <color name="md_theme_dark_error">#FFB4AB</color> + <color name="md_theme_dark_errorContainer">#93000A</color> + <color name="md_theme_dark_onError">#690005</color> + <color name="md_theme_dark_onErrorContainer">#FFDAD6</color> + <color name="md_theme_dark_background">#001F25</color> + <color name="md_theme_dark_onBackground">#A6EEFF</color> + <color name="md_theme_dark_surface">#001F25</color> + <color name="md_theme_dark_onSurface">#A6EEFF</color> + <color name="md_theme_dark_surfaceVariant">#45464F</color> + <color name="md_theme_dark_onSurfaceVariant">#C6C5D0</color> + <color name="md_theme_dark_outline">#90909A</color> + <color name="md_theme_dark_inverseOnSurface">#001F25</color> + <color name="md_theme_dark_inverseSurface">#A6EEFF</color> + <color name="md_theme_dark_inversePrimary">#4157B4</color> + <color name="md_theme_dark_shadow">#000000</color> + <color name="md_theme_dark_surfaceTint">#B8C3FF</color> + <color name="md_theme_dark_outlineVariant">#45464F</color> + <color name="md_theme_dark_scrim">#000000</color> </resources> diff --git a/wallet/src/main/res/values/defaults.xml b/wallet/src/main/res/values/defaults.xml index 0e2a6a1..dffc14e 100644 --- a/wallet/src/main/res/values/defaults.xml +++ b/wallet/src/main/res/values/defaults.xml @@ -16,6 +16,4 @@ <resources> - <bool name="settings_backup_default">true</bool> - </resources>
\ No newline at end of file diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index efaa7dd..8466e2d 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -44,7 +44,10 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="button_back">Go Back</string> <string name="button_scan_qr_code">Scan Taler QR Code</string> + <string name="button_scan_qr_code_label">Scan QR code</string> <string name="enter_uri">Enter Taler URI</string> + <string name="copy" tools:override="true">Copy</string> + <string name="copy_uri">Copy Taler URI</string> <string name="paste">Paste</string> <string name="paste_invalid">Clipboard contains an invalid data type</string> <string name="uri_invalid">Not a valid Taler URI</string> @@ -53,60 +56,154 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="search">Search</string> <string name="menu">Menu</string> <string name="or">or</string> + <string name="currency">Currency</string> + <!-- The count should be mirrored in RTL languages --> + <string name="char_count">%1$d/%2$d</string> + <string name="import_db">Import</string> + <string name="reset">Reset</string> + <string name="share_payment">Share payment link</string> <string name="offline">Operation requires internet access. Please ensure your internet connection works and try again.</string> + <string name="offline_banner">No internet access</string> <string name="error_unsupported_uri">Error: This Taler URI is not supported.</string> + <string name="error_broken_uri">Error: This Taler URI is (currently) not working.</string> <string name="menu_settings">Settings</string> <string name="menu_retry_pending_operations">Retry Pending Operations</string> <string name="host_apdu_service_desc">Taler NFC Payments</string> + <string name="handle_uri_title">Loading action</string> + <string name="balances_title">Balances</string> - <string name="amount_positive">+ %s</string> - <string name="amount_negative">- %s</string> + <string name="amount_positive">+%s</string> + <string name="amount_negative">-%s</string> <string name="amount_chosen">Chosen Amount</string> + <string name="amount_sent">Amount sent</string> + <string name="amount_received">Amount received</string> <string name="balances_inbound_label">inbound</string> <string name="balances_empty_state">There is no digital cash in your wallet.\n\nYou can get test money from the demo bank:\n\nhttps://bank.demo.taler.net</string> + <string name="balance_scope_exchange">Exchange: %1$s</string> + <string name="balance_scope_auditor">Auditor: %1$s</string> <string name="transactions_title">Transactions</string> + <string name="transactions_balance">Balance</string> + <string name="transactions_send_funds">Send\nFunds</string> + <string name="transactions_send_funds_title">Send %1$s</string> + <string name="transactions_receive_funds">Receive\nFunds</string> + <string name="transactions_receive_funds_title">Receive %1$s</string> <string name="transactions_empty">You don\'t have any transactions</string> <string name="transactions_empty_search">No transactions found. Try a different search.</string> <string name="transactions_error">Could not load transactions\n\n%s</string> <string name="transactions_detail_title">Transaction</string> - <string name="transactions_detail_title_balance">Balance: %s</string> + <string name="transactions_detail_title_currency">%s Transactions</string> <string name="transactions_delete">Delete</string> + <string name="transactions_retry">Retry</string> + <string name="transactions_abort">Abort</string> + <string name="transactions_fail">Kill</string> + <string name="transactions_suspend">Suspend</string> + <string name="transactions_resume">Resume</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_delete_selected_dialog_message">Are you sure you want to remove the selected transactions from your wallet?</string> + <string name="transactions_abort_dialog_title">Abort Transaction</string> + <string name="transactions_abort_dialog_message">Are you sure you want to abort this transaction? Funds still in transit might get lost.</string> + <string name="transactions_fail_dialog_title">Kill Transaction</string> + <string name="transactions_fail_dialog_message">Are you sure you want to kill this transaction? Funds still in transit WILL GET LOST.</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> <string name="transaction_order_total">Total</string> <string name="transaction_order">Purchase</string> <string name="transaction_order_id">Receipt #%1$s</string> - <string name="transaction_tip_from">Tip from %s</string> <string name="transaction_refund">Refund</string> <string name="transaction_refund_from">Refund from %s</string> <string name="transaction_pending">PENDING</string> <string name="transaction_refresh">Coin expiry change fee</string> + <string name="transaction_deposit">Deposit</string> + <string name="transaction_peer_push_debit">Push payment</string> + <string name="transaction_peer_pull_credit">Invoice</string> + <string name="transaction_peer_pull_debit">Invoice paid</string> + <string name="transaction_peer_push_credit">Push payment</string> + <string name="transaction_action_kyc">Complete KYC</string> + <string name="transaction_denom_loss">Loss of funds</string> + <string name="transaction_dummy_title">Unknown Transaction</string> <string name="payment_title">Payment</string> + <string name="payment_prompt_title">Review Payment</string> <string name="payment_fee">+%s payment fee</string> <string name="payment_button_confirm">Confirm Payment</string> <string name="payment_label_amount_total">Total Amount:</string> <string name="payment_label_order_summary">Purchase</string> <string name="payment_error">Error: %s</string> + <string name="payment_pending">Payment not completed, it will be retried</string> <string name="payment_balance_insufficient">Balance insufficient!</string> <string name="payment_aborted">Aborted</string> <string name="payment_failed">Failed</string> <string name="payment_initiated">Payment initiated</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="payment_pay_template_title">Customize your order</string> + <string name="payment_create_order">Create order</string> + <string name="payment_confirmation_code">Confirmation code</string> + <string name="payment_template_error">Error creating order</string> + + <string name="receive_amount">Amount to receive</string> + <string name="receive_amount_invalid">Amount invalid</string> + <string name="receive_intro">Choose where to receive money from:</string> + <string name="receive_withdraw">Withdraw from bank account</string> + <string name="receive_peer">Invoice another wallet</string> + <string name="receive_peer_title">Request payment</string> + <string name="receive_peer_create_button">Create invoice</string> + <string name="receive_peer_invoice_instruction">Let the payer scan this QR code to pay:</string> + <string name="receive_peer_invoice_uri">Alternatively, copy and send this URI:</string> + <string name="receive_peer_amount_invoiced">Amount invoiced</string> + + <string name="send_amount">Amount to send</string> + <string name="send_intro">Choose where to send money to:</string> + <string name="send_deposit">To a bank account</string> + <string name="send_deposit_bitcoin">To a Bitcoin wallet</string> + <string name="send_deposit_title">Deposit to a bank account</string> + <string name="send_deposit_iban">IBAN</string> + <string name="send_deposit_iban_error">IBAN is invalid</string> + <string name="send_deposit_bic_error">BIC is invalid</string> + <string name="send_deposit_bic">BIC/SWIFT</string> + <string name="send_deposit_name">Account holder</string> + <string name="send_deposit_bitcoin_address">Bitcoin address</string> + <string name="send_deposit_check_fees_button">Check fees</string> + <string name="send_deposit_amount_effective">Effective Amount</string> + <string name="send_deposit_create_button">Make deposit</string> + <string name="send_deposit_bitcoin_create_button">Transfer Bitcoin</string> + <string name="send_peer">To another wallet</string> + <string name="send_peer_bitcoin">To another Taler wallet</string> + <string name="send_peer_title">Send money to another wallet</string> + <string name="send_peer_create_button">Send funds now</string> + <string name="send_peer_payment_instruction">Let the payee scan this QR code to receive:</string> + <string name="send_peer_expiration_period">Expires in</string> + <string name="send_peer_expiration_1d">1 day</string> + <string name="send_peer_expiration_7d">7 days</string> + <string name="send_peer_expiration_30d">30 days</string> + <string name="send_peer_expiration_custom">Custom</string> + <string name="send_peer_expiration_days">Days</string> + <string name="send_peer_expiration_hours">Hours</string> + <string name="send_peer_purpose">Purpose</string> + + <string name="pay_peer_title">Pay invoice</string> + <string name="pay_peer_intro">Do you want to pay this invoice?</string> + <string name="receive_peer_payment_title">Receive payment</string> + <string name="receive_peer_payment_intro">Do you want to receive this payment?</string> <string name="withdraw_initiated">Withdrawal initiated</string> <string name="withdraw_title">Withdrawal</string> + <string name="withdraw_subtitle">Select target bank account</string> <string name="withdraw_total">Withdraw</string> <string name="withdraw_fees">Fee</string> + <string name="withdraw_restrict_age">Restrict Usage to Age</string> + <string name="withdraw_restrict_age_unrestricted">Unrestricted</string> <string name="withdraw_exchange">Exchange</string> + <string name="withdraw_bank">Bank</string> <string name="withdraw_button_confirm">Confirm Withdraw</string> <string name="withdraw_button_confirm_bank">Confirm with bank</string> <string name="withdraw_button_tos">Review Terms</string> @@ -119,11 +216,11 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="withdraw_manual_ready_title">Exchange is ready for withdrawal!</string> <string name="withdraw_manual_ready_intro">To complete the process you need to wire %s to the exchange bank account</string> <string name="withdraw_manual_ready_details_intro">Bank transfer details</string> - <string name="withdraw_manual_bitcoin_ready_details_intro">Bitcoin transfer details</string> - <string name="withdraw_manual_bitcoin_ready_details_segwit">The exchange need a transaction with 3 output, one output is the exchange account and the other two are segwit fake address for metadata with an minimum amount.</string> - <string name="withdraw_manual_bitcoin_ready_details_bitcoincore">In bitcoincore wallet use \'Add Recipient\' button to add two additional recipient and copy addresses and amounts</string> - <string name="withdraw_manual_bitcoin_ready_details_confirm">Make sure the amount show %s, else you have to change the base unit to BTC</string> + <string name="withdraw_manual_bitcoin_title">Bitcoin exchange ready for withdrawal</string> + <string name="withdraw_manual_bitcoin_intro">Now make a split transaction with the following three outputs.</string> <string name="withdraw_manual_ready_iban">IBAN</string> + <string name="withdraw_manual_ready_account">Account</string> + <string name="withdraw_manual_ready_receiver">Receiver name</string> <string name="withdraw_manual_ready_subject">Subject</string> <string name="withdraw_manual_ready_bank_button">Open in banking app</string> <string name="withdraw_manual_ready_cancel">Cancel withdrawal</string> @@ -131,6 +228,11 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="withdraw_error_title">Withdrawal Error</string> <string name="withdraw_error_message">Withdrawing is currently not possible. Please try again later!</string> <string name="withdraw_error_test">Error withdrawing TESTKUDOS</string> + <string name="withdraw_account">Account #%1$d</string> + <string name="withdraw_account_currency">Account #%1$d (%2$s)</string> + <string name="withdraw_transfer">Transfer</string> + <string name="withdraw_conversion">Conversion</string> + <string name="withdraw_conversion_support">This exchange supports currency conversion</string> <string name="exchange_settings_title">Exchanges</string> <string name="exchange_settings_summary">Manage list of exchanges known to this wallet</string> @@ -138,8 +240,16 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="exchange_list_empty">No exchanges known\n\nAdd one manually or withdraw digital cash!</string> <string name="exchange_list_currency">Currency: %s</string> <string name="exchange_list_add">Add exchange</string> + <string name="exchange_list_select">Select exchange</string> + <string name="exchange_delete">Delete exchange</string> + <string name="exchange_delete_force">Force deletion (purge)</string> + <string name="exchange_dialog_delete_message">Are you sure you want to delete this exchange? Forcing this operation will result in a loss of funds.</string> + <string name="exchange_reload">Reload information</string> + <string name="exchange_not_contacted">Exchange not contacted</string> <string name="exchange_add_url">Enter address of exchange</string> <string name="exchange_add_error">Could not add exchange</string> + <string name="exchange_list_error">Could not list exchanges</string> + <string name="exchange_list_add_dev">Add development exchanges</string> <string name="exchange_menu_manual_withdraw">Withdraw</string> <string name="exchange_fee_withdrawal_fee_label">Withdrawal Fee:</string> @@ -161,39 +271,59 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="exchange_tos_accept">Accept Terms of Service</string> <string name="exchange_tos_error">Error showing Terms of Service: %s</string> + <string name="loss_amount">Amount lost</string> + <string name="loss_reason">Reason</string> + <string name="loss_reason_expired">Funds were not renewed, because the wallet was not opened for a long time</string> + <string name="loss_reason_vanished">The payment provider lost the record of the funds</string> + <string name="loss_reason_unoffered">The payment provider stopped offering the denomination backing the funds</string> + + <string name="pending_operations_title">Pending Operations</string> <string name="pending_operations_refuse">Refuse Proposal</string> <string name="pending_operations_no_action">(no action)</string> + <!-- Observability --> + <string name="show_logs">Show logs</string> + <string name="observability_title">Internal event log</string> + <string name="observability_show_json">Show JSON</string> + <string name="observability_hide_json">Hide JSON</string> + <string name="settings_dev_mode">Developer Mode</string> <string name="settings_dev_mode_summary">Shows more information intended for debugging</string> <string name="settings_withdraw_testkudos">Withdraw TESTKUDOS</string> <string name="settings_withdraw_testkudos_summary">Get money for testing</string> <string name="settings_logcat">Debug log</string> - <string name="settings_logcat_summary">View/send internal log</string> + <string name="settings_logcat_summary">Save internal log</string> + <string name="settings_logcat_error">Error exporting log</string> + <string name="settings_logcat_success">Log exported to file</string> + <string name="settings_db_export">Export database</string> + <string name="settings_db_export_summary">Save internal database</string> + <string name="settings_db_import">Import database</string> + <string name="settings_db_import_summary">Restore database from file</string> + <string name="settings_db_export_error">Error exporting database</string> + <string name="settings_db_import_error">Error importing database</string> + <string name="settings_db_clear_error">Error cleaning database</string> + <string name="settings_db_export_success">Database exported to file</string> + <string name="settings_db_import_success">Database imported from file</string> <string name="settings_version_app">App Version</string> <string name="settings_version_core">Wallet Core Version</string> <string name="settings_version_protocol_exchange">Supported Exchange Versions</string> <string name="settings_version_protocol_merchant">Supported Merchant Versions</string> <string name="settings_version_unknown">Unknown</string> + <string name="settings_test">Run integration test</string> + <string name="settings_test_summary">Performs test transactions with demo setup</string> <string name="settings_reset">Reset Wallet (dangerous!)</string> <string name="settings_reset_summary">Throws away your money</string> - <string name="nav_settings_backup">Backup</string> - <string name="backup_last">Last Backup: %s</string> + <string name="settings_dialog_reset_message">Do you really want to reset the wallet and lose all coins and purchases?</string> + <string name="settings_dialog_import_message">This operation will overwrite your existing database. Do you want to continue?</string> + <string name="settings_alert_reset_done">Wallet has been reset</string> + <string name="settings_alert_reset_canceled">Reset cancelled</string> + <string name="settings_alert_import_canceled">Import cancelled</string> <string name="refund_title">Refund</string> <string name="refund_error">Error processing refund</string> - <string name="refund_success">Refund received: %s</string> - - <string name="tip_title">Tip</string> - <string name="tip_already_accepted">This tip is already accepted.</string> - <string name="tip_total">Total</string> - <string name="tip_fees">Fee</string> - <string name="tip_exchange">Exchange</string> - <string name="tip_merchant_url">Merchant URL</string> - <string name="tip_button_confirm">Accept tip</string> - <string name="tip_received">Tip received</string> + <string name="refund_success">Refund received!</string> <string name="wifi_disabled_error">Turn on Wi-Fi to get free Wi-Fi</string> <string name="wifi_connect_error">Could not connect to free Wi-Fi: %s</string> diff --git a/wallet/src/main/res/values/styles.xml b/wallet/src/main/res/values/styles.xml index 33e31a3..961c8da 100644 --- a/wallet/src/main/res/values/styles.xml +++ b/wallet/src/main/res/values/styles.xml @@ -14,32 +14,103 @@ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> --> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> - <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - <item name="colorAccent">@color/colorAccent</item> - <item name="colorOnPrimary">@android:color/white</item> + <style name="AppTheme.Light" parent="Theme.Material3.Light"> + <!-- Material 3 theme builder --> + <item name="colorPrimary">@color/md_theme_light_primary</item> + <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_light_secondary</item> + <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_light_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_light_error</item> + <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item> + <item name="colorOnError">@color/md_theme_light_onError</item> + <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_light_background</item> + <item name="colorOnBackground">@color/md_theme_light_onBackground</item> + <item name="colorSurface">@color/md_theme_light_surface</item> + <item name="colorOnSurface">@color/md_theme_light_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_light_outline</item> + <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item> + <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item> + </style> + + <style name="AppTheme.Dark" parent="Theme.Material3.Dark"> + <item name="windowActionModeOverlay">true</item> + <item name="android:statusBarColor" tools:targetApi="m">?colorSurface</item> + <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> + <item name="android:navigationBarColor" tools:targetApi="o_mr1">?colorSurface</item> + <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item> + <!-- Material 3 theme builder --> + <item name="colorPrimary">@color/md_theme_dark_primary</item> + <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_dark_secondary</item> + <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_dark_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_dark_error</item> + <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item> + <item name="colorOnError">@color/md_theme_dark_onError</item> + <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_dark_background</item> + <item name="colorOnBackground">@color/md_theme_dark_onBackground</item> + <item name="colorSurface">@color/md_theme_dark_surface</item> + <item name="colorOnSurface">@color/md_theme_dark_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_dark_outline</item> + <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item> + <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item> + </style> + + <style name="AppTheme" parent="AppTheme.Light"> <item name="windowActionModeOverlay">true</item> </style> <style name="AppTheme.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> - <item name="android:statusBarColor">@android:color/transparent</item> </style> - <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.ActionBar" /> + <style name="AppTheme.AppBarOverlay" parent="Widget.Material3.ActionBar.Solid" /> - <style name="AppTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar.Primary" /> + <style name="AppTheme.Toolbar" parent="Widget.Material3.Toolbar" /> - <style name="DialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert" /> + <style name="DialogTheme" parent="Theme.Material3.DayNight.Dialog.Alert" /> <style name="TransactionTitle"> - <item name="android:textSize">16sp</item> - <item name="android:textColor">?android:textColorPrimary</item> + <item name="android:textAppearance">@style/TextAppearance.Material3.TitleMedium</item> + </style> + + <style name="TransactionSubtitle"> + <item name="android:textAppearance">@style/TextAppearance.Material3.BodyMedium</item> + </style> + + <style name="TransactionTimestamp"> + <item name="android:textAppearance">@style/TextAppearance.Material3.LabelMedium</item> + </style> + + <style name="TransactionAmount"> + <item name="android:textAppearance">@style/TextAppearance.Material3.TitleLarge</item> </style> <style name="TransactionLabel"> @@ -72,13 +143,11 @@ <item name="cardElevation">8dp</item> </style> - <style name="FabStyle" parent="Widget.MaterialComponents.FloatingActionButton"> + <style name="FabStyle" parent="Widget.Material3.FloatingActionButton.Primary"> <item name="android:layout_gravity">bottom|end</item> <item name="android:layout_marginEnd">16dp</item> <item name="android:layout_marginBottom">16dp</item> - <item name="backgroundTint">@color/colorPrimary</item> <item name="layout_dodgeInsetEdges">bottom</item> - <item name="tint">?attr/colorOnPrimary</item> </style> </resources> diff --git a/wallet/src/main/res/xml/network_security_config.xml b/wallet/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..de61259 --- /dev/null +++ b/wallet/src/main/res/xml/network_security_config.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config> + <domain-config cleartextTrafficPermitted="true"> + <domain includeSubdomains="true">localhost</domain> + </domain-config> +</network-security-config> diff --git a/wallet/src/main/res/xml/settings_backup.xml b/wallet/src/main/res/xml/settings_backup.xml deleted file mode 100644 index f8c5839..0000000 --- a/wallet/src/main/res/xml/settings_backup.xml +++ /dev/null @@ -1,58 +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/> - --> - -<PreferenceScreen - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <SwitchPreferenceCompat - app:defaultValue="@bool/settings_backup_default" - app:fragment="net.taler.wallet.settings.BackupSettingsFragment" - app:icon="@drawable/ic_baseline_backup" - app:key="pref_backup_switch" - app:summaryOff="Backup is disabled" - app:summaryOn="Backup is enabled" - app:title="Backup my wallet" /> - - <Preference - app:dependency="pref_backup_switch" - app:icon="@drawable/ic_baseline_account_tree" - app:key="pref_backup_services" - app:selectable="false" - app:summary="1 backup service set up" - app:title="Backup services" /> - - <PreferenceCategory - app:iconSpaceReserved="false" - app:summary="At least one of these is required to restore from backup" - app:title="Recovery Options"> - - <Preference - app:dependency="pref_backup_switch" - app:icon="@drawable/ic_baseline_vpn_key" - app:key="pref_backup_secret" - app:selectable="false" - app:title="Show backup secret" /> - - <Preference - app:dependency="pref_backup_switch" - app:icon="@drawable/ic_baseline_cloud_circle" - app:key="pref_backup_recovery" - app:summary="Not used" - app:title="Secure cloud recovery"/> - - </PreferenceCategory> - -</PreferenceScreen> diff --git a/wallet/src/main/res/xml/settings_main.xml b/wallet/src/main/res/xml/settings_main.xml index a713838..3567e49 100644 --- a/wallet/src/main/res/xml/settings_main.xml +++ b/wallet/src/main/res/xml/settings_main.xml @@ -24,13 +24,6 @@ app:summary="@string/exchange_settings_summary" app:title="@string/exchange_settings_title" /> - <Preference - app:fragment="net.taler.wallet.settings.BackupSettingsFragment" - app:icon="@drawable/ic_baseline_backup" - app:isPreferenceVisible="false" - app:key="pref_backup" - app:title="Backup" - tools:isPreferenceVisible="true" /> <SwitchPreferenceCompat app:icon="@drawable/ic_developer_mode" @@ -55,8 +48,24 @@ tools:isPreferenceVisible="true" /> <Preference - app:icon="@drawable/ic_account_balance_wallet" + app:icon="@drawable/ic_unarchive" + app:isPreferenceVisible="false" + app:key="pref_export_db" + app:summary="@string/settings_db_export_summary" + app:title="@string/settings_db_export" + tools:isPreferenceVisible="true" /> + + <Preference + app:icon="@drawable/ic_archive" app:isPreferenceVisible="false" + app:key="pref_import_db" + app:summary="@string/settings_db_import_summary" + app:title="@string/settings_db_import" + tools:isPreferenceVisible="true" /> + + <Preference + app:icon="@drawable/ic_account_balance_wallet" + app:isPreferenceVisible="true" app:key="pref_version_app" app:selectable="false" app:summary="@string/settings_version_unknown" @@ -91,6 +100,13 @@ tools:isPreferenceVisible="true" /> <Preference + app:isPreferenceVisible="false" + app:key="pref_test" + app:summary="@string/settings_test_summary" + app:title="@string/settings_test" + tools:isPreferenceVisible="true" /> + + <Preference app:icon="@drawable/ic_nuke" app:isPreferenceVisible="false" app:key="pref_reset" |