From fbb3b4a0e51107bfa4f47610e66b809232ab6bb9 Mon Sep 17 00:00:00 2001 From: Santosh Bhandary Date: Fri, 22 Oct 2021 19:52:18 +0545 Subject: [PATCH] change pass if default password --- .../features/home/gateway/HomeV2Gateway.java | 2 +- .../features/home/model/UserInfoModelV2.java | 27 ++- .../presenter/HomeNotificationHandler.java | 25 ++- .../presenter/HomeV2PresenterInterface.java | 3 + .../home/presenter/HomeViewModel.java | 11 +- .../features/home/view/HomeActivityV2.java | 6 + .../features/home/view/HomeFragmentV2.java | 7 +- .../ChangePassNotificationView.java | 69 ++++++++ .../HomeNotificiationViewFactory.java | 10 +- .../adapter/NoticeListingRVAdapter.java | 2 - .../notice/gateway/NoticeGateway.java | 4 +- .../notice/view/NoticeListingFragment.java | 2 +- .../userprofile/view/ProfileActivity.java | 2 +- .../jmecustomer/utils/https/API_URL.java | 2 +- .../jmecustomer/utils/https/ApiEndpoints.java | 5 +- app/src/main/res/drawable/ic_read.xml | 6 +- app/src/main/res/layout/activity_settings.xml | 2 +- ..._existing_customer_registration_submit.xml | 5 +- .../res/layout/notice_list_viewholder_v3.xml | 154 ++++++++++-------- app/src/main/res/values-bn/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ne/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values/strings.xml | 3 + 24 files changed, 250 insertions(+), 105 deletions(-) create mode 100644 app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java index 4acce759..36a0178d 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java @@ -74,7 +74,7 @@ public class HomeV2Gateway extends PrivilegedGateway implements HomeV2Interactor sharedPreferenceEditor.putString(PrefKeys.USER_REWAD_POINT, loginApiResponseModelV2.getRewardPoint()); sharedPreferenceEditor.putString(PrefKeys.USER_SOURCE_ID, loginApiResponseModelV2.getSourceId()); sharedPreferenceEditor.putBoolean(PrefKeys.USER_KYC_VERIFIED, loginApiResponseModelV2.isVerified()); - sharedPreferenceEditor.putBoolean(PrefKeys.USER_EMAIL_VERIFIED, loginApiResponseModelV2.getEmailVerified()); + sharedPreferenceEditor.putBoolean(PrefKeys.USER_EMAIL_VERIFIED, loginApiResponseModelV2.isEmailVerified()); sharedPreferenceEditor.putString(PrefKeys.USER_WALLET_NUMBER, loginApiResponseModelV2.getWalletNumber()); sharedPreferenceEditor.putString(PrefKeys.USER_YEARLY_REMAINING_LIMIT, loginApiResponseModelV2.getYearlyLimit()); sharedPreferenceEditor.putString(PrefKeys.USER_DOB, loginApiResponseModelV2.getUserDob()); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java index c17905d3..0849825f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java @@ -148,8 +148,13 @@ public class UserInfoModelV2 { @Expose protected boolean isEmailVerified; + @SerializedName("IsBiometricLogin") + @Expose + protected boolean IsBiometricLogin; - + @SerializedName("BiometricLoginType") + @Expose + protected String BiometricLoginType; public String getReferralCode() { return referralCode; @@ -500,9 +505,27 @@ public class UserInfoModelV2 { this.hasUpdatedDefaultCredentials = hasUpdatedDefaultCredentials; } - public boolean getEmailVerified() { + public boolean isEmailVerified() { return isEmailVerified; } + public void setEmailVerified(boolean emailVerified) { + isEmailVerified = emailVerified; + } + + public boolean isBiometricLogin() { + return IsBiometricLogin; + } + public void setBiometricLogin(boolean biometricLogin) { + IsBiometricLogin = biometricLogin; + } + + public String getBiometricLoginType() { + return BiometricLoginType; + } + + public void setBiometricLoginType(String biometricLoginType) { + BiometricLoginType = biometricLoginType; + } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java index 300d9327..976bcb0c 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java @@ -53,11 +53,11 @@ public class HomeNotificationHandler { } public static HomeNotificationViewDTO generateNotificationFromType(RemitApplication.StringExtractor stringExtractor, HomeNoticeViewTypeEnum type) { - return new HomeNotificationHandler(stringExtractor).generateHomeNotificaationViewExplicitlyFromType(type); + return new HomeNotificationHandler(stringExtractor).generateHomeNotificationViewExplicitlyFromType(type); } - private HomeNotificationViewDTO generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum type) { + private HomeNotificationViewDTO generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum type) { switch (type) { case KYC_NOT_SUBMITTED: HomeNotificationViewDTO kycNotSubmittedNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.kyc_fill_text), stringExtractor.getStringFromStringId(R.string.complete_your_registration_text), isExistingCustomer, HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED, hasUpdatedDefaultCredentials); @@ -82,6 +82,11 @@ public class HomeNotificationHandler { changeTxnPinNPassNotificationViewDTO.setFocused(true); return changeTxnPinNPassNotificationViewDTO; + case CHANGE_TXN_PASS: + HomeNotificationViewDTO changeTxnPassNotificationViewDTO = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.change_txn_pass), stringExtractor.getStringFromStringId(R.string.change_txn_pass_detail), isExistingCustomer, HomeNoticeViewTypeEnum.CHANGE_TXN_PASS, hasUpdatedDefaultCredentials); + changeTxnPassNotificationViewDTO.setFocused(true); + return changeTxnPassNotificationViewDTO; + case EMAIL_NOT_VERIFIED: HomeNotificationViewDTO emailNotVerifiedDto = new HomeNotificationViewDTO(stringExtractor.getStringFromStringId(R.string.verify_email_text), stringExtractor.getStringFromStringId(R.string.verify_email_detail_text), isExistingCustomer, HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED, hasUpdatedDefaultCredentials); emailNotVerifiedDto.setFocused(true); @@ -100,22 +105,24 @@ public class HomeNotificationHandler { private HomeNotificationViewDTO generateAppropriateRegistrationRelatedNotification() { if (!isEmailVerified) - return generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED); + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.EMAIL_NOT_VERIFIED); else if (!kycSubmit) - return generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED); + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_SUBMITTED); else if (!isTermsAccepted) - return generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum.TERMSNOTACCEPTED); + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.TERMSNOTACCEPTED); else if (!isVerified) - return generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED); + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.KYC_NOT_VERIFIED); else if (hasUpdatedDefaultCredentials.equals("1")) - return generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN); + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN); else if (hasUpdatedDefaultCredentials.equals("2")) - return generateHomeNotificaationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS); + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS); + else if (hasUpdatedDefaultCredentials.equals("3")) + return generateHomeNotificationViewExplicitlyFromType(HomeNoticeViewTypeEnum.CHANGE_TXN_PIN_N_PASS); else return null; } public enum HomeNoticeViewTypeEnum { - KYC_NOT_SUBMITTED, KYC_NOT_VERIFIED, AUTO_DEBIT_FILLUP_REQUIRED, PENNY_TEST_REQUIRED, CHANGE_TXN_PIN, CHANGE_TXN_PIN_N_PASS, EMAIL_NOT_VERIFIED, TERMSNOTACCEPTED + KYC_NOT_SUBMITTED, KYC_NOT_VERIFIED, AUTO_DEBIT_FILLUP_REQUIRED, PENNY_TEST_REQUIRED, CHANGE_TXN_PIN, CHANGE_TXN_PIN_N_PASS,CHANGE_TXN_PASS, EMAIL_NOT_VERIFIED, TERMSNOTACCEPTED } } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java index 948bf934..0901be0e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java @@ -21,6 +21,7 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface { void showKYCScreen(); void showChangePinScreen(); void showChangePinNPassScreen(); + void showChangePassScreen(); void postEmailCodeToVerify(String emailCode); @@ -61,6 +62,8 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface { void showChangePinNPassScreen(); + void showChangePassScreen(); + void showVerifyEmailDialog(); void onEmailVerifySuccess(); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java index 01635b5b..9e919e28 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java @@ -114,6 +114,13 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter } } + @Override + public void showChangePassScreen() { + if (notificationViewDTO != null) { + view.showChangePassScreen(); + } + } + @Override public void postEmailCodeToVerify(String OTP) { @@ -274,7 +281,7 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter boolean shouldShowTermsAndCondition = "True".equalsIgnoreCase(userInfoModelV2.getAgreeYn()); - Log.d(TAG, "hasOtp verified? : " + userInfoModelV2.getEmailVerified()); + Log.d(TAG, "hasOtp verified? : " + userInfoModelV2.isEmailVerified()); notificationViewDTO = new HomeNotificationHandler( @@ -286,7 +293,7 @@ public class HomeViewModel extends BaseViewModel implements HomeV2PresenterInter shouldShowTermsAndCondition, userInfoModelV2.getExistingCustomer(), userInfoModelV2.getHasUpdatedDefaultCredentials(), - userInfoModelV2.getEmailVerified()) + userInfoModelV2.isEmailVerified()) .generateAppropriateHomeNotificationViewDTO(); homeRelatedMutableLiveData.setValue( diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java index e82d7bf5..e8723529 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java @@ -41,6 +41,7 @@ import com.swifttech.remit.jmecustomer.features.agentslisting.view.AgentListV2Ac import com.swifttech.remit.jmecustomer.features.appupdate.AppUpdateActivity; import com.swifttech.remit.jmecustomer.features.cashpickuptowallet.view.CashPickupToWalletActivity; import com.swifttech.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity; +import com.swifttech.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity; import com.swifttech.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity; import com.swifttech.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment; import com.swifttech.remit.jmecustomer.features.exrate.view.ExchangeRateActivity; @@ -546,6 +547,11 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra startActivity(new Intent(this, ChangePassNPinActivity.class)); } + @Override + public void showChangePassScreen() { + startActivity(new Intent(this, UserPasswordChangeV2Activity.class)); + } + @Override public void showVerifyEmailDialog() { if (currentFragment instanceof HomeFragmentV2) diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java index 9a2d172f..32196ead 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java @@ -31,6 +31,7 @@ import com.swifttech.remit.jmecustomer.features.home.adapters.HomeMenuRvAdapterV import com.swifttech.remit.jmecustomer.features.home.model.HomeNotificationViewDTO; import com.swifttech.remit.jmecustomer.features.home.model.MenuItem; import com.swifttech.remit.jmecustomer.features.home.presenter.HomeViewModel; +import com.swifttech.remit.jmecustomer.features.home.view.notifications.ChangePassNotificationView; import com.swifttech.remit.jmecustomer.features.home.view.notifications.ChangePinNPassNotificationView; import com.swifttech.remit.jmecustomer.features.home.view.notifications.ChangePinNotificationView; import com.swifttech.remit.jmecustomer.features.home.view.notifications.EmailNotVerifiedView; @@ -118,8 +119,6 @@ public class HomeFragmentV2 extends BaseFragment implements setupMenuRecyclerView(); homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class); compositeDisposable = new CompositeDisposable(); - - } private void setupMenuRecyclerView() { @@ -260,7 +259,9 @@ public class HomeFragmentV2 extends BaseFragment implements homeViewModel.showChangePinScreen(); } else if (notificationView instanceof ChangePinNPassNotificationView) { homeViewModel.showChangePinNPassScreen(); - } else if (notificationView instanceof EmailNotVerifiedView) { + } else if (notificationView instanceof ChangePassNotificationView) { + homeViewModel.requestForOtp(); + }else if (notificationView instanceof EmailNotVerifiedView) { homeViewModel.requestForOtp(); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java new file mode 100644 index 00000000..84364381 --- /dev/null +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java @@ -0,0 +1,69 @@ +package com.swifttech.remit.jmecustomer.features.home.view.notifications; + +import android.animation.ObjectAnimator; +import android.animation.ValueAnimator; +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import com.swifttech.remit.jmecustomer.R; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class ChangePassNotificationView extends NotificaitonBaseView { + + @BindView(R.id.kftc_renew_title) + TextView kftc_renew_title; + + @BindView(R.id.kftc_renew_text) + TextView kftc_renew_text; + + @BindView(R.id.kftc_renew_image) + ImageView kftc_renew_image; + private ObjectAnimator anim; + + public ChangePassNotificationView(Context context) { + super(context); + init(context); + } + + public ChangePassNotificationView(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + } + + public ChangePassNotificationView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + @Override + public void animateNotification() { + if(anim==null||!anim.isRunning()) { + anim = ObjectAnimator.ofFloat(kftc_renew_image, View.ROTATION, 0,15,-15,9,-9,0); + anim.setStartDelay(300); + anim.setDuration(2000).setRepeatMode(ValueAnimator.RESTART); + anim.setRepeatCount(ValueAnimator.INFINITE); + anim.start(); + } + } + + private void init(Context context) + { + View view= LayoutInflater.from(context).inflate(R.layout.notification_auto_debit_required, this, true); + ButterKnife.bind(view,this); + } + + public void setTitle(String title) { + kftc_renew_title.setText(title); + } + + public void setMessage(String messageBody) { + kftc_renew_text.setText(messageBody); + + } +} diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java index 77a7373a..0e229760 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java @@ -22,7 +22,8 @@ public class HomeNotificiationViewFactory { return getChangePinView(homeNoticeViewDTO, context); case CHANGE_TXN_PIN_N_PASS: return getChangePinNPassView(homeNoticeViewDTO, context); - + case CHANGE_TXN_PASS: + return getChangePassView(homeNoticeViewDTO, context); case EMAIL_NOT_VERIFIED: return getEmailNotVerifiedView(homeNoticeViewDTO,context); default: @@ -44,6 +45,13 @@ public class HomeNotificiationViewFactory { return view; } + private static ChangePassNotificationView getChangePassView(HomeNotificationViewDTO homeNoticeViewDTO, Context context) { + ChangePassNotificationView view = new ChangePassNotificationView(context); + view.setTitle(homeNoticeViewDTO.getTitle()); + view.setMessage(homeNoticeViewDTO.getMessageBody()); + return view; + } + private static ChangePinNotificationView getChangePinView(HomeNotificationViewDTO homeNoticeViewDTO, Context context) { ChangePinNotificationView view = new ChangePinNotificationView(context); view.setTitle(homeNoticeViewDTO.getTitle()); diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java index 1e607ba1..8232a803 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java @@ -1,13 +1,11 @@ package com.swifttech.remit.jmecustomer.features.notice.adapter; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; - import com.swifttech.remit.jmecustomer.R; import com.swifttech.remit.jmecustomer.features.notice.model.NoticeDTO; diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java index b1bc7edd..b3147e2f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java @@ -31,8 +31,8 @@ public class NoticeGateway extends PrivilegedGateway implements NoticeGatewayInt } @Override - public Observable setNoticeStatus(String auth, String tranId, String notice) { - return HttpClientV2.getInstance().setNoticeReadStatus(auth,tranId); + public Observable setNoticeStatus(String auth, String tranId, String yesNo) { + return HttpClientV2.getInstance().setNoticeReadStatus(auth,tranId,yesNo); } @Override diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java index f6df8856..3fbac210 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java @@ -51,7 +51,7 @@ public class NoticeListingFragment extends BaseFragment implements NoticeListing private void init() { noticeListingRVAdapter = new NoticeListingRVAdapter(this); noticeRv.setAdapter(noticeListingRVAdapter); - noticeRv.addItemDecoration(new LineDividerItemDecoration(noticeRv.getContext(), LineDividerItemDecoration.VERTICAL_LIST)); +// noticeRv.addItemDecoration(new LineDividerItemDecoration(noticeRv.getContext(), LineDividerItemDecoration.VERTICAL_LIST)); } private void performDefaultAction(Bundle savedInstance) { diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java b/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java index 90f97dee..4e21bd2e 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java @@ -122,7 +122,7 @@ public class ProfileActivity extends BaseActivity implements UserProfilePresente if(referralCode==null||referralCode.length()<1) referralCode=getString(R.string.na_text); - String referralCodeTitle=getString(R.string.referral_code_text).replaceAll("\\(.*\\)", ""); + String referralCodeTitle=getString(R.string.memberShipId_text); tv_referral.setText(String.format("%s\n%s", referralCodeTitle, referralCode)); } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java index a6e8ddd5..1296afb4 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java @@ -111,7 +111,7 @@ public class API_URL { public static final String PROCEED_FOR_BANK_DEPOSIT = BuildConfig.API_VERSION + "/mobile/withdrawFromWallet"; public static final String CHANGE_PIN = BuildConfig.API_VERSION + "/mobile/changeTxnPin"; public static final String GET_CCDI = BuildConfig.API_VERSION + "/mobile/sendmoney/getcddi/{userId}"; - public static final String SET_NOTICE_STAT = BuildConfig.API_VERSION + "/mobile/receipt/{tranId}"; + public static final String SET_NOTICE_STAT = BuildConfig.API_VERSION + "/mobile/receipt/{tranId}/{yesNo}"; } diff --git a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java index aa42982a..61e5a29f 100644 --- a/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java +++ b/app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java @@ -46,8 +46,6 @@ import retrofit2.http.Url; public interface ApiEndpoints { - - /* V2 */ @GET(API_URL.EXCHANGE_RATE_SERVICE) @@ -332,7 +330,6 @@ public interface ApiEndpoints { @POST(API_URL.SET_NOTICE_STAT) @Headers("Content-Type: application/json") - Observable setNoticeReadStatus(@Header("Authorization") String token, @Path("tranId")String tranId); - + Observable setNoticeReadStatus(@Header("Authorization") String token, @Path("tranId")String tranId, @Path("yesNo")String yesNo); } diff --git a/app/src/main/res/drawable/ic_read.xml b/app/src/main/res/drawable/ic_read.xml index 27662286..b6037cef 100644 --- a/app/src/main/res/drawable/ic_read.xml +++ b/app/src/main/res/drawable/ic_read.xml @@ -1,4 +1,4 @@ - + android:fillColor="@color/light_gray"/> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index e9b35ed1..af619f01 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -18,7 +18,7 @@ android:contentDescription="@string/app_name" android:padding="10dp" app:srcCompat="@drawable/icv_back" - android:tint="@color/white" /> + app:tint="@color/white" /> @@ -127,8 +128,8 @@ app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle" > diff --git a/app/src/main/res/layout/notice_list_viewholder_v3.xml b/app/src/main/res/layout/notice_list_viewholder_v3.xml index 030a36f1..7a67d6fe 100644 --- a/app/src/main/res/layout/notice_list_viewholder_v3.xml +++ b/app/src/main/res/layout/notice_list_viewholder_v3.xml @@ -1,84 +1,98 @@ - + android:outlineAmbientShadowColor="@color/dark_gray" + android:outlineSpotShadowColor="@color/dark_gray" + android:layout_margin="@dimen/_5sdp" + android:layout_marginRight="@dimen/_10sdp" + android:layout_marginLeft="@dimen/_10sdp" + > + + + - + - + - + - + - + - diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 995d9f1b..fce5a79f 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -542,4 +542,6 @@ ইমেইল যাচাই করুন আপনার ইমেইল ঠিকানা যাচাই করতে এখানে ক্লিক করুন Your Mobile is not compatiable for biometric login + Change Password + Please click here to change your Login Password \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c4b859fb..8733e73c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -542,5 +542,7 @@ Your Mobile is not compatiable for biometric login + Change Password + Please click here to change your Login Password \ No newline at end of file diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index be2817e5..bedf250c 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -541,4 +541,6 @@ ईमेल प्रमाणित गर्नुस कृपया यहाँ क्लिक गर्नुहोस् तपाईंको ईमेल ठेगाना प्रमाणित गर्न कृपया Your Mobile is not compatiable for biometric login + Change Password + Please click here to change your Login Password \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 87e20bb6..812b1b29 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -538,5 +538,7 @@ Xác nhận Email Vui lòng bấm vào đây để xác minh địa chỉ email của bạn Your Mobile is not compatiable for biometric login + Change Password + Please click here to change your Login Password \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd80a2aa..388763e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -565,5 +565,8 @@ Verify email Please click here to verify your email address Your Mobile is not compatiable for biometric login + Membership ID + Change Password + Please click here to change your Login Password