diff options
Diffstat (limited to 'wallet/src/main/res/layout')
3 files changed, 14 insertions, 46 deletions
diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml index 0d507c8..fe64bad 100644 --- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml @@ -131,18 +131,7 @@ android:padding="8dp"> <Button - android:id="@+id/button_cancel_withdraw" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:backgroundTint="@color/red" - android:text="@string/button_cancel" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/button_confirm_withdraw" - app:layout_constraintHorizontal_chainStyle="spread_inside" - app:layout_constraintStart_toStartOf="parent" /> - - <Button - android:id="@+id/button_confirm_withdraw" + android:id="@+id/confirmWithdrawButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:backgroundTint="@color/green" @@ -150,7 +139,8 @@ android:text="@string/withdraw_button_confirm" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/button_cancel_withdraw" /> + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" /> <ProgressBar android:id="@+id/confirmProgressBar" @@ -158,10 +148,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="@+id/button_confirm_withdraw" - app:layout_constraintEnd_toEndOf="@+id/button_confirm_withdraw" - app:layout_constraintStart_toStartOf="@+id/button_confirm_withdraw" - app:layout_constraintTop_toTopOf="@+id/button_confirm_withdraw" + 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> 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 69f5c7c..9c7d7a1 100644 --- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml +++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml @@ -77,17 +77,6 @@ tools:visibility="visible" /> <Button - android:id="@+id/abortTosButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:backgroundTint="@color/red" - android:text="@string/button_cancel" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/acceptTosButton" - app:layout_constraintHorizontal_chainStyle="spread_inside" - app:layout_constraintStart_toStartOf="parent" /> - - <Button android:id="@+id/acceptTosButton" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -96,7 +85,8 @@ android:text="@string/exchange_tos_button_continue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/abortTosButton" /> + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/payment_bottom_bar.xml b/wallet/src/main/res/layout/payment_bottom_bar.xml index c17068e..a19ac4e 100644 --- a/wallet/src/main/res/layout/payment_bottom_bar.xml +++ b/wallet/src/main/res/layout/payment_bottom_bar.xml @@ -32,13 +32,13 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginBottom="27dp" android:text="@string/payment_label_amount_total" android:visibility="invisible" - app:layout_constraintBottom_toTopOf="@+id/abortButton" + app:layout_constraintBottom_toTopOf="@+id/confirmButton" app:layout_constraintEnd_toStartOf="@+id/totalView" app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" @@ -80,18 +80,6 @@ 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" @@ -101,8 +89,8 @@ 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_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/feeView" tools:enabled="true" /> |