add auto multiply to e

Darkempire78 · Nov 20, 2022 · 4b239d6 · 4b239d6
1 parent 3804353
commit 4b239d6
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/src/main/java/com/darkempire78/opencalculator/Expression.kt b/app/src/main/java/com/darkempire78/opencalculator/Expression.kt
@@ -110,7 +110,16 @@ class Expression {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
                     cleanCalculationLength ++
                 }
-                if (i-1 >= 0 && (cleanCalculation[i-1] in "123456789)")) {
+                if (i-1 >= 0 && (cleanCalculation[i-1] in "πe123456789)")) {
+                    cleanCalculation = cleanCalculation.addCharAtIndex('*', i)
+                    cleanCalculationLength ++
+                }
+            } else if (cleanCalculation[i] == 'e') {
+                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "π123456789(")) {
+                    cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
+                    cleanCalculationLength ++
+                }
+                if (i-1 >= 0 && (cleanCalculation[i-1] in "πe123456789)")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i)
                     cleanCalculationLength ++
                 }