From 60753a8f4891060f079ee7d62fdafdbf160000d0 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Thu, 31 Jan 2019 14:32:29 +0900 Subject: [PATCH] Profile screen translation fixes --- .idea/caches/build_file_checksums.ser | Bin 661 -> 661 bytes .../view/ChangePasswordV2Activity.java | 11 ++ .../VerificationSendMoneyFragment.java | 22 ++-- app/src/main/res/layout/activity_profile.xml | 106 +++++++++--------- app/src/main/res/layout/activity_settings.xml | 3 +- .../main/res/layout/dialog_branch_listing.xml | 2 +- .../res/layout/dialog_country_listing.xml | 2 +- app/src/main/res/layout/home_menu_item_v2.xml | 4 +- 8 files changed, 81 insertions(+), 69 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 9b2cabf0f35bf47f504fa270371c850eef9f921b..cd1419a5927670256a56f97aea83e0d59c07587d 100644 GIT binary patch delta 14 WcmbQrI+b<8OlFIgnH%T)WCQ>x=>`1& delta 14 WcmbQrI+b<8OlDm}>y2}MG6Dc3)CEBR 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..b5dab634 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 @@ -190,6 +190,17 @@ public class ChangePasswordV2Activity extends BaseActivity implements ChangePass } + @Override + public void onBackPressed() { + if(securityKeyboardConfirmPasswordManager!=null&&securityKeyboardConfirmPasswordManager.isKeyboardVisible()) + securityKeyboardConfirmPasswordManager.hideKeyboard(); + else if(securityKeyboardCurrentPasswordManager!=null&&securityKeyboardCurrentPasswordManager.isKeyboardVisible()) + securityKeyboardCurrentPasswordManager.hideKeyboard(); + else if(securityKeyboardNewPasswordManager!=null&&securityKeyboardNewPasswordManager.isKeyboardVisible()) + securityKeyboardNewPasswordManager.hideKeyboard(); + else + super.onBackPressed(); + } @Override public boolean dispatchTouchEvent(MotionEvent ev) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java index ddcf7414..f9b8e424 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java @@ -129,25 +129,25 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View private void performDefaultAction(Bundle savedInstance) { VerificationViewModel verificationViewModel= ((SendMoneyActionListener)getActivity()).getPresenter().getVerificationRelatedData(); - txt_address.setText(verificationViewModel.getAddress()); - txt_country.setText(verificationViewModel.getCountry()); - txt_exrate.setText(verificationViewModel.getExRate()); - txt_firstName.setText(verificationViewModel.getFirstName()); - txt_mobile.setText(verificationViewModel.getMobile()); - txt_pamount.setText(verificationViewModel.getpAmount()); - txt_pcountry.setText(verificationViewModel.getpCountry()); - txt_pmode.setText(verificationViewModel.getpMode()); - txt_servicechargeAmount.setText(verificationViewModel.getServiceCharge()); + txt_address.setText(" : "+verificationViewModel.getAddress()); + txt_country.setText(" : "+verificationViewModel.getCountry()); + txt_exrate.setText(" : "+verificationViewModel.getExRate()); + txt_firstName.setText(" : "+verificationViewModel.getFirstName()); + txt_mobile.setText(" : "+verificationViewModel.getMobile()); + txt_pamount.setText(" : "+verificationViewModel.getpAmount()); + txt_pcountry.setText(" : "+verificationViewModel.getpCountry()); + txt_pmode.setText(" : "+verificationViewModel.getpMode()); + txt_servicechargeAmount.setText(" : "+verificationViewModel.getServiceCharge()); if(verificationViewModel.getBankAcNo()!=null&&verificationViewModel.getBankAcNo().length()>1) { bankAcNoContainer.setVisibility(View.VISIBLE); - txt_bankAcNo.setText(verificationViewModel.getBankAcNo()); + txt_bankAcNo.setText(" : "+verificationViewModel.getBankAcNo()); } String pAgent=verificationViewModel.getpAgent(); if(pAgent!=null) { hideAgentLocation(false); - txt_pagent.setText(verificationViewModel.getpAgent()); + txt_pagent.setText(" : "+verificationViewModel.getpAgent()); } else hideAgentLocation(true); diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index afd79cba..70d8ee30 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -141,83 +141,83 @@ android:text="@string/verify_account_text"/> - + android:background="@drawable/ic_rectangle_white_extra_corners"> + - + + - - - + android:text="0" + android:textColor="@color/colorAccent" + android:textSize="24sp" + app:layout_constraintBaseline_toBaselineOf="@+id/tv_currency" + app:layout_constraintStart_toStartOf="@+id/tv_balance_label" /> + + + + android:text="@string/withdraw_text" + android:textColor="@color/darkgray" + android:textSize="12sp" + android:visibility="visible" + app:layout_constraintBottom_toBottomOf="@+id/tv_currency" + app:layout_constraintEnd_toEndOf="parent" + app:txtfontName="@string/semibold" /> + - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@+id/tv_balance_label" + app:layout_constraintTop_toBottomOf="@+id/tv_balance" /> - - + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index c419e550..fc13cb99 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -32,7 +32,6 @@ android:layout_height="62dp" android:layout_gravity="center" android:adjustViewBounds="true" - android:contentDescription="@string/app_name" android:src="@drawable/ic_setting" /> diff --git a/app/src/main/res/layout/dialog_branch_listing.xml b/app/src/main/res/layout/dialog_branch_listing.xml index 782df107..62810aee 100644 --- a/app/src/main/res/layout/dialog_branch_listing.xml +++ b/app/src/main/res/layout/dialog_branch_listing.xml @@ -25,7 +25,7 @@ android:gravity="center" android:layout_gravity="end" android:textColor="@color/colorAccent" - android:text="Cancel" /> + android:text="@string/cancel_text" /> + android:text="@string/cancel_text" />