diff --git a/AndroidCalculator/Base.lproj/Main.storyboard b/AndroidCalculator/Base.lproj/Main.storyboard index 42e88bb..c7d7d23 100644 --- a/AndroidCalculator/Base.lproj/Main.storyboard +++ b/AndroidCalculator/Base.lproj/Main.storyboard @@ -27,6 +27,9 @@ + + + diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift index e32e986..96821ba 100644 --- a/AndroidCalculator/Calculator.swift +++ b/AndroidCalculator/Calculator.swift @@ -12,4 +12,40 @@ class Calculator { func clickNumber(_ number: Int) { print(number) } + + func clickDot() { + print(".") + } + + func clickEquation() { + print("=") + } + + func clickPlus() { + print("+") + } + + func clickMinus() { + print("-") + } + + func clickMultiplication() { + print("*") + } + + func clickDivision() { + print("/") + } + + func clickPercent() { + print("%") + } + + func clickInversion() { + print("+/-") + } + + func clickAllClear() { + print("AC") + } } diff --git a/AndroidCalculator/ViewController.swift b/AndroidCalculator/ViewController.swift index 0bb566a..9c68297 100644 --- a/AndroidCalculator/ViewController.swift +++ b/AndroidCalculator/ViewController.swift @@ -22,6 +22,42 @@ class ViewController: UIViewController { calculator.clickNumber(number) } + @IBAction func clickDotButton(_ sender: UIButton) { + calculator.clickDot() + } + + @IBAction func clickEquationButton(_ sender: UIButton) { + calculator.clickEquation() + } + + @IBAction func clickPlusButton(_ sender: UIButton) { + calculator.clickPlus() + } + + @IBAction func clickMinusButton(_ sender: UIButton) { + calculator.clickMinus() + } + + @IBAction func clickMultiplicationButton(_ sender: UIButton) { + calculator.clickMultiplication() + } + + @IBAction func clickDivisionButton(_ sender: UIButton) { + calculator.clickDivision() + } + + @IBAction func clickPercentButton(_ sender: UIButton) { + calculator.clickPercent() + } + + @IBAction func clickInversionButton(_ sender: UIButton) { + calculator.clickInversion() + } + + @IBAction func clickAllClearButton(_ sender: UIButton) { + calculator.clickAllClear() + } + override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view.