src/main/java/rocks/zipcode/atm/ActionResult.java

@@ -32,6 +32,10 @@ public class ActionResult<T> {
         return new ActionResult<E>(data);
     }
 
+    public static <E> ActionResult<E> overdrawn(String overdrawnMessage) {
+        return new ActionResult<E>(overdrawnMessage);
+    }
+
     public static <E> ActionResult<E> fail(String errorMessage) {
         return new ActionResult<E>(errorMessage);
     }

src/main/java/rocks/zipcode/atm/CashMachine.java

@@ -23,13 +23,14 @@ public class CashMachine {
     };
 
     public void login(int id) {
+
         tryCall(
                 () -> bank.getAccountById(id),
                 update
         );
     }
 
-    public void deposit(int amount) {
+    public void deposit(float amount) {
         if (accountData != null) {
             tryCall(
                     () -> bank.deposit(accountData, amount),
@@ -38,7 +39,7 @@ public class CashMachine {
         }
     }
 
-    public void withdraw(int amount) {
+    public void withdraw(float amount) {
         if (accountData != null) {
             tryCall(
                     () -> bank.withdraw(accountData, amount),
@@ -51,11 +52,22 @@ public class CashMachine {
         if (accountData != null) {
             accountData = null;
         }
+
+    }
+
+    public boolean isValidId(int id){
+        if (bank.isValidId(id)) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
     public String toString() {
-        return accountData != null ? accountData.toString() : "Try account 1000 or 2000 and click submit.";
+//
+        // if (accountData != null){isValidId();}
+        return accountData != null ? accountData.toString() : "Set Account ID:\n1000\n2000\n6666\n7337";
     }
 
     private <T> void tryCall(Supplier<ActionResult<T> > action, Consumer<T> postAction) {

src/main/java/rocks/zipcode/atm/CashMachineApp.java

@@ -1,5 +1,7 @@
 package rocks.zipcode.atm;
 
+import javafx.geometry.Pos;
+import javafx.scene.layout.GridPane;
 import rocks.zipcode.atm.bank.Bank;
 import javafx.application.Application;
 import javafx.scene.Parent;
@@ -7,71 +9,124 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import javafx.scene.layout.FlowPane;
+import javafx.scene.paint.Color;
 
 /**
  * @author ZipCodeWilmington
  */
 public class CashMachineApp extends Application {
+    Color blue = Color.rgb(0,0,255);
 
-    private TextField field = new TextField();
     private CashMachine cashMachine = new CashMachine(new Bank());
 
+    private TextField setAccountIdField = new TextField();
+    private TextField setDepositField = new TextField();
+    private TextField setWithdrawField = new TextField();
+
     private Parent createContent() {
-        VBox vbox = new VBox(10);
-        vbox.setPrefSize(600, 600);
+        setAccountIdField.setMinSize(250, 40);
+        setDepositField.setMinSize(250, 40);
+        setWithdrawField.setMinSize(250, 40);
 
-        TextArea areaInfo = new TextArea();
+        GridPane gridPane = new GridPane();
+        gridPane.setPrefSize(500, 400);
+        gridPane.setAlignment(Pos.CENTER);
+        gridPane.setStyle("-fx-background-color: Green;");
 
-        Button btnSubmit = new Button("Set Account ID");
-        btnSubmit.setOnAction(e -> {
-            int id = Integer.parseInt(field.getText());
-            cashMachine.login(id);
+        TextArea areaInfo = new TextArea();
+        areaInfo.setMaxSize(250, 160);
 
-            areaInfo.setText(cashMachine.toString());
-        });
 
         Button btnDeposit = new Button("Deposit");
+        btnDeposit.setMinSize(250, 40);
+        btnDeposit.setTextFill(blue);
+        btnDeposit.setDisable(true);
         btnDeposit.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            float amount = Float.parseFloat(setWithdrawField.getText());
             cashMachine.deposit(amount);
-
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnWithdraw = new Button("Withdraw");
+        btnWithdraw.setMinSize(250, 40);
+        btnWithdraw.setTextFill(blue);
+        btnWithdraw.setDisable(true);
         btnWithdraw.setOnAction(e -> {
-            int amount = Integer.parseInt(field.getText());
+            float amount = Float.parseFloat(setWithdrawField.getText());
             cashMachine.withdraw(amount);
-
             areaInfo.setText(cashMachine.toString());
         });
 
         Button btnExit = new Button("Exit");
+        btnExit.setMinSize(250, 160);
+        btnExit.setTextFill(blue);
+        btnExit.setDisable(true);
         btnExit.setOnAction(e -> {
+            btnDeposit.setDisable(true);
+            btnWithdraw.setDisable(true);
+            btnExit.setDisable(true);
+            resetOnExit();
             cashMachine.exit();
+            areaInfo.setText(cashMachine.toString());
+        });
+
+        Button btnSubmit = new Button("Set Account ID");
+        btnSubmit.setMinSize(250, 40);
+        btnSubmit.setTextFill(blue);
+        btnSubmit.setOnAction(e -> {
+            int id = Integer.parseInt(setAccountIdField.getText());
+            if (isValidId(id)){
+                btnDeposit.setDisable(false);
+                btnWithdraw.setDisable(false);
+                btnExit.setDisable(false);
+            }
+            else {
+                btnDeposit.setDisable(true);
+                btnWithdraw.setDisable(true);
+                btnExit.setDisable(true);
+            }
+            cashMachine.login(id);
 
             areaInfo.setText(cashMachine.toString());
         });
 
-        FlowPane flowpane = new FlowPane();
 
-        flowpane.getChildren().add(btnSubmit);
-        flowpane.getChildren().add(btnDeposit);
-        flowpane.getChildren().add(btnWithdraw);
-        flowpane.getChildren().add(btnExit);
-        vbox.getChildren().addAll(field, flowpane, areaInfo);
-        return vbox;
+        GridPane.setConstraints(btnSubmit, 0, 0);
+        GridPane.setConstraints(btnDeposit, 0, 1);
+        GridPane.setConstraints(btnWithdraw, 0, 2);
+        GridPane.setConstraints(btnExit, 0, 3);
+        GridPane.setConstraints(setAccountIdField, 1, 0);
+        setWithdrawField.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+        GridPane.setConstraints(setWithdrawField, 1, 1, 1, 2);
+        GridPane.setConstraints(areaInfo, 1, 3);
+        gridPane.getChildren().addAll(btnSubmit, btnDeposit, btnWithdraw, btnExit,
+                setAccountIdField, setWithdrawField, areaInfo);
+        return gridPane;
     }
 
     @Override
     public void start(Stage stage) throws Exception {
         stage.setScene(new Scene(createContent()));
+        stage.setTitle("Zip Code ATM");
         stage.show();
     }
 
+    public boolean isValidId(int id){
+        if (cashMachine.isValidId(id)) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    public void resetOnExit(){
+        setAccountIdField.clear();
+        setDepositField.clear();
+        setWithdrawField.clear();
+    }
+
     public static void main(String[] args) {
         launch(args);
     }

src/main/java/rocks/zipcode/atm/bank/Account.java

@@ -15,11 +15,11 @@ public abstract class Account {
         return accountData;
     }
 
-    public void deposit(int amount) {
+    public void deposit(float amount) {
         updateBalance(getBalance() + amount);
     }
 
-    public boolean withdraw(int amount) {
+    public boolean withdraw(float amount) {
         if (canWithdraw(amount)) {
             updateBalance(getBalance() - amount);
             return true;
@@ -28,15 +28,15 @@ public abstract class Account {
         }
     }
 
-    protected boolean canWithdraw(int amount) {
+    protected boolean canWithdraw(float amount) {
         return getBalance() >= amount;
     }
 
-    public int getBalance() {
+    public float getBalance() {
         return accountData.getBalance();
     }
 
-    private void updateBalance(int newBalance) {
+    private void updateBalance(float newBalance) {
         accountData = new AccountData(accountData.getId(), accountData.getName(), accountData.getEmail(),
                 newBalance);
     }

src/main/java/rocks/zipcode/atm/bank/AccountData.java

@@ -9,9 +9,9 @@ public final class AccountData {
     private final String name;
     private final String email;
 
-    private final int balance;
+    private final float balance;
 
-    AccountData(int id, String name, String email, int balance) {
+    AccountData(int id, String name, String email, float balance) {
         this.id = id;
         this.name = name;
         this.email = email;
@@ -30,7 +30,7 @@ public final class AccountData {
         return email;
     }
 
-    public int getBalance() {
+    public float getBalance() {
         return balance;
     }
 

src/main/java/rocks/zipcode/atm/bank/Bank.java

@@ -1,6 +1,8 @@
 package rocks.zipcode.atm.bank;
 
 import rocks.zipcode.atm.ActionResult;
+import rocks.zipcode.atm.CashMachine;
+import rocks.zipcode.atm.CashMachineApp;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,33 +22,54 @@ public class Bank {
         accounts.put(2000, new PremiumAccount(new AccountData(
                 2000, "Example 2", "example2@gmail.com", 200
         )));
+
+        accounts.put(6666, new PremiumAccount(new AccountData(
+                6666, "Nick Satinover", "nsatinover@gmail.com", 20000
+        )));
+
+        accounts.put(7337, new BasicAccount(new AccountData(
+                7337, "Kris HaHaYourBroke", "kris@onedollar.com", 1
+        )));
     }
 
     public ActionResult<AccountData> getAccountById(int id) {
         Account account = accounts.get(id);
-
         if (account != null) {
             return ActionResult.success(account.getAccountData());
         } else {
-            return ActionResult.fail("No account with id: " + id + "\nTry account 1000 or 2000");
+            return ActionResult.fail("No account with id: " + id + "\nTry account 1000, 2000, 6666, 7337");
         }
     }
 
-    public ActionResult<AccountData> deposit(AccountData accountData, int amount) {
+    public ActionResult<AccountData> deposit(AccountData accountData, float amount) {
         Account account = accounts.get(accountData.getId());
         account.deposit(amount);
 
         return ActionResult.success(account.getAccountData());
     }
 
-    public ActionResult<AccountData> withdraw(AccountData accountData, int amount) {
+    public ActionResult<AccountData> withdraw(AccountData accountData, float amount) {
         Account account = accounts.get(accountData.getId());
         boolean ok = account.withdraw(amount);
 
         if (ok) {
+            if (account.getBalance() < 0) {
+                Overdraft.popupMessage("Overdraft", "Warning, your account is now in overdraft");
+            }
             return ActionResult.success(account.getAccountData());
         } else {
+            Overdraft.popupMessage("Declined", "Declined, account contains insufficient funds");
             return ActionResult.fail("Withdraw failed: " + amount + ". Account has: " + account.getBalance());
         }
     }
+
+    public boolean isValidId(int id){
+        Account account = accounts.get(id);
+        if (account != null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }

src/main/java/rocks/zipcode/atm/bank/Overdraft.java

@@ -0,0 +1,54 @@
+package rocks.zipcode.atm.bank;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.stage.Stage;
+import javafx.scene.*;
+import javafx.scene.layout.*;
+import javafx.scene.control.*;
+import javafx.geometry.*;
+import javafx.stage.Modality;
+
+import java.awt.*;
+
+public class Overdraft {
+
+    public static void popupMessage(String title, String message){
+        // "Warning, your account is now in popupMessage";
+        Stage window = new Stage();
+        window.initModality(Modality.APPLICATION_MODAL); //Block Input until window closed/ resolved
+        window.setTitle(title);
+        window.setMinWidth(250);
+
+        Label label = new Label();
+        label.setText(message);
+
+        Button closeButton = new Button("Close");
+        closeButton.setOnAction(e -> window.close());
+
+        VBox layout = new VBox(10);
+        layout.getChildren().addAll(label, closeButton);
+        layout.setAlignment(Pos.CENTER);
+
+        Scene scene = new Scene(layout);
+        window.setScene(scene);
+        window.showAndWait();
+
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/main/java/rocks/zipcode/atm/bank/PremiumAccount.java

@@ -5,14 +5,14 @@ package rocks.zipcode.atm.bank;
  */
 public class PremiumAccount extends Account {
 
-    private static final int OVERDRAFT_LIMIT = 100;
+    private static final int OVERDRAFT_LIMIT = 1000;
 
     public PremiumAccount(AccountData accountData) {
         super(accountData);
     }
 
     @Override
-    protected boolean canWithdraw(int amount) {
+    protected boolean canWithdraw(float amount) {
         return getBalance() + OVERDRAFT_LIMIT >= amount;
     }
 }