From 2f9b1785ac241504edc86fa2f4ae619a4fe0a5dd Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 30 Jul 2019 17:27:40 +0900 Subject: [PATCH] Fab gesture detection added --- .../presenter/RegisterV2Presenter.java | 1 + .../registerV2/view/RegisterV2Activity.java | 2 ++ .../splash_screen/view/SplashScreen.java | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java index 3e1f1755..726a8d09 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java @@ -337,6 +337,7 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres gateway.persistSecretKey(fingerprintEncResult.getEncKey()); gateway.persistUserPwd(fingerprintEncResult.getEncPwd()); gateway.persistUserId(fingerprintEncResult.getUserId()); + gateway.turnOffFingerprintAuth(true); view.redirectToDashboard(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java index 436e3111..d45cf60e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java @@ -284,6 +284,8 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen public void redirectToDashboard() { Intent redirectIntent = new Intent(this, HomeActivityV2.class); redirectIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + redirectIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + redirectIntent.putExtra(HomeActivityV2.PROMPT_FINGERPRINT_BUNDLE_FLAG, true); startActivity(redirectIntent); finish(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index a054b88f..d0941482 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -67,6 +67,10 @@ import butterknife.ButterKnife; public class SplashScreen extends BaseActivity implements View.OnClickListener, LanguageSelectionRVAdapter.LanguageSelectionListener, SplashScreenPresenterInterface.SplashScreenContractInterfacee, PayoutModeSelectionRVAdapter.OnPaymentModeSelectionListener, TextView.OnEditorActionListener { + static { + System.loadLibrary("antidebugger"); + } + @BindView(R.id.view_pager) ConstraintLayout view_pager; @@ -752,6 +756,8 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, int[] btnLoginLeftAndTopCoordinates = new int[2]; int[] btnRegisterLeftAndTopCoordinates = new int[2]; + int[] btnFABLeftAndTopCoordinates = new int[2]; + sendMoneyViewContainer.getLocationOnScreen(sendMoneyLeftAndTopCoordinates); receiveMoneyViewContainer.getLocationOnScreen(receiveMoneyLeftAndTopCoordinates); iv_back.getLocationOnScreen(backButtonLeftAndTopCoordinates); @@ -760,6 +766,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, selectedLanguageText.getLocationOnScreen(languageTextLeftAndTopCoordinates); btn_login.getLocationOnScreen(btnLoginLeftAndTopCoordinates); btn_new_user.getLocationOnScreen(btnRegisterLeftAndTopCoordinates); + fab_chat.getLocationOnScreen(btnFABLeftAndTopCoordinates); Rect sendMoneyBoundRect = new Rect(sendMoneyLeftAndTopCoordinates[0], sendMoneyLeftAndTopCoordinates[1], @@ -790,6 +797,10 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, btnRegisterLeftAndTopCoordinates[0] + btn_new_user.getMeasuredWidth(), btnRegisterLeftAndTopCoordinates[1] + btn_new_user.getMeasuredHeight()); + Rect btn_fabRect = new Rect(btnFABLeftAndTopCoordinates[0], btnFABLeftAndTopCoordinates[1], + btnFABLeftAndTopCoordinates[0] + fab_chat.getMeasuredWidth(), + btnFABLeftAndTopCoordinates[1] + fab_chat.getMeasuredHeight()); + return (receiveAmountEdTxt.hasFocus() || sendAmountEdTxt.hasFocus()) && !sendMoneyBoundRect.contains(posX, posY) @@ -798,17 +809,14 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, && !selectedLanguageTextRect.contains(posX, posY) && !selectedLanguageIconRect.contains(posX, posY) && !btn_loginRect.contains(posX, posY) - && !btn_new_userRect.contains(posX, posY); + && !btn_new_userRect.contains(posX, posY) + && !btn_fabRect.contains(posX, posY); } } - static { - System.loadLibrary("antidebugger"); - } - public native void startAntiDebugger(); private void initAntiDebugger() {