PinLin/AndroidCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

把原本 formula 改名成 process

Browse Source
This commit is contained in:
Pin Lin
2020-05-06 05:48:30 +08:00
parent 5f66025658
commit aa3277628a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidCalculator/Base.lproj/Main.storyboard
View File

@@ -246,7 +246,7 @@
</view> </view>
<connections> <connections>
<outlet property="borderView" destination="srp-dc-mcA" id="ETm-Yj-q7C"/> <outlet property="borderView" destination="srp-dc-mcA" id="ETm-Yj-q7C"/>
<outlet property="formulaLabel" destination="hBk-3O-ze9" id="dZb-Wh-Z9j"/> <outlet property="processLabel" destination="hBk-3O-ze9" id="dZb-Wh-Z9j"/>
<outlet property="resultLabel" destination="HLr-pN-Kn5" id="xna-3f-s3J"/> <outlet property="resultLabel" destination="HLr-pN-Kn5" id="xna-3f-s3J"/>
<outletCollection property="numberButtons" destination="iKJ-gm-pgJ" collectionClass="NSMutableArray" id="pku-qD-GzX"/> <outletCollection property="numberButtons" destination="iKJ-gm-pgJ" collectionClass="NSMutableArray" id="pku-qD-GzX"/>
<outletCollection property="numberButtons" destination="nAR-KS-hdA" collectionClass="NSMutableArray" id="BPw-Wl-WA0"/> <outletCollection property="numberButtons" destination="nAR-KS-hdA" collectionClass="NSMutableArray" id="BPw-Wl-WA0"/>

6
AndroidCalculator/Calculator.swift
View File

@@ -9,14 +9,14 @@
import Foundation import Foundation
class Calculator { class Calculator {
var formula = "" var process = ""
var result = "" var result = ""
func click(_ text: String) { func click(_ text: String) {
if text == "AC" { if text == "AC" {
formula = "" process = ""
} else { } else {
formula += text process += text
} }
} }
} }

4
AndroidCalculator/ViewController.swift
View File

@@ -11,7 +11,7 @@ import UIKit
class ViewController: UIViewController { class ViewController: UIViewController {
@IBOutlet weak var borderView: UIView! @IBOutlet weak var borderView: UIView!
@IBOutlet weak var formulaLabel: UILabel! @IBOutlet weak var processLabel: UILabel!
@IBOutlet weak var resultLabel: UILabel! @IBOutlet weak var resultLabel: UILabel!
@IBOutlet var numberButtons: [UIButton]! @IBOutlet var numberButtons: [UIButton]!
@@ -23,7 +23,7 @@ class ViewController: UIViewController {
} }
func updateView() { func updateView() {
formulaLabel.text = calculator.formula processLabel.text = calculator.process
resultLabel.text = calculator.result resultLabel.text = calculator.result
} }