Merge pull request #5 from tapglue/new-design

Update default color of follow btn+update biography view
tapglue · Mar 23, 2016 · f7d72fd · f7d72fd
2 parents 09498cd + 819f29c
commit f7d72fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/Pod/Classes/internal/Config.swift b/Pod/Classes/internal/Config.swift
@@ -54,10 +54,10 @@ class FollowButtonConfig {
 
     init() {
         notFollowed = UIColor.whiteColor()
-        notFollowedText = UIColor.blackColor()
-        followed = UIColor.colorFromHexString("#4A4A4A")
+        notFollowedText = UIColor.colorFromHexString("#007AFF")
+        followed = UIColor.colorFromHexString("#007AFF")
         followedText = UIColor.whiteColor()
-        border = UIColor.colorFromHexString("#979797")
+        border = UIColor.colorFromHexString("#007AFF")
     }
 
     init(notFollowed: UIColor, notFollowedText: UIColor, followed: UIColor, followedText: UIColor, border: UIColor) {

diff --git a/Pod/Classes/views/ProfileBiographyView.xib b/Pod/Classes/views/ProfileBiographyView.xib
@@ -26,18 +26,18 @@
                                 </constraints>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y9p-CM-mTh" userLabel="nameview">
-                                <rect key="frame" x="108" y="24" width="369" height="50"/>
+                                <rect key="frame" x="108" y="24" width="445" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c8g-xq-iJ6">
-                                        <rect key="frame" x="0.0" y="30" width="369" height="20"/>
+                                        <rect key="frame" x="0.0" y="30" width="445" height="20"/>
                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                         <color key="textColor" red="0.5490196078431373" green="0.5490196078431373" blue="0.5490196078431373" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="full name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PoL-sF-fPv" userLabel="fullname">
-                                        <rect key="frame" x="0.0" y="0.0" width="369" height="24"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="445" height="24"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -52,13 +52,6 @@
                                     <constraint firstAttribute="bottom" secondItem="c8g-xq-iJ6" secondAttribute="bottom" id="uC2-av-L8F"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cPk-aQ-Z3c" customClass="FollowButton" customModule="elements" customModuleProvider="target">
-                                <rect key="frame" x="485" y="34" width="80" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="80" id="DbR-sg-pN1"/>
-                                </constraints>
-                                <state key="normal" title="Follow"/>
-                            </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BxH-EM-N1J" userLabel="countContainer">
                                 <rect key="frame" x="0.0" y="134" width="573" height="50"/>
                                 <subviews>
@@ -132,6 +125,13 @@
                                     <constraint firstAttribute="trailing" secondItem="iiC-90-erM" secondAttribute="trailing" id="v9x-1i-Yot"/>
                                 </constraints>
                             </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cPk-aQ-Z3c" customClass="FollowButton" customModule="elements" customModuleProvider="target">
+                                <rect key="frame" x="108" y="86" width="100" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="100" id="DbR-sg-pN1"/>
+                                </constraints>
+                                <state key="normal" title="Follow"/>
+                            </button>
                         </subviews>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="BxH-EM-N1J" secondAttribute="trailing" id="6l3-eX-23d"/>
@@ -140,8 +140,12 @@
                             <constraint firstItem="y9p-CM-mTh" firstAttribute="leading" secondItem="9Pi-iQ-nkL" secondAttribute="trailing" constant="8" symbolic="YES" id="AKv-tn-Wfe"/>
                             <constraint firstItem="y9p-CM-mTh" firstAttribute="leading" secondItem="9Pi-iQ-nkL" secondAttribute="leading" id="C4u-eg-k90"/>
                             <constraint firstAttribute="trailing" secondItem="cPk-aQ-Z3c" secondAttribute="trailing" constant="8" id="EmD-RK-1g2"/>
+                            <constraint firstItem="cPk-aQ-Z3c" firstAttribute="leading" secondItem="9Pi-iQ-nkL" secondAttribute="trailing" constant="8" id="Fcn-ev-PU1"/>
+                            <constraint firstAttribute="trailing" secondItem="y9p-CM-mTh" secondAttribute="trailing" constant="20" symbolic="YES" id="I4v-eJ-ZfM"/>
                             <constraint firstItem="BxH-EM-N1J" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="IMc-05-w1Q"/>
                             <constraint firstItem="cPk-aQ-Z3c" firstAttribute="leading" secondItem="y9p-CM-mTh" secondAttribute="trailing" constant="8" symbolic="YES" id="LGv-JV-vyl"/>
+                            <constraint firstItem="cPk-aQ-Z3c" firstAttribute="baseline" secondItem="9Pi-iQ-nkL" secondAttribute="baseline" id="LOg-QY-Gmd"/>
+                            <constraint firstItem="cPk-aQ-Z3c" firstAttribute="bottom" secondItem="9Pi-iQ-nkL" secondAttribute="bottom" id="No2-YO-irn"/>
                             <constraint firstItem="9Pi-iQ-nkL" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="T1b-kN-F39"/>
                             <constraint firstItem="cPk-aQ-Z3c" firstAttribute="centerY" secondItem="y9p-CM-mTh" secondAttribute="centerY" id="UfG-Nl-ZpL"/>
                             <constraint firstAttribute="bottom" secondItem="BxH-EM-N1J" secondAttribute="bottom" id="dVD-R6-Ojv"/>
@@ -150,6 +154,10 @@
                         <variation key="default">
                             <mask key="constraints">
                                 <exclude reference="C4u-eg-k90"/>
+                                <exclude reference="EmD-RK-1g2"/>
+                                <exclude reference="LGv-JV-vyl"/>
+                                <exclude reference="LOg-QY-Gmd"/>
+                                <exclude reference="UfG-Nl-ZpL"/>
                             </mask>
                         </variation>
                     </view>