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"/> - -