diff --git a/AndroidCalculator/Base.lproj/Main.storyboard b/AndroidCalculator/Base.lproj/Main.storyboard
index 853b673..3f3d991 100644
--- a/AndroidCalculator/Base.lproj/Main.storyboard
+++ b/AndroidCalculator/Base.lproj/Main.storyboard
@@ -28,7 +28,7 @@
-
+
diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift
index 7ef06bf..540befe 100644
--- a/AndroidCalculator/Calculator.swift
+++ b/AndroidCalculator/Calculator.swift
@@ -9,56 +9,14 @@
import Foundation
class Calculator {
- var formula: String = ""
- var result: String = ""
+ var formula = ""
+ var result = ""
- func clickNumber(_ number: Int) {
- formula += String(number)
- result += String(number)
- }
-
- func clickDot() {
- formula += "."
- result += "."
- }
-
- func clickEquation() {
- formula += "="
- result += "="
- }
-
- func clickPlus() {
- formula += "+"
- result += "+"
- }
-
- func clickMinus() {
- formula += "-"
- result += "-"
- }
-
- func clickMultiplication() {
- formula += "*"
- result += "*"
- }
-
- func clickDivision() {
- formula += "/"
- result += "/"
- }
-
- func clickPercent() {
- formula += "%"
- result += "%"
- }
-
- func clickInversion() {
- formula += "+/-"
- result += "+/-"
- }
-
- func clickAllClear() {
- formula = ""
- result = ""
+ func click(_ text: String) {
+ if text == "AC" {
+ formula = ""
+ } else {
+ formula += text
+ }
}
}
diff --git a/AndroidCalculator/ViewController.swift b/AndroidCalculator/ViewController.swift
index f6dcd78..3c6fb05 100644
--- a/AndroidCalculator/ViewController.swift
+++ b/AndroidCalculator/ViewController.swift
@@ -15,60 +15,14 @@ class ViewController: UIViewController {
@IBOutlet weak var resultLabel: UILabel!
@IBOutlet var numberButtons: [UIButton]!
- var calculator: Calculator = Calculator()
+ var calculator = Calculator()
- @IBAction func clickNumberButton(_ sender: UIButton) {
- let number = numberButtons.firstIndex(of: sender)!
- calculator.clickNumber(number)
- updateFormulaAndResult()
+ @IBAction func clickButton(_ sender: UIButton) {
+ calculator.click(sender.currentTitle!)
+ updateView()
}
- @IBAction func clickDotButton(_ sender: UIButton) {
- calculator.clickDot()
- updateFormulaAndResult()
- }
-
- @IBAction func clickEquationButton(_ sender: UIButton) {
- calculator.clickEquation()
- updateFormulaAndResult()
- }
-
- @IBAction func clickPlusButton(_ sender: UIButton) {
- calculator.clickPlus()
- updateFormulaAndResult()
- }
-
- @IBAction func clickMinusButton(_ sender: UIButton) {
- calculator.clickMinus()
- updateFormulaAndResult()
- }
-
- @IBAction func clickMultiplicationButton(_ sender: UIButton) {
- calculator.clickMultiplication()
- updateFormulaAndResult()
- }
-
- @IBAction func clickDivisionButton(_ sender: UIButton) {
- calculator.clickDivision()
- updateFormulaAndResult()
- }
-
- @IBAction func clickPercentButton(_ sender: UIButton) {
- calculator.clickPercent()
- updateFormulaAndResult()
- }
-
- @IBAction func clickInversionButton(_ sender: UIButton) {
- calculator.clickInversion()
- updateFormulaAndResult()
- }
-
- @IBAction func clickAllClearButton(_ sender: UIButton) {
- calculator.clickAllClear()
- updateFormulaAndResult()
- }
-
- func updateFormulaAndResult() {
+ func updateView() {
formulaLabel.text = calculator.formula
resultLabel.text = calculator.result
}
@@ -78,7 +32,7 @@ class ViewController: UIViewController {
// Do any additional setup after loading the view.
borderView.layer.borderWidth = 1
borderView.layer.borderColor = #colorLiteral(red: 0.8374180198, green: 0.8374378085, blue: 0.8374271393, alpha: 1)
- updateFormulaAndResult()
+ updateView()
}