v 1.4.1 fix ColorPicker bugs

dillidon · Jan 31, 2018 · 482d080 · 482d080
1 parent 5ff858b
commit 482d080
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/Example/Resources/Main.storyboard b/Example/Resources/Main.storyboard
@@ -32,27 +32,27 @@
                                             <constraint firstAttribute="width" constant="200" id="uoT-0W-8CS"/>
                                         </constraints>
                                         <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="24"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="circleCorner" value="NO"/>
+                                            <userDefinedRuntimeAttribute type="boolean" keyPath="circleCorner" value="YES"/>
                                             <userDefinedRuntimeAttribute type="size" keyPath="shadowOffset">
-                                                <size key="value" width="0.0" height="6"/>
+                                                <size key="value" width="1" height="5"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
                                                 <real key="value" value="0.40000000000000002"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="shadowShouldRasterize" value="YES"/>
                                             <userDefinedRuntimeAttribute type="number" keyPath="shadowRadius">
-                                                <real key="value" value="12"/>
+                                                <real key="value" value="14"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="shadowColor">
+                                                <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="uel-BC-dC0">
                                         <rect key="frame" x="0.0" y="258" width="311" height="148"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0tN-R9-wtT" customClass="GradientSlider" customModule="Alerts_Pickers" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="311" height="36"/>
+                                                <rect key="frame" x="-2" y="-4" width="315" height="44"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="36" id="Q8e-SK-Zzo"/>
                                                 </constraints>
@@ -72,7 +72,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gc1-Bj-h3h" customClass="GradientSlider" customModule="Alerts_Pickers" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="56" width="311" height="36"/>
+                                                <rect key="frame" x="-2" y="52" width="315" height="44"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="36" id="5Eh-kD-PEa"/>
                                                 </constraints>
@@ -93,7 +93,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ES1-8x-tqc" customClass="GradientSlider" customModule="Alerts_Pickers" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="112" width="311" height="36"/>
+                                                <rect key="frame" x="-2" y="108" width="315" height="44"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="36" id="T2U-9b-SvG"/>
                                                 </constraints>

diff --git a/Source/Pickers/Color/ColorPickerViewController.swift b/Source/Pickers/Color/ColorPickerViewController.swift
@@ -15,15 +15,14 @@ extension UIAlertController {
         let buttonSelection = UIAlertAction(title: "Select", style: .default) { action in
             selection?(color)
         }
-        buttonSelection.isEnabled = false
+        buttonSelection.isEnabled = true
 
         let storyboard = UIStoryboard(name: "Main", bundle: nil)
         guard let vc = storyboard.instantiateViewController(withIdentifier: "ColorPicker") as? ColorPickerViewController else { return }
         set(vc: vc)
 
         set(title: color.hexString, font: .systemFont(ofSize: 17), color: color)
         vc.set(color: color) { new in
-            buttonSelection.isEnabled = color != new
             color = new
             self.set(title: color.hexString, font: .systemFont(ofSize: 17), color: color)
         }