diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/content_main.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_already_paid.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_payment_successful.xml | 87 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_prompt_payment.xml | 160 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_withdraw_successful.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/payment_bottom_bar.xml | 124 | ||||
| -rw-r--r-- | app/src/main/res/layout/payment_details.xml | 119 |
7 files changed, 307 insertions, 191 deletions
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index acfb4ef..c43af48 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -25,7 +25,7 @@ tools:showIn="@layout/app_bar_main" tools:context=".MainActivity"> - <fragment + <androidx.fragment.app.FragmentContainerView android:id="@+id/nav_host_fragment" android:name="androidx.navigation.fragment.NavHostFragment" android:layout_width="0dp" @@ -37,4 +37,4 @@ app:defaultNavHost="true" app:navGraph="@navigation/nav_graph" /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_already_paid.xml b/app/src/main/res/layout/fragment_already_paid.xml index f7f9d87..beda615 100644 --- a/app/src/main/res/layout/fragment_already_paid.xml +++ b/app/src/main/res/layout/fragment_already_paid.xml @@ -47,7 +47,7 @@ android:text="Go Back" android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/button_success_back"/> + android:id="@+id/backButton"/> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_payment_successful.xml b/app/src/main/res/layout/fragment_payment_successful.xml index f52380a..cf9e5e8 100644 --- a/app/src/main/res/layout/fragment_payment_successful.xml +++ b/app/src/main/res/layout/fragment_payment_successful.xml @@ -1,5 +1,4 @@ -<?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. ~ @@ -15,40 +14,50 @@ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="15dp" - tools:context=".payment.PaymentSuccessfulFragment"> - - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <Space android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"/> - - <TextView - android:layout_gravity="center" - android:layout_width="match_parent" - android:textAlignment="center" - android:layout_height="50dp" - android:text="@string/payment_successful" - android:autoSizeTextType="uniform" - android:textColor="@android:color/holo_green_dark"/> - - - <Space android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"/> - <Button - android:text="Go Back" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/button_success_back"/> - - </LinearLayout> - -</FrameLayout>
\ No newline at end of file +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/frameLayout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="16dp" + tools:context=".payment.PaymentSuccessfulFragment"> + + <ImageView + android:id="@+id/successImageView" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_margin="32dp" + android:src="@drawable/ic_check_circle" + app:layout_constraintBottom_toTopOf="@+id/successTextView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="ContentDescription" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/successTextView" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginBottom="16dp" + android:text="@string/payment_successful" + android:textAlignment="center" + android:textColor="@color/green" + app:autoSizeMaxTextSize="48sp" + app:autoSizeMinTextSize="10sp" + app:autoSizeTextType="uniform" + app:layout_constraintBottom_toTopOf="@+id/backButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/successImageView" /> + + <Button + android:id="@+id/backButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="@string/payment_back_button" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_prompt_payment.xml b/app/src/main/res/layout/fragment_prompt_payment.xml index 808abf4..26cbeb6 100644 --- a/app/src/main/res/layout/fragment_prompt_payment.xml +++ b/app/src/main/res/layout/fragment_prompt_payment.xml @@ -1,5 +1,4 @@ -<?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. ~ @@ -22,159 +21,24 @@ android:layout_height="match_parent" tools:context=".payment.PromptPaymentFragment"> - <ScrollView + <include + android:id="@+id/scrollView" + layout="@layout/payment_details" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginBottom="16dp" - android:fillViewport="true" - app:layout_constraintBottom_toTopOf="@+id/button_abort_payment" + app:layout_constraintBottom_toTopOf="@+id/bottomView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" /> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/error_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:textColor="@android:color/holo_red_dark" - android:textSize="22sp" - android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/order_summary_label" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:text="@string/payment_balance_insufficient" - tools:visibility="visible" /> - - <TextView - android:id="@+id/order_summary_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:text="@string/payment_label_order_summary" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/order_summary" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/error_text" - tools:visibility="visible" /> - - <TextView - android:id="@+id/order_summary" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:layout_marginTop="16dp" - android:gravity="center_horizontal" - android:textAppearance="@style/TextAppearance.AppCompat.Headline" - android:textSize="25sp" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/detailsButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/order_summary_label" - tools:text="2 x Cappuccino, 1 x Hot Meals, 1 x Dessert" - tools:visibility="visible" /> - - <Button - android:id="@+id/detailsButton" - style="@style/Widget.AppCompat.Button.Colored" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:backgroundTint="@color/colorPrimary" - android:text="@string/payment_show_details" - android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/productsList" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/order_summary" - tools:visibility="visible" /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/productsList" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/order_amount_label" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/detailsButton" - tools:listitem="@layout/list_item_product" - tools:visibility="visible" /> - - <TextView - android:id="@+id/order_amount_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:text="@string/payment_label_amount_total" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/order_amount" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/productsList" - tools:visibility="visible" /> - - <TextView - android:id="@+id/order_amount" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:textAppearance="@style/TextAppearance.AppCompat.Headline" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/order_fees_amount" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/order_amount_label" - tools:text="10 TESTKUDOS" - tools:visibility="visible" /> - - <TextView - android:id="@+id/order_fees_amount" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/order_amount" - tools:text="@string/payment_fee" - tools:visibility="visible" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - - </ScrollView> - - <Button - android:id="@+id/button_abort_payment" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:text="@string/payment_button_abort" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/button_confirm_payment" - app:layout_constraintHorizontal_chainStyle="spread_inside" - app:layout_constraintStart_toStartOf="parent" /> - - <Button - android:id="@+id/button_confirm_payment" - style="@style/Widget.AppCompat.Button.Colored" - android:layout_width="wrap_content" + <include + android:id="@+id/bottomView" + layout="@layout/payment_bottom_bar" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:enabled="false" - android:text="@string/payment_button_confirm" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/button_abort_payment" - tools:enabled="true" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/scrollView" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_withdraw_successful.xml b/app/src/main/res/layout/fragment_withdraw_successful.xml index 60e1344..b1474de 100644 --- a/app/src/main/res/layout/fragment_withdraw_successful.xml +++ b/app/src/main/res/layout/fragment_withdraw_successful.xml @@ -60,7 +60,7 @@ android:layout_weight="1" /> <Button - android:id="@+id/button_success_back" + android:id="@+id/backButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Go Back" /> diff --git a/app/src/main/res/layout/payment_bottom_bar.xml b/app/src/main/res/layout/payment_bottom_bar.xml new file mode 100644 index 0000000..5b5c9f3 --- /dev/null +++ b/app/src/main/res/layout/payment_bottom_bar.xml @@ -0,0 +1,124 @@ +<?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/> + --> + +<com.google.android.material.card.MaterialCardView 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="0dp" + android:layout_height="wrap_content" + app:cardCornerRadius="0dp" + app:cardElevation="8dp" + tools:showIn="@layout/fragment_prompt_payment"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/totalLabelView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:text="@string/payment_label_amount_total" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/abortButton" + app:layout_constraintEnd_toStartOf="@+id/totalView" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + tools:visibility="visible" /> + + <TextView + android:id="@+id/totalView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" + android:textColor="?android:attr/textColorPrimary" + android:textStyle="bold" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/feeView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/totalLabelView" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + tools:text="10 TESTKUDOS" + tools:visibility="visible" /> + + <TextView + android:id="@+id/feeView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/confirmButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/totalView" + tools:text="@string/payment_fee" + tools:visibility="visible" /> + + <Button + android:id="@+id/abortButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:backgroundTint="@color/red" + android:text="@string/payment_button_abort" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/confirmButton" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toStartOf="parent" /> + + <Button + android:id="@+id/confirmButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:backgroundTint="@color/green" + android:enabled="false" + android:text="@string/payment_button_confirm" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/abortButton" + app:layout_constraintTop_toBottomOf="@+id/feeView" + tools:enabled="true" /> + + <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/confirmButton" + app:layout_constraintEnd_toEndOf="@+id/confirmButton" + app:layout_constraintStart_toStartOf="@+id/confirmButton" + app:layout_constraintTop_toTopOf="@+id/confirmButton" + tools:visibility="visible" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/payment_details.xml b/app/src/main/res/layout/payment_details.xml new file mode 100644 index 0000000..60d1d73 --- /dev/null +++ b/app/src/main/res/layout/payment_details.xml @@ -0,0 +1,119 @@ +<?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="0dp" + android:layout_height="0dp" + android:fillViewport="true" + tools:showIn="@layout/fragment_prompt_payment"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/errorView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="@dimen/activity_horizontal_margin" + android:textAlignment="center" + android:textColor="@android:color/holo_red_dark" + android:textSize="22sp" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/orderLabelView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" + tools:text="@string/payment_balance_insufficient" + tools:visibility="visible" /> + + <TextView + android:id="@+id/orderLabelView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/payment_label_order_summary" + android:textAlignment="center" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/orderView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/errorView" + tools:visibility="visible" /> + + <TextView + android:id="@+id/orderView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="@dimen/activity_horizontal_margin" + android:layout_marginTop="16dp" + android:textAlignment="center" + android:textAppearance="@style/TextAppearance.AppCompat.Headline" + android:textSize="25sp" + android:visibility="invisible" + app:layout_constraintBottom_toTopOf="@+id/detailsButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/orderLabelView" + tools:text="2 x Cappuccino, 1 x Hot Meals, 1 x Dessert" + tools:visibility="visible" /> + + <Button + android:id="@+id/detailsButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/payment_show_details" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/productsList" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/orderView" + tools:visibility="visible" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/productsList" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="@dimen/activity_horizontal_margin" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/detailsButton" + tools:listitem="@layout/list_item_product" + tools:visibility="visible" /> + + <ProgressBar + android:id="@+id/progressBar" + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:indeterminate="false" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + +</ScrollView> |