From c9445dd5e7727e2c535c275aed0af06396d9bb77 Mon Sep 17 00:00:00 2001
From: Pin Lin <moneycat711@gmail.com>
Date: Tue, 5 May 2020 00:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E9=81=8E=E7=A8=8B=E7=AE=97?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E7=B5=90=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AndroidCalculator/Base.lproj/Main.storyboard | 18 ++++++++++++++++++
 AndroidCalculator/ViewController.swift       |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/AndroidCalculator/Base.lproj/Main.storyboard b/AndroidCalculator/Base.lproj/Main.storyboard
index 9089d86..0769092 100644
--- a/AndroidCalculator/Base.lproj/Main.storyboard
+++ b/AndroidCalculator/Base.lproj/Main.storyboard
@@ -197,6 +197,22 @@
                             <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hLf-ut-UVB">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="204"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="7" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HLr-pN-Kn5">
+                                        <rect key="frame" x="25" y="132" width="324" height="39"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="32"/>
+                                        <color key="textColor" systemColor="systemGrayColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="1+2×3" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hBk-3O-ze9">
+                                        <rect key="frame" x="25" y="73" width="324" height="51"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="42"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </view>
                         </subviews>
@@ -205,6 +221,8 @@
                     </view>
                     <connections>
                         <outlet property="borderView" destination="srp-dc-mcA" id="ETm-Yj-q7C"/>
+                        <outlet property="formulaLabel" destination="hBk-3O-ze9" id="dZb-Wh-Z9j"/>
+                        <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="nAR-KS-hdA" collectionClass="NSMutableArray" id="BPw-Wl-WA0"/>
                         <outletCollection property="numberButtons" destination="kDf-qC-jcV" collectionClass="NSMutableArray" id="DW5-pD-IzB"/>
diff --git a/AndroidCalculator/ViewController.swift b/AndroidCalculator/ViewController.swift
index 6e7550a..741e6b5 100644
--- a/AndroidCalculator/ViewController.swift
+++ b/AndroidCalculator/ViewController.swift
@@ -11,6 +11,8 @@ import UIKit
 class ViewController: UIViewController {
 
   @IBOutlet weak var borderView: UIView!
+  @IBOutlet weak var formulaLabel: UILabel!
+  @IBOutlet weak var resultLabel: UILabel!
   @IBOutlet var numberButtons: [UIButton]!
   
   @IBAction func clickNumberButton(_ sender: UIButton) {