1 files changed, 2 insertions, 11 deletions
diff --git a/app/src/main/java/com/a404m/calculator/util/MathHelper.kt b/app/src/main/java/com/a404m/calculator/util/MathHelper.kt
index 77244b0..51aec93 100644
--- a/app/src/main/java/com/a404m/calculator/util/MathHelper.kt
+++ b/app/src/main/java/com/a404m/calculator/util/MathHelper.kt
@@ -180,7 +180,7 @@ object MathHelper {
                             value = expression.substring(
                                 start,
                                 i
-                            ).toBigDecimal()
+                            ).toBigDecimal().multiply(BigDecimal("1.0"))
                         )
                     )
                     --i
@@ -310,16 +310,7 @@ object MathHelper {
         val value: MathNumberType,
     ) {
         override fun toString(): String {
-            var str = value.toString()
-            if(str.contains('.')){
-                while (str.last() == '0'){
-                    str = str.removeRange(str.length-1,str.length)
-                }
-                if(str.last() == '.'){
-                    str = str.removeRange(str.length-1,str.length)
-                }
-            }
-            return str
+            return value.stripTrailingZeros().toString()
         }
     }