From a5ec64f6f954c2e4cbc8f1cedb111b45e98ea786 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 28 Dec 2020 21:03:39 +0100
Subject: [PATCH] =?UTF-8?q?replace=20*=20with=20=C3=97=20and=20/=20with=20?=
 =?UTF-8?q?=C3=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calculator/helpers/CalculatorImpl.kt         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
index b70b4f8f..6d567c8c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
@@ -13,8 +13,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
     private var inputDisplayedFormula = "0"
     private var lastKey = ""
     private var lastOperation = ""
-    private val operations = listOf("+", "-", "*", "/", "^", "%", "√")
-    private val operationsRegex = "[-+*/^%√]".toPattern()
+    private val operations = listOf("+", "-", "×", "÷", "^", "%", "√")
+    private val operationsRegex = "[-+×÷^%√]".toPattern()
     private val numbersRegex = "[^0-9,.]".toRegex()
 
     init {
@@ -100,7 +100,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
                 calculateResult()
 
                 if (!operations.contains(inputDisplayedFormula.last().toString())) {
-                    if (!inputDisplayedFormula.contains("/")) {
+                    if (!inputDisplayedFormula.contains("÷")) {
                         inputDisplayedFormula += getSign(operation)
                     }
                 }
@@ -167,9 +167,9 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
 
         if (lastOperation != "") {
             val sign = getSign(lastOperation)
-            val expression = "${baseValue.format()}$sign${secondValue.format()}".replace("√", "sqrt")
+            val expression = "${baseValue.format()}$sign${secondValue.format()}".replace("√", "sqrt").replace("×", "*").replace("÷", "/")
             try {
-                if (sign == "/" && secondValue == 0.0) {
+                if (sign == "÷" && secondValue == 0.0) {
                     context.toast(R.string.formula_divide_by_zero_error)
                     return
                 }
@@ -178,7 +178,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
                 showNewResult(result.format())
                 baseValue = result
                 inputDisplayedFormula = result.format()
-                showNewFormula(expression.replace("sqrt", "√"))
+                showNewFormula(expression.replace("sqrt", "√").replace("*", "×").replace("/", "÷"))
             } catch (e: Exception) {
                 context.toast(R.string.unknown_error_occurred)
             }
@@ -243,8 +243,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
 
     private fun getSign(lastOperation: String) = when (lastOperation) {
         MINUS -> "-"
-        MULTIPLY -> "*"
-        DIVIDE -> "/"
+        MULTIPLY -> "×"
+        DIVIDE -> "÷"
         PERCENT -> "%"
         POWER -> "^"
         ROOT -> "√"