From d143e49e4b5d0ccc36f9dcdc9e575a356868da19 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Mon, 30 Mar 2026 23:57:29 +0630 Subject: [PATCH] sing on duel --- .../main/java/com/utsmm/kbz/MainFragment.java | 31 ++++++++++++++++--- .../utsmm/kbz/ui/sign_on/SignOnFragment.java | 2 -- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java index 7410bee..ccfa50b 100644 --- a/app/src/main/java/com/utsmm/kbz/MainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java @@ -465,6 +465,31 @@ public class MainFragment extends DataBindingFragment { }); } + private void showCurrencyChooserForSignOn() { + List currencies = getAvailableCardSaleCurrencies(); + if (currencies.isEmpty()) { + applyCardCurrencyAndHost("MMK"); + navigateToSignOn(); + return; + } + + if (currencies.size() == 1) { + applyCardCurrencyAndHost(currencies.get(0)); + navigateToSignOn(); + return; + } + + showCurrencyPickerDialog("Choose Currency", currencies, currency -> { + applyCardCurrencyAndHost(currency); + navigateToSignOn(); + }); + } + + private void navigateToSignOn() { + routeId = R.id.action_nav_main_to_nav_sign_on; + safeNavigateToRouteId(); + } + private List getAvailableCardSaleCurrencies() { cachePrimaryCardHostIfNeeded(); LinkedHashSet values = new LinkedHashSet<>(); @@ -1025,12 +1050,10 @@ public class MainFragment extends DataBindingFragment { showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); } else if (SystemParamsOperation.getInstance().isNeedSettlement()) { AlertXDialog.getInstance().showDialog(requireContext(), getResourceString(R.string.title_need_settle), getResourceString(R.string.txt_do_you_want_to_continue), () -> { - routeId = R.id.action_nav_main_to_nav_sign_on; - safeNavigateToRouteId(); + showCurrencyChooserForSignOn(); }); } else { - routeId = R.id.action_nav_main_to_nav_sign_on; - safeNavigateToRouteId(); + showCurrencyChooserForSignOn(); } } diff --git a/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java b/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java index 74ab960..bdc7795 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java @@ -13,7 +13,6 @@ import com.utsmm.kbz.BR; import com.utsmm.kbz.R; import com.utsmm.kbz.config.Constants; import com.utsmm.kbz.util.enums.ResponseStatus; -import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation; /* * This file is not using in this project cuz IPEK is used instead of TMK. @@ -56,7 +55,6 @@ public class SignOnFragment extends DataBindingFragment { super.onViewCreated(view, savedInstanceState); signOnViewModel.startSignOnProcess(); - observeData(); }