Merge pull request #252 from potatoes1286/patch-1

Fix #196
Darkempire78 · Mar 24, 2023 · e9aaf21 · e9aaf21
2 parents ccb1f0e + f9cda08
commit e9aaf21
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
@@ -55,6 +55,15 @@ class Expression {
         if (calculation[operatorBeforePercentPos] == '*') {
             return calculation
         }
+
+        if(calculation[operatorBeforePercentPos] == '/') {
+            // insert brackets into percentage. Fixes 900/10% -> 900/(10/100), not 900/10/100 which evals differently.
+            // also prevents it from doing the rest of this function, which screws the calculation up
+            var stringFirst = calculation.substring(0, operatorBeforePercentPos+1)
+            var stringMiddle = calculation.substring(operatorBeforePercentPos+1, percentPos+1)
+            var stringLast = calculation.substring(percentPos+1, calculation.length)
+            return "$stringFirst($stringMiddle)$stringLast"
+        }
 
         // extract the first part of the calculation
         var calculationStringFirst = calculation.subSequence(0, operatorBeforePercentPos).toString()
@@ -279,4 +288,4 @@ class Expression {
     private fun String.addCharAtIndex(char: Char, index: Int) =
         StringBuilder(this).apply { insert(index, char) }.toString()
 
-}
+}