Skip to content

Removed constraints for note description and login #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Prem789538 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed constraints for note description and login #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions app/src/main/java/com/pjyotianwar/notewithimage/screens/AddNote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/java/com/pjyotianwar/notewithimage/viewmodels/CommonViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 {
Expand Down Expand Up @@ -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
}
}