Completes extra credit 1 and closes #12

petervanhoef · Mar 26, 2017 · 57a49ca · 57a49ca
1 parent 62ca500
commit 57a49ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Calculator/Calculator/Base.lproj/Main.storyboard b/Calculator/Calculator/Base.lproj/Main.storyboard
@@ -51,7 +51,7 @@
                                                         <fontDescription key="fontDescription" type="system" pointSize="30"/>
                                                         <state key="normal" title="BS"/>
                                                         <connections>
-                                                            <action selector="clear:" destination="BYZ-38-t0r" eventType="touchUpInside" id="qr1-Ca-0eX"/>
+                                                            <action selector="backspace:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Klu-Xx-Mpz"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NCt-oF-aVp">

diff --git a/Calculator/Calculator/ViewController.swift b/Calculator/Calculator/ViewController.swift
@@ -60,5 +60,17 @@ class ViewController: UIViewController {
         displayValue = 0
         sequence.text = " "
     }
+
+    @IBAction func backspace(_ sender: UIButton) {
+        if userIsInTheMiddleOfTyping {
+            var textCurrentlyInDisplay = display.text!
+            textCurrentlyInDisplay.remove(at: textCurrentlyInDisplay.index(before: textCurrentlyInDisplay.endIndex))
+            if textCurrentlyInDisplay.isEmpty {
+                userIsInTheMiddleOfTyping = false
+                textCurrentlyInDisplay = "0"
+            }
+            display.text = textCurrentlyInDisplay
+        }
+    }
 }