Skip to content

fix:check input values to avoid zero million or impossible values #49

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

fix:check input values to avoid zero million or impossible values #49

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
12 changes: 12 additions & 0 deletions app/src/main/java/com/forz/calculator/fragments/MainFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.text.Editable
import android.text.InputFilter
import android.text.Spanned
import android.text.TextWatcher
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand Down Expand Up @@ -177,6 +179,16 @@ class MainFragment : Fragment(),
}
}

binding.expressionEditText.filters = arrayOf(object : InputFilter {
override fun filter(source: CharSequence?, start: Int, end: Int,
dest: Spanned?, dstart: Int, dend: Int
): CharSequence? {
val result = dest.toString().substring(0, dstart) + source?.subSequence(start, end) + dest.toString().substring(dend)
val findPattern = Regex("^0[0-9]")
return if(findPattern.find(result) != null) "" else null
}
})

binding.expressionEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/forz/calculator/fragments/land/MainLandFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.text.Editable
import android.text.InputFilter
import android.text.Spanned
import android.text.TextWatcher
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand Down Expand Up @@ -147,6 +149,16 @@ class MainLandFragment : Fragment(),
}
}

binding.expressionEditText.filters = arrayOf(object : InputFilter {
override fun filter(source: CharSequence?, start: Int, end: Int,
dest: Spanned?, dstart: Int, dend: Int
): CharSequence? {
val result = dest.toString().substring(0, dstart) + source?.subSequence(start, end) + dest.toString().substring(dend)
val findPattern = Regex("^0[0-9]")
return if(findPattern.find(result) != null) "" else null
}
})

binding.expressionEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/forz/calculator/fragments/largeLand/LargeLandFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.text.Editable
import android.text.InputFilter
import android.text.Spanned
import android.text.TextWatcher
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand Down Expand Up @@ -143,6 +145,16 @@ class LargeLandFragment : Fragment(),
}
}

binding.expressionEditText.filters = arrayOf(object : InputFilter {
override fun filter(source: CharSequence?, start: Int, end: Int,
dest: Spanned?, dstart: Int, dend: Int
): CharSequence? {
val result = dest.toString().substring(0, dstart) + source?.subSequence(start, end) + dest.toString().substring(dend)
val findPattern = Regex("^0[0-9]")
return if(findPattern.find(result) != null) "" else null
}
})

binding.expressionEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/forz/calculator/fragments/small/SmallFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.text.Editable
import android.text.InputFilter
import android.text.Spanned
import android.text.TextWatcher
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand Down Expand Up @@ -181,6 +183,16 @@ class SmallFragment : Fragment(),
}
}

binding.expressionEditText.filters = arrayOf(object : InputFilter {
override fun filter(source: CharSequence?, start: Int, end: Int,
dest: Spanned?, dstart: Int, dend: Int
): CharSequence? {
val result = dest.toString().substring(0, dstart) + source?.subSequence(start, end) + dest.toString().substring(dend)
val findPattern = Regex("^0[0-9]")
return if(findPattern.find(result) != null) "" else null
}
})

binding.expressionEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/forz/calculator/fragments/smallLand/SmallLandFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package com.forz.calculator.fragments.smallLand

import android.os.Bundle
import android.text.Editable
import android.text.InputFilter
import android.text.Spanned
import android.text.TextWatcher
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand Down Expand Up @@ -81,6 +83,16 @@ class SmallLandFragment : Fragment(),
}
}

binding.expressionEditText.filters = arrayOf(object : InputFilter {
override fun filter(source: CharSequence?, start: Int, end: Int,
dest: Spanned?, dstart: Int, dend: Int
): CharSequence? {
val result = dest.toString().substring(0, dstart) + source?.subSequence(start, end) + dest.toString().substring(dend)
val findPattern = Regex("^0[0-9]")
return if(findPattern.find(result) != null) "" else null
}
})

binding.expressionEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/forz/calculator/fragments/xLargeLand/XLargeLandFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.text.Editable
import android.text.InputFilter
import android.text.Spanned
import android.text.TextWatcher
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
Expand Down Expand Up @@ -142,6 +144,16 @@ class XLargeLandFragment : Fragment(),
}
}

binding.expressionEditText.filters = arrayOf(object : InputFilter {
override fun filter(source: CharSequence?, start: Int, end: Int,
dest: Spanned?, dstart: Int, dend: Int
): CharSequence? {
val result = dest.toString().substring(0, dstart) + source?.subSequence(start, end) + dest.toString().substring(dend)
val findPattern = Regex("^0[0-9]")
return if(findPattern.find(result) != null) "" else null
}
})

binding.expressionEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}
Expand Down