From 8b3bccdb0db776ec6c983378b86ee69395f342ff Mon Sep 17 00:00:00 2001
From: Darkempire <50015928+Darkempire78@users.noreply.github.com>
Date: Thu, 1 Dec 2022 11:33:50 +0100
Subject: [PATCH] fix decimal then parenthesis causes the application to crash

---
 .../com/darkempire78/opencalculator/Expression.kt  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/darkempire78/opencalculator/Expression.kt b/app/src/main/java/com/darkempire78/opencalculator/Expression.kt
index e6cb0e6f..4c63ad15 100644
--- a/app/src/main/java/com/darkempire78/opencalculator/Expression.kt
+++ b/app/src/main/java/com/darkempire78/opencalculator/Expression.kt
@@ -92,17 +92,17 @@ class Expression {
         while (i < cleanCalculationLength) {
 
             if (cleanCalculation[i] == '(') {
-                if (i != 0 && (cleanCalculation[i-1] in "\\${NumberFormatter.decimalSeparatorSymbol}e0123456789)")) {
+                if (i != 0 && (cleanCalculation[i-1] in ".e0123456789)")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i)
                     cleanCalculationLength ++
                 }
             } else if (cleanCalculation[i] == ')') {
-                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "\\${NumberFormatter.decimalSeparatorSymbol}0123456789(")) {
+                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "0123456789(")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
                     cleanCalculationLength ++
                 }
             } else if (cleanCalculation[i] == '!') {
-                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "\\${NumberFormatter.decimalSeparatorSymbol}0123456789π(")) {
+                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "0123456789π(")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
                     cleanCalculationLength ++
                 }
@@ -112,20 +112,20 @@ class Expression {
                     cleanCalculationLength ++
                 }
             } else if (cleanCalculation[i] == 'π') {
-                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "\\${NumberFormatter.decimalSeparatorSymbol}0123456789(")) {
+                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "0123456789(")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
                     cleanCalculationLength ++
                 }
-                if (i-1 >= 0 && (cleanCalculation[i-1] in "\\${NumberFormatter.decimalSeparatorSymbol}%πe0123456789)")) {
+                if (i-1 >= 0 && (cleanCalculation[i-1] in ".%πe0123456789)")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i)
                     cleanCalculationLength ++
                 }
             } else if (cleanCalculation[i] == 'e') {
-                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "\\${NumberFormatter.decimalSeparatorSymbol}π0123456789(")) {
+                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "π0123456789(")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
                     cleanCalculationLength ++
                 }
-                if (i-1 >= 0 && (cleanCalculation[i-1] in "\\${NumberFormatter.decimalSeparatorSymbol}%πe0123456789)")) {
+                if (i-1 >= 0 && (cleanCalculation[i-1] in ".%πe0123456789)")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i)
                     cleanCalculationLength ++
                 }