From 3b7f24c47cf01f22e88613f49bb644b0c6bdea6e Mon Sep 17 00:00:00 2001 From: vsuryakumar Date: Mon, 13 Feb 2023 13:06:45 +0530 Subject: [PATCH] Validating the patient name, so as to work with filenaming also. i.e, showing error on using restricted characters. --- .../hpos/presentation/testRight/TestRightExpSample.kt | 11 +++++++++-- app/src/main/res/values/strings.xml | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt index 6320952..8d157e0 100644 --- a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt @@ -74,7 +74,7 @@ class TestRightExpSample : Fragment() { } binding.btnSubmit.setOnClickListener { - val details = checkAndReturnPatientDetails() + val details = validateAndReturnPatientData() if (details != null) { viewModel.patientDetails = details @@ -97,12 +97,19 @@ class TestRightExpSample : Fragment() { binding.etGenderBlock.setOnClickListener { binding.ddGender.isErrorEnabled = false } } - private fun checkAndReturnPatientDetails(): PatientData? { + private fun validateAndReturnPatientData(): PatientData? { val name = binding.etName.editText?.text?.trim() if (name.isNullOrEmpty()) { binding.etName.error = getString(R.string.name_error) return null + } else { + val regex = Regex("[|\\\\?*<\":>+\\[\\]'/]") + if (regex.containsMatchIn(name)){ + binding.etName.error = getString(R.string.name_error_2) + return null + } } + val age = binding.etAge.editText?.text?.trim() if (age.isNullOrEmpty()) { binding.etAge.error = getString(R.string.age_error) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index da231af..1c2430a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -78,5 +78,6 @@ Sickle Cert Sickle Find Submit + Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only \ No newline at end of file