Implemented functionality for task 2 and closes #2

petervanhoef · Mar 19, 2017 · 98941d2 · 98941d2
1 parent ec03202
commit 98941d2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Calculator/Calculator/ViewController.swift b/Calculator/Calculator/ViewController.swift
@@ -18,9 +18,15 @@ class ViewController: UIViewController {
         let digit = sender.currentTitle!
         if userIsInTheMiddleOfTyping {
             let textCurrentlyInDisplay = display.text!
-            display.text = textCurrentlyInDisplay + digit
+            if !(digit == "." && textCurrentlyInDisplay.contains(".")) {
+                display.text = textCurrentlyInDisplay + digit
+            }
         } else {
-            display.text = digit
+            if digit == "." {
+                display.text = "0."
+            } else {
+                display.text = digit
+            }
             userIsInTheMiddleOfTyping = true
         }
     }