IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Profile screen translation fixes

master
preyearegmi 6 years ago
parent
66de3f2a91
commit
60753a8f48
8 changed files with 81 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 11
      app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java
  3. 22
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java
  4. 106
      app/src/main/res/layout/activity_profile.xml
  5. 3
      app/src/main/res/layout/activity_settings.xml
  6. 2
      app/src/main/res/layout/dialog_branch_listing.xml
  7. 2
      app/src/main/res/layout/dialog_country_listing.xml
  8. 4
      app/src/main/res/layout/home_menu_item_v2.xml

BIN
.idea/caches/build_file_checksums.ser
View File

11
app/src/main/java/com/gmeremit/online/gmeremittance_native/changepasswordV2/view/ChangePasswordV2Activity.java
View File

@ -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 @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {

22
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java
View File

@ -129,25 +129,25 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View
private void performDefaultAction(Bundle savedInstance) { private void performDefaultAction(Bundle savedInstance) {
VerificationViewModel verificationViewModel= ((SendMoneyActionListener)getActivity()).getPresenter().getVerificationRelatedData(); 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) if(verificationViewModel.getBankAcNo()!=null&&verificationViewModel.getBankAcNo().length()>1)
{ {
bankAcNoContainer.setVisibility(View.VISIBLE); bankAcNoContainer.setVisibility(View.VISIBLE);
txt_bankAcNo.setText(verificationViewModel.getBankAcNo());
txt_bankAcNo.setText(" : "+verificationViewModel.getBankAcNo());
} }
String pAgent=verificationViewModel.getpAgent(); String pAgent=verificationViewModel.getpAgent();
if(pAgent!=null) { if(pAgent!=null) {
hideAgentLocation(false); hideAgentLocation(false);
txt_pagent.setText(verificationViewModel.getpAgent());
txt_pagent.setText(" : "+verificationViewModel.getpAgent());
} }
else else
hideAgentLocation(true); hideAgentLocation(true);

106
app/src/main/res/layout/activity_profile.xml
View File

@ -141,83 +141,83 @@
android:text="@string/verify_account_text"/> android:text="@string/verify_account_text"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
<android.support.constraint.ConstraintLayout
android:id="@+id/relativeLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ic_rectangle_white_extra_corners"
android:layout_margin="10dp" android:layout_margin="10dp"
android:padding="6dp">
android:background="@drawable/ic_rectangle_white_extra_corners">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_balance_label" android:id="@+id/tv_balance_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="13dp"
android:padding="2dp" android:padding="2dp"
android:textSize="13sp"
android:text="@string/available_balance_text"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:layout_marginLeft="16dp"
android:layout_marginTop="6dp"
android:text="@string/available_balance_text"/>
<LinearLayout
android:id="@+id/balanceLayout"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_balance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/tv_balance_label"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:layout_marginLeft="16dp"
android:orientation="horizontal">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24sp"
android:textColor="@color/colorAccent"
android:text="0"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_currency"
android:layout_below="@id/tv_balance_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:textSize="18sp"
android:paddingLeft="4dp"
android:textColor="@color/darkgray"
android:text="KRW"/>
</LinearLayout>
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" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:visibility="invisible"
android:id="@+id/tv_withdraw"
android:id="@+id/tv_currency"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/withdraw_text"
android:layout_marginTop="9dp"
android:paddingLeft="4dp"
android:text="KRW"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="12sp"
android:textSize="18sp"
app:layout_constraintStart_toEndOf="@+id/tv_balance"
app:layout_constraintTop_toBottomOf="@+id/tv_balance_label" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_withdraw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/ic_rounded_gray"
android:paddingBottom="6dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingTop="6dp" android:paddingTop="6dp"
android:paddingBottom="6dp"
android:layout_marginRight="8dp"
app:txtfontName="@string/semibold"
android:layout_below="@id/tv_balance_label"
android:layout_alignParentRight="true"
android:background="@drawable/ic_rounded_gray"
/>
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" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_wallet_number" android:id="@+id/tv_wallet_number"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="13dp"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="15sp" android:textSize="15sp"
android:layout_marginTop="4dp"
android:layout_marginLeft="16dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_below="@id/tv_withdraw"
/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_balance_label"
app:layout_constraintTop_toBottomOf="@+id/tv_balance" />
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>

3
app/src/main/res/layout/activity_settings.xml
View File

@ -32,7 +32,6 @@
android:layout_height="62dp" android:layout_height="62dp"
android:layout_gravity="center" android:layout_gravity="center"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_setting" /> android:src="@drawable/ic_setting" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
@ -96,7 +95,7 @@
android:paddingLeft="21dp" android:paddingLeft="21dp"
android:paddingStart="21dp" android:paddingStart="21dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:text="@string/change_password"
android:text="@string/change_password_text"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="14sp" /> android:textSize="14sp" />

2
app/src/main/res/layout/dialog_branch_listing.xml
View File

@ -25,7 +25,7 @@
android:gravity="center" android:gravity="center"
android:layout_gravity="end" android:layout_gravity="end"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
android:text="Cancel" />
android:text="@string/cancel_text" />
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/searchViewContainer" android:id="@+id/searchViewContainer"

2
app/src/main/res/layout/dialog_country_listing.xml
View File

@ -25,7 +25,7 @@
android:gravity="center" android:gravity="center"
android:layout_gravity="end" android:layout_gravity="end"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
android:text="Cancel" />
android:text="@string/cancel_text" />
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/searchViewContainer" android:id="@+id/searchViewContainer"

4
app/src/main/res/layout/home_menu_item_v2.xml
View File

@ -28,11 +28,13 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/image" android:layout_below="@id/image"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:gravity="center" android:gravity="center"
android:text="Send Money" android:text="Send Money"
android:textSize="12sp" android:textSize="12sp"

Write Preview
Loading…
Cancel
Save