diff --git a/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java b/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java index 0f9c79d3..c640f1db 100644 --- a/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java +++ b/app/src/main/java/com/swifttech/remit/android/common/customwidgets/exchangecountrylistingdialog/CountryFlagMapper.java @@ -1,6 +1,9 @@ package com.swifttech.remit.android.common.customwidgets.exchangecountrylistingdialog; import com.swifttech.remit.android.R; +import com.swifttech.remit.android.features.splashscreen.model.LanguageModel; + +import java.util.List; public class CountryFlagMapper { @@ -230,4 +233,14 @@ public class CountryFlagMapper { return R.drawable.flag_default; } } + + public static String getLanguageFromCountryCode(List languagemodels,String LanguageCode){ + for (LanguageModel languageModel : languagemodels){ + if(languageModel.getCountryCode().equalsIgnoreCase(LanguageCode)){ + return languageModel.getCountryName(); + } + } + + return ""; + } } diff --git a/app/src/main/java/com/swifttech/remit/android/common/view/MTextInputEditText.java b/app/src/main/java/com/swifttech/remit/android/common/view/MTextInputEditText.java index 4db96725..1c345e94 100644 --- a/app/src/main/java/com/swifttech/remit/android/common/view/MTextInputEditText.java +++ b/app/src/main/java/com/swifttech/remit/android/common/view/MTextInputEditText.java @@ -3,8 +3,8 @@ package com.swifttech.remit.android.common.view; import android.content.Context; import android.content.ContextWrapper; import android.content.res.TypedArray; +import android.text.InputFilter; import android.util.AttributeSet; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -12,11 +12,11 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; +import com.google.android.material.textfield.TextInputEditText; import com.swifttech.remit.android.R; import com.swifttech.remit.android.common.customwidgets.FontCache; -import com.google.android.material.textfield.TextInputEditText; +import com.swifttech.remit.android.common.customwidgets.GmeEditText; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -51,8 +51,7 @@ public class MTextInputEditText extends TextInputEditText { if (customImeNextOptionMethodString != null && customImeNextOptionMethodString.length() > 0) { setOnEditorActionListener(new DeclaredSoftKeyboardOnImeOptionNextClickListener(this, customImeNextOptionMethodString)); } - - + setFilters(new InputFilter[]{new GmeEditText.RegExInputFilter("^[a-zA-Z0-9]+$"), new InputFilter.LengthFilter(50)}); } private static class DeclaredSoftKeyboardOnImeOptionNextClickListener implements OnEditorActionListener { @@ -98,8 +97,6 @@ public class MTextInputEditText extends TextInputEditText { throw new IllegalStateException("Could not find method " + mMethodName + "() in a parent or ancestor Context for android:onImeOptionNext " + "attribute defined on view " + mHostView.getClass() + idText); - - } @Override diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java index 2a59a68e..cb89c010 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java +++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java @@ -74,8 +74,6 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme TextView tv_acc_no; @BindView(R.id.account_no_container) ViewGroup account_no_container; - @BindView(R.id.account_no_container_divider) - View account_no_container_divider; @BindView(R.id.btn_submit) Button btnSubmit; @BindView(R.id.btn_cancel) @@ -95,7 +93,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme @BindView(R.id.txt_partner_info) TextView txt_partner_info; @BindView(R.id.tv_note) - TextView txt_note; + TextView txv_note; @BindView(R.id.img_partner_info) ImageView img_partner_info; @BindView(R.id.progressbar_partner_info) @@ -187,7 +185,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme String middlName = recieptData.getRMiddleName() == null || recieptData.getRMiddleName().equalsIgnoreCase(" ") ? "" : recieptData.getRMiddleName() + " "; String name = recieptData.getRFirstName() + " " + middlName + recieptData.getRLastName(); - receiverNameTextView.setText(String.format("%s : %s", getString(R.string.to_text), name)); + receiverNameTextView.setText(String.format("%s", name)); payoutAmountTextView.setText(recieptData.getPAmount()); if (isRequestedBySendMoney) { @@ -218,7 +216,6 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme if (accounNo != null && accounNo.length() > 0) { tv_acc_no.setText(accounNo); account_no_container.setVisibility(View.VISIBLE); - account_no_container_divider.setVisibility(View.VISIBLE); } } @@ -226,7 +223,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme @Override public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl, String note) { if (note != null && note.length() > 0) - txt_note.setText(note); + txv_note.setText(note); if (action) { txt_partner_info.setText(partnerText); diff --git a/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenter.java b/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenter.java index 5bdad505..c0bc737f 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenter.java +++ b/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenter.java @@ -66,6 +66,7 @@ public class SplashScreenPresenter extends BasePresenter implements SplashScreen @Override public void checkCurrentSelectedLanguage() { view.updateFlagImage(CountryFlagMapper.getFlagFromCountryCode(this.languageGateway.getPreferredCountryCode())); + view.updateLanguageName(CountryFlagMapper.getLanguageFromCountryCode(this.languageGateway.getRelatedLanguageData(),this.languageGateway.getPreferredCountryCode())); } @Override diff --git a/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenterInterface.java b/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenterInterface.java index 1376a5aa..0a58aca0 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenterInterface.java +++ b/app/src/main/java/com/swifttech/remit/android/features/splashscreen/presenter/SplashScreenPresenterInterface.java @@ -30,6 +30,7 @@ public interface SplashScreenPresenterInterface extends BasePresenterInterface { Context getContext(); void updateFlagImage(int flagFromCountryCode); + void updateLanguageName(String languageName); void showAppVersion(String appVersion); diff --git a/app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java b/app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java index ad8cb193..dead4884 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java +++ b/app/src/main/java/com/swifttech/remit/android/features/splashscreen/view/SplashScreen.java @@ -357,6 +357,11 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, selectedLanguageIcon.setImageResource(flagFromCountryCode); } + @Override + public void updateLanguageName(String languageName) { + selectedLanguageText.setText(languageName); + } + @Override public void showAppVersion(String appVersion) { diff --git a/app/src/main/res/drawable/ic_transaction_sucess.xml b/app/src/main/res/drawable/ic_transaction_sucess.xml new file mode 100644 index 00000000..2a87b459 --- /dev/null +++ b/app/src/main/res/drawable/ic_transaction_sucess.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/app/src/main/res/layout/activity_register_v2.xml b/app/src/main/res/layout/activity_register_v2.xml index 3d144cf7..4163585b 100644 --- a/app/src/main/res/layout/activity_register_v2.xml +++ b/app/src/main/res/layout/activity_register_v2.xml @@ -152,7 +152,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="10dp" - android:layout_marginTop="@dimen/_20sdp" + android:layout_marginTop="@dimen/_5sdp" android:layout_gravity="center" > diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml index 8547ab47..b460dfda 100644 --- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml +++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml @@ -19,208 +19,190 @@ android:background="@color/background_gray" android:orientation="vertical"> + - - - + android:padding="@dimen/_5sdp"> - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + > + + - + - + + - + + + + + + + + + + + - - - + app:layout_constraintStart_toStartOf="parent" + /> - + - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/llHeader" + app:layout_constraintBottom_toTopOf="@+id/llHeader" + /> - + android:background="@drawable/bg_dotted" /> @@ -313,8 +294,8 @@ android:padding="@dimen/_8sdp" android:singleLine="true" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> @@ -341,8 +322,8 @@ android:gravity="end" android:padding="@dimen/_8sdp" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> @@ -370,8 +351,8 @@ android:singleLine="false" android:text="" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> @@ -401,8 +382,8 @@ android:singleLine="false" android:text="" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> @@ -428,13 +409,12 @@ android:padding="@dimen/_8sdp" android:text="" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> - @@ -465,8 +445,7 @@ android:id="@+id/coupon_fee_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" - > + android:visibility="gone"> @@ -514,8 +493,8 @@ android:gravity="end" android:padding="@dimen/_8sdp" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> @@ -540,8 +519,8 @@ android:gravity="end" android:padding="@dimen/_8sdp" android:textColor="@color/darkgray" - android:textStyle="bold" android:textSize="@dimen/_11sdp" + android:textStyle="bold" app:txtfontName="@string/semibold" /> @@ -549,13 +528,13 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2accd347..11c8f918 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,8 +214,8 @@ Transfer Successful! You have successfully transferred your money to Total Payout Amount - Japan Money Express Control No - Please keep this Japan Money Express control no. very secure. + JME Control No + Please keep this JME control no. very secure. Share with concerned party only Transaction Date Receiver @@ -421,11 +421,11 @@ All the configurations are done from backend web application system which allows Please write a subject Please write a message body - Japan Money Express Number not found + JME Number not found No transaction id found Subject Invalid account number (Only numbers and alphabets allowed) - Japan Money Express No / Receiver Name / Bank Name + JME No / Receiver Name / Bank Name Try again in Referral Code (Optional) Fingerprint Authentication