From ee037a1101f27caaf25e9e585cfd985b2647b367 Mon Sep 17 00:00:00 2001 From: MooN <56061215+MgKyawLay@users.noreply.github.com> Date: Mon, 22 Dec 2025 22:54:28 +0630 Subject: [PATCH] hide time picker --- .../main/java/com/utsmm/kbz/MainFragment.java | 12 +++++---- .../TransactionSummaryFragment.java | 12 +++++++-- .../settlement/SelectSettlementFragment.java | 27 ++++++++++++++----- .../fragment_transaction_summary_screen.xml | 2 ++ 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java index 37fa36d..bcdb8f8 100644 --- a/app/src/main/java/com/utsmm/kbz/MainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java @@ -892,11 +892,13 @@ public class MainFragment extends DataBindingFragment { if (mainViewModel.payDetailSingle.getValue() != null) { mainViewModel.startReversal(mainViewModel.payDetailSingle.getValue()); - } else if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { - showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage()); - } else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { - showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); - } else { + } +// else if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { +// showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage()); +// } else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { +// showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); +// } + else { sharedViewModel.settlementType.setValue(SettlementType.NORMAL); sharedViewModel.transactionsType.setValue(TransactionsType.SETTLEMENT); sharedViewModel.setTransMenu(TransMenu.SETTLEMENT); diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java index dd7a480..3b91b36 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/management/TransactionSummaryFragment.java @@ -153,11 +153,19 @@ public class TransactionSummaryFragment extends DataBindingFragment { if (isStart) { String selectedDate = dateFormat.format(myCalendar.getTime()); summaryViewModel.startDate.postValue(selectedDate); - LogUtil.d(TAG, "Start date updated: " + selectedDate); +// LogUtil.d(TAG, "Start date updated: " + selectedDate); + // STATIC START TIME + summaryViewModel.startHr.setValue("00"); + summaryViewModel.startMin.setValue("00"); + summaryViewModel.startDayOrNight.setValue(getString(R.string.txt_am)); } else { String selectedDate = dateFormat.format(myCalendar2.getTime()); summaryViewModel.endDate.postValue(selectedDate); - LogUtil.d(TAG, "End date updated: " + selectedDate); + // STATIC END TIME + summaryViewModel.endHr.setValue("23"); + summaryViewModel.endMin.setValue("59"); + summaryViewModel.endDayOrNight.setValue(getString(R.string.txt_pm)); +// LogUtil.d(TAG, "End date updated: " + selectedDate); } } catch (Exception e) { LogUtil.e(TAG, "Error updating date label: " + e.getMessage()); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java index a7567aa..0f22580 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java @@ -16,6 +16,9 @@ import com.utsmm.kbz.config.Constants; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmm.kbz.util.ecr.CoreUtils; import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType; +import com.utsmm.kbz.util.tms.TMSUtil; +import com.utsmm.kbz.util.Connectivity; +import com.utsmm.kbz.config.data.model.ValidityStatus; public class SelectSettlementFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback { @@ -77,15 +80,27 @@ public class SelectSettlementFragment extends DataBindingFragment implements Dat public class ClickEvent { public void onCardSettlement() { - - routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment; - safeNavigateToRouteId(); + if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { + showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage()); + } else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { + showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); + } else{ + routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment; + safeNavigateToRouteId(); + } } public void onQRSettlement() { - sharedViewModel.hostType.setValue(HostType.QR); - routeId = R.id.action_selectSettlementFragment_to_QRSettlementTransactionFragment; - safeNavigateToRouteId(); + + if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { + showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage()); + } else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { + showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); + } else { + sharedViewModel.hostType.setValue(HostType.QR); + routeId = R.id.action_selectSettlementFragment_to_QRSettlementTransactionFragment; + safeNavigateToRouteId(); + } } public void onCancel() { diff --git a/app/src/main/res/layout/fragment_transaction_summary_screen.xml b/app/src/main/res/layout/fragment_transaction_summary_screen.xml index a9c33bc..5124eea 100644 --- a/app/src/main/res/layout/fragment_transaction_summary_screen.xml +++ b/app/src/main/res/layout/fragment_transaction_summary_screen.xml @@ -189,6 +189,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" + android:visibility="gone" android:gravity="center"> @@ -405,6 +406,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" + android:visibility="gone" android:gravity="center">