add icon

diff --git a/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib b/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib
index a3ae1269b6c3bdd3c80a100e779a6f07982ec7f4..816612e0b5bd2e923e5405c86e2cca238158772b 100644 (file)
--- a/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib
+++ b/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib
@@ -25,7 +25,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="👻" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sT9-gH-fBt">
-                    <rect key="frame" x="182" y="282" width="118" height="30"/>
+                    <rect key="frame" x="182" y="251" width="118" height="114"/>
                     <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="128"/>

diff --git a/tools/AceBox/AceBox/Base.lproj/Main.storyboard b/tools/AceBox/AceBox/Base.lproj/Main.storyboard
index b4e79b327a806cc526b79a8a867aba00853c54c3..43bf3aac5e0c96486f44784def996c41c0e96844 100644 (file)
--- a/tools/AceBox/AceBox/Base.lproj/Main.storyboard
+++ b/tools/AceBox/AceBox/Base.lproj/Main.storyboard
@@ -5,7 +5,7 @@
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
     </dependencies>
     <scenes>
-        <!--First-->
+        <!--Ace-->
         <scene sceneID="hNz-n2-bh7">
             <objects>
                 <viewController id="9pv-A4-QxB" customClass="FirstViewController" customModule="AceBox" customModuleProvider="target" sceneMemberID="viewController">
@@ -18,14 +18,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" text="赵彦柏" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="KQZ-1w-vlD">
-                                <rect key="frame" x="221" y="278" width="157.5" height="42"/>
+                                <rect key="frame" x="221" y="278" width="158" height="42"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="36"/>
                                 <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Loaded by FirstViewController" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A5M-7J-77L">
-                                <rect key="frame" x="203" y="327" width="194.5" height="17"/>
+                                <rect key="frame" x="203" y="327" width="195" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -39,13 +39,13 @@
                             <constraint firstAttribute="centerY" secondItem="KQZ-1w-vlD" secondAttribute="centerY" id="exm-UA-ej4"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="First" image="first" id="acW-dT-cKf" propertyAccessControl="none"/>
+                    <tabBarItem key="tabBarItem" title="Ace" image="HeadHL" id="acW-dT-cKf" propertyAccessControl="none"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="W5J-7L-Pyd" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="605" y="-1114"/>
         </scene>
-        <!--Second-->
+        <!--Puppy-->
         <scene sceneID="wg7-f3-ORb">
             <objects>
                 <viewController id="8rJ-Kc-sve" customClass="SecondViewController" customModule="AceBox" customModuleProvider="target" sceneMemberID="viewController">
@@ -79,12 +79,50 @@
                             <constraint firstAttribute="centerY" secondItem="zEq-FU-wV5" secondAttribute="centerY" id="qzY-Ky-pLD"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Second" image="second" id="cPa-gy-q4n"/>
+                    <tabBarItem key="tabBarItem" title="Puppy" image="MsgBubbleHL" id="cPa-gy-q4n"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4Nw-L8-lE0" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="605" y="-383"/>
         </scene>
+        <!--Origin-->
+        <scene sceneID="i4U-8R-4wd">
+            <objects>
+                <viewController id="jmD-Pu-qTM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="DLs-VT-Hhw"/>
+                        <viewControllerLayoutGuide type="bottom" id="QNW-MS-DZf"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Blk-xb-rOq">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Raa-Jl-0dF" userLabel="TextContainer">
+                                <rect key="frame" x="150" y="300" width="300" height="180"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            </view>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="HeadImg" translatesAutoresizingMaskIntoConstraints="NO" id="R4n-8M-7o5">
+                                <rect key="frame" x="180" y="83" width="240" height="128"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="300" id="4we-zg-mRc"/>
+                                    <constraint firstAttribute="height" constant="180" id="c5X-Wo-Cm4"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstItem="Raa-Jl-0dF" firstAttribute="top" secondItem="R4n-8M-7o5" secondAttribute="bottom" constant="10" id="Lgh-nr-xyJ"/>
+                            <constraint firstItem="R4n-8M-7o5" firstAttribute="top" secondItem="DLs-VT-Hhw" secondAttribute="bottom" constant="42" id="N3x-BZ-WaD"/>
+                            <constraint firstItem="Raa-Jl-0dF" firstAttribute="centerX" secondItem="Blk-xb-rOq" secondAttribute="centerX" id="Z1s-l0-rms"/>
+                            <constraint firstItem="R4n-8M-7o5" firstAttribute="centerX" secondItem="Blk-xb-rOq" secondAttribute="centerX" id="gHA-rE-dgb"/>
+                        </constraints>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Origin" image="DiscoverHL" id="uzD-Rq-djR"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9d0-jo-47d" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="572" y="493"/>
+        </scene>
         <!--Tab Bar Controller-->
         <scene sceneID="yl2-sM-qoP">
             <objects>
@@ -104,6 +142,7 @@
                     <connections>
                         <segue destination="9pv-A4-QxB" kind="relationship" relationship="viewControllers" id="u7Y-xg-7CH"/>
                         <segue destination="8rJ-Kc-sve" kind="relationship" relationship="viewControllers" id="lzU-1b-eKA"/>
+                        <segue destination="jmD-Pu-qTM" kind="relationship" relationship="viewControllers" id="X5O-5K-yR5"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="HuB-VB-40B" sceneMemberID="firstResponder"/>
@@ -112,8 +151,10 @@
         </scene>
     </scenes>
     <resources>
-        <image name="first" width="30" height="30"/>
-        <image name="second" width="30" height="30"/>
+        <image name="DiscoverHL" width="23" height="23"/>
+        <image name="HeadHL" width="23" height="23"/>
+        <image name="HeadImg" width="1159" height="1160"/>
+        <image name="MsgBubbleHL" width="25" height="23"/>
     </resources>
     <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
 </document>

diff --git a/tools/AceBox/AceBox/Images.xcassets/Contents.json b/tools/AceBox/AceBox/Images.xcassets/Contents.json
new file mode 100644 (file)
index 0000000..da4a164
--- /dev/null
+++ b/tools/AceBox/AceBox/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

diff --git a/tools/AceBox/AceBox/Images.xcassets/GO.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/GO.imageset/Contents.json
new file mode 100644 (file)
index 0000000..17dd500
--- /dev/null
+++ b/tools/AceBox/AceBox/Images.xcassets/GO.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "frontpage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

diff --git a/tools/AceBox/AceBox/Images.xcassets/HeadImg.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/HeadImg.imageset/Contents.json
new file mode 100644 (file)
index 0000000..e98bfe2
--- /dev/null
+++ b/tools/AceBox/AceBox/Images.xcassets/HeadImg.imageset/Contents.json
@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "IMG_4358 copy.JPG",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

diff --git a/tools/AceBox/AceBox/Images.xcassets/head.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/head.imageset/Contents.json
index 614b44ab960301d725e7109a532aebd962b9e88f..f04e7ed2e3be80923ef2b63e29c555254025d5ee 100644 (file)
--- a/tools/AceBox/AceBox/Images.xcassets/head.imageset/Contents.json
+++ b/tools/AceBox/AceBox/Images.xcassets/head.imageset/Contents.json
@@ -2,15 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "head.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "tabbar_me@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "tabbar_me@3x.png",
       "scale" : "3x"
     }
   ],

diff --git a/tools/AceBox/AceBox/Images.xcassets/head.imageset/head.png b/tools/AceBox/AceBox/Images.xcassets/head.imageset/head.png
deleted file mode 100644 (file)
index 86621a2..0000000
Binary files a/tools/AceBox/AceBox/Images.xcassets/head.imageset/head.png and /dev/null differ