From 9f7d261b351791546accb4be29e7b94b9a36315b Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Fri, 1 Feb 2019 11:28:52 +0900 Subject: [PATCH 1/3] Keypad ballon effect added in transaction password prompt --- .../TransactionPasswordPromptActivity.java | 1 + .../SecurityKeypadRequestParamBuilder.java | 11 +++++++++- .../activity_transaction_password_prompt.xml | 22 +++++++++++-------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java index 4cb50150..933dce3c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java @@ -88,6 +88,7 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S securityKeyboardManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); request.setHintString("Password"); + request.disableKeyPadEffect(false); securityKeyboardManager.bindWithSecurityWidgetView(securityKeyboardView) .setBallonView(ballonView) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java index 3a457655..8d2252cf 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java @@ -22,6 +22,7 @@ public class SecurityKeypadRequestParamBuilder byte[] secureKey; private final Context context; + private boolean shouldDisableKeypadEffect; public SecurityKeypadRequestParamBuilder(Context context) { @@ -65,6 +66,12 @@ public class SecurityKeypadRequestParamBuilder return this; } + public SecurityKeypadRequestParamBuilder disableKeyPadEffect(boolean action) + { + this.shouldDisableKeypadEffect=action; + return this; + } + public int getDefaultKeyboardType() { return keyPadType; @@ -80,6 +87,7 @@ public class SecurityKeypadRequestParamBuilder textType= TransKeyActivity.mTK_TYPE_TEXT_PASSWORD_LAST_IMAGE; this.maxLength=16; this.keyPadType=mTK_TYPE_KEYPAD_QWERTY_LOWER; + this.shouldDisableKeypadEffect=true; } @@ -174,7 +182,6 @@ public class SecurityKeypadRequestParamBuilder newIntent.putExtra(TransKeyActivity.mTK_PARAM_MIN_LENGTH_MESSAGE, "최소 글자 2글자 미만입니다"); newIntent.putExtra(TransKeyActivity.mTK_PARAM_INPUT_MINLENGTH, 0); newIntent.putExtra(TransKeyActivity.mTK_PARAM_ALERTDIALOG_TITLE, "mTranskey alert"); - newIntent.putExtra(TransKeyActivity.mTK_PARAM_DISABLE_BUTTON_EFFECT, true); // newIntent.putExtra(TransKeyActivity.mTK_PARAM_QWERTY_BUTTON_MARGIN, 1f); newIntent.putExtra(TransKeyActivity.mTK_PARAM_NUMBER_BUTTON_MARGIN, 0.44f); @@ -214,6 +221,8 @@ public class SecurityKeypadRequestParamBuilder newIntent.putExtra(TransKeyActivity.mTK_PARAM_PLAY_RES_BUTTON_SOUND, true); newIntent.putExtra (TransKeyActivity.mTK_PARAM_QWERTY_HEIGHT, (float).95); newIntent.putExtra(TransKeyActivity.mTK_PARAM_QWERTY_BUTTON_MARGIN, 1.5f); + newIntent.putExtra(TransKeyActivity.mTK_PARAM_DISABLE_BUTTON_EFFECT, this.shouldDisableKeypadEffect); + return newIntent; } diff --git a/app/src/main/res/layout/activity_transaction_password_prompt.xml b/app/src/main/res/layout/activity_transaction_password_prompt.xml index 749c59d7..f5608359 100644 --- a/app/src/main/res/layout/activity_transaction_password_prompt.xml +++ b/app/src/main/res/layout/activity_transaction_password_prompt.xml @@ -1,5 +1,9 @@ - + - - - - \ No newline at end of file + + + + From dd8621ec31f28f023d7d1b2d76c6702366f34f19 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Fri, 1 Feb 2019 13:54:08 +0900 Subject: [PATCH 2/3] Login screen keyboard ballon added --- app/src/main/AndroidManifest.xml | 2 +- .../loginV2/view/LoginV2Activity.java | 7 ++++--- .../TransactionPasswordPromptActivity.java | 3 ++- .../SecurityKeypadRequestParamBuilder.java | 4 ++-- app/src/main/res/layout/activity_login_v2.xml | 18 ++++++++++++------ .../activity_transaction_password_prompt.xml | 12 +++--------- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8304379d..dc38e186 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -271,7 +271,7 @@ android:name=".loginV2.view.LoginV2Activity" android:screenOrientation="portrait" android:theme="@style/AppTheme.NoActionBar" - android:windowSoftInputMode="stateAlwaysHidden" /> + android:windowSoftInputMode="adjustResize" /> { - scrollView.smoothScrollTo(0,rootView.getBottom()); - },250); +// scrollView.postDelayed(()->{ +// scrollView.smoothScrollTo(0,rootView.getBottom()); +// },250); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java index 933dce3c..98649d0b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/TransactionPasswordPromptActivity.java @@ -10,6 +10,7 @@ import android.support.v4.view.GestureDetectorCompat; import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; +import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.widget.FrameLayout; @@ -42,7 +43,7 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S RelativeLayout ballonView; @BindView(R.id.rootView) - LinearLayout rootView; + View rootView; @BindView(R.id.passwordErrorTxt) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java index 8d2252cf..18513515 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java @@ -219,8 +219,8 @@ public class SecurityKeypadRequestParamBuilder newIntent.putExtra(TransKeyActivity.mTK_PARAM_LANGUAGE, TransKeyActivity. mTK_Language_English); newIntent.putExtra(TransKeyActivity.mTK_PARAM_PLAY_RES_BUTTON_SOUND, true); - newIntent.putExtra (TransKeyActivity.mTK_PARAM_QWERTY_HEIGHT, (float).95); - newIntent.putExtra(TransKeyActivity.mTK_PARAM_QWERTY_BUTTON_MARGIN, 1.5f); + newIntent.putExtra (TransKeyActivity.mTK_PARAM_QWERTY_HEIGHT, 1f); + newIntent.putExtra(TransKeyActivity.mTK_PARAM_QWERTY_BUTTON_MARGIN, 1f); newIntent.putExtra(TransKeyActivity.mTK_PARAM_DISABLE_BUTTON_EFFECT, this.shouldDisableKeypadEffect); diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml index aafe4d64..d6f68804 100644 --- a/app/src/main/res/layout/activity_login_v2.xml +++ b/app/src/main/res/layout/activity_login_v2.xml @@ -1,9 +1,15 @@ - + + + + + - - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_transaction_password_prompt.xml b/app/src/main/res/layout/activity_transaction_password_prompt.xml index f5608359..b2764fc4 100644 --- a/app/src/main/res/layout/activity_transaction_password_prompt.xml +++ b/app/src/main/res/layout/activity_transaction_password_prompt.xml @@ -2,13 +2,11 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/rootView" > @@ -59,22 +57,18 @@ android:paddingBottom="2dp" android:paddingTop="2dp" /> - - + android:layout_weight="1"/> - - Date: Fri, 1 Feb 2019 14:54:21 +0900 Subject: [PATCH 3/3] Keyboard fixes overall app --- .../view/ChangePasswordV2Activity.java | 17 ++++++++-- .../loginV2/view/LoginV2Activity.java | 6 ++-- .../registerV2/view/RegisterV2Activity.java | 11 +++++-- .../layout/activity_change_password_v2.xml | 32 ++++++++++--------- app/src/main/res/layout/activity_login_v2.xml | 15 +++------ .../main/res/layout/activity_register_v2.xml | 24 +++++++------- 6 files changed, 61 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java index 12c30d94..010790c6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java @@ -67,6 +67,16 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass @BindView(R.id.scrollView) ScrollView scrollView; + + @BindView(R.id.newPasswordText) + TextView newPasswordText; + + @BindView(R.id.confirmPasswordText) + TextView confirmPasswordText; + + @BindView(R.id.currentPasswordText) + TextView currentPasswordText; + @BindView(R.id.rootViewChangePassword) View rootView; @@ -104,6 +114,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass try { securityKeyboardCurrentPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); + request.disableKeyPadEffect(false); request.setHintString("Password"); securityKeyboardCurrentPasswordManager.bindWithSecurityWidgetView(securityKeyboardCurrentPasswordView) @@ -276,7 +287,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass hideKeyBoard(); securityKeyboardCurrentPasswordManager.showKeyboard(); scrollView.postDelayed(()->{ - scrollView.smoothScrollTo(0, securityKeyboardCurrentPasswordView.getBottom()); + scrollView.smoothScrollTo(0, currentPasswordText.getTop()); },250); } } @@ -337,7 +348,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass hideKeyBoard(); securityKeyboardNewPasswordManager.showKeyboard(); scrollView.postDelayed(()->{ - scrollView.smoothScrollTo(0, securityKeyboardNewPassword.getBottom()); + scrollView.smoothScrollTo(0, newPasswordText.getTop()); },250); } @@ -399,7 +410,7 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass hideKeyBoard(); securityKeyboardConfirmPasswordManager.showKeyboard(); scrollView.postDelayed(()->{ - scrollView.smoothScrollTo(0, securityKeyboardConfirmPassword.getBottom()); + scrollView.smoothScrollTo(0, confirmPasswordText.getTop()); },250); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java index 1ed8eda0..509fbbb9 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/view/LoginV2Activity.java @@ -343,9 +343,9 @@ public class LoginV2Activity extends BaseActivity implements View.OnClickListene if (securityKeyboardManager != null && !securityKeyboardManager.isKeyboardVisible()) { hideKeyBoard(); securityKeyboardManager.showKeyboard(); -// scrollView.postDelayed(()->{ -// scrollView.smoothScrollTo(0,rootView.getBottom()); -// },250); + scrollView.postDelayed(()->{ + scrollView.smoothScrollTo(0,rootView.getBottom()); + },250); } } 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 6ebd8947..b5a0c30f 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 @@ -83,6 +83,12 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen @BindView(R.id.scrollView) ScrollView scrollView; + @BindView(R.id.passwordText) + TextView passwordTextView; + + @BindView(R.id.confirmPasswordText) + TextView confirmPasswordTextView; + @BindView(R.id.rootViewRegister) View rootView; @@ -140,6 +146,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen securityKeyboardConfirmPasswordManager = new SecurityKeyboardManager(this); SecurityKeypadRequestParamBuilder request = new SecurityKeypadRequestParamBuilder(this); request.setHintString("Password"); + request.disableKeyPadEffect(false); securityKeyboardConfirmPasswordManager.bindWithSecurityWidgetView(securityKeyboardConfirmPasswordView) .setBallonView(ballonView) @@ -353,7 +360,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen hideKeyBoard(); securityKeyboardPasswordManager.showKeyboard(); scrollView.postDelayed(()->{ - scrollView.smoothScrollTo(0, securityKeyboardPasswordView.getBottom()); + scrollView.smoothScrollTo(0, passwordTextView.getTop()); },250); } @@ -418,7 +425,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen hideKeyBoard(); securityKeyboardConfirmPasswordManager.showKeyboard(); scrollView.postDelayed(()->{ - scrollView.smoothScrollTo(0, securityKeyboardConfirmPasswordView.getBottom()); + scrollView.smoothScrollTo(0, confirmPasswordTextView.getTop()); },250); } diff --git a/app/src/main/res/layout/activity_change_password_v2.xml b/app/src/main/res/layout/activity_change_password_v2.xml index dca6c51d..363054ea 100644 --- a/app/src/main/res/layout/activity_change_password_v2.xml +++ b/app/src/main/res/layout/activity_change_password_v2.xml @@ -1,14 +1,15 @@ - + + android:background="@color/background_gray"> - - - - - + + + diff --git a/app/src/main/res/layout/activity_login_v2.xml b/app/src/main/res/layout/activity_login_v2.xml index d6f68804..ad3d715b 100644 --- a/app/src/main/res/layout/activity_login_v2.xml +++ b/app/src/main/res/layout/activity_login_v2.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - + android:layout_height="wrap_content" /> - + @@ -24,7 +28,7 @@ - - + android:layout_height="wrap_content" /> + - \ No newline at end of file +