From 899ff017325516c034d5b2f42a2690f22d8ccdf5 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Wed, 14 Aug 2019 17:56:49 +0900 Subject: [PATCH] Notification view fixes --- .../homeV2/presenter/HomeV2Presenter.java | 11 ++++++++++- .../homeV2/view/HomeActivityV2.java | 18 +++++++++++------- .../homeV2/view/HomeFragmentV2.java | 2 ++ .../view/notifications/DimBackgroundView.java | 2 +- 4 files changed, 24 insertions(+), 9 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 16e9ae38..046802a5 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 @@ -305,6 +305,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt } } + boolean toogle=false; public class UserInfoObserverV2 extends UserSessionObserverResponse { @Override @@ -313,9 +314,17 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt //TODO Mocking server response here userInfoModelV2.setRedirectTo(null); userInfoModelV2.setKyc(false); - userInfoModelV2.setVerified(true); + userInfoModelV2.setVerified(false); userInfoModelV2.setPennyTestStatus("2"); + if(toogle) + { + toogle=false; + userInfoModelV2.setKyc(true); + + } + + toogle=true; //TODO Mocking end 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 bdd40ac4..afd87b0a 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 @@ -37,7 +37,6 @@ import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2Presenter import com.gmeremit.online.gmeremittance_native.homeV2.presenter.HomeV2PresenterInterface; import com.gmeremit.online.gmeremittance_native.homeV2.view.notifications.DimBackgroundView; import com.gmeremit.online.gmeremittance_native.int_notification.view.IntNotificationView; -import com.gmeremit.online.gmeremittance_native.kycV2.view.KYCFormV2Activity; import com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientlisting.RecipientListingV2Activity; import com.gmeremit.online.gmeremittance_native.resendV2.view.TransactionListingV2Activity; import com.gmeremit.online.gmeremittance_native.settings.view.FingerprintEnablePromptActivity; @@ -357,8 +356,6 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra } - - private void openWithdrawScreen() { String unverifiedMessage = presenter.checkIfUserVerified(); if (unverifiedMessage == null) @@ -397,9 +394,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra public void dimOutMenu(Rect notificationViewBoundry, boolean action) { ViewGroupOverlay viewGroupOverlay = drawer_home.getOverlay(); - viewGroupOverlay.clear(); - if (action) { + if (action && !isNotificaitonViewActive) { DimBackgroundView view = new DimBackgroundView(drawer_home.getContext()); view.setLeft(0); @@ -407,14 +403,22 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra view.setRight(drawer_home.getWidth()); view.setBottom(drawer_home.getHeight()); + viewGroupOverlay.clear(); viewGroupOverlay.add(view); + + view.animate().alpha(.6f).setDuration(100).start(); drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); } + + if (!action) { + drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); + + viewGroupOverlay.clear(); + } + this.notificationViewBoundry = notificationViewBoundry; isNotificaitonViewActive = action; - if(!action) - drawer_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); } 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 31b83b02..0247ab04 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 @@ -370,6 +370,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. } else { scrollViewHomeFragment.setEnableScrolling(true); + ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false); } @@ -411,6 +412,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. } else { scrollViewHomeFragment.setEnableScrolling(true); + ((HomeParentViewContractV2) getActivity()).dimOutMenu(null, false); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/notifications/DimBackgroundView.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/notifications/DimBackgroundView.java index 3634b423..b7785137 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/notifications/DimBackgroundView.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/notifications/DimBackgroundView.java @@ -35,8 +35,8 @@ public class DimBackgroundView extends View { private void init() { Drawable colorDrawable=new ColorDrawable(Color.BLACK); - colorDrawable.setAlpha((int) (255*.6f)); setBackground(colorDrawable); + setAlpha(0f); }