Browse Source

change pass if default password

new_design
Santosh Bhandary 3 years ago
parent
commit
fbb3b4a0e5
  1. 2
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/gateway/HomeV2Gateway.java
  2. 27
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/model/UserInfoModelV2.java
  3. 25
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeNotificationHandler.java
  4. 3
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeV2PresenterInterface.java
  5. 11
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/presenter/HomeViewModel.java
  6. 6
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeActivityV2.java
  7. 7
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/HomeFragmentV2.java
  8. 69
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/ChangePassNotificationView.java
  9. 10
      app/src/main/java/com/swifttech/remit/jmecustomer/features/home/view/notifications/HomeNotificiationViewFactory.java
  10. 2
      app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/adapter/NoticeListingRVAdapter.java
  11. 4
      app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/gateway/NoticeGateway.java
  12. 2
      app/src/main/java/com/swifttech/remit/jmecustomer/features/notice/view/NoticeListingFragment.java
  13. 2
      app/src/main/java/com/swifttech/remit/jmecustomer/features/userprofile/view/ProfileActivity.java
  14. 2
      app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/API_URL.java
  15. 5
      app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/ApiEndpoints.java
  16. 6
      app/src/main/res/drawable/ic_read.xml
  17. 2
      app/src/main/res/layout/activity_settings.xml
  18. 5
      app/src/main/res/layout/fragment_existing_customer_registration_submit.xml
  19. 154
      app/src/main/res/layout/notice_list_viewholder_v3.xml
  20. 2
      app/src/main/res/values-bn/strings.xml
  21. 2
      app/src/main/res/values-ja/strings.xml
  22. 2
      app/src/main/res/values-ne/strings.xml
  23. 2
      app/src/main/res/values-vi/strings.xml
  24. 3
      app/src/main/res/values/strings.xml

2
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());

27
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;
}
}

25
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
}
}

3
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();

11
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(

6
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)

7
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();
}

69
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);
}
}

10
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());

2
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;

4
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<ResponseBody> setNoticeStatus(String auth, String tranId, String notice) {
return HttpClientV2.getInstance().setNoticeReadStatus(auth,tranId);
public Observable<ResponseBody> setNoticeStatus(String auth, String tranId, String yesNo) {
return HttpClientV2.getInstance().setNoticeReadStatus(auth,tranId,yesNo);
}
@Override

2
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) {

2
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));
}

2
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}";
}

5
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<ResponseBody> setNoticeReadStatus(@Header("Authorization") String token, @Path("tranId")String tranId);
Observable<ResponseBody> setNoticeReadStatus(@Header("Authorization") String token, @Path("tranId")String tranId, @Path("yesNo")String yesNo);
}

6
app/src/main/res/drawable/ic_read.xml

@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
@ -6,9 +6,9 @@
<path
android:pathData="M19,10C19.34,10 19.67,10.03 20,10.08V4H4V16H12.08C12.57,12.61 15.47,10 19,10Z"
android:strokeAlpha="0.1"
android:fillColor="#DC1431"
android:fillColor="@color/light_gray"
android:fillAlpha="0.1"/>
<path
android:pathData="M17.34,20L13.8,16.46L15.21,15.05L17.33,17.17L21.57,12.93L23,14.34L17.34,20ZM12.08,16H4V4H20V10.08C20.71,10.18 21.38,10.39 22,10.68V4C22,2.9 21.1,2 20,2H4C2.9,2 2,2.9 2,4V22L6,18H12C12,17.86 12.02,17.73 12.03,17.6C12.01,17.4 12,17.2 12,17C12,16.66 12.03,16.33 12.08,16Z"
android:fillColor="#DC1431"/>
android:fillColor="@color/light_gray"/>
</vector>

2
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" />
<LinearLayout
android:layout_width="match_parent"

5
app/src/main/res/layout/fragment_existing_customer_registration_submit.xml

@ -108,8 +108,9 @@
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
<com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
android:inputType="textPassword"
android:id="@+id/newPin_edTxt"
android:inputType="numberPassword"
android:maxLength="6"
style="@style/MTextInputEditText"/>
</com.swifttech.remit.jmecustomer.common.view.MTextInputLayout>
@ -127,8 +128,8 @@
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
<com.swifttech.remit.jmecustomer.common.view.MTextInputEditTextSpaceMasked
android:inputType="textPassword"
android:id="@+id/confirmPin_edTxt"
android:inputType="numberPassword"
android:maxLength="6"
style="@style/MTextInputEditText"/>

154
app/src/main/res/layout/notice_list_viewholder_v3.xml

