diff options
Diffstat (limited to 'wallet/src/main/res/layout')
22 files changed, 345 insertions, 1006 deletions
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/balance_actions.xml b/wallet/src/main/res/layout/balance_actions.xml new file mode 100644 index 0000000..d071a78 --- /dev/null +++ b/wallet/src/main/res/layout/balance_actions.xml @@ -0,0 +1,117 @@ +<?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/> + --> + +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + + <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:layout_marginVertical="10dp" + android:paddingHorizontal="18dp" + android:text="@string/transactions_send_funds" + app:icon="@drawable/ic_funds_send" + tools:ignore="MissingConstraints" /> + + <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:layout_marginVertical="10dp" + android:paddingHorizontal="18dp" + android:text="@string/transactions_receive_funds" + app:icon="@drawable/ic_funds_receive" + tools:ignore="MissingConstraints" /> + + <androidx.constraintlayout.helper.widget.Flow + android:layout_width="0dp" + android:layout_height="wrap_content" + app:constraint_referenced_ids="sendButton,receiveButton" + android:paddingHorizontal="10dp" + app:flow_horizontalGap="10dp" + app:flow_horizontalBias="0" + app:flow_horizontalAlign="start" + app:flow_horizontalStyle="packed" + app:flow_wrapMode="chain" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/amountBarrier" + app:layout_constraintBottom_toBottomOf="@id/topBarrier"/> + + <androidx.constraintlayout.widget.Barrier + android:id="@+id/amountBarrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/divider" + app:barrierDirection="start"/> + + <LinearLayout + android:id="@+id/amountLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:orientation="vertical" + android:gravity="end" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/divider" + app:layout_constraintStart_toEndOf="@id/amountBarrier"> + + <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" /> + + <TextView + android:id="@+id/amount" + style="@style/TextAppearance.Material3.TitleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:layout_marginBottom="8dp" + android:textStyle="bold" + tools:text="23.42" + tools:visibility="visible" /> + + </LinearLayout> + + <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,amountLayout" /> + + <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.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 941274f..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_marginEnd="8dp" - android:layout_marginBottom="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 03e7d1a..e77a549 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/amount_fee" + 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/amount_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 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 c5f5f81..0000000 --- a/wallet/src/main/res/layout/fragment_transaction_payment.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/amountPaidWithFeesLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="23 March 2020 23:42pm" /> - - <TextView - android:id="@+id/amountPaidWithFeesLabel" - style="@style/TransactionLabel" - android:text="@string/transaction_paid" - 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_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_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/amountPaidWithFeesView" /> - - <TextView - android:id="@+id/orderAmountView" - style="@style/TransactionContent" - 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_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_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_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_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_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orderSummaryView" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/deleteButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginVertical="10dp" - android:text="@string/transactions_delete" - app:backgroundTint="@color/red" - app:icon="@drawable/ic_delete" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orderIdView" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - -</ScrollView> diff --git a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml deleted file mode 100644 index 47dbafb..0000000 --- a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml +++ /dev/null @@ -1,153 +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" - 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/actionButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView" - tools:ignore="RtlHardcoded" /> - - <Button - android:id="@+id/actionButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginVertical="10dp" - android:backgroundTint="@color/colorAccent" - android:visibility="gone" - app:layout_constraintBottom_toTopOf="@id/chosenAmountLabel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/confirmWithdrawalButton" - tools:text="@string/transaction_action_kyc" - tools:visibility="visible" /> - - <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/actionButton" - 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_toTopOf="@+id/deleteButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/exchangeLabel" - tools:text="exchange.demo.taler.net" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/deleteButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginVertical="10dp" - android:text="@string/transactions_delete" - app:backgroundTint="@color/red" - app:icon="@drawable/ic_delete" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/exchangeView" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - -</ScrollView> diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml index bad79ea..c417540 100644 --- a/wallet/src/main/res/layout/fragment_transactions.xml +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -20,87 +20,40 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <com.google.android.material.button.MaterialButton - android:id="@+id/sendButton" - style="@style/Widget.MaterialComponents.Button.TextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/transactions_send_funds" - app:layout_constraintBottom_toTopOf="@+id/divider" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> - <com.google.android.material.button.MaterialButton - android:id="@+id/receiveButton" - style="@style/Widget.MaterialComponents.Button.TextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> - <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" /> + <FrameLayout + android:id="@+id/actionsFrame" + android:layout_height="wrap_content" + android:layout_width="match_parent"> + <include + android:id="@+id/actionsBar" + layout="@layout/balance_actions" + android:layout_height="wrap_content" + android:layout_width="match_parent"/> + </FrameLayout> - <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" /> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:nestedScrollingEnabled="false" + android:scrollbars="vertical" + android:visibility="invisible" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/list_item_transaction" + tools:visibility="visible" /> - <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" /> + </LinearLayout> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/list" - android:layout_width="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" /> + </androidx.core.widget.NestedScrollView> <TextView android:id="@+id/emptyState" @@ -115,7 +68,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider" + app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> <ProgressBar @@ -128,16 +81,17 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider" + app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> - <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" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/wallet/src/main/res/layout/fragment_uri_input.xml b/wallet/src/main/res/layout/fragment_uri_input.xml index 1e9934f..6547625 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" @@ -67,7 +68,8 @@ android:layout_marginTop="16dp" android:layout_marginEnd="16dp" android:backgroundTint="@color/green" - android:text="@string/ok" + android:text="@string/open" + 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_balance.xml b/wallet/src/main/res/layout/list_item_balance.xml index 475e7d6..6e5e440 100644 --- a/wallet/src/main/res/layout/list_item_balance.xml +++ b/wallet/src/main/res/layout/list_item_balance.xml @@ -14,9 +14,9 @@ ~ 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" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" @@ -26,65 +26,35 @@ android:id="@+id/balanceAmountView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:textSize="40sp" - app:layout_constraintEnd_toStartOf="@+id/balanceCurrencyView" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + style="?textAppearanceDisplaySmall" tools:text="100.50" /> <TextView - android:id="@+id/balanceCurrencyView" + android:id="@+id/scopeView" android:layout_width="wrap_content" 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" + tools:text="@string/balance_scope_exchange" + tools:visibility="visible"/> <TextView android:id="@+id/balanceInboundAmount" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/green" - android:textSize="20sp" - 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" - tools:text="+10 TESTKUDOS" + style="?textAppearanceBodyLarge" + tools:text="+10 TESTKUDOS inbound" tools:visibility="visible" /> <TextView - android:id="@+id/balanceInboundLabel" + android:id="@+id/balanceOutboundAmount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:text="@string/balances_inbound_label" - android:textColor="@color/green" - app:layout_constraintBottom_toBottomOf="@+id/balanceInboundAmount" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/balanceInboundAmount" - app:layout_constraintTop_toTopOf="@+id/balanceInboundAmount" + android:textColor="?colorError" + style="?textAppearanceBodyLarge" + tools:text="-10 TESTKUDOS outbound" tools:visibility="visible" /> - <TextView - android:id="@+id/pendingView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/badge" - android:text="@string/transaction_pending" - android:textColor="?android:textColorPrimaryInverse" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - -</androidx.constraintlayout.widget.ConstraintLayout> +</LinearLayout> 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 232afb8..ad792ae 100644 --- a/wallet/src/main/res/layout/list_item_transaction.xml +++ b/wallet/src/main/res/layout/list_item_transaction.xml @@ -22,9 +22,9 @@ 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" @@ -50,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" @@ -62,28 +62,17 @@ tools:text="@string/withdraw_waiting_confirm" tools:visibility="visible" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/actionButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - app:backgroundTint="@color/colorAccent" - app:layout_constraintStart_toStartOf="@id/title" - app:layout_constraintTop_toBottomOf="@id/extraInfoView" - tools:text="Complete KYC" - tools:visibility="visible"/> - <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" - app:layout_constraintTop_toBottomOf="@+id/actionButton" + app:layout_constraintTop_toBottomOf="@+id/extraInfoView" tools:text="23 min ago" /> <androidx.constraintlayout.widget.Barrier @@ -95,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/layout/payment_bottom_bar.xml b/wallet/src/main/res/layout/payment_bottom_bar.xml index 496f2f3..9026127 100644 --- a/wallet/src/main/res/layout/payment_bottom_bar.xml +++ b/wallet/src/main/res/layout/payment_bottom_bar.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="8dp" - android:text="@string/payment_label_amount_total" + android:text="@string/amount_total_label" android:visibility="invisible" app:layout_constraintBottom_toTopOf="@+id/confirmButton" app:layout_constraintEnd_toStartOf="@+id/totalView" |