Support 'x' for multiplication, normalize operator display in result …

…to Unicode
Neamar · Jun 24, 2018 · 0f43e75 · 0f43e75
1 parent 1c13695
commit 0f43e75
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/src/main/java/fr/neamar/kiss/dataprovider/simpleprovider/CalculatorProvider.java b/app/src/main/java/fr/neamar/kiss/dataprovider/simpleprovider/CalculatorProvider.java
@@ -12,7 +12,7 @@ public class CalculatorProvider implements IProvider {
     private Pattern p;
 
     public CalculatorProvider() {
-        p = Pattern.compile("([0-9.]+)\\s?([+\\-*/×÷])\\s?([0-9.]+)");
+        p = Pattern.compile("([0-9.]+)\\s?([+\\-*/×x÷])\\s?([0-9.]+)");
     }
 
     @Override
@@ -40,11 +40,14 @@ public void requestResults(String query, Searcher searcher) {
                     break;
                 case "*":
                 case "×":
+                case "x":
                     floatResult = lhs * rhs;
+                    operator = "×";
                     break;
                 case "/":
                 case "÷":
                     floatResult = lhs / rhs;
+                    operator = "÷";
                     break;
                 default:
                     floatResult = Float.POSITIVE_INFINITY;