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

fix special character and digit validation and remove image crop feature

new_design
Mukesh Dhungana 2 years ago
parent
6a8c6d32c0
commit
e4993e4450
8 changed files with 251 additions and 203 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java
  2. 63
      app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java
  3. 24
      app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewIdActivity.java
  4. 39
      app/src/main/res/layout/dialog_answer_input.xml
  5. 15
      app/src/main/res/layout/fragment_ccdi_send_money_v2.xml
  6. 126
      app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml
  7. 36
      app/src/main/res/layout/fragment_existing_kyc_document.xml
  8. 127
      app/src/main/res/layout/fragment_kyc_customer_detail.xml

24
app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java
View File

@ -531,7 +531,9 @@ public class ExistingKYCIDTypeFragment extends BaseFragment {
) {
if (resultCode == RESULT_OK) {
requestToCropImage(requestCode);
//requestToCropImage(requestCode);
File imageFile = createCompressedImageFileFromUri(photoFile);
kycv3ViewModel.checkImageStatus(requestCode, resultCode, imageFile);
}
} else if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
@ -540,8 +542,8 @@ public class ExistingKYCIDTypeFragment extends BaseFragment {
if (resultCode == RESULT_OK) {
Uri resultUri = result.getUri();
File imageFile = createCompressedImageFileFromUri(resultUri);
kycv3ViewModel.checkImageStatus(currentRequest, resultCode, imageFile);
// File imageFile = createCompressedImageFileFromUri(resultUri);
//kycv3ViewModel.checkImageStatus(currentRequest, resultCode, imageFile);
} else {
showToastMessage(result.getError().getMessage());
@ -570,7 +572,21 @@ public class ExistingKYCIDTypeFragment extends BaseFragment {
}
private File createCompressedImageFileFromUri(Uri data) {
// private File createCompressedImageFileFromUri(Uri data) {
//
// File compressedBitmap = null;
// try {
// compressedBitmap = new Compressor(getActivity())
// .setCompressFormat(Bitmap.CompressFormat.JPEG)
// .setQuality(COMPRESS_QUALITY)
// .compressToFile(new File(data.getPath()));
// } catch (Exception e) {
//
// }
// return compressedBitmap;
// }
private File createCompressedImageFileFromUri(File data) {
File compressedBitmap = null;
try {

63
app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java
View File

@ -6,6 +6,8 @@ import android.content.ClipData;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.Camera;
import android.media.Image;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -68,6 +70,7 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
public static final int CAMERA_REQUEST_FACE_PHOTO = 4000;
public static final int CAMERA_REQUEST_ADDITIONAL_ID = 5000;
public static final int CAMERA_REQUEST_ADDITIONAL_ID_BACK = 6000;
private static final int CAMERA_REQUEST = 1888;
public static final int GALLERY_REQUEST_ID_FRONT = 7000;
@ -726,8 +729,43 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
}
// @Override
// public void onActivityResult(int requestCode, int resultCode, Intent data) {
// super.onActivityResult(requestCode, resultCode, data);
// try {
// if (resultCode == RESULT_OK) {
// if (requestCode == CAMERA_REQUEST_ID_BACK ||
// requestCode == CAMERA_REQUEST_ID_FRONT ||
// requestCode == CAMERA_REQUEST_ID_SIDE ||
// requestCode == CAMERA_REQUEST_ADDITIONAL_ID ||
// requestCode == CAMERA_REQUEST_ADDITIONAL_ID_BACK ||
// requestCode == CAMERA_REQUEST_FACE_PHOTO
// ) {
// requestToCropImage(requestCode);
// } else if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
// CropImage.ActivityResult result = CropImage.getActivityResult(data);
// if (result.isSuccessful()) {
// Uri resultUri = result.getUri();
// File imageFile = createCompressedImageFileFromUri(resultUri);
// kycv3ViewModel.checkImageStatus(currentRequest, resultCode, imageFile);
//
// } else {
// showToastMessage(result.getError().getMessage());
// }
// } else {
// photoURI = data.getData();
// requestToCropImage(requestCode);
// }
// }
// } catch (NullPointerException ex) {
// ex.printStackTrace();
// }
//
// }
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
try {
if (resultCode == RESULT_OK) {
if (requestCode == CAMERA_REQUEST_ID_BACK ||
@ -737,14 +775,16 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
requestCode == CAMERA_REQUEST_ADDITIONAL_ID_BACK ||
requestCode == CAMERA_REQUEST_FACE_PHOTO
) {
requestToCropImage(requestCode);
//requestToCropImage(requestCode);
File imageFile = createCompressedImageFileFromUri(photoFile);
kycv3ViewModel.checkImageStatus(requestCode, resultCode, imageFile);
} else if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
CropImage.ActivityResult result = CropImage.getActivityResult(data);
if (result.isSuccessful()) {
Uri resultUri = result.getUri();
File imageFile = createCompressedImageFileFromUri(resultUri);
kycv3ViewModel.checkImageStatus(currentRequest, resultCode, imageFile);
//File imageFile = createCompressedImageFileFromUri(resultUri);
//kycv3ViewModel.checkImageStatus(currentRequest, resultCode, imageFile);
} else {
showToastMessage(result.getError().getMessage());
@ -757,6 +797,7 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
} catch (NullPointerException ex) {
ex.printStackTrace();
}
}
private void requestToCropImage(int currentRequest) {
@ -777,7 +818,21 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt
}
private File createCompressedImageFileFromUri(Uri data) {
// private File createCompressedImageFileFromUri(Uri data) {
//
// File compressedBitmap = null;
// try {
// compressedBitmap = new Compressor(getActivity())
// .setCompressFormat(Bitmap.CompressFormat.JPEG)
// .setQuality(COMPRESS_QUALITY)
// .compressToFile(new File(data.getPath()));
// } catch (Exception e) {
//
// }
// return compressedBitmap;
// }
private File createCompressedImageFileFromUri(File data) {
File compressedBitmap = null;
try {

24
app/src/main/java/com/remit/jmecustomer/features/renewId/view/RenewIdActivity.java
View File

@ -350,7 +350,9 @@ public class RenewIdActivity extends BaseActivity implements RenewIdV2PresenterI
) {
if (resultCode == RESULT_OK) {
requestToCropImage(requestCode);
// requestToCropImage(requestCode);
File imageFile = createCompressedImageFileFromUri(photoFile);
viewModel.checkImageStatus(requestCode, resultCode, imageFile);
}
} else if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
@ -359,8 +361,8 @@ public class RenewIdActivity extends BaseActivity implements RenewIdV2PresenterI
if (resultCode == RESULT_OK) {
Uri resultUri = result.getUri();
File imageFile = createCompressedImageFileFromUri(resultUri);
viewModel.checkImageStatus(currentRequest, resultCode, imageFile);
//File imageFile = createCompressedImageFileFromUri(resultUri);
//viewModel.checkImageStatus(currentRequest, resultCode, imageFile);
} else {
showToastMessage(result.getError().getMessage());
@ -470,7 +472,21 @@ public class RenewIdActivity extends BaseActivity implements RenewIdV2PresenterI
}
}
private File createCompressedImageFileFromUri(Uri data) {
// private File createCompressedImageFileFromUri(Uri data) {
//
// File compressedBitmap = null;
// try {
// compressedBitmap = new Compressor(this)
// .setCompressFormat(Bitmap.CompressFormat.JPEG)
// .setQuality(COMPRESS_QUALITY)
// .compressToFile(new File(data.getPath()));
// } catch (Exception e) {
//
// }
// return compressedBitmap;
// }
private File createCompressedImageFileFromUri(File data) {
File compressedBitmap = null;
try {

39
app/src/main/res/layout/dialog_answer_input.xml
View File

@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/_8sdp">
<ImageView
android:layout_marginEnd="@dimen/_4sdp"
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
app:srcCompat="@drawable/vd_close"
android:textColor="@color/blue"
android:layout_marginTop="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_4sdp"
android:layout_marginBottom="@dimen/commonMargin"
android:text="@string/cancel_text" />
android:text="@string/cancel_text"
android:textColor="@color/blue"
app:srcCompat="@drawable/vd_close" />
<com.remit.jmecustomer.common.view.MTextView
android:id="@+id/questionTextView"
app:txtfontName="@string/regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_5sdp"
android:fontFamily="@font/san_francisco_text_regular"
android:textColor="@color/black"
android:textSize="@dimen/text_normal"
android:layout_marginTop="@dimen/_5sdp"
android:visibility="gone"
tools:text="This is the first question."
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
app:txtfontName="@string/regular"
tools:text="This is the first question." />
<com.remit.jmecustomer.common.view.MTextInputLayout
@ -38,26 +38,25 @@
android:layout_marginTop="0dp"
app:endIconMode="clear_text"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.customwidgets.GmeEditText
android:id="@+id/answerEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionDone"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"
/>
android:singleLine="true" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.customwidgets.GmeButton
android:layout_marginBottom="@dimen/_5sdp"
android:id="@+id/submitBtn"
style="@style/MButton"
android:layout_gravity="center_horizontal"
android:text="Submit"
android:layout_marginBottom="@dimen/_5sdp"
android:enabled="true"
style="@style/MButton"/>
android:text="Submit" />
</LinearLayout>

15
app/src/main/res/layout/fragment_ccdi_send_money_v2.xml
View File

@ -64,8 +64,7 @@
android:layout_marginBottom="@dimen/_3sdp"
android:orientation="vertical"
android:padding="@dimen/_8sdp"
android:visibility="invisible"
>
android:visibility="invisible">
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/goodsTypeLayout"
@ -77,9 +76,9 @@
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/goodsType"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
@ -92,9 +91,9 @@
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/goodsOrigin"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
@ -107,9 +106,9 @@
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/portOfShipment"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
</LinearLayout>

126
app/src/main/res/layout/fragment_existing_kyc_customer_detail.xml
View File

@ -5,23 +5,23 @@
android:layout_height="match_parent">
<LinearLayout
android:focusableInTouchMode="true"
android:focusable="true"
android:clickable="true"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:layout_marginTop="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:background="@color/white"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<LinearLayout
android:layout_marginBottom="@dimen/_3sdp"
android:id="@+id/form1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/_3sdp"
android:orientation="vertical"
android:padding="@dimen/_8sdp">
@ -39,102 +39,93 @@
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/employerNameWrapper"
android:hint="@string/employerName_text"
style="@style/MTextInputLayoutForm"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:hint="@string/employerName_text"
app:errorEnabled="true"
style="@style/MTextInputLayoutForm"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_employerName"
app:endIconMode="clear_text"
app:errorEnabled="true"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
app:maxLengthLimiter="100"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"/>
app:endIconMode="clear_text"
app:errorEnabled="true"
app:maxLengthLimiter="100" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/occupationSelectionWrapper"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
android:hint="@string/select_occupation_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_occupation"
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions"
android:imeOptions="actionDone" />
android:imeOptions="actionDone"
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/monthlyIncomeSelectionWrapper"
android:hint="@string/monthlyIncome_text"
style="@style/MTextInputLayoutForm"
android:hint="@string/monthlyIncome_text"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_monthlyIncome"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"
/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
style="@style/MTextInputLayoutForm"
android:id="@+id/emailCodeWrapper"
style="@style/MTextInputLayoutForm"
android:hint="@string/mobileNumber_text"
app:errorEnabled="true"
app:prefixText="@string/mobile_prefix"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:prefixText="@string/mobile_prefix">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_emailCode"
app:endIconMode="clear_text"
app:errorEnabled="true"
style="@style/MTextInputEditText"
android:inputType="phone"
android:digits="0123456789"
android:maxLength="11"
android:imeOptions="actionNext"
/>
android:inputType="phone"
android:maxLength="11"
app:endIconMode="clear_text"
app:errorEnabled="true" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/businessTypeSelectionWrapper"
android:hint="@string/employee_business_type_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:hint="@string/employee_business_type_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_businesstype"
android:inputType="textNoSuggestions"
style="@style/MAutoCompleteDropDown" />
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -142,36 +133,33 @@
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/addressWrapper"
android:hint="@string/additional_address_text"
style="@style/MTextInputLayoutForm"
android:hint="@string/additional_address_text"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_address"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionDone"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"
/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
</FrameLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/purposeOfRegistrationWrapper"
android:hint="@string/purpose_of_registration_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:hint="@string/purpose_of_registration_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_purposeOfRegistration"
android:inputType="textNoSuggestions"
style="@style/MAutoCompleteDropDown" />
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
@ -179,71 +167,67 @@
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:drawablePadding="@dimen/_5sdp"
android:gravity="bottom"
android:text="@string/id_information_text"
android:textColor="@android:color/black"
android:textSize="@dimen/_12ssp"
app:drawableStartCompat="@drawable/icv_vd_account"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
app:txtfontName="@string/semibold" />
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/idTypeSelectionWrapper"
android:hint="@string/id_type_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
app:endIconDrawable="@drawable/icv_dropdown"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:hint="@string/id_type_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_idType"
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions"
android:imeOptions="actionDone"
/>
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/visaStatusWrapper"
android:hint="@string/visa_status_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:hint="@string/visa_status_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_visaStatus"
android:inputType="textNoSuggestions"
style="@style/MAutoCompleteDropDown" />
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:drawablePadding="@dimen/_5sdp"
android:gravity="bottom"
android:text="@string/saveButtonInfo_text"
android:textSize="@dimen/_12ssp"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
app:txtfontName="@string/regular" />
<com.remit.jmecustomer.common.customwidgets.GmeButton
android:id="@+id/btn_submit1"
style="@style/MButton"
android:enabled="true"
android:layout_gravity="center"
android:layout_marginTop="@dimen/_15sdp"
android:layout_marginBottom="@dimen/_15sdp"
android:text="@string/save_and_next_text"
/>
android:enabled="true"
android:text="@string/save_and_next_text" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

36
app/src/main/res/layout/fragment_existing_kyc_document.xml
View File

@ -11,8 +11,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:layout_marginTop="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
@ -20,16 +20,12 @@
android:paddingBottom="@dimen/_10sdp">
<com.remit.jmecustomer.common.view.MTextView
style="@style/MFormTitleDescriptionTextView"
android:layout_marginTop="@dimen/_10sdp"
android:layout_marginBottom="@dimen/_10sdp"
android:layout_marginStart="@dimen/_8sdp"
android:layout_marginTop="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_10sdp"
android:drawablePadding="@dimen/_5sdp"
android:gravity="bottom"
android:text="@string/primaryIdDocuments_text"
@ -60,12 +56,12 @@
android:layout_marginStart="@dimen/_20sdp"
android:layout_marginEnd="@dimen/_20sdp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/icv_upload_image"
app:layout_constraintBottom_toTopOf="@+id/idTypeFrontHintTxtView"
app:layout_constraintEnd_toStartOf="@+id/view9"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icv_upload_image"
tools:ignore="ContentDescription" />
@ -118,9 +114,9 @@
android:padding="@dimen/_5sdp"
android:text="@string/view_sample_text"
android:textColor="@color/m_blue_text_link"
app:layout_constraintTop_toBottomOf="@+id/frontIDImageview"
app:layout_constraintBottom_toTopOf="@+id/idTypeFrontHintTxtView"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/frontIDImageview" />
<com.remit.jmecustomer.common.view.MTextView
@ -129,8 +125,8 @@
android:layout_marginStart="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:gravity="start"
android:visibility="gone"
android:text="@string/pleaseProvideFrontPhoto_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
@ -163,12 +159,12 @@
android:layout_marginStart="@dimen/_20sdp"
android:layout_marginEnd="@dimen/_20sdp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/icv_upload_image"
app:layout_constraintBottom_toTopOf="@+id/idTypeBackHintTxtView"
app:layout_constraintEnd_toStartOf="@+id/view10"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icv_upload_image"
tools:ignore="ContentDescription" />
<ProgressBar
@ -220,9 +216,9 @@
android:padding="@dimen/_5sdp"
android:text="@string/view_sample_text"
android:textColor="@color/m_blue_text_link"
app:layout_constraintTop_toBottomOf="@+id/backIDImageview"
app:layout_constraintBottom_toTopOf="@+id/idTypeBackHintTxtView"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/backIDImageview" />
<com.remit.jmecustomer.common.view.MTextView
@ -231,8 +227,8 @@
android:layout_marginStart="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:gravity="start"
android:visibility="gone"
android:text="@string/provideBackIdPhoto_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
@ -249,8 +245,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/_4sdp"
app:cardCornerRadius="@dimen/_8sdp"
android:visibility="gone"
app:cardCornerRadius="@dimen/_8sdp"
app:cardElevation="@dimen/_2sdp">
<androidx.constraintlayout.widget.ConstraintLayout
@ -267,12 +263,12 @@
android:layout_marginStart="@dimen/_20sdp"
android:layout_marginEnd="@dimen/_20sdp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/icv_upload_image"
app:layout_constraintBottom_toTopOf="@+id/idTypeSideHintTxtView"
app:layout_constraintEnd_toStartOf="@+id/view13"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icv_upload_image"
tools:ignore="ContentDescription" />
<ProgressBar
@ -324,9 +320,9 @@
android:padding="@dimen/_5sdp"
android:text="@string/view_sample_text"
android:textColor="@color/m_blue_text_link"
app:layout_constraintTop_toBottomOf="@+id/sideIDImageview"
app:layout_constraintBottom_toTopOf="@+id/idTypeSideHintTxtView"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sideIDImageview" />
<com.remit.jmecustomer.common.view.MTextView
@ -335,8 +331,8 @@
android:layout_marginStart="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:gravity="start"
android:visibility="gone"
android:text="@string/provideSideFacingIdPhoto_text"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

127
app/src/main/res/layout/fragment_kyc_customer_detail.xml
View File

@ -5,22 +5,22 @@
android:layout_height="match_parent">
<LinearLayout
android:focusableInTouchMode="true"
android:focusable="true"
android:clickable="true"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_10sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:layout_marginTop="@dimen/_5sdp"
android:layout_marginEnd="@dimen/_10sdp"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<LinearLayout
android:layout_marginBottom="@dimen/_3sdp"
android:id="@+id/form1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/_3sdp"
android:background="@drawable/ic_rounded_white"
android:orientation="vertical"
android:padding="@dimen/_8sdp">
@ -39,100 +39,89 @@
<com.remit.jmecustomer.common.view.MTextInputLayout
style="@style/MTextInputLayoutForm"
android:id="@+id/employerNameWrapper"
android:hint="@string/employerName_text"
style="@style/MTextInputLayoutForm"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:hint="@string/employerName_text"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_employerName"
app:endIconMode="clear_text"
app:errorEnabled="true"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
app:maxLengthLimiter="100"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"/>
app:endIconMode="clear_text"
app:errorEnabled="true"
app:maxLengthLimiter="100" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/occupationSelectionWrapper"
android:hint="@string/select_occupation_text"
style="@style/MTextInputLayoutFormDropDown"
android:hint="@string/select_occupation_text"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_occupation"
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions"
android:imeOptions="actionDone"
/>
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/monthlyIncomeSelectionWrapper"
android:hint="@string/monthlyIncome_text"
style="@style/MTextInputLayoutForm"
android:hint="@string/monthlyIncome_text"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_monthlyIncome"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionNext"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"
/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
style="@style/MTextInputLayoutForm"
android:id="@+id/emailCodeWrapper"
style="@style/MTextInputLayoutForm"
android:hint="@string/mobileNumber_text"
app:errorEnabled="true"
app:prefixText="@string/mobile_prefix"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:prefixText="@string/mobile_prefix">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_emailCode"
app:endIconMode="clear_text"
app:errorEnabled="true"
style="@style/MTextInputEditText"
android:inputType="phone"
android:digits="0123456789"
android:maxLength="11"
android:imeOptions="actionNext"
/>
android:inputType="phone"
android:maxLength="11"
app:endIconMode="clear_text"
app:errorEnabled="true" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/businessTypeSelectionWrapper"
android:hint="@string/employee_business_type_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:hint="@string/employee_business_type_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_businesstype"
android:inputType="textNoSuggestions"
style="@style/MAutoCompleteDropDown" />
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
@ -143,46 +132,43 @@
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/addressWrapper"
android:hint="@string/additional_address_text"
style="@style/MTextInputLayoutForm"
android:hint="@string/additional_address_text"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MTextInputEditText
android:id="@+id/ed_address"
style="@style/MTextInputEditText"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?,/- 01234567890"
android:imeOptions="actionDone"
android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ !@#$%^*?"
/>
android:inputType="text" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<ImageView
android:layout_marginEnd="@dimen/_8sdp"
android:id="@+id/img_gps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/_8sdp"
android:layout_marginBottom="8dp"
android:visibility="gone"
app:srcCompat="@drawable/vd_gps" />
</FrameLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/purposeOfRegistrationWrapper"
android:hint="@string/purpose_of_registration_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:hint="@string/purpose_of_registration_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_purposeOfRegistration"
android:inputType="textNoSuggestions"
style="@style/MAutoCompleteDropDown" />
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
@ -190,69 +176,66 @@
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:drawablePadding="@dimen/_5sdp"
android:gravity="bottom"
android:text="@string/id_information_text"
android:textColor="@android:color/black"
android:textSize="@dimen/_12ssp"
app:drawableStartCompat="@drawable/icv_vd_account"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
app:txtfontName="@string/semibold" />
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/idTypeSelectionWrapper"
android:hint="@string/id_type_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:layout_marginTop="@dimen/form_initial_input_margin_top"
android:hint="@string/id_type_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_idType"
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions"
android:imeOptions="actionDone"
/>
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.view.MTextInputLayout
android:id="@+id/additionalIdTypeSelectionWrapper"
android:hint="@string/additional_id_type_text"
style="@style/MTextInputLayoutFormDropDown"
app:endIconMode="dropdown_menu"
android:hint="@string/additional_id_type_text"
app:endIconDrawable="@drawable/icv_dropdown"
app:endIconMode="dropdown_menu"
app:errorEnabled="true"
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle"
>
app:errorTextAppearance="@style/MTextInpuLayoutErrorStyle">
<com.remit.jmecustomer.common.view.MAutoCompleteTextView
android:id="@+id/ed_additionalIdType"
style="@style/MAutoCompleteDropDown"
android:inputType="textNoSuggestions"
android:imeOptions="actionDone"
/>
android:inputType="textNoSuggestions" />
</com.remit.jmecustomer.common.view.MTextInputLayout>
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_normal"
android:gravity="bottom"
android:text="@string/saveButtonInfo_text"
android:textSize="@dimen/_12ssp"
android:layout_marginTop="@dimen/text_normal"
app:txtfontName="@string/regular" />
<com.remit.jmecustomer.common.customwidgets.GmeButton
android:id="@+id/btn_submit1"
style="@style/MButton"
android:enabled="true"
android:layout_gravity="center"
android:layout_marginTop="@dimen/_15sdp"
android:layout_marginBottom="@dimen/_15sdp"
android:text="@string/save_and_next_text"
/>
android:enabled="true"
android:text="@string/save_and_next_text" />
</LinearLayout>

Write Preview
Loading…
Cancel
Save