diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 526b4c2..a2d7c21 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,7 +13,6 @@ - diff --git a/app/src/main/java/com/pjyotianwar/notewithimage/screens/AddNote.kt b/app/src/main/java/com/pjyotianwar/notewithimage/screens/AddNote.kt index 9276980..114310c 100644 --- a/app/src/main/java/com/pjyotianwar/notewithimage/screens/AddNote.kt +++ b/app/src/main/java/com/pjyotianwar/notewithimage/screens/AddNote.kt @@ -132,9 +132,9 @@ fun editNote(commonViewModel: CommonViewModel, applicationContext: Context) { text = commonViewModel.noteTitle.value, label = "Title", onTextChange = { - if (it.all { char -> - char.isLetter() || char.isWhitespace() - }) +// if (it.all { char -> +// char.isLetter() || char.isWhitespace() +// }) commonViewModel.noteTitle.value = it if (commonViewModel.noteTitleErrorState.value) { commonViewModel.noteTitleErrorState.value = false @@ -156,7 +156,7 @@ fun editNote(commonViewModel: CommonViewModel, applicationContext: Context) { text = commonViewModel.noteDescription.value, label = "Description", onTextChange = { - if (it.all { char -> char.isLetter() || char.isWhitespace() }) + //if (it.all { char -> char.isLetter() || char.isWhitespace() }) commonViewModel.noteDescription.value = it if (commonViewModel.noteDescriptionErrorState.value) { commonViewModel.noteDescriptionErrorState.value = false diff --git a/app/src/main/java/com/pjyotianwar/notewithimage/viewmodels/CommonViewModel.kt b/app/src/main/java/com/pjyotianwar/notewithimage/viewmodels/CommonViewModel.kt index f6014a5..5500b51 100644 --- a/app/src/main/java/com/pjyotianwar/notewithimage/viewmodels/CommonViewModel.kt +++ b/app/src/main/java/com/pjyotianwar/notewithimage/viewmodels/CommonViewModel.kt @@ -100,8 +100,8 @@ class CommonViewModel @Inject constructor( // val ptrn = "^[a-z](?=.*[~'!@#$%^&*-_=+/.,])(?=(.*[A-Z]){2,})(?=(.*[0-9]){2,}).{8,15}\$" // val pattern = Pattern.compile(ptrn) // pattern.matcher(password).find() - return !password.contains(name, ignoreCase = true) && - password.matches(Regex(strongPass)) + return !password.contains(name, ignoreCase = true) //&& +// password.matches(Regex(strongPass)) } fun clearSignUp() { @@ -121,7 +121,7 @@ class CommonViewModel @Inject constructor( fun validateLogin(): Boolean { luserNameErrorState.value = luserName.value.isEmpty() lpasswordErrorState.value = lpassword.value.isEmpty() - return luserName.value.isNotEmpty() && lpassword.value.length in 8..15 + return luserName.value.isNotEmpty()// && lpassword.value.length in 8..15 } fun validateSignUp(): Boolean { @@ -373,11 +373,13 @@ class CommonViewModel @Inject constructor( fun validateTitle(title: String): Boolean{ Log.d("validateTitle", "${title.length} ${title.length in 5..100}") - return title.length in 5..100 +// return title.length in 5..100 + return true } fun validateDescription(desc: String): Boolean{ Log.d("validateDesc", "${desc.length} ${desc.length in 100..1000}") - return desc.length in 100..1000 +// return desc.length in 100..1000 + return true } } \ No newline at end of file