From 194ac0aeec89276355e53125ba120b5d91c823de Mon Sep 17 00:00:00 2001
From: ylzheng <yunl.zheng@gmail.com>
Date: Sun, 1 Nov 2015 16:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 librx/Base.lproj/Main.storyboard          | 18 +++++++++---------
 librx/ExploreCollectionReusableView.swift |  3 ---
 librx/ExploreTableViewController.swift    |  4 +++-
 librx/StorysTableViewController.swift     |  3 +--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/librx/Base.lproj/Main.storyboard b/librx/Base.lproj/Main.storyboard
index 5bfe64c..1a39872 100644
--- a/librx/Base.lproj/Main.storyboard
+++ b/librx/Base.lproj/Main.storyboard
@@ -978,7 +978,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default" translatesAutoresizingMaskIntoConstraints="NO" id="R6A-Ti-2a4">
-                                            <rect key="frame" x="8" y="18" width="50" height="50"/>
+                                            <rect key="frame" x="13" y="18" width="50" height="50"/>
                                             <animations/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="50" id="5t6-ae-vF1"/>
@@ -986,13 +986,13 @@
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y7z-Tx-VxF">
-                                            <rect key="frame" x="71" y="18" width="511" height="19"/>
+                                            <rect key="frame" x="76" y="18" width="506" height="19.5"/>
                                             <animations/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="250" id="iN7-nL-Gx4"/>
                                             </constraints>
-                                            <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="16"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="16"/>
+                                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                             <variation key="default">
                                                 <mask key="constraints">
@@ -1001,13 +1001,13 @@
                                             </variation>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xu5-wb-ckw">
-                                            <rect key="frame" x="71" y="44" width="511" height="12"/>
+                                            <rect key="frame" x="76" y="47.5" width="506" height="12"/>
                                             <animations/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="200" id="ik9-js-Hq3"/>
                                             </constraints>
                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="10"/>
-                                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                             <variation key="default">
                                                 <mask key="constraints">
@@ -1022,8 +1022,8 @@
                                         <constraint firstItem="R6A-Ti-2a4" firstAttribute="centerY" secondItem="HbO-0j-EsW" secondAttribute="centerY" constant="3.25" id="9Be-MX-Igz"/>
                                         <constraint firstAttribute="trailingMargin" secondItem="Y7z-Tx-VxF" secondAttribute="trailing" constant="10" id="9hl-TV-MAD"/>
                                         <constraint firstItem="Y7z-Tx-VxF" firstAttribute="leading" secondItem="R6A-Ti-2a4" secondAttribute="trailing" constant="13" id="BZc-oP-DTI"/>
-                                        <constraint firstAttribute="leadingMargin" secondItem="R6A-Ti-2a4" secondAttribute="leading" id="GwL-pK-1IG"/>
-                                        <constraint firstItem="Xu5-wb-ckw" firstAttribute="top" secondItem="Y7z-Tx-VxF" secondAttribute="bottom" constant="7.5" id="a6z-Dj-ewo"/>
+                                        <constraint firstAttribute="leadingMargin" secondItem="R6A-Ti-2a4" secondAttribute="leading" constant="-5" id="GwL-pK-1IG"/>
+                                        <constraint firstItem="Xu5-wb-ckw" firstAttribute="top" secondItem="Y7z-Tx-VxF" secondAttribute="bottom" constant="10" id="a6z-Dj-ewo"/>
                                         <constraint firstAttribute="trailingMargin" secondItem="Xu5-wb-ckw" secondAttribute="trailing" constant="10" id="c1u-wW-Pq1"/>
                                         <constraint firstItem="Xu5-wb-ckw" firstAttribute="leading" secondItem="Y7z-Tx-VxF" secondAttribute="leading" id="hRr-Jr-OA0"/>
                                         <constraint firstItem="Y7z-Tx-VxF" firstAttribute="top" secondItem="R6A-Ti-2a4" secondAttribute="top" id="jW5-HE-xPr"/>
@@ -1775,7 +1775,7 @@
         <image name="profile_bg1" width="1078" height="449"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="dIc-VY-jD3"/>
         <segue reference="cuN-Eg-MZE"/>
+        <segue reference="dIc-VY-jD3"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/librx/ExploreCollectionReusableView.swift b/librx/ExploreCollectionReusableView.swift
index 140904b..db89a47 100644
--- a/librx/ExploreCollectionReusableView.swift
+++ b/librx/ExploreCollectionReusableView.swift
@@ -78,8 +78,6 @@ class ExploreCollectionViewController: UICollectionViewController, UICollectionV
         cell.frame.size.width = screenWidth / 3
         cell.frame.size.height = screenWidth / 3
         
-        // cornerRadius
-        
         // mark cell content
         let explore: Explore = explores[indexPath.row]
         cell.nameLabel.text = explore.name
@@ -90,7 +88,6 @@ class ExploreCollectionViewController: UICollectionViewController, UICollectionV
         cell.iconImage.layer.cornerRadius = cell.iconImage.frame.width / 2
         cell.iconImage.clipsToBounds = true
         cell.iconImage.layer.borderWidth = 1
-        cell.iconImage.sizeToFit()
         cell.iconImage.layer.borderColor = UIColor.lightGrayColor().CGColor
         
         return cell
diff --git a/librx/ExploreTableViewController.swift b/librx/ExploreTableViewController.swift
index 343afa8..5e5e817 100644
--- a/librx/ExploreTableViewController.swift
+++ b/librx/ExploreTableViewController.swift
@@ -21,6 +21,7 @@ class ExploreTableViewController: UITableViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+
     }
     
     override func viewDidAppear(animated: Bool) {
@@ -98,6 +99,7 @@ class ExploreTableViewController: UITableViewController {
     
         }else {
             self.tableView.separatorStyle = UITableViewCellSeparatorStyle.SingleLine;
+            self.tableView.backgroundView = nil
             return 1;
         }
         return 0;
@@ -140,7 +142,7 @@ class ExploreTableViewController: UITableViewController {
         cell.sourceImg.layer.cornerRadius = cell.sourceImg.frame.size.width / 2
         cell.sourceImg.clipsToBounds = true
         cell.sourceImg.layer.borderWidth = 1
-        cell.sourceImg.layer.borderColor = UIColor.blackColor().CGColor
+        cell.sourceImg.layer.borderColor = UIColor.grayColor().CGColor
         
         cell.descriptionLabel.text = source.description
         
diff --git a/librx/StorysTableViewController.swift b/librx/StorysTableViewController.swift
index 00d383c..2896a5d 100644
--- a/librx/StorysTableViewController.swift
+++ b/librx/StorysTableViewController.swift
@@ -39,8 +39,7 @@ class StorysTableViewController: UITableViewController {
         self.refreshControl?.attributedTitle = NSAttributedString(string: "下拉可以刷新数据")
         self.refreshControl?.tintColor = UIColor(red: 46/255.0, green: 204/255.0, blue: 113/255.0, alpha: 1.0)
         self.refreshControl?.addTarget(self, action: "refresh", forControlEvents: .ValueChanged)
-        self.refreshControl?.backgroundColor = UIColor.clearColor()
-        
+        self.refreshControl?.backgroundColor = UIColor.lightGrayColor()
        
         
         self.tableView.addSubview(refreshControl!)