diff --git a/app/src/main/java/com/utsmm/kbz/ui/adapters/QRPayAdapter.java b/app/src/main/java/com/utsmm/kbz/ui/adapters/QRPayAdapter.java index ce980c2..b207f52 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/adapters/QRPayAdapter.java +++ b/app/src/main/java/com/utsmm/kbz/ui/adapters/QRPayAdapter.java @@ -40,8 +40,20 @@ public class QRPayAdapter extends RecyclerView.Adapter return new ViewHolder(binding); } + + private final int[] colors = new int[]{ + R.color.colorPrimary, + R.color.amber, + R.color.forestGreen + }; + + @Override public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + + int colorRes = colors[position % colors.length]; + holder.itemView.setBackgroundResource(colorRes); + QRPayItem item = items.get(position); holder.binding.setText(item.title); holder.binding.setIcon(item.icon); 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 b901e53..c6d6956 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 @@ -42,7 +42,7 @@ public class QRPayFragment extends DataBindingFragment { @Override public void onResume() { super.onResume(); - setToolBarTitleWithBackIcon("MMQR"); + setToolBarTitleWithBackIcon("MMQR PAY"); } @Override diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java index c82c64c..ba6a40b 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundFragment.java @@ -23,6 +23,7 @@ import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.util.DataBindingConfig; import com.utsmyanmar.paylibs.model.PayDetail; +import java.util.ArrayList; import java.util.List; @@ -104,6 +105,9 @@ public class QRRefundFragment extends DataBindingFragment { public void onCancel(){ safeNavigateToRouteId(); } + public void onSearch(){ + searchById(); + } } private void onRefundItemClicked(PayDetail payDetail) { @@ -112,4 +116,27 @@ public class QRRefundFragment extends DataBindingFragment { routeId = R.id.action_qrRefundList_to_qrRefundDetail; NavHostFragment.findNavController(this).navigate(routeId, bundle); } + + private void searchById(){ + EditText editText = getView().findViewById(R.id.rnn_trace_id); + String keyword = editText.getText().toString().trim(); + + if(keyword.isEmpty()){ + updateList(qrPayViewModel.getRefundableQrHistory().getValue()); + return; + } + + List originalList = qrPayViewModel.getRefundableQrHistory().getValue(); + if(originalList == null) return; + + List filteredList = new ArrayList<>(); + for(PayDetail item: originalList){ + if(item.getReferNo() != null && item.getReferNo().contains(keyword)){ + filteredList.add(item); + } + } + + updateList(filteredList); + } + } diff --git a/app/src/main/res/layout/fragment_dashboard_screen.xml b/app/src/main/res/layout/fragment_dashboard_screen.xml index b1021ae..34d173a 100644 --- a/app/src/main/res/layout/fragment_dashboard_screen.xml +++ b/app/src/main/res/layout/fragment_dashboard_screen.xml @@ -136,14 +136,14 @@ + app:tint="@color/colorPrimary" /> diff --git a/app/src/main/res/layout/fragment_qr_pay.xml b/app/src/main/res/layout/fragment_qr_pay.xml index 07fb1e4..06996f9 100644 --- a/app/src/main/res/layout/fragment_qr_pay.xml +++ b/app/src/main/res/layout/fragment_qr_pay.xml @@ -14,12 +14,12 @@ + android:background="@color/colorBackground"> diff --git a/app/src/main/res/layout/fragment_qr_refund.xml b/app/src/main/res/layout/fragment_qr_refund.xml index 7627443..dfc84ea 100644 --- a/app/src/main/res/layout/fragment_qr_refund.xml +++ b/app/src/main/res/layout/fragment_qr_refund.xml @@ -15,6 +15,9 @@ + - - - - - - - - - - + - - - - - - - - - + + - - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - @@ -99,15 +132,14 @@ android:id="@+id/emptyStateSectionRefund" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" android:gravity="center" + android:orientation="vertical" android:visibility="@{manageViewModel.reprintLayoutBtmVisibility}" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent"> - + app:lottie_loop="true"/> - - - - + android:textColor="@color/colorPrimary" + android:layout_marginBottom="8dp"/> - - + android:paddingHorizontal="32dp"/> diff --git a/app/src/main/res/layout/item_qr_pay_button.xml b/app/src/main/res/layout/item_qr_pay_button.xml index 1c8bb7f..6e23686 100644 --- a/app/src/main/res/layout/item_qr_pay_button.xml +++ b/app/src/main/res/layout/item_qr_pay_button.xml @@ -13,52 +13,62 @@ name="icon" type="Integer" /> - - - - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintDimensionRatio="1:1" + > - - - - + android:orientation="vertical" + android:padding="16dp"> - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_qr_refund.xml b/app/src/main/res/layout/item_qr_refund.xml index 244506f..68f9a8b 100644 --- a/app/src/main/res/layout/item_qr_refund.xml +++ b/app/src/main/res/layout/item_qr_refund.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="4dp" - android:layout_margin="16dp" + android:layout_margin="8dp" android:layout_marginVertical="6dp" app:cardCornerRadius="12dp" app:cardElevation="0dp" diff --git a/app/src/main/res/layout/item_view_dashboard.xml b/app/src/main/res/layout/item_view_dashboard.xml index d4405f1..1a5a415 100644 --- a/app/src/main/res/layout/item_view_dashboard.xml +++ b/app/src/main/res/layout/item_view_dashboard.xml @@ -5,58 +5,61 @@ - - - + - - - - - + android:orientation="vertical" + android:padding="16dp" + android:background="@color/white"> - + - + - \ No newline at end of file + + + + + + diff --git a/app/src/main/res/layout/item_view_dashboard_old.xml b/app/src/main/res/layout/item_view_dashboard_old.xml new file mode 100644 index 0000000..d4405f1 --- /dev/null +++ b/app/src/main/res/layout/item_view_dashboard_old.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file