Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switched to EvalEx

Browse Source 
Will need to refactor some convert method in the future.
This commit is contained in:
Sad Ellie 2022-11-21 17:24:37 +04:00
parent e620794358
commit 193170c734
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -200,6 +200,6 @@ dependencies {
// ComposeReorderable
implementation("org.burnoutcrew.composereorderable:reorderable:0.9.6")
// ExprK
implementation("com.github.Keelar:ExprK:30c00415a8")
// EvalEx
implementation("com.ezylang:EvalEx:3.0.1")
}

10
app/src/main/java/com/sadellie/unitto/data/Library.kt
View File

@ -29,11 +29,11 @@ data class AppLibrary(
val ALL_LIBRARIES = lazy {
listOf(
AppLibrary(
name = "ExprK",
dev = "Keelar",
website = "https://github.com/Keelar/ExprK",
license = "MIT license",
description = "A simple mathematical expression evaluator for Kotlin and Java, written in Kotlin."
name = "EvalEx",
dev = "ezylang",
website = "https://github.com/ezylang/EvalEx",
license = "Apache-2.0",
description = "EvalEx is a handy expression evaluator for Java, that allows to evaluate simple mathematical and boolean expressions."
),
AppLibrary(
name = "currency-api",

22
app/src/main/java/com/sadellie/unitto/screens/main/MainViewModel.kt
View File

@ -24,8 +24,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.keelar.exprk.ExpressionException
import com.github.keelar.exprk.Expressions
import com.ezylang.evalex.BaseException
import com.ezylang.evalex.Expression
import com.sadellie.unitto.FirebaseHelper
import com.sadellie.unitto.data.KEY_0
import com.sadellie.unitto.data.KEY_1
@ -126,14 +126,17 @@ class MainViewModel @Inject constructor(
// Kotlin doesn't have a multi catch
val calculatedInput = try {
Expressions()
val evaluated = Expression(cleanInput)
// Optimal precision, not too low, not too high. Balanced for performance and UX.
.setPrecision(128)
.eval(cleanInput)
.evaluate()
.numberValue
.setScale(_userPrefs.value.digitsPrecision, RoundingMode.HALF_EVEN)
.stripTrailingZeros()
if (evaluated.compareTo(BigDecimal.ZERO) == 0) BigDecimal.ZERO else evaluated
} catch (e: Exception) {
// Kotlin doesn't have a multi catch
when (e) {
is ExpressionException, is ArrayIndexOutOfBoundsException, is NumberFormatException, is ArithmeticException -> return mainFlow.value.resultValue
is BaseException, is ArrayIndexOutOfBoundsException, is NumberFormatException, is ArithmeticException -> return mainFlow.value.resultValue
else -> throw e
}
}
@ -157,10 +160,7 @@ class MainViewModel @Inject constructor(
* consists of ZEROS only (0.00000 as an example). This check is a workaround. If the result
* is zero, than we make sure there are no trailing zeros.
*/
val resultValue = if (convertedValue == BigDecimal.ZERO.setScale(
_userPrefs.value.digitsPrecision, RoundingMode.HALF_EVEN
)
) {
val resultValue = if (convertedValue.compareTo(BigDecimal.ZERO) == 0) {
KEY_0
} else {
convertedValue.toStringWith(_userPrefs.value.outputFormat)
@ -342,7 +342,7 @@ class MainViewModel @Inject constructor(
* "50+". We don't add "/' here. User will click "/" second time and the input
* will be "50/".
*/
(lastSecondSymbol in OPERATORS) and (lastSymbol == KEY_MINUS)-> {
(lastSecondSymbol in OPERATORS) and (lastSymbol == KEY_MINUS) -> {
deleteDigit()
}
// Don't allow multiple operators near each other