buttons kind of work

README.md

@@ -16,10 +16,7 @@ CalcEngine is a "fails all tests" class, and you should use the one from your pr
 See the MainApplication class to see how to call it from your __main__ method.
 
 Making a simple 4-function calculator should be trivial for you at this stage.
-
-*BUT*, how about adding a column of buttons for x-squared, square-root, inverse (1/x), and
-exponent (x^y).
-
+ 
 Then you might add a column of buttons that do the Memory functions.
 (What should you add to the UI to make this easier??)
 

src/main/java/rocks/zipcode/calcskin/CalcEngine.java

@@ -6,18 +6,47 @@ public class CalcEngine {
     }
 
     public double add(double v, double v1) {
-        return Double.NaN;
+
+        return v + v1;
     }
 
     public double subtract(double v, double v1) {
-        return Double.NaN;
+
+        return v - v1;
     }
 
     public double multiply(double v, double v1) {
-        return Double.NaN;
+
+           return v * v1;
     }
 
     public double divide(double v, double v1) {
-        return Double.NaN;
+
+        return v / v1;
+    }
+
+    public double exponent(double v, double v1){
+
+        return (Math.pow(v, v1));
+    }
+
+    public double squareRoot(double v) {
+
+        return (Math.sqrt(v));
+
     }
+
+    public double inverse(double v) {
+
+        return 1 / v;
+    }
+
+    public double square(double v) {
+
+        return Math.pow(v, 2);
+    }
+
+
+
+
 }

src/main/java/rocks/zipcode/calcskin/CalcSkin.java

@@ -24,10 +24,10 @@ public class CalcSkin extends Application {
         launch(args);
     }
     private static final String[][] template = {
-            { "7", "8", "9", "/" },
-            { "4", "5", "6", "*" },
-            { "1", "2", "3", "-" },
-            { "0", "c", "=", "+" }
+            { "7", "8", "9", "/", "x2" },
+            { "4", "5", "6", "*", "√x"},
+            { "1", "2", "3", "-", "1/x" },
+            { "0", "c", "=", "+", "x^y"}
     };
 
     private final Map<String, Button> accelerators = new HashMap<>();
@@ -36,7 +36,7 @@ public class CalcSkin extends Application {
     private DoubleProperty currentValue = new SimpleDoubleProperty();
     private CalcEngine calcEngine = new CalcEngine();
 
-    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE }
+    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE, SQUARE, ROOT, INVERSE, EXPO }
 
     private Op curOp   = Op.NOOP;
     private Op stackOp = Op.NOOP;
@@ -60,7 +60,7 @@ public class CalcSkin extends Application {
     private VBox createLayout(TextField screen, TilePane buttons) {
         final VBox layout = new VBox(20);
         layout.setAlignment(Pos.CENTER);
-        layout.setStyle("-fx-background-color: silver; -fx-padding: 20; -fx-font-size: 20;");
+        layout.setStyle("-fx-background-color: orange; -fx-padding: 20; -fx-font-size: 20;");
         layout.getChildren().setAll(screen, buttons);
         handleAccelerators(layout);
         screen.prefWidthProperty().bind(buttons.widthProperty());
@@ -81,7 +81,7 @@ public class CalcSkin extends Application {
 
     private TextField createScreen() {
         final TextField screen = new TextField();
-        screen.setStyle("-fx-background-color: aquamarine;");
+        screen.setStyle("-fx-background-color: red;");
         screen.setAlignment(Pos.CENTER_RIGHT);
         screen.setEditable(false);
         screen.textProperty().bind(Bindings.format("%.0f", currentValue));
@@ -114,12 +114,15 @@ public class CalcSkin extends Application {
                 makeClearButton(button);
             } else if ("=".equals(s)) {
                 makeEqualsButton(button);
+            } else if ("x2".equals(s)) {
+
             }
         }
 
         return button;
     }
 
+
     private ObjectProperty<Op> determineOperand(String s) {
         final ObjectProperty<Op> triggerOp = new SimpleObjectProperty<>(Op.NOOP);
         switch (s) {
@@ -127,12 +130,17 @@ public class CalcSkin extends Application {
             case "-": triggerOp.set(Op.SUBTRACT); break;
             case "*": triggerOp.set(Op.MULTIPLY); break;
             case "/": triggerOp.set(Op.DIVIDE);   break;
+            case "x2":triggerOp.set(Op.SQUARE);   break;
+            case "√x":triggerOp.set(Op.ROOT);     break;
+            case "1/x":triggerOp.set(Op.INVERSE); break;
+            case "x^y":triggerOp.set(Op.EXPO);    break;
+
         }
         return triggerOp;
     }
 
     private void makeOperandButton(Button button, final ObjectProperty<Op> triggerOp) {
-        button.setStyle("-fx-base: lightgray;");
+        button.setStyle("-fx-base: #fdff00;");
         button.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
@@ -143,7 +151,7 @@ public class CalcSkin extends Application {
 
     private Button makeStandardButton(String s) {
         Button button = new Button(s);
-        button.setStyle("-fx-base: beige;");
+        button.setStyle("-fx-base: #b88cf5;");
         accelerators.put(s, button);
         button.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
         return button;
@@ -166,7 +174,7 @@ public class CalcSkin extends Application {
     }
 
     private void makeClearButton(Button button) {
-        button.setStyle("-fx-base: mistyrose;");
+        button.setStyle("-fx-base: rgba(169,255,131,1);");
         button.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
@@ -175,8 +183,10 @@ public class CalcSkin extends Application {
         });
     }
 
+
+
     private void makeEqualsButton(Button button) {
-        button.setStyle("-fx-base: ghostwhite;");
+        button.setStyle("-fx-base: #ff03e8;");
         button.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
@@ -185,6 +195,10 @@ public class CalcSkin extends Application {
                     case SUBTRACT: currentValue.set(calcEngine.subtract(previousValue.get(), currentValue.get())); break;
                     case MULTIPLY: currentValue.set(calcEngine.multiply(previousValue.get(), currentValue.get())); break;
                     case DIVIDE:   currentValue.set(calcEngine.divide(previousValue.get(), currentValue.get())); break;
+                    //case SQUARE:   currentValue.set(calcEngine.square(currentValue.get())); break;
+                    case ROOT:     currentValue.set(calcEngine.squareRoot(currentValue.get())); break;
+                    case INVERSE:  currentValue.set(calcEngine.inverse(currentValue.get())); break;
+                    case EXPO:     currentValue.set(calcEngine.exponent(previousValue.get(), currentValue.get())); break;
                 }
             }
         });