Skip to content

Fix day validation of month February #9

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
BasdekD wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix day validation of month February #9

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
2 changes: 1 addition & 1 deletion dateedittext/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 29
Expand Down
11 changes: 6 additions & 5 deletions dateedittext/src/main/java/com/msa/dateedittext/DateEditText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class DateEditText : TextInputEditText {
val day = date.substring(0, 2).toInt()
val month = date.substring(3, 5).toInt()
val year = date.substring(6, 10).toInt()
val isLeapYear = (year % 100 != 0 || year % 400 != 0)
val isLeapYear = (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)

if (month > 12 || month <= 0) {
throw IllegalArgumentException("Invalid date")
Expand Down Expand Up @@ -300,6 +300,7 @@ class DateEditText : TextInputEditText {
setError(value= mValue.substring(0, 2), errorMessage = context.getString(R.string.invalid_day))
}
}

}

// validate month
Expand All @@ -320,7 +321,7 @@ class DateEditText : TextInputEditText {
}else{
setError(value= mValue.substring(0,5), errorMessage = context.getString(R.string.invalid_day_of_month))
}
} else if (month == 2 && day == 31) {
} else if (month == 2 && day > 29) {
if (autoCorrect){
mValue = mValue.replace(day.toString(), "29", false)
}else{
Expand Down Expand Up @@ -360,11 +361,11 @@ class DateEditText : TextInputEditText {
if (isLeapYear(year).not()) {
val month = mValue.substring(3, 5).toInt()
val day = mValue.substring(0, 2).toInt()
if (month == 2 && day >= 28) {
if (month == 2 && day > 28) {
if (autoCorrect){
mValue = mValue.replace(day.toString(), "28", false)
}else{
setError(value= mValue, errorMessage = context.getString(R.string.invalid_day_of_month_leap_year))
} else {
setError(value= mValue, errorMessage = context.getString(R.string.invalid_day_of_month))
}
}
}
Expand Down