Skip to content

Commit d0554c1

Browse files
committed
Bug Fixes.
1 parent 99762ea commit d0554c1

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

app/src/main/java/com/calculator/MyViewModel.kt

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.util.Log
44
import androidx.lifecycle.MutableLiveData
55
import androidx.lifecycle.ViewModel
66
import net.objecthunter.exp4j.ExpressionBuilder
7+
import java.lang.Exception
78

89
class MyViewModel : ViewModel() {
910

@@ -30,11 +31,15 @@ class MyViewModel : ViewModel() {
3031
Log.d("number", text)
3132
val expression = ExpressionBuilder(text).build()
3233

34+
try {
3335
val result = expression.evaluate()
3436
if (Math.floor(result) == result)
3537
answer.value = result.toString()
3638
else
3739
answer.value = result.toString()
40+
} catch (e: Exception) {
41+
answer.value="Invalid"
42+
}
3843
}
3944

4045
private fun getFormatted(): String {

0 commit comments

Comments
 (0)