From c5e037b4d870498f137f60f25fc266c70efa737b Mon Sep 17 00:00:00 2001 From: shankar-yadav Date: Thu, 7 Oct 2021 15:32:59 +0530 Subject: [PATCH 1/3] remove hard code strings --- .../amc/investorapp/constants/Constant.kt | 11 ++++ .../ui/kyc/activities/KycActivity.kt | 6 +-- .../ui/kyc/activities/KycWebViewActivity.kt | 12 +++-- .../ui/kyc/fragments/AadhaarEsignFragment.kt | 4 +- .../ui/kyc/fragments/AddressFragment.kt | 18 +++---- .../fragments/AddressProofChooseFragment.kt | 16 +++--- .../fragments/AddressProofUploadFragment.kt | 26 ++++----- .../ui/kyc/fragments/BankDetailsFragment.kt | 20 +++---- .../kyc/fragments/BankVerificationFragment.kt | 21 ++++---- .../kyc/fragments/EmploymentDetailFragment.kt | 13 ++--- .../ui/kyc/fragments/NomineeFragment.kt | 19 +++---- .../ui/kyc/fragments/VideoFragment.kt | 12 ++--- .../ui/kyc/fragments/VideoPreviewFragment.kt | 14 +++-- navi-amc/src/main/res/values/strings.xml | 54 +++++++++++++++++++ 14 files changed, 162 insertions(+), 84 deletions(-) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt index 1abafe630a..ce80ac2597 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt @@ -48,6 +48,9 @@ object Constant { const val CONGRATULATION = "CONGRATULATION" const val STATE = "STATE" const val FAILED = "FAILED" + const val SUCCESSFUL = "SUCCESSFUL" + const val VERIFIED = "VERIFIED" + const val KYC_SUBMITTED = "KYC_SUBMITTED" const val IS_FRONT_VIEW = "IS_FRONT_VIEW" const val IS_FROM_NON_KYC = "IS_FROM_NON_KYC" const val ADDRESS_PROOF_TYPE = "ADDRESS_PROOF_TYPE" @@ -76,5 +79,13 @@ object Constant { const val V_RESOLUTION = 700 * 1000 * 8 const val V_DURATION = 10000 const val V_SIZE = 9000000 + const val COLOR_C3DEB8A3 = "#C3DEB8A3" + const val COLOR_CEE5EBA3 = "#CEE5EBA3" + const val COLOR_F5D2D8A3 = "#F5D2D8A3" + const val COLOR_FFE59EA3 = "#FFE59EA3" + const val PROOF_OF_ADDRESS_FRONT_UPLOAD = "PROOF_OF_ADDRESS_FRONT_UPLOAD" + const val PROOF_OF_ADDRESS_BACK_UPLOAD = "PROOF_OF_ADDRESS_BACK_UPLOAD" + const val VIDEO_UPLOAD = "VIDEO_UPLOAD" + const val MULTIPART_FORM_DATA = "multipart/form-data" } diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycActivity.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycActivity.kt index d8358511e1..9a32b6181c 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycActivity.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycActivity.kt @@ -181,10 +181,10 @@ class KycActivity : BaseActivity(), HeaderInteraction val commonBottomSheet = CommonBottomSheet.getInstance( data = GenericResponse( - message = "As per SEBI, it is mandatory to verify\nKYC to start investing in india.", + message = getString(R.string.as_per_sebi_mandatory_to_verify), iconCode = IconUtils.ICON_COMPLETE_KYC, - primaryActionTitle = "Later", - secondaryActionTitle = "Complete KYC" + primaryActionTitle = getString(R.string.later), + secondaryActionTitle = getString(R.string.complete_kyc) ), primaryAction = primaryAction ) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycWebViewActivity.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycWebViewActivity.kt index af94608aff..2580c25231 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycWebViewActivity.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/activities/KycWebViewActivity.kt @@ -16,6 +16,8 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.navi.amc.investorapp.R import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.FAILED +import com.navi.amc.investorapp.constants.Constant.SUCCESSFUL import com.navi.amc.investorapp.constants.EXTRA_URL import com.navi.amc.investorapp.databinding.ActivityKycWebViewBinding import com.navi.amc.investorapp.extension.gotoFinish @@ -38,6 +40,7 @@ class KycWebViewActivity : AppCompatActivity() { const val JAVA_SCRIPT_INTERFACE = "JAVA_SCRIPT_INTERFACE" const val JAVA_SCRIPT_NAME = "JAVA_SCRIPT_NAME" const val JAVA_SCRIPT_NAME_DEFAULT = "NaviJavaScript" + const val AGENT = "Mozilla/5.0 (Android; Tablet; rv:20.0) Gecko/20.0 Firefox/20.0" } @SuppressLint("SetJavaScriptEnabled") @@ -54,8 +57,7 @@ class KycWebViewActivity : AppCompatActivity() { webSettings.useWideViewPort = true webSettings.loadsImagesAutomatically = true webSettings.builtInZoomControls = false - webSettings.userAgentString = - "Mozilla/5.0 (Android; Tablet; rv:20.0) Gecko/20.0 Firefox/20.0" + webSettings.userAgentString = AGENT webSettings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW webSettings.mediaPlaybackRequiresUserGesture = false binding.webView.setLayerType(View.LAYER_TYPE_HARDWARE, null) @@ -99,12 +101,12 @@ class KycWebViewActivity : AppCompatActivity() { } viewModel.kycResponse.observe(this, { it.let { its -> - if (its.status == "SUCCESSFUL") { + if (SUCCESSFUL.equals(its.status, true)) { handler.removeCallbacks(runnable) gotoFinish(Intent(this, KycActivity::class.java).apply { putExtra(Constant.STATUS, Constant.ADD_NOMINEE) }) - } else if (its.status == "failed") { + } else if (FAILED.equals(its.status, true)) { handler.removeCallbacks(runnable) gotoFinish(Intent(this, KycActivity::class.java).apply { putExtra(Constant.STATUS, Constant.AADHAAR_ESIGN) @@ -115,7 +117,7 @@ class KycWebViewActivity : AppCompatActivity() { viewModel.error.observe(this, { it.let { its -> handler.removeCallbacks(runnable) - binding.root.showSnackBar("Something went wrong, we will get back to you") + binding.root.showSnackBar(getString(R.string.something_went_wrong_we_will_get_back_to_you)) val intent = Intent(this, KycActivity::class.java).apply { putExtra(Constant.STATUS, Constant.AADHAAR_ESIGN) } diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AadhaarEsignFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AadhaarEsignFragment.kt index 4d25c9a16a..90b662758c 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AadhaarEsignFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AadhaarEsignFragment.kt @@ -64,8 +64,8 @@ class AadhaarEsignFragment : override fun init() { headerInteractionListener?.setProperties( - "Aadhaar eSign", - "Your Aadhaar should be linked to mobile.", + getString(R.string.aadhaar_esight), + getString(R.string.your_aadhaar_should_be_linked_to_mobile), 95, IconUtils.ICON_ESIGN ) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressFragment.kt index 3b03606739..75402b3451 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressFragment.kt @@ -73,13 +73,13 @@ class AddressFragment : override fun init() { headerInteractionListener?.setProperties( - "Confirm your details", - "Your information is safe with us", + getString(R.string.confirm_your_details), + getString(R.string.your_information_is_safe_with_us), 80, IconUtils.ICON_GOVT_UPLOAD ) if (addressProofType == Constant.AADHAAR_CARD) { - binding.idTv.text = "Last 4 Digits of Aadhaar" + binding.idTv.text = getString(R.string.last_four_digits_aadhaar) binding.issueDateTv.visibility = View.GONE binding.issueDateEv.visibility = View.GONE binding.expireTv.visibility = View.GONE @@ -149,28 +149,28 @@ class AddressFragment : private fun isValidDetails(): Boolean { if (binding.addressEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter your address") + binding.root.showSnackBar(getString(R.string.please_enter_your_address)) return false } if (binding.cityEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter city's name") + binding.root.showSnackBar(getString(R.string.please_enter_citys_name)) return false } if (binding.pincodeEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter your pincode") + binding.root.showSnackBar(getString(R.string.please_enter_your_pincode)) return false } if (binding.idEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter your id's number") + binding.root.showSnackBar(getString(R.string.please_enter_your_id_number)) return false } if (addressProofType != Constant.AADHAAR_CARD) { if (binding.issueDateEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter issue date") + binding.root.showSnackBar(getString(R.string.please_enter_issue_date)) return false } if (binding.expireEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter expire date") + binding.root.showSnackBar(getString(R.string.please_enter_expire_date)) return false } } diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt index 03ad84e332..e0dec3ea51 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt @@ -52,23 +52,23 @@ class AddressProofChooseFragment : override fun init() { headerInteractionListener?.setProperties( - "Verify Address", - "This is mandatory to submit your KYC details", + getString(R.string.verify_address), + getString(R.string.this_is_mandatory_to_submit_your_kyc_details), 70, IconUtils.ICON_HOUSE ) binding.aadhaarView.setProperties( - "Aadhaar\nCard", + getString(R.string.aadhaar_card_newline), IconUtils.ICON_AADHAAR_FINGER, - "#C3DEB8A3" + Constant.COLOR_C3DEB8A3 ) - binding.passportView.setProperties("Passport", IconUtils.ICON_PASSPORT, "#F5D2D8A3") + binding.passportView.setProperties(getString(R.string.passport), IconUtils.ICON_PASSPORT, Constant.COLOR_F5D2D8A3) binding.drivingLicenseView.setProperties( - "Driving\nLicence", + getString(R.string.driving_licence_newline), IconUtils.ICON_DRIVING_LICENCE, - "#CEE5EBA3" + Constant.COLOR_CEE5EBA3 ) - binding.voterIdView.setProperties("Voter ID", IconUtils.ICON_VOTER_ID, "#FFE59EA3") + binding.voterIdView.setProperties(getString(R.string.voter_id), IconUtils.ICON_VOTER_ID, Constant.COLOR_FFE59EA3) binding.aadhaarView.setViewBackGround(true) arguments?.getString(Constant.MESSAGE)?.let { binding.root.showSnackBar(it) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofUploadFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofUploadFragment.kt index 60aa05b4c2..bb36a8bdd0 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofUploadFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofUploadFragment.kt @@ -11,6 +11,8 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.PROOF_OF_ADDRESS_BACK_UPLOAD +import com.navi.amc.investorapp.constants.Constant.PROOF_OF_ADDRESS_FRONT_UPLOAD import com.navi.amc.investorapp.databinding.FragmentAddressProofUploadBinding import com.navi.amc.investorapp.extension.isVisible import com.navi.amc.investorapp.sharedpreference.SharedPreferencesKeys @@ -90,27 +92,27 @@ class AddressProofUploadFragment : if (isFrontView) { analyticsEventTracker.onPOAFrontSideLand() progress = 70 - binding.titleTv.text = "Scan the front" - binding.subTitleTv.text = "Take a photo of the front of the ID card" + binding.titleTv.text = getString(R.string.scan_the_front) + binding.subTitleTv.text = getString(R.string.take_a_photo_of_the_front_of_the_id_card) binding.subDocTitleTv.text = - "Front side of ".plus(getAddressProofName(addressProofType)) + getString(R.string.front_side_of).plus(getAddressProofName(addressProofType)) } else { analyticsEventTracker.onPOABackSideLand() progress = 75 - binding.titleTv.text = "Scan the back" - binding.subTitleTv.text = "Take a photo of the back of the ID card" - binding.subDocTitleTv.text = "Back side of ".plus(getAddressProofName(addressProofType)) + binding.titleTv.text = getString(R.string.scan_the_back) + binding.subTitleTv.text = getString(R.string.take_a_photo_of_the_back_of_the_id_card) + binding.subDocTitleTv.text = getString(R.string.back_side_of).plus(getAddressProofName(addressProofType)) } IconUtils.updateIcon(getIconCodeAddressProof(isFrontView, addressProofType), binding.docIv) headerInteractionListener?.setProperties( - "Upload your ID", - "Your information is safe with us", + getString(R.string.upload_your_id), + getString(R.string.your_information_is_safe_with_us), progress, IconUtils.ICON_GOVT_UPLOAD ) binding.docTitleTv.text = - "Your ".plus(getAddressProofName(addressProofType)).plus(" looks like this") - binding.permissionDeniedView.setTitle("Allow camera permission") + getString(R.string.your).plus(getAddressProofName(addressProofType)).plus(getString(R.string.looks_like_this)) + binding.permissionDeniedView.setTitle(getString(R.string.allow_camera_permission)) binding.permissionDeniedView.setBgColor(R.color.white) initBeforeScreenCapture() observeCameraImage() @@ -183,9 +185,9 @@ class AddressProofUploadFragment : sharedPreferences?.getObject(SharedPreferencesKeys.COMMON_RESPONSE_OBJECT)?.accessToken.toString() val screen: String if (isFrontView) { - screen = "PROOF_OF_ADDRESS_FRONT_UPLOAD" + screen = PROOF_OF_ADDRESS_FRONT_UPLOAD } else { - screen = "PROOF_OF_ADDRESS_BACK_UPLOAD" + screen = PROOF_OF_ADDRESS_BACK_UPLOAD } val outputStream = ByteArrayOutputStream() bitmapImage?.compress(Bitmap.CompressFormat.JPEG, 100, outputStream) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankDetailsFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankDetailsFragment.kt index b108e71376..93f2bea76e 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankDetailsFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankDetailsFragment.kt @@ -89,8 +89,8 @@ class BankDetailsFragment : override fun init() { headerInteractionListener?.setProperties( - "Bank Details", - "Your information is 100% safe with us", + getString(R.string.bank_details), + getString(R.string.your_information_is_100_safe_with_us), 90, IconUtils.ICON_BANK ) @@ -226,9 +226,9 @@ class BankDetailsFragment : R.id.bank_name_ev -> { if (binding.bankNameEv.text.toString().isBlank()) { if (binding.ifscEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter ifsc") + binding.root.showSnackBar(getString(R.string.please_enter_ifsc)) } else { - binding.root.showSnackBar("Please enter valid ifsc") + binding.root.showSnackBar(getString(R.string.please_enter_valid_ifsc)) } } } @@ -237,29 +237,29 @@ class BankDetailsFragment : private fun isValidDetails(): Boolean { if (binding.ifscEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter ifsc") + binding.root.showSnackBar(getString(R.string.please_enter_ifsc)) return false } if (binding.ifscEv.text.toString().length != 11) { - binding.root.showSnackBar("Please enter valid ifsc") + binding.root.showSnackBar(getString(R.string.please_enter_valid_ifsc)) return false } if (binding.bankNameEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter valid ifsc") + binding.root.showSnackBar(getString(R.string.please_enter_valid_ifsc)) return false } if (binding.accountNoEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter account number") + binding.root.showSnackBar(getString(R.string.please_enter_account_number)) return false } if (binding.verifyAccountNoEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please select verify account number") + binding.root.showSnackBar(getString(R.string.please_select_verify_account_number)) return false } if (!binding.accountNoEv.text.toString().trim() .equals(binding.verifyAccountNoEv.text.toString().trim()) ) { - binding.root.showSnackBar("Account number does not match") + binding.root.showSnackBar(getString(R.string.account_number_does_not_match)) return false } return true diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankVerificationFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankVerificationFragment.kt index d0f36e3c9c..0de641a7fb 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankVerificationFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/BankVerificationFragment.kt @@ -11,6 +11,8 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.FAILED +import com.navi.amc.investorapp.constants.Constant.VERIFIED import com.navi.amc.investorapp.databinding.FragmentKycVerifyingBinding import com.navi.amc.investorapp.sharedpreference.SharedPreferencesKeys import com.navi.amc.investorapp.sharedpreference.SharedPreferencesWriter @@ -65,8 +67,9 @@ class BankVerificationFragment : get() = BankVerificationVM::class.java override fun init() { - binding.titleTv.text = "Verifying your bank account." - val spannable = SpannableString("We will be sending Rs 1 to your \n" + "bank account ") + binding.titleTv.text = getString(R.string.verifying_your_bank_account) + val spannable = + SpannableString(getString(R.string.we_will_be_sending_rs_1_to_your_bank_account)) spannable.setSpan( ForegroundColorSpan(resources.getColor(R.color.black)), 19, @@ -89,7 +92,7 @@ class BankVerificationFragment : private fun initObservers() { viewModel.response.observe(viewLifecycleOwner, { - if (it.status == "VERIFIED") { + if (VERIFIED.equals(it.status, true)) { if (arguments?.getBoolean(Constant.IS_FROM_NON_KYC).orFalse()) { analyticsEventTracker.onBankVerified() } else { @@ -111,14 +114,14 @@ class BankVerificationFragment : } else { fragmentInterchangeListener?.navigateToNextScreen(Constant.AADHAAR_ESIGN) } - } else if (it.status == "FAILED") { + } else if (FAILED.equals(it.status, true)) { binding.iconIv.visibility = View.VISIBLE binding.retryTv.visibility = View.VISIBLE binding.progress.visibility = View.GONE countDownTimer?.cancel() binding.titleTv.text = - "Looks like we were not able to verify\nyour bank account.." - binding.subTitleTv.text = "Check your details again & confirm." + getString(R.string.looks_like_we_were_not_able_to_verify_your_bank_account) + binding.subTitleTv.text = getString(R.string.check_your_details_again_and_confirm) } }) } @@ -126,7 +129,7 @@ class BankVerificationFragment : override fun onClick(view: View?) { when (view?.id) { R.id.retry_tv -> { - if (viewModel.response.value?.status == "FAILED") { + if (FAILED.equals(viewModel.response.value?.status, true)) { val fragmentTransaction = requireActivity().supportFragmentManager.beginTransaction() fragmentTransaction.remove(this) @@ -155,8 +158,8 @@ class BankVerificationFragment : binding.iconIv.visibility = View.VISIBLE binding.retryTv.visibility = View.VISIBLE binding.progress.visibility = View.GONE - binding.titleTv.text = "This is taking too long to verify" - binding.subTitleTv.text = "Please try again" + binding.titleTv.text = getString(R.string.this_is_taking_too_long_to_verify) + binding.subTitleTv.text = getString(R.string.please_try_again) } } } diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/EmploymentDetailFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/EmploymentDetailFragment.kt index c5b3cdeafc..640765c017 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/EmploymentDetailFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/EmploymentDetailFragment.kt @@ -7,6 +7,7 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.EMPLOYMENT_DETAILS import com.navi.amc.investorapp.databinding.FragmentEmploymentDetailsBinding import com.navi.amc.investorapp.extension.showMenu import com.navi.amc.investorapp.extension.showSnackBar @@ -68,8 +69,8 @@ class EmploymentDetailFragment : override fun init() { headerInteractionListener?.setProperties( - "Employment Details", - "This is mandatory as per SEBI guidelines", + getString(R.string.employment_details), + getString(R.string.this_is_mandatory_as_per_sebi_guidelines), 25, IconUtils.ICON_EMPLOYMENT ) @@ -105,7 +106,7 @@ class EmploymentDetailFragment : politicallyExposed = !binding.politicallyExposed.isChecked, citizenBornLivingInIndia = binding.indianCitizen.isChecked ) - viewModel.submitData(accessToken, "EMPLOYMENT_DETAILS", personalDetails) + viewModel.submitData(accessToken, EMPLOYMENT_DETAILS, personalDetails) } } R.id.tax_tv, R.id.politically_exposed, R.id.indian_citizen-> { @@ -164,15 +165,15 @@ class EmploymentDetailFragment : private fun isValidDetails(): Boolean { if (binding.sourceIncomeTv.text.toString().isBlank()) { - binding.root.showSnackBar("Please select source of income") + binding.root.showSnackBar(getString(R.string.please_select_source_of_income)) return false } if (binding.occupationTv.text.toString().isBlank()) { - binding.root.showSnackBar("Please select occupation") + binding.root.showSnackBar(getString(R.string.please_select_occupation)) return false } if (binding.incomeTv.text.toString().isBlank()) { - binding.root.showSnackBar("Please select annual income") + binding.root.showSnackBar(getString(R.string.please_select_annual_income)) return false } if (!binding.politicallyExposed.isChecked || !binding.indianCitizen.isChecked || !binding.taxTv.isChecked) { diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/NomineeFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/NomineeFragment.kt index cdfbf012bd..e6b05f995e 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/NomineeFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/NomineeFragment.kt @@ -10,6 +10,7 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.KYC_SUBMITTED import com.navi.amc.investorapp.databinding.FragmentNominessBinding import com.navi.amc.investorapp.extension.hideKeyboard import com.navi.amc.investorapp.extension.showMenu @@ -73,13 +74,13 @@ class NomineeFragment : override fun init() { headerInteractionListener?.setProperties( - "Add Nominee", - "Assign nominees for funds", + getString(R.string.add_nominee), + getString(R.string.assign_nominee_for_funds), 100, IconUtils.ICON_NOMINEE ) - binding.yesView.setProperties("Yes") - binding.noView.setProperties("No") + binding.yesView.setProperties(getString(R.string.yes)) + binding.noView.setProperties(getString(R.string.no)) binding.yesView.titleCentric() binding.noView.titleCentric() binding.noView.setViewBackGround(true) @@ -114,11 +115,11 @@ class NomineeFragment : } }) viewModel.kycStatus.observe(viewLifecycleOwner, { - if (it.status == "KYC_SUBMITTED") { + if (KYC_SUBMITTED.equals(it.status, true)) { fragmentInterchangeListener?.navigateToNextScreen( Constant.CONGRATULATION, arguments ?: Bundle()) } else { - binding.root.showSnackBar("Please check it again") + binding.root.showSnackBar(getString(R.string.please_check_it_agin)) } }) } @@ -189,15 +190,15 @@ class NomineeFragment : if (binding.noView.isItemSelected()) return true if (binding.nomineeNameEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter name of nominee") + binding.root.showSnackBar(getString(R.string.please_enter_name_of_nominee)) return false } if (binding.dateEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please select dob") + binding.root.showSnackBar(getString(R.string.please_select_dob)) return false } if (binding.relationshipEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please select relationship") + binding.root.showSnackBar(getString(R.string.please_select_releationship)) return false } return true diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoFragment.kt index 32d4295049..7a2339b8a0 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoFragment.kt @@ -80,12 +80,12 @@ class VideoFragment : BaseFragment(), View.OnC override fun init() { headerInteractionListener?.setProperties( - "Make a Video", - "Your video is needed to verify your identity", + getString(R.string.make_a_video), + getString(R.string.your_photo_is_needed_to_verify_your_identity), 60, IconUtils.ICON_VIDEO ) - binding.permissionDeniedView.setTitle("Allow camera permission") + binding.permissionDeniedView.setTitle(getString(R.string.allow_camera_permission)) binding.permissionDeniedView.setBgColor(R.color.white) initBeforeScreenCapture() isPermissionAlready = permissionsManager.hasPermissions(cameraPermission) @@ -208,11 +208,11 @@ class VideoFragment : BaseFragment(), View.OnC val videoOTPBottomSheet = VideoOTPBottomSheet.getInstance( data = GenericResponse( - title = "Make sure you make a video\nfor 5 Seconds ", - message = "Say out load & Record", + title = getString(R.string.make_sure_you_make_a_video_for_5_second), + message = getString(R.string.say_out_load_record), iconCode = IconUtils.ICON_LOUD_SPEAKER, otp = otp, - primaryActionTitle = "Continue" + primaryActionTitle = getString(R.string.continue_) ) ) if (requireActivity() is KycActivity) { diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt index a313a6e55d..5b10bb6d28 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt @@ -9,6 +9,8 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.MULTIPART_FORM_DATA +import com.navi.amc.investorapp.constants.Constant.VIDEO_UPLOAD import com.navi.amc.investorapp.databinding.FragmentKycVideoPreviewBinding import com.navi.amc.investorapp.sharedpreference.SharedPreferencesKeys import com.navi.amc.investorapp.sharedpreference.SharedPreferencesWriter @@ -62,8 +64,8 @@ class VideoPreviewFragment : BaseFragmentIntroducing View my investments Please complete the account setup + Complete KYC + Later + As per SEBI, it is mandatory to verify\nKYC to start investing in india. + Something went wrong, we will get back to you + Aadhaar eSign + Your Aadhaar should be linked to mobile. + Confirm your details + Last 4 Digits of Aadhaar + Please enter your address + Please enter city\'s name + Please enter your pincode + Please enter your id\'s number + Please enter issue date + Please enter expire date + Verify Address + This is mandatory to submit your KYC details + Aadhaar\nCard + Driving\nLicence + Passport + Voter ID + Scan the front + Take a photo of the front of the ID card + \"Front side of \" + Scan the back + Take a photo of the back of the ID card + \"Back side of \" + Upload your ID + \"Your \" + \" looks like this\" + Allow camera permission + Your information is 100% safe with us + Please enter ifsc + Please enter valid ifsc + Please enter account number + Please select verify account number + Account number does not match + Verifying your bank account. + We will be sending Rs 1 to your \n" + "bank account + Please try again + This is taking too long to verify + + ]]> + Employment Details + Please select source of income + Please select occupation + Please select annual income + Please check it again + Please enter name of nominee + Please select dob + Please select relationship + Make a Video + Your photo is needed to verify your identity + "Make sure you make a video\nfor 5 Seconds " + ICICI BANK HDFC BANK From 2b2b01e1d6cd2127268c695836845e079c395f14 Mon Sep 17 00:00:00 2001 From: shankar-yadav Date: Thu, 7 Oct 2021 17:23:10 +0530 Subject: [PATCH 2/3] Fix remaning strings --- .../amc/investorapp/constants/Constant.kt | 8 ++ .../fragments/AddressProofChooseFragment.kt | 12 ++- .../ui/kyc/fragments/PanFragment.kt | 9 ++- .../kyc/fragments/PersonalDetailFragment.kt | 45 +++++------ .../ui/kyc/fragments/SelfieFragment.kt | 15 ++-- .../ui/kyc/fragments/SignatureFragment.kt | 9 ++- .../ui/kyc/fragments/VideoPreviewFragment.kt | 1 - .../java/com/navi/amc/investorapp/util/Ext.kt | 2 +- .../res/layout/bottom_sheet_video_otp.xml | 2 +- .../res/layout/fragment_aadhaar_esign.xml | 8 +- .../src/main/res/layout/fragment_address.xml | 22 +++--- .../res/layout/fragment_address_proof.xml | 2 +- .../layout/fragment_address_proof_upload.xml | 10 +-- .../main/res/layout/fragment_bank_details.xml | 16 ++-- .../layout/fragment_employment_details.xml | 12 +-- .../layout/fragment_kyc_congratulation.xml | 4 +- .../main/res/layout/fragment_kyc_selfie.xml | 6 +- .../res/layout/fragment_kyc_verifying.xml | 6 +- .../main/res/layout/fragment_kyc_video.xml | 4 +- .../res/layout/fragment_kyc_video_preview.xml | 6 +- .../src/main/res/layout/fragment_nominess.xml | 12 +-- navi-amc/src/main/res/layout/fragment_pan.xml | 8 +- .../res/layout/fragment_personal_details.xml | 16 ++-- .../main/res/layout/fragment_signature.xml | 10 +-- navi-amc/src/main/res/values/strings.xml | 78 +++++++++++++++++-- 25 files changed, 202 insertions(+), 121 deletions(-) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt index ce80ac2597..5d579d0dfa 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt @@ -86,6 +86,14 @@ object Constant { const val PROOF_OF_ADDRESS_FRONT_UPLOAD = "PROOF_OF_ADDRESS_FRONT_UPLOAD" const val PROOF_OF_ADDRESS_BACK_UPLOAD = "PROOF_OF_ADDRESS_BACK_UPLOAD" const val VIDEO_UPLOAD = "VIDEO_UPLOAD" + const val PAN_UPLOAD = "PAN_UPLOAD" + const val USER_PHOTO_UPLOAD = "USER_PHOTO_UPLOAD" + const val SIGNATURE_UPLOAD = "SIGNATURE_UPLOAD" const val MULTIPART_FORM_DATA = "multipart/form-data" + const val SINGLE = "single" + const val MARRIED = "married" + const val OTHER = "other" + const val MALE = "male" + const val FEMALE = "female" } diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt index e0dec3ea51..6884ef323c 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt @@ -62,13 +62,21 @@ class AddressProofChooseFragment : IconUtils.ICON_AADHAAR_FINGER, Constant.COLOR_C3DEB8A3 ) - binding.passportView.setProperties(getString(R.string.passport), IconUtils.ICON_PASSPORT, Constant.COLOR_F5D2D8A3) + binding.passportView.setProperties( + getString(R.string.passport), + IconUtils.ICON_PASSPORT, + Constant.COLOR_F5D2D8A3 + ) binding.drivingLicenseView.setProperties( getString(R.string.driving_licence_newline), IconUtils.ICON_DRIVING_LICENCE, Constant.COLOR_CEE5EBA3 ) - binding.voterIdView.setProperties(getString(R.string.voter_id), IconUtils.ICON_VOTER_ID, Constant.COLOR_FFE59EA3) + binding.voterIdView.setProperties( + getString(R.string.voter_id), + IconUtils.ICON_VOTER_ID, + Constant.COLOR_FFE59EA3 + ) binding.aadhaarView.setViewBackGround(true) arguments?.getString(Constant.MESSAGE)?.let { binding.root.showSnackBar(it) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PanFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PanFragment.kt index 80d2c66106..f1ec89c426 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PanFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PanFragment.kt @@ -11,6 +11,7 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.PAN_UPLOAD import com.navi.amc.investorapp.databinding.FragmentPanBinding import com.navi.amc.investorapp.extension.isVisible import com.navi.amc.investorapp.sharedpreference.SharedPreferencesKeys @@ -82,12 +83,12 @@ class PanFragment : BaseFragment(), View.OnClickListe override fun init() { headerInteractionListener?.setProperties( - "Add your PAN", - "PAN is mandatory for investing", + getString(R.string.add_your_pan), + getString(R.string.pan_is_mandatory_for_investing), 35, IconUtils.ICON_PAN ) - binding.permissionDeniedView.setTitle("Allow camera permission") + binding.permissionDeniedView.setTitle(getString(R.string.allow_camera_permission)) binding.permissionDeniedView.setBgColor(R.color.white) initBeforeScreenCapture() observeCameraImage() @@ -169,7 +170,7 @@ class PanFragment : BaseFragment(), View.OnClickListe sharedPreferences?.getObject(SharedPreferencesKeys.COMMON_RESPONSE_OBJECT)?.accessToken.toString() val outputStream = ByteArrayOutputStream() bitmapImage?.compress(Bitmap.CompressFormat.JPEG, 100, outputStream) - viewModel.submitData(accessToken, "PAN_UPLOAD", outputStream.toByteArray()) + viewModel.submitData(accessToken, PAN_UPLOAD, outputStream.toByteArray()) } private fun openCamera() { diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PersonalDetailFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PersonalDetailFragment.kt index bbdc6b8639..0f767346d0 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PersonalDetailFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/PersonalDetailFragment.kt @@ -13,6 +13,7 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.PERSONAL_DETAILS import com.navi.amc.investorapp.databinding.FragmentPersonalDetailsBinding import com.navi.amc.investorapp.extension.hideKeyboard import com.navi.amc.investorapp.extension.isValidEmail @@ -87,19 +88,19 @@ class PersonalDetailFragment : override fun init() { headerInteractionListener?.setProperties( - "Personal Details", - "This is mandatory as per SEBI guidelines", + getString(R.string.personal_details), + getString(R.string.this_is_mandatory_as_per_sebi_guidelines), 20, IconUtils.ICON_CHAT ) - binding.permissionDeniedView.setTitle("Allow location permission") + binding.permissionDeniedView.setTitle(getString(R.string.allow_camera_permission)) binding.permissionDeniedView.setBgColor(R.color.white) - binding.singleView.setProperties("Single", IconUtils.ICON_SINGLE) - binding.marriedView.setProperties("Married", IconUtils.ICON_MARRIED) - binding.marriedOtherView.setProperties("Other", IconUtils.ICON_OTHER) - binding.maleView.setProperties("Male", IconUtils.ICON_MALE) - binding.femaleView.setProperties("Female", IconUtils.ICON_FEMALE) - binding.otherView.setProperties("Other", IconUtils.ICON_OTHER) + binding.singleView.setProperties(getString(R.string.single), IconUtils.ICON_SINGLE) + binding.marriedView.setProperties(getString(R.string.married), IconUtils.ICON_MARRIED) + binding.marriedOtherView.setProperties(getString(R.string.other), IconUtils.ICON_OTHER) + binding.maleView.setProperties(getString(R.string.male), IconUtils.ICON_MALE) + binding.femaleView.setProperties(getString(R.string.female), IconUtils.ICON_FEMALE) + binding.otherView.setProperties(getString(R.string.other), IconUtils.ICON_OTHER) binding.singleView.setViewBackGround(true) binding.femaleView.setViewBackGround(true) } @@ -177,7 +178,7 @@ class PersonalDetailFragment : longitude = locationManager.location.value?.longitude ) ) - viewModel.submitData(accessToken, "PERSONAL_DETAILS", personalDetails) + viewModel.submitData(accessToken, PERSONAL_DETAILS, personalDetails) } } R.id.single_view -> { @@ -216,29 +217,29 @@ class PersonalDetailFragment : private fun isValidDetails(): Boolean { if (binding.emailEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter email ID") + binding.root.showSnackBar(getString(R.string.please_enter_email_id)) return false } if (!binding.emailEv.text.toString().isValidEmail) { - binding.root.showSnackBar("Please enter valid email-id") + binding.root.showSnackBar(getString(R.string.please_enter_valid_email_id)) return false } if (binding.fatherNameEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter father's name") + binding.root.showSnackBar(getString(R.string.please_enter_father_name)) return false } if (binding.yourNameEv.text.toString().isBlank()) { - binding.root.showSnackBar("Please enter your name") + binding.root.showSnackBar(getString(R.string.please_enter_your_name)) return false } if (!permissionsManager.hasPermissions(locationPermission)) { - binding.root.showSnackBar("Please give location permission") + binding.root.showSnackBar(getString(R.string.please_give_location_permission)) permissionsManager.requestPermissions(locationPermission) return false } if (locationManager.location.value?.latitude == null || locationManager.location.value?.longitude == null) { locationManager.requestLocationUpdates(requireActivity()) - binding.root.showSnackBar("Please enable location") + binding.root.showSnackBar(getString(R.string.please_enable_location)) return false } return true @@ -246,22 +247,22 @@ class PersonalDetailFragment : private fun getMaritalStatus(): String { if (binding.singleView.isItemSelected()) { - return "single" + return Constant.SINGLE } if (binding.marriedView.isItemSelected()) { - return "married" + return Constant.MARRIED } - return "other" + return Constant.OTHER } private fun getGenderStatus(): String { if (binding.maleView.isItemSelected()) { - return "male" + return Constant.MALE } if (binding.femaleView.isItemSelected()) { - return "female" + return Constant.FEMALE } - return "other" + return Constant.OTHER } private fun isCompleteData(): Boolean { diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SelfieFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SelfieFragment.kt index 334174f6fa..282a70fe45 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SelfieFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SelfieFragment.kt @@ -11,18 +11,19 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.USER_PHOTO_UPLOAD import com.navi.amc.investorapp.databinding.FragmentKycSelfieBinding import com.navi.amc.investorapp.extension.isVisible import com.navi.amc.investorapp.sharedpreference.SharedPreferencesKeys import com.navi.amc.investorapp.sharedpreference.SharedPreferencesWriter +import com.navi.amc.investorapp.ui.kyc.customcamera.CameraActionListener +import com.navi.amc.investorapp.ui.kyc.customcamera.CameraEventListener +import com.navi.amc.investorapp.ui.kyc.customcamera.getCameraCaptureImageBitmap import com.navi.amc.investorapp.ui.kyc.listeners.FragmentInterchangeListener import com.navi.amc.investorapp.ui.kyc.listeners.HeaderInteractionListener import com.navi.amc.investorapp.ui.kyc.viewmodel.KycVM import com.navi.amc.investorapp.ui.kyc.viewmodel.SelfieVM import com.navi.amc.investorapp.util.* -import com.navi.amc.investorapp.ui.kyc.customcamera.CameraActionListener -import com.navi.amc.investorapp.ui.kyc.customcamera.CameraEventListener -import com.navi.amc.investorapp.ui.kyc.customcamera.getCameraCaptureImageBitmap import com.otaliastudios.cameraview.CameraException import com.otaliastudios.cameraview.PictureResult import com.otaliastudios.cameraview.controls.Preview @@ -75,12 +76,12 @@ class SelfieFragment : BaseFragment(), View. override fun init() { headerInteractionListener?.setProperties( - "Take a Selfie", - "Your photo is needed to verify your identity", + getString(R.string.take_your_selfie), + getString(R.string.your_photo_is_needed_to_verify_your_identity), 50, IconUtils.ICON_CAMERA ) - binding.permissionDeniedView.setTitle("Allow camera permission") + binding.permissionDeniedView.setTitle(getString(R.string.allow_camera_permission)) binding.permissionDeniedView.setBgColor(R.color.white) initBeforeScreenCapture() observeCameraImage() @@ -143,7 +144,7 @@ class SelfieFragment : BaseFragment(), View. sharedPreferences?.getObject(SharedPreferencesKeys.COMMON_RESPONSE_OBJECT)?.accessToken.toString() val outputStream = ByteArrayOutputStream() bitmapImage?.compress(Bitmap.CompressFormat.JPEG, 100, outputStream) - viewModel.submitData(accessToken, "USER_PHOTO_UPLOAD", outputStream.toByteArray()) + viewModel.submitData(accessToken, USER_PHOTO_UPLOAD, outputStream.toByteArray()) } private fun openCamera() { diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SignatureFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SignatureFragment.kt index 96f80c0138..783ab8b683 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SignatureFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/SignatureFragment.kt @@ -15,6 +15,7 @@ import com.navi.amc.investorapp.R import com.navi.amc.investorapp.base.BaseFragment import com.navi.amc.investorapp.constants.AnalyticsConstant import com.navi.amc.investorapp.constants.Constant +import com.navi.amc.investorapp.constants.Constant.SIGNATURE_UPLOAD import com.navi.amc.investorapp.databinding.FragmentSignatureBinding import com.navi.amc.investorapp.sharedpreference.SharedPreferencesKeys import com.navi.amc.investorapp.sharedpreference.SharedPreferencesWriter @@ -77,8 +78,8 @@ class SignatureFragment : override fun init() { headerInteractionListener?.setProperties( - "Add your signature", - "Your information is safe with us", + getString(R.string.add_your_signature), + getString(R.string.your_information_is_safe_with_us), 85, IconUtils.ICON_SIGNATURE ) @@ -87,7 +88,7 @@ class SignatureFragment : binding.saveTv.visibility = View.GONE binding.retakeTv.visibility = View.GONE binding.permissionDeniedView.visibility = View.GONE - binding.permissionDeniedView.setTitle("Allow storage permission") + binding.permissionDeniedView.setTitle(getString(R.string.allow_storage_permission)) binding.permissionDeniedView.setBgColor(R.color.white) isPermissionAlready = permissionsManager.hasPermissions(storagePermission) if (!isPermissionAlready) { @@ -138,7 +139,7 @@ class SignatureFragment : sharedPreferences?.getObject(SharedPreferencesKeys.COMMON_RESPONSE_OBJECT)?.accessToken.toString() val outputStream = ByteArrayOutputStream() bitmapImage?.compress(Bitmap.CompressFormat.JPEG, 70, outputStream) - viewModel.submitData(accessToken, "SIGNATURE_UPLOAD", outputStream.toByteArray()) + viewModel.submitData(accessToken, SIGNATURE_UPLOAD, outputStream.toByteArray()) } R.id.retake_tv, R.id.upload_iv, R.id.upload_title_tv -> { if (permissionsManager.hasPermissions(storagePermission) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt index 5b10bb6d28..51c5ecb7b3 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/VideoPreviewFragment.kt @@ -115,7 +115,6 @@ class VideoPreviewFragment : BaseFragment diff --git a/navi-amc/src/main/res/layout/fragment_aadhaar_esign.xml b/navi-amc/src/main/res/layout/fragment_aadhaar_esign.xml index 8a0dff219c..3d381871e3 100644 --- a/navi-amc/src/main/res/layout/fragment_aadhaar_esign.xml +++ b/navi-amc/src/main/res/layout/fragment_aadhaar_esign.xml @@ -22,7 +22,7 @@ style="@style/tv_style1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Why is eSign needed?" + android:text="@string/why_is_esign_needed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_16dp" - android:text="Aadhaar eSign digitally signs your documents needed for KYC and account opening on Navi" + android:text="@string/aadhaar_esign_digitally_signs_your_documents_needed_for_kyc_and_account_opening_on_navi" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_tv" /> @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/_8dp" android:layout_marginTop="@dimen/_34dp" - android:text="Your data is 100% safe and secure" + android:text="@string/your_data_is_100_safe_and_secure" app:layout_constraintStart_toEndOf="@+id/icon_iv" app:layout_constraintTop_toBottomOf="@+id/sub_title_tv" /> @@ -65,7 +65,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_4dp" android:gravity="center" - android:text="Proceed to Aadhaar Esign" + android:text="@string/proceed_to_aadhaar_esign" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/navi-amc/src/main/res/layout/fragment_address.xml b/navi-amc/src/main/res/layout/fragment_address.xml index 8e74afdd78..a307a31c71 100644 --- a/navi-amc/src/main/res/layout/fragment_address.xml +++ b/navi-amc/src/main/res/layout/fragment_address.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_32dp" - android:text="Your Address" + android:text="@string/your_address" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -39,7 +39,7 @@ android:layout_height="112dp" android:layout_marginTop="@dimen/_8dp" android:gravity="start" - android:hint="Your Address" + android:hint="@string/your_address" android:imeOptions="actionNext" android:singleLine="true" app:layout_constraintStart_toStartOf="parent" @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="City" + android:text="@string/city" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/address_ev" /> @@ -63,7 +63,7 @@ android:layout_marginTop="@dimen/_8dp" android:layout_marginEnd="@dimen/_8dp" android:gravity="center_vertical" - android:hint="City" + android:hint="@string/city" android:imeOptions="actionNext" android:singleLine="true" app:layout_constraintEnd_toStartOf="@+id/pincode_ev" @@ -76,7 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Pincode" + android:text="@string/pincode" app:layout_constraintStart_toStartOf="@+id/pincode_ev" app:layout_constraintTop_toBottomOf="@+id/address_ev" /> @@ -88,7 +88,7 @@ android:layout_marginStart="@dimen/_8dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Pincode" + android:hint="@string/pincode" android:imeOptions="actionNext" android:inputType="number" android:maxLength="6" @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="ID number" + android:text="@string/id_number" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/pincode_ev" /> @@ -114,7 +114,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Enter your id number" + android:hint="@string/enter_your_id_number" android:imeOptions="actionNext" android:singleLine="true" app:layout_constraintStart_toStartOf="parent" @@ -126,7 +126,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Issue date" + android:text="@string/issue_date" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/id_ev" /> @@ -155,7 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Expiry date" + android:text="@string/expiry_date" app:layout_constraintStart_toStartOf="@+id/expire_ev" app:layout_constraintTop_toBottomOf="@+id/id_ev" /> @@ -190,7 +190,7 @@ android:layout_marginTop="@dimen/_4dp" android:alpha="0.5" android:gravity="center" - android:text="Save" /> + android:text="@string/save" /> \ No newline at end of file diff --git a/navi-amc/src/main/res/layout/fragment_address_proof.xml b/navi-amc/src/main/res/layout/fragment_address_proof.xml index e0e733abb8..e8c8b05094 100644 --- a/navi-amc/src/main/res/layout/fragment_address_proof.xml +++ b/navi-amc/src/main/res/layout/fragment_address_proof.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_20dp" - android:text="Select document" + android:text="@string/select_document" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/navi-amc/src/main/res/layout/fragment_address_proof_upload.xml b/navi-amc/src/main/res/layout/fragment_address_proof_upload.xml index ae6bba8b2d..394b2c35f2 100644 --- a/navi-amc/src/main/res/layout/fragment_address_proof_upload.xml +++ b/navi-amc/src/main/res/layout/fragment_address_proof_upload.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_20dp" - android:text="Scan the front" + android:text="@string/scan_the_front" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_8dp" - android:text="Take a photo of the front of the ID card" + android:text="@string/take_a_photo_of_the_front_of_the_id_card" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_tv" /> @@ -107,7 +107,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_16dp" - android:text="Your Id card looks like this" + android:text="@string/your_id_card_looks_like_this" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/camera_capture_iv" /> @@ -153,7 +153,7 @@ android:layout_marginEnd="@dimen/_8dp" android:background="@drawable/bg_rectangle_black_outline_white_bg" android:gravity="center" - android:text="Retake photo" + android:text="@string/retake_photo" app:layout_constraintEnd_toStartOf="@+id/save_tv" app:layout_constraintStart_toStartOf="parent" /> @@ -164,7 +164,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/_8dp" android:gravity="center" - android:text="Save" + android:text="@string/save" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/retake_tv" /> diff --git a/navi-amc/src/main/res/layout/fragment_bank_details.xml b/navi-amc/src/main/res/layout/fragment_bank_details.xml index d892545b06..d0d535013d 100644 --- a/navi-amc/src/main/res/layout/fragment_bank_details.xml +++ b/navi-amc/src/main/res/layout/fragment_bank_details.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_36dp" - android:text="IFSC code" /> + android:text="@string/ifsc_code" /> + android:text="@string/bank_name" /> + android:hint="@string/select_your_bank" /> + android:text="@string/account_number" /> @@ -88,7 +88,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Verify Account Number" /> + android:text="@string/verify_account_number" /> diff --git a/navi-amc/src/main/res/layout/fragment_employment_details.xml b/navi-amc/src/main/res/layout/fragment_employment_details.xml index 7b1bdfc8ec..edf46f94d5 100644 --- a/navi-amc/src/main/res/layout/fragment_employment_details.xml +++ b/navi-amc/src/main/res/layout/fragment_employment_details.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_36dp" - android:text="What is your source of income?" + android:text="@string/what_is_your_source_of_income" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -39,7 +39,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Choose the source" + android:hint="@string/choose_the_source" app:drawableEndCompat="@drawable/ic_drop_down_black" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/source_income_title_tv" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="What is your occupation" + android:text="@string/what_is_your_occupation" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/source_income_tv" /> @@ -61,7 +61,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Choose the occupation" + android:hint="@string/choose_the_occupation" app:drawableEndCompat="@drawable/ic_drop_down_black" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/occupation_title_tv" /> @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="What is your annual income?" + android:text="@string/what_is_your_annual_income" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/occupation_tv" /> @@ -83,7 +83,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Choose the income" + android:hint="@string/choose_the_income" app:drawableEndCompat="@drawable/ic_drop_down_black" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/income_title_tv" /> diff --git a/navi-amc/src/main/res/layout/fragment_kyc_congratulation.xml b/navi-amc/src/main/res/layout/fragment_kyc_congratulation.xml index c52022f5c6..d89891ef24 100644 --- a/navi-amc/src/main/res/layout/fragment_kyc_congratulation.xml +++ b/navi-amc/src/main/res/layout/fragment_kyc_congratulation.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" android:gravity="center" - android:text="Congratulations!!!" + android:text="@string/congratulations_" app:layout_constraintBottom_toTopOf="@+id/sub_title_tv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/_16dp" android:gravity="center" - android:text="Your account creation is successful.\nStart investing now." + android:text="@string/your_account_creation_is_successful_nstart_investing_now" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/navi-amc/src/main/res/layout/fragment_kyc_selfie.xml b/navi-amc/src/main/res/layout/fragment_kyc_selfie.xml index dd08a0f010..01adfaf8f7 100644 --- a/navi-amc/src/main/res/layout/fragment_kyc_selfie.xml +++ b/navi-amc/src/main/res/layout/fragment_kyc_selfie.xml @@ -84,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_16dp" - android:text="Tips for great selfie" + android:text="@string/tips_for_great_selfie" android:textColor="#000000" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/camera_capture_iv" /> @@ -132,7 +132,7 @@ android:layout_marginEnd="@dimen/_8dp" android:background="@drawable/bg_rectangle_black_outline_white_bg" android:gravity="center" - android:text="Retake photo" + android:text="@string/retake_photo" app:layout_constraintEnd_toStartOf="@+id/save_tv" app:layout_constraintStart_toStartOf="parent" /> @@ -143,7 +143,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/_8dp" android:gravity="center" - android:text="Save" + android:text="@string/save" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/retake_tv" /> diff --git a/navi-amc/src/main/res/layout/fragment_kyc_verifying.xml b/navi-amc/src/main/res/layout/fragment_kyc_verifying.xml index 9e967d9562..db960dd2dd 100644 --- a/navi-amc/src/main/res/layout/fragment_kyc_verifying.xml +++ b/navi-amc/src/main/res/layout/fragment_kyc_verifying.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" android:gravity="center" - android:text="Looks like we were not able to verify\nyour bank account.." + android:text="@string/looks_like_we_were_not_able_to_verify_nyour_bank_account" app:layout_constraintBottom_toTopOf="@+id/sub_title_tv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/_16dp" android:gravity="center" - android:text="We will be sending Rs 1 to your\nbank account" + android:text="@string/we_will_be_sending_rs_1_to_your_bank_account" app:layout_constraintBottom_toTopOf="@+id/retry_tv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -69,7 +69,7 @@ android:gravity="center" android:paddingStart="@dimen/_60dp" android:paddingRight="@dimen/_60dp" - android:text="Retry" + android:text="@string/retry" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/navi-amc/src/main/res/layout/fragment_kyc_video.xml b/navi-amc/src/main/res/layout/fragment_kyc_video.xml index 11fa055909..551de04365 100644 --- a/navi-amc/src/main/res/layout/fragment_kyc_video.xml +++ b/navi-amc/src/main/res/layout/fragment_kyc_video.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Speak the digits below while recording" + android:text="@string/speak_the_digits_below_while_recording" android:textColor="#000000" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -151,7 +151,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_66dp" - android:text="Tips for great video" + android:text="@string/tips_for_great_video" android:textColor="#000000" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/camera" /> diff --git a/navi-amc/src/main/res/layout/fragment_kyc_video_preview.xml b/navi-amc/src/main/res/layout/fragment_kyc_video_preview.xml index f2e1a3e6f2..3cb5b254c5 100644 --- a/navi-amc/src/main/res/layout/fragment_kyc_video_preview.xml +++ b/navi-amc/src/main/res/layout/fragment_kyc_video_preview.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_32dp" - android:text="Tips for great video" + android:text="@string/tips_for_great_video" android:textColor="#000000" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/photo_iv" /> @@ -108,7 +108,7 @@ android:layout_marginEnd="@dimen/_8dp" android:background="@drawable/bg_rectangle_black_outline_white_bg" android:gravity="center" - android:text="Retake video" + android:text="@string/retake_video" app:layout_constraintEnd_toStartOf="@+id/save_tv" app:layout_constraintStart_toStartOf="parent" /> @@ -119,7 +119,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/_8dp" android:gravity="center" - android:text="Save" + android:text="@string/save" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/retake_tv" /> diff --git a/navi-amc/src/main/res/layout/fragment_nominess.xml b/navi-amc/src/main/res/layout/fragment_nominess.xml index 811315ccac..d95fcd93f5 100644 --- a/navi-amc/src/main/res/layout/fragment_nominess.xml +++ b/navi-amc/src/main/res/layout/fragment_nominess.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_36dp" - android:text="Do you wish to add nominee?" + android:text="@string/do_you_wish_to_add_nominee" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Nominee Name" + android:text="@string/nominee_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/yes_view" /> @@ -66,7 +66,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Enter nominee name" + android:hint="@string/enter_nominee_name" android:imeOptions="flagNoEnterAction" android:singleLine="true" app:layout_constraintStart_toStartOf="parent" @@ -78,7 +78,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Date of birth" + android:text="@string/date_of_birth" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/nominee_name_ev" /> @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Relationship" + android:text="@string/relationship" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/date_ev" /> @@ -116,7 +116,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Select your relationship" + android:hint="@string/select_your_relationship" app:drawableEndCompat="@drawable/ic_drop_down_black" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/relationship_tv" /> diff --git a/navi-amc/src/main/res/layout/fragment_pan.xml b/navi-amc/src/main/res/layout/fragment_pan.xml index 758b976b44..e829b64c25 100644 --- a/navi-amc/src/main/res/layout/fragment_pan.xml +++ b/navi-amc/src/main/res/layout/fragment_pan.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_20dp" - android:text="Scan the front" + android:text="@string/scan_the_front" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_8dp" - android:text="Take a photo of the front of the PAN card" + android:text="@string/take_a_photo_of_the_front_of_the_pan_card" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_tv" /> @@ -92,7 +92,7 @@ android:layout_marginEnd="@dimen/_8dp" android:background="@drawable/bg_rectangle_black_outline_white_bg" android:gravity="center" - android:text="Retake photo" + android:text="@string/retake_photo" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/save_tv" app:layout_constraintStart_toStartOf="parent" /> @@ -105,7 +105,7 @@ android:layout_marginStart="@dimen/_8dp" android:layout_marginTop="@dimen/_4dp" android:gravity="center" - android:text="Save" + android:text="@string/save" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/retake_tv" /> diff --git a/navi-amc/src/main/res/layout/fragment_personal_details.xml b/navi-amc/src/main/res/layout/fragment_personal_details.xml index 8babd2318c..161a0df9f7 100644 --- a/navi-amc/src/main/res/layout/fragment_personal_details.xml +++ b/navi-amc/src/main/res/layout/fragment_personal_details.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_36dp" - android:text="Are you married?" + android:text="@string/are_you_married" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="What’s your gender?" + android:text="@string/what_s_your_gender" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/single_view" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Your name" + android:text="@string/your_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/other_view" /> @@ -111,7 +111,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Enter your name" + android:hint="@string/enter_your_name" android:imeOptions="actionNext" android:singleLine="true" app:layout_constraintStart_toStartOf="parent" @@ -123,7 +123,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Father’s name" + android:text="@string/father_s_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/your_name_ev" /> @@ -134,7 +134,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Enter your father’s name" + android:hint="@string/enter_your_father_s_name" android:imeOptions="actionNext" android:singleLine="true" app:layout_constraintStart_toStartOf="parent" @@ -146,7 +146,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_24dp" - android:text="Enter your email-id" + android:text="@string/enter_your_email_id" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/father_name_ev" /> @@ -157,7 +157,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginTop="@dimen/_8dp" android:gravity="center_vertical" - android:hint="Email ID" + android:hint="@string/email_id" android:imeOptions="flagNoEnterAction" android:singleLine="true" app:layout_constraintStart_toStartOf="parent" diff --git a/navi-amc/src/main/res/layout/fragment_signature.xml b/navi-amc/src/main/res/layout/fragment_signature.xml index ee746bb964..33f38323b1 100644 --- a/navi-amc/src/main/res/layout/fragment_signature.xml +++ b/navi-amc/src/main/res/layout/fragment_signature.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_20dp" - android:text="Upload your signature" + android:text="@string/upload_your_signature" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_8dp" - android:text="Ensure the photo has white background" + android:text="@string/ensure_the_photo_has_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_tv" /> @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_marginTop="@dimen/_4dp" android:layout_height="wrap_content" - android:text="Upload Signature" + android:text="@string/upload_signature" app:layout_constraintBottom_toBottomOf="@+id/doc_iv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -72,7 +72,7 @@ android:layout_marginEnd="@dimen/_8dp" android:background="@drawable/bg_rectangle_black_outline_white_bg" android:gravity="center" - android:text="Upload again" + android:text="@string/upload_again" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/save_tv" app:layout_constraintStart_toStartOf="parent" /> @@ -84,7 +84,7 @@ android:layout_height="@dimen/_48dp" android:layout_marginStart="@dimen/_8dp" android:gravity="center" - android:text="Continue" + android:text="@string/continuee" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/retake_tv" /> diff --git a/navi-amc/src/main/res/values/strings.xml b/navi-amc/src/main/res/values/strings.xml index 07a26e327b..0bd6325eb0 100644 --- a/navi-amc/src/main/res/values/strings.xml +++ b/navi-amc/src/main/res/values/strings.xml @@ -100,10 +100,6 @@ Tell us more about you! Date of birth Gender - Male - Female - Single - Married Prefer not to say What do you do? Source of income @@ -167,7 +163,7 @@ Nominee Name Select Relation - Bank name + Bank Name ICICI012 Alert @@ -187,7 +183,7 @@ Remove nominee Relationship DD-MM-YYYY - Enter Nominee Name + Enter nominee name Verify OTP resend in Make payment @@ -320,7 +316,6 @@ Invested Current - Add your PAN Your PAN Personal Details 2/4 @@ -472,7 +467,7 @@ Please select verify account number Account number does not match Verifying your bank account. - We will be sending Rs 1 to your \n" + "bank account + We will be sending Rs 1 to your\nbank account Please try again This is taking too long to verify @@ -489,6 +484,73 @@ Your photo is needed to verify your identity "Make sure you make a video\nfor 5 Seconds " + Add your PAN + PAN is mandatory for investing + Single + Married + Other + Male + Female + Please enter email ID + Please enter valid email-id + Please enter father\'s name + Please enter your name + Please give location permission + Please enable location + Take a Selfie + Add your signature + Allow storage permission + Why is eSign needed? + Aadhaar eSign digitally signs your documents needed for KYC and account opening on Navi + Your data is 100% safe and secure + Proceed to Aadhaar Esign + Your Address + City + ID number + Enter your id number + Issue date + Expiry date + Save + Select document + Scan the front + Take a photo of the front of the ID card + Your Id card looks like this + Retake photo + IFSC code + ICIC0005267 + Select your bank + Enter your account number + Verify Account Number + Re-enter your account number + Retry + Choose the source + What is your occupation + Choose the occupation + Choose the income + Your account creation is successful.\nStart investing now. + Do you wish to add nominee? + Nominee Name + Date of birth + Relationship + Select your relationship + Scan the front + Take a photo of the front of the PAN card + Are you married? + What’s your gender? + Your name + Enter your name + Father’s name + Enter your father’s name + Enter your email-id + Email ID + Tips for great selfie + Upload your signature + Ensure the photo has white background + Upload Signature + Upload again + Speak the digits below while recording + Tips for great video + Retake video ICICI BANK HDFC BANK From 9ee07bc07578621b5fc69cf04626965c605f156e Mon Sep 17 00:00:00 2001 From: shankar-yadav Date: Tue, 12 Oct 2021 12:22:51 +0530 Subject: [PATCH 3/3] resolve conflict --- .../investorapp/common/customview/TextIconCheckedView.kt | 6 +++--- .../java/com/navi/amc/investorapp/constants/Constant.kt | 4 ---- .../ui/kyc/fragments/AddressProofChooseFragment.kt | 8 ++++---- navi-amc/src/main/res/values/colors.xml | 4 ++++ navi-amc/src/main/res/values/strings.xml | 7 ------- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/common/customview/TextIconCheckedView.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/common/customview/TextIconCheckedView.kt index 6e973f5831..ed303cabe5 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/common/customview/TextIconCheckedView.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/common/customview/TextIconCheckedView.kt @@ -1,11 +1,11 @@ package com.navi.amc.investorapp.common.customview import android.content.Context -import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.util.AttributeSet import android.view.LayoutInflater import android.view.View +import androidx.annotation.ColorInt import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.databinding.DataBindingUtil @@ -27,7 +27,7 @@ class TextIconCheckedView(context: Context, attrs: AttributeSet?) : fun setProperties( title: String? = null, iconCode: String? = null, - bgCode: String? = null + @ColorInt bgCode: Int? = null ) { title?.let { binding.titleTv.visibility = View.VISIBLE @@ -44,7 +44,7 @@ class TextIconCheckedView(context: Context, attrs: AttributeSet?) : bgCode?.let { val shape = GradientDrawable() shape.cornerRadius = dpToPx(8).toFloat() - shape.setColor(Color.parseColor(it)) + shape.setColor(bgCode) binding.iconIv.background = shape } } diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt index 5d579d0dfa..8fc6de5f8c 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/constants/Constant.kt @@ -79,10 +79,6 @@ object Constant { const val V_RESOLUTION = 700 * 1000 * 8 const val V_DURATION = 10000 const val V_SIZE = 9000000 - const val COLOR_C3DEB8A3 = "#C3DEB8A3" - const val COLOR_CEE5EBA3 = "#CEE5EBA3" - const val COLOR_F5D2D8A3 = "#F5D2D8A3" - const val COLOR_FFE59EA3 = "#FFE59EA3" const val PROOF_OF_ADDRESS_FRONT_UPLOAD = "PROOF_OF_ADDRESS_FRONT_UPLOAD" const val PROOF_OF_ADDRESS_BACK_UPLOAD = "PROOF_OF_ADDRESS_BACK_UPLOAD" const val VIDEO_UPLOAD = "VIDEO_UPLOAD" diff --git a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt index 6884ef323c..3777eecee0 100644 --- a/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/investorapp/ui/kyc/fragments/AddressProofChooseFragment.kt @@ -60,22 +60,22 @@ class AddressProofChooseFragment : binding.aadhaarView.setProperties( getString(R.string.aadhaar_card_newline), IconUtils.ICON_AADHAAR_FINGER, - Constant.COLOR_C3DEB8A3 + resources.getColor(R.color.color_14BC51) ) binding.passportView.setProperties( getString(R.string.passport), IconUtils.ICON_PASSPORT, - Constant.COLOR_F5D2D8A3 + resources.getColor(R.color.color_F5D2D8A3) ) binding.drivingLicenseView.setProperties( getString(R.string.driving_licence_newline), IconUtils.ICON_DRIVING_LICENCE, - Constant.COLOR_CEE5EBA3 + resources.getColor(R.color.color_CEE5EBA3) ) binding.voterIdView.setProperties( getString(R.string.voter_id), IconUtils.ICON_VOTER_ID, - Constant.COLOR_FFE59EA3 + resources.getColor(R.color.color_FFE59EA3) ) binding.aadhaarView.setViewBackGround(true) arguments?.getString(Constant.MESSAGE)?.let { diff --git a/navi-amc/src/main/res/values/colors.xml b/navi-amc/src/main/res/values/colors.xml index e3c84f7cb7..4117515323 100644 --- a/navi-amc/src/main/res/values/colors.xml +++ b/navi-amc/src/main/res/values/colors.xml @@ -23,6 +23,10 @@ #99000000 #E5E5E5 #392D40 + #C3DEB8A3 + #F5D2D8A3 + #CEE5EBA3 + #FFE59EA3 #4CAF50 #FFF6DC #E4E4E4 diff --git a/navi-amc/src/main/res/values/strings.xml b/navi-amc/src/main/res/values/strings.xml index 0bd6325eb0..a24857f843 100644 --- a/navi-amc/src/main/res/values/strings.xml +++ b/navi-amc/src/main/res/values/strings.xml @@ -98,7 +98,6 @@ Enter your a Full Name Please Verify Your Pan Card Details. Tell us more about you! - Date of birth Gender Prefer not to say What do you do? @@ -512,8 +511,6 @@ Expiry date Save Select document - Scan the front - Take a photo of the front of the ID card Your Id card looks like this Retake photo IFSC code @@ -529,11 +526,8 @@ Choose the income Your account creation is successful.\nStart investing now. Do you wish to add nominee? - Nominee Name Date of birth - Relationship Select your relationship - Scan the front Take a photo of the front of the PAN card Are you married? What’s your gender? @@ -542,7 +536,6 @@ Father’s name Enter your father’s name Enter your email-id - Email ID Tips for great selfie Upload your signature Ensure the photo has white background