From 48378d46d3d6350ab99502a103e39213c02d2367 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 27 Nov 2018 17:42:25 +0545 Subject: [PATCH] Managing notifications --- .../homeV2/presenter/HomeV2Presenter.java | 9 +- .../presenter/HomeV2PresenterInterface.java | 2 + .../homeV2/view/HomeActivityV2.java | 8 +- .../homeV2/view/HomeFragmentV2.java | 28 +++--- app/src/main/res/layout/fragment_home_v2.xml | 94 ++++++++++++++----- 5 files changed, 100 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java index a101cb50..c68d0e49 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java @@ -71,9 +71,12 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt @Override public void manuallyUpdateKYCForStatusToSubmitted() { - String message = "Your registration request is in approval process. You will soon be able to use GME services."; - String title = "Verification in Process"; - view.showKYCVerifiedIfRequired(true, message, title, true); + String kycMessage = "Your registration request is in approval process. You will soon be able to use GME services."; + String kycTitle = "Verification in Process"; + String pennyTestTitle = "Verify your Bank Account"; + String pennyTestMessage = "Please complete your primary bank account verification process."; + view.showPennyTestViewIfRequired(true,pennyTestTitle,pennyTestMessage); + view.showKYCVerifiedIfRequired(true, kycMessage, kycTitle, true); gateway.updateSubmittedKycInCache(true); gateway.updateVerifiedUserInCache(false); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java index aba69cbb..de9142bd 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java @@ -33,5 +33,7 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface { void performLogout(); void showWithdrawView(Boolean action); + + void showPennyTestViewIfRequired(boolean showView, String pennyTestTitle, String pennyTestMessage); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index 35962de5..b4291d35 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -357,7 +357,13 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra @Override public void showKYCVerifiedIfRequired(boolean shouldShowView, String message, String title, boolean disableKYCViewClick) { if (currentFragment != null && currentFragment instanceof HomeFragmentV2) - ((HomeFragmentV2) currentFragment).showKYCVerifiedIfRequired(shouldShowView, message, title, disableKYCViewClick); + ((HomeFragmentV2) currentFragment).showKYCVerifiedIfRequired(shouldShowView, message, title, disableKYCViewClick,null); + } + + @Override + public void showPennyTestViewIfRequired(boolean showView, String pennyTestTitle, String pennyTestMessage) { + if (currentFragment != null && currentFragment instanceof HomeFragmentV2) + ((HomeFragmentV2) currentFragment).showPennyTestViewIfRequired(showView, pennyTestMessage,pennyTestTitle); } @Override diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java index 0cc0c01d..a099eec0 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java @@ -76,7 +76,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. private boolean disableKYCViewClick; private HomeFragmentDataObserver homeFragmentDataObserver; private CompositeDisposable compositeDisposable; - private boolean hasRequestedPennyTestEarlier=false; + private boolean hasRequestedPennyTestEarlier = false; @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -225,10 +225,9 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. } - private void showPennyTestView(boolean hasRequestedPennyTestEarlier) - { + private void showPennyTestView(boolean hasRequestedPennyTestEarlier) { Intent startPennyTestIntent = new Intent(getActivity(), PennyTestActivity.class); - startPennyTestIntent.putExtra(PennyTestActivity.HAS_REQUESTED_FOR_PENNY_TEST,hasRequestedPennyTestEarlier); + startPennyTestIntent.putExtra(PennyTestActivity.HAS_REQUESTED_FOR_PENNY_TEST, hasRequestedPennyTestEarlier); startActivity(startPennyTestIntent); } @@ -242,7 +241,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. HomeParentViewContractV2 parentView = ((HomeParentViewContractV2) getActivity()); if (parentView != null) parentView.getPresenter().manuallyUpdateKYCForStatusToSubmitted(); - new Handler().postDelayed(()->showPennyTestView(false),500); + new Handler().postDelayed(() -> showPennyTestView(false), 500); } } @@ -258,20 +257,18 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. } } - public void showKYCVerifiedIfRequired(boolean shouldShowView, String message, String title, boolean disableKYCViewClick) { + public void showKYCVerifiedIfRequired(boolean shouldShowView, String message, String title, boolean disableKYCViewClick, Runnable callback) { if (isUIReady()) { if (shouldShowView) { this.disableKYCViewClick = disableKYCViewClick; kycVerificationBody.setText(message); kycTitleLabel.setText(title); if (kyc_notice_view.getVisibility() != View.VISIBLE) - Utils.expand(kyc_notice_view, null, 200); + Utils.expand(kyc_notice_view, callback, 200); } else { if (kyc_notice_view.getVisibility() != View.GONE) Utils.collapse(kyc_notice_view, () -> { -// kycVerificationBody.setText(message); -// kycVerificationBody.setText(title); }, 200); } } else { @@ -282,12 +279,11 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. kycVerificationBody.setText(message); kycTitleLabel.setText(title); if (kyc_notice_view.getVisibility() != View.VISIBLE) - Utils.expand(kyc_notice_view, null, 200); + Utils.expand(kyc_notice_view, callback, 200); } else { if (kyc_notice_view.getVisibility() != View.GONE) Utils.collapse(kyc_notice_view, () -> { - }, 200); } @@ -336,11 +332,13 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. @Override protected void onSuccess(HomeV2Presenter.HomeFragmentRelatedData dashboardRelatedData) { + hasRequestedPennyTestEarlier = dashboardRelatedData.hasRequestedPennyTest(); updateInfo(dashboardRelatedData.getUserName(), dashboardRelatedData.getYearlyLimit(), dashboardRelatedData.getRewardPoint()); - showKYCVerifiedIfRequired(dashboardRelatedData.isShouldShowKycView(), dashboardRelatedData.getKycMessage(), dashboardRelatedData.getKycTitle(), dashboardRelatedData.isDisableKYCViewClick()); - hasRequestedPennyTestEarlier=dashboardRelatedData.hasRequestedPennyTest(); - new Handler().postDelayed(() -> showPennyTestViewIfRequired(dashboardRelatedData.isPennyTestPending(), dashboardRelatedData.getPennyTestMessage(), dashboardRelatedData.getPennyTestTitle()) - , 400); +// showKYCVerifiedIfRequired(dashboardRelatedData.isShouldShowKycView(), dashboardRelatedData.getKycMessage(), dashboardRelatedData.getKycTitle(), dashboardRelatedData.isDisableKYCViewClick(), +// () -> new Handler().postDelayed(()-> showPennyTestViewIfRequired(dashboardRelatedData.isPennyTestPending(), dashboardRelatedData.getPennyTestMessage(), dashboardRelatedData.getPennyTestTitle()),200)); + showKYCVerifiedIfRequired(dashboardRelatedData.isShouldShowKycView(), dashboardRelatedData.getKycMessage(), dashboardRelatedData.getKycTitle(), dashboardRelatedData.isDisableKYCViewClick(), + () -> showPennyTestViewIfRequired(dashboardRelatedData.isPennyTestPending(), dashboardRelatedData.getPennyTestMessage(), dashboardRelatedData.getPennyTestTitle())); + } @Override diff --git a/app/src/main/res/layout/fragment_home_v2.xml b/app/src/main/res/layout/fragment_home_v2.xml index 9b2dd983..5811fd7d 100644 --- a/app/src/main/res/layout/fragment_home_v2.xml +++ b/app/src/main/res/layout/fragment_home_v2.xml @@ -77,7 +77,57 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:src="@drawable/ic_kyc_non_verified_userstatus" /> + android:textSize="14sp" /> - + android:textSize="10sp" /> + - +