@ -1,84 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/_8sdp">
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"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/_5sdp"
android:paddingLeft="@dimen/_8sdp"
android:paddingRight="@dimen/_8sdp"
>
<com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_marginTop="@dimen/_5sdp"
android:id="@+id/tv_notification_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="start"
android:maxLines="1"
android:textColor="@color/darkgray"
android:textSize="@dimen/_13sdp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_status"
app:txtfontName="@string/bold"
tools:text="When developed " />
<com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_marginEnd="@dimen/_15sdp"
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:textColor="@color/blue"
android:paddingStart="@dimen/_6sdp"
android:paddingEnd="@dimen/_6sdp"
android:paddingTop="@dimen/_1sdp"
android:paddingBottom="@dimen/_1sdp"
android:visibility="gone"
android:textSize="@dimen/_10ssp"
app:layout_constraintStart_toEndOf="@+id/tv_notification_title"
app:layout_constraintTop_toTopOf="@id/tv_notification_title"
app:layout_constraintEnd_toStartOf="@id/rightArrow"
android:background="@drawable/ic_rounded_country_listing_pink"
android:text="@string/new_text" />
<com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_marginTop="@dimen/_5sdp"
android:id="@+id/tv_notification_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="start"
android:maxLines="1"
android:textColor="@color/darkgray"
android:textSize="@dimen/_13ssp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_status"
app:txtfontName="@string/bold"
tools:text="When developed " />
<com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/tv_notification_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start"
android:textColor="@color/darkgray2"
android:textSize="@dimen/_10ssp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/rightArrow"
app:layout_constraintStart_toStartOf="@+id/tv_notification_title"
app:layout_constraintTop_toBottomOf="@+id/tv_notification_title"
android:layout_marginTop="@dimen/_4sdp"
android:layout_marginBottom="@dimen/_5sdp"
app:txtfontName="@string/regular"
app:layout_constraintEnd_toStartOf="@id/tv_status"
tools:text="@string/date_text" />
<com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_marginEnd="@dimen/_15sdp"
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:textColor="@color/blue"
android:paddingStart="@dimen/_6sdp"
android:paddingEnd="@dimen/_6sdp"
android:paddingTop="@dimen/_1sdp"
android:paddingBottom="@dimen/_1sdp"
android:visibility="gone"
android:textSize="@dimen/_10ssp"
app:layout_constraintStart_toEndOf="@+id/tv_notification_title"
app:layout_constraintTop_toTopOf="@id/tv_notification_title"
app:layout_constraintEnd_toStartOf="@id/rightArrow"
android:background="@drawable/ic_rounded_country_listing_pink"
android:text="@string/new_text" />
<ImageView
android:id="@+id/rightArrow"
android:layout_width="@dimen/_16sdp"
android:layout_height="@dimen/_18sdp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/right_arrow" />
<com.swifttech.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/tv_notification_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start"
android:textColor="@color/darkgray2"
android:textSize="@dimen/_10ssp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/rightArrow"
app:layout_constraintStart_toStartOf="@+id/tv_notification_title"
app:layout_constraintTop_toBottomOf="@+id/tv_notification_title"
android:layout_marginTop="@dimen/_4sdp"
android:layout_marginBottom="@dimen/_5sdp"
app:txtfontName="@string/regular"
app:layout_constraintEnd_toStartOf="@id/tv_status"
tools:text="@string/date_text" />
<ImageView
android:id="@+id/imgNotificationStat"
android:layout_width="@dimen/_16sdp"
android:layout_height="@dimen/_18sdp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_notification_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginRight="@dimen/commonMargin"
/>
<ImageView
android:id="@+id/rightArrow"
android:layout_width="@dimen/_16sdp"
android:layout_height="@dimen/_18sdp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/right_arrow" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/imgNotificationStat"
android:layout_width="@dimen/_16sdp"
android:layout_height="@dimen/_18sdp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_notification_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginRight="@dimen/commonMargin"
/>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values-bn/strings.xml

@ -542,4 +542,6 @@
<string name="verify_email_text">ইমেইল যাচাই করুন</string>
<string name="verify_email_detail_text">আপনার ইমেইল ঠিকানা যাচাই করতে এখানে ক্লিক করুন</string>
<string name="deviceNotCompForBiometric">Your Mobile is not compatiable for biometric login</string>
<string name="change_txn_pass">Change Password</string>
<string name="change_txn_pass_detail">Please click here to change your Login Password</string>
</resources>

2
app/src/main/res/values-ja/strings.xml

@ -542,5 +542,7 @@
<string name="verify_email_text"> </string>
<string name="verify_email_detail_text"></string>
<string name="deviceNotCompForBiometric">Your Mobile is not compatiable for biometric login</string>
<string name="change_txn_pass">Change Password</string>
<string name="change_txn_pass_detail">Please click here to change your Login Password</string>
</resources>

2
app/src/main/res/values-ne/strings.xml

@ -541,4 +541,6 @@
<string name="verify_email_text">ईमेल प्रमाणित गर्नुस</string>
<string name="verify_email_detail_text">कृपया यहाँ क्लिक गर्नुहोस् तपाईंको ईमेल ठेगाना प्रमाणित गर्न कृपया</string>
<string name="deviceNotCompForBiometric">Your Mobile is not compatiable for biometric login</string>
<string name="change_txn_pass">Change Password</string>
<string name="change_txn_pass_detail">Please click here to change your Login Password</string>
</resources>

2
app/src/main/res/values-vi/strings.xml

@ -538,5 +538,7 @@
<string name="verify_email_text">Xác nhận Email</string>
<string name="verify_email_detail_text">Vui lòng bấm vào đây để xác minh địa chỉ email của bạn</string>
<string name="deviceNotCompForBiometric">Your Mobile is not compatiable for biometric login</string>
<string name="change_txn_pass">Change Password</string>
<string name="change_txn_pass_detail">Please click here to change your Login Password</string>
</resources>

3
app/src/main/res/values/strings.xml

@ -565,5 +565,8 @@
<string name="verify_email_text">Verify email</string>
<string name="verify_email_detail_text">Please click here to verify your email address</string>
<string name="deviceNotCompForBiometric">Your Mobile is not compatiable for biometric login</string>
<string name="memberShipId_text">Membership ID</string>
<string name="change_txn_pass">Change Password</string>
<string name="change_txn_pass_detail">Please click here to change your Login Password</string>
</resources>
Loading…
Cancel
Save