Merge pull request #4 from ykyouhei/fix-button-color

Fix button color
ykyouhei · Aug 14, 2015 · 6923cb2 · 6923cb2
2 parents f8a3a47 + befd0af
commit 6923cb2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/Classes/KYShutterButton.swift b/Classes/KYShutterButton.swift
@@ -53,7 +53,7 @@ public class KYShutterButton: UIButton {
 
     @IBInspectable public var buttonColor: UIColor = UIColor.redColor() {
         didSet {
-            _circleLayer.backgroundColor = buttonColor.CGColor
+            _circleLayer.fillColor = buttonColor.CGColor
         }
     }
 

diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -119,17 +119,6 @@
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1up-oe-NtX" customClass="KYShutterButton" customModule="Example" customModuleProvider="target">
-                                <rect key="frame" x="16" y="20" width="100" height="100"/>
-                                <state key="normal" title="Button">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="color" keyPath="buttonColor">
-                                        <color key="value" red="1" green="0.94645378020000004" blue="0.2725811977" alpha="1" colorSpace="calibratedRGB"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </button>
                         </subviews>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>

diff --git a/KYShutterButton.podspec b/KYShutterButton.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "KYShutterButton"
-  s.version      = "1.0.0"
+  s.version      = "1.0.1"
   s.summary      = "KYShutterButton is a custom button that is similar to the shutter button of the camera app"
   s.homepage     = "https://github.com/ykyouhei/KYShutterButton"
   s.license      = "MIT"