diff options
Diffstat (limited to 'wallet/src/main/res/layout')
| -rw-r--r-- | wallet/src/main/res/layout/payment_bottom_bar.xml | 102 | ||||
| -rw-r--r-- | wallet/src/main/res/layout/payment_details.xml | 14 |
2 files changed, 68 insertions, 48 deletions
diff --git a/wallet/src/main/res/layout/payment_bottom_bar.xml b/wallet/src/main/res/layout/payment_bottom_bar.xml index 496f2f3..2108d4a 100644 --- a/wallet/src/main/res/layout/payment_bottom_bar.xml +++ b/wallet/src/main/res/layout/payment_bottom_bar.xml @@ -27,57 +27,66 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <TextView - android:id="@+id/totalLabelView" + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" - android:text="@string/payment_label_amount_total" - android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/confirmButton" - app:layout_constraintEnd_toStartOf="@+id/totalView" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBottom_toTopOf="@id/confirmButton" 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_constraintStart_toStartOf="parent" 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" /> + android:layout_marginVertical="20dp"> + <TextView + android:id="@+id/totalLabelView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:textSize="18sp" + android:text="@string/payment_label_amount_total" + android:visibility="invisible" + app:layout_constraintEnd_toStartOf="@+id/totalView" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + 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" /> + <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:textSize="18sp" + 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:textSize="18sp" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/totalView" + tools:text="@string/payment_fee" + tools:visibility="visible" /> + </androidx.constraintlayout.widget.ConstraintLayout> <Button android:id="@+id/confirmButton" @@ -91,7 +100,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/feeView" tools:enabled="true" /> <ProgressBar diff --git a/wallet/src/main/res/layout/payment_details.xml b/wallet/src/main/res/layout/payment_details.xml index 0610f52..ef33335 100644 --- a/wallet/src/main/res/layout/payment_details.xml +++ b/wallet/src/main/res/layout/payment_details.xml @@ -53,6 +53,7 @@ android:text="@string/payment_label_order_summary" android:textAlignment="center" android:visibility="invisible" + app:layout_constraintTop_toTopOf="@id/errorView" app:layout_constraintBottom_toTopOf="@+id/orderView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +70,6 @@ android:textAppearance="@style/TextAppearance.AppCompat.Headline" android:textSize="25sp" android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/productsList" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/orderLabelView" @@ -89,6 +89,18 @@ tools:listitem="@layout/list_item_product" tools:visibility="visible" /> + <TextView + android:id="@+id/singleItemLabelView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAlignment="center" + android:text="@string/payment_single_item" + android:visibility="invisible" + app:layout_constraintStart_toStartOf="@id/productsList" + app:layout_constraintEnd_toEndOf="@id/productsList" + app:layout_constraintTop_toTopOf="@id/productsList" + tools:visibility="invisible"/> + <ProgressBar android:id="@+id/progressBar" style="?android:attr/progressBarStyleLarge" |