From 54c7a2e28bdd9aef237396c43e3ddd695e9344bb Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Tue, 18 Aug 2026 14:14:55 +0630 Subject: [PATCH] settlement view fixed --- .../utsmm/kbz/ui/qr_pay/QRPayFragment.java | 2 +- .../res/layout/fragment_view_batch_screen.xml | 978 +++--------------- 2 files changed, 171 insertions(+), 809 deletions(-) diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java index 1962a26..4d8b27f 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java @@ -63,7 +63,7 @@ public class QRPayFragment extends DataBindingFragment { features.add(new QRPayItem("Refund", R.drawable.ic_refund, true)); } features.add(new QRPayItem("History", R.drawable.ic_history, true)); -// features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true)); + features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true)); // List features = List.of( // new QRPayItem("Sale", R.drawable.ic_qr_pay, true), diff --git a/app/src/main/res/layout/fragment_view_batch_screen.xml b/app/src/main/res/layout/fragment_view_batch_screen.xml index f70bab1..38ef7af 100644 --- a/app/src/main/res/layout/fragment_view_batch_screen.xml +++ b/app/src/main/res/layout/fragment_view_batch_screen.xml @@ -1,835 +1,197 @@ - + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical" + android:paddingStart="17dp" + android:paddingTop="40dp" + android:paddingEnd="17dp"> - + android:gravity="center" + android:layout_marginBottom="24dp" + android:text="SETTLEMENT" + android:textColor="@color/colorPrimary" + android:textSize="20sp" + android:textStyle="bold" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:gravity="bottom" + android:orientation="horizontal" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:visibility="@{settleViewModel.btmLayout}" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent"> + + + + + - - - -