From 8e0c683bf8aa97daa368df05eb7af5d8ee15b9ce Mon Sep 17 00:00:00 2001
From: Pin Lin <moneycat711@gmail.com>
Date: Wed, 6 May 2020 03:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E6=8C=89=E4=B8=8B=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=8D=B5=E9=A1=AF=E7=A4=BA=E5=87=BA=E4=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AndroidCalculator/Calculator.swift     | 33 ++++++++++++++++++--------
 AndroidCalculator/ViewController.swift | 16 +++++++++++++
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift
index 96821ba..7ef06bf 100644
--- a/AndroidCalculator/Calculator.swift
+++ b/AndroidCalculator/Calculator.swift
@@ -9,43 +9,56 @@
 import Foundation
 
 class Calculator {
+  var formula: String = ""
+  var result: String = ""
+  
   func clickNumber(_ number: Int) {
-    print(number)
+    formula += String(number)
+    result += String(number)
   }
   
   func clickDot() {
-    print(".")
+    formula += "."
+    result += "."
   }
   
   func clickEquation() {
-    print("=")
+    formula += "="
+    result += "="
   }
   
   func clickPlus() {
-    print("+")
+    formula += "+"
+    result += "+"
   }
   
   func clickMinus() {
-    print("-")
+    formula += "-"
+    result += "-"
   }
   
   func clickMultiplication() {
-    print("*")
+    formula += "*"
+    result += "*"
   }
   
   func clickDivision() {
-    print("/")
+    formula += "/"
+    result += "/"
   }
   
   func clickPercent() {
-    print("%")
+    formula += "%"
+    result += "%"
   }
   
   func clickInversion() {
-    print("+/-")
+    formula += "+/-"
+    result += "+/-"
   }
   
   func clickAllClear() {
-    print("AC")
+    formula = ""
+    result = ""
   }
 }
diff --git a/AndroidCalculator/ViewController.swift b/AndroidCalculator/ViewController.swift
index 9c68297..f6dcd78 100644
--- a/AndroidCalculator/ViewController.swift
+++ b/AndroidCalculator/ViewController.swift
@@ -20,42 +20,57 @@ class ViewController: UIViewController {
   @IBAction func clickNumberButton(_ sender: UIButton) {
     let number = numberButtons.firstIndex(of: sender)!
     calculator.clickNumber(number)
+    updateFormulaAndResult()
   }
   
   @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() {
+    formulaLabel.text = calculator.formula
+    resultLabel.text = calculator.result
   }
   
   override func viewDidLoad() {
@@ -63,6 +78,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()
   }