Add/edit bean collection has now received changes, UI-wise.

3 files changed, 35 insertions, 37 deletions

diff --git a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
index 92f82a3..601cbfa 100644
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iBean/iBean/BeanCollectionExtractionViewController.m b/iBean/iBean/BeanCollectionExtractionViewController.m
index 2670f29..84d058e 100644
--- a/iBean/iBean/BeanCollectionExtractionViewController.m
+++ b/iBean/iBean/BeanCollectionExtractionViewController.m
@@ -192,7 +192,6 @@
                                                                    self.extractionTimerView.frame.size.width,
                                                                    self.extractionTimerView.frame.size.height);
                        //Remove shadow
-                       //[self.extractionTimerView.layer setShadowOpacity:0.0];
                        [self.extractionTimerView.layer setShadowRadius:0.0];
                        [self.extractionTimerView.layer setShadowOffset:CGSizeMake(0.0, 0.0)];
                      }
diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard
index 5ac8ac0..6086ee1 100644
--- a/iBean/iBean/iPhoneStoryboard.storyboard
+++ b/iBean/iBean/iPhoneStoryboard.storyboard
@@ -653,7 +653,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JHg-Fk-IL0">
-                                        <color key="backgroundColor" red="0.6845703125" green="0.58594199899999999" blue="0.51132836960000005" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="368" id="eyQ-2Q-yaW"/>
                                         </constraints>
@@ -685,7 +685,7 @@
                                 </connections>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.91372549530000002" green="0.89803922179999995" blue="0.87450981139999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="gb9-GM-dee" firstAttribute="leading" secondItem="clg-Db-36O" secondAttribute="leading" type="default" id="9qK-8n-oWN"/>
                             <constraint firstItem="gb9-GM-dee" firstAttribute="top" secondItem="clg-Db-36O" secondAttribute="top" type="default" id="EW6-TS-V1S"/>
@@ -770,7 +770,7 @@
                                 <color key="tintColor" red="0.45358338650000002" green="0.35254074499999999" blue="0.2925220067" alpha="1" colorSpace="calibratedRGB"/>
                             </toolbar>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="6cY-dj-XP0" firstAttribute="top" secondItem="bW3-E7-UoQ" secondAttribute="bottom" type="default" id="Ake-zY-ggk"/>
                             <constraint firstItem="6cY-dj-XP0" firstAttribute="bottom" secondItem="2kX-jW-aIG" secondAttribute="bottom" type="default" id="DQ7-6h-Ix5"/>
@@ -861,24 +861,24 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.91372549530000002" green="0.89803922179999995" blue="0.87450981139999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="o6F-sa-dYn" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="144" id="0v6-kO-Mri"/>
-                            <constraint firstItem="blJ-S2-uV9" firstAttribute="top" secondItem="3Yp-lm-I9K" secondAttribute="top" constant="119" id="37C-JE-2LQ"/>
-                            <constraint firstItem="bUi-2X-Nne" firstAttribute="leading" secondItem="Tbo-8t-W22" secondAttribute="leading" type="default" id="BTS-CE-WSI"/>
+                            <constraint firstItem="blJ-S2-uV9" firstAttribute="top" secondItem="3Yp-lm-I9K" secondAttribute="top" constant="94" id="2PS-XI-D0S"/>
+                            <constraint firstItem="qb5-I0-339" firstAttribute="leading" secondItem="bUi-2X-Nne" secondAttribute="leading" type="default" id="HIP-OX-N5b"/>
+                            <constraint firstItem="qb5-I0-339" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="14" id="IVh-Rz-p0a"/>
                             <constraint firstAttribute="trailing" secondItem="blJ-S2-uV9" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Kql-Pp-MaV"/>
                             <constraint firstItem="GEQ-Pg-YlJ" firstAttribute="top" secondItem="Tbo-8t-W22" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="L52-kL-FXZ"/>
-                            <constraint firstAttribute="trailing" secondItem="bIT-x3-0cE" secondAttribute="trailing" constant="25" id="MFr-eH-Gd5"/>
-                            <constraint firstItem="qb5-I0-339" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="VXd-tb-OoD"/>
-                            <constraint firstItem="bUi-2X-Nne" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="14" id="WFp-1i-ucU"/>
+                            <constraint firstAttribute="trailing" secondItem="bIT-x3-0cE" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="LLq-Ib-lSq"/>
+                            <constraint firstItem="bIT-x3-0cE" firstAttribute="top" secondItem="3Yp-lm-I9K" secondAttribute="top" constant="145" id="MgJ-Ge-tpg"/>
                             <constraint firstItem="nPM-k1-zYG" firstAttribute="centerY" secondItem="bIT-x3-0cE" secondAttribute="centerY" type="default" id="b9z-GH-iLZ"/>
-                            <constraint firstItem="Tbo-8t-W22" firstAttribute="top" secondItem="3Yp-lm-I9K" secondAttribute="top" constant="20" symbolic="YES" type="default" id="dbh-vK-IP0"/>
+                            <constraint firstItem="GEQ-Pg-YlJ" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="13" id="eeB-Wj-g9g"/>
                             <constraint firstItem="nPM-k1-zYG" firstAttribute="baseline" secondItem="bUi-2X-Nne" secondAttribute="baseline" type="default" id="fc6-DV-eht"/>
                             <constraint firstItem="o6F-sa-dYn" firstAttribute="baseline" secondItem="qb5-I0-339" secondAttribute="baseline" type="default" id="gTY-0N-LM6"/>
+                            <constraint firstItem="Tbo-8t-W22" firstAttribute="top" secondItem="3Yp-lm-I9K" secondAttribute="top" constant="11" id="kIq-tL-GTW"/>
                             <constraint firstItem="nPM-k1-zYG" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="145" id="mwi-L1-YFq"/>
+                            <constraint firstItem="qb5-I0-339" firstAttribute="leading" secondItem="Tbo-8t-W22" secondAttribute="leading" type="default" id="qcr-xJ-W4R"/>
                             <constraint firstItem="o6F-sa-dYn" firstAttribute="centerY" secondItem="blJ-S2-uV9" secondAttribute="centerY" type="default" id="sQk-uG-tQj"/>
-                            <constraint firstItem="GEQ-Pg-YlJ" firstAttribute="leading" secondItem="3Yp-lm-I9K" secondAttribute="leading" constant="13" id="tPV-Xw-rMr"/>
-                            <constraint firstItem="bIT-x3-0cE" firstAttribute="top" secondItem="3Yp-lm-I9K" secondAttribute="top" constant="216" id="wFC-kX-wJz"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Edit bean" id="A3D-NS-DOt">
@@ -908,7 +908,7 @@
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extraction time (s):" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9UJ-bM-UDb">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extraction time:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9UJ-bM-UDb">
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
@@ -918,24 +918,25 @@
                                     <action selector="extractionSettingStepperChanged:" destination="49F-vz-WhB" eventType="valueChanged" id="Tht-18-lS4"/>
                                 </connections>
                             </stepper>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="25" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i9j-PQ-aof">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="25.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i9j-PQ-aof">
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="53" id="DUG-g4-TU9"/>
+                                    <constraint firstAttribute="height" constant="53" id="qSm-wm-WhR"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="56"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.91372549530000002" green="0.89803922179999995" blue="0.87450981139999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="i9j-PQ-aof" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="2xC-sO-L9h"/>
-                            <constraint firstItem="9UJ-bM-UDb" firstAttribute="leading" secondItem="GTi-kB-GK2" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="5UN-Uy-aQs"/>
-                            <constraint firstAttribute="trailing" secondItem="lvU-0d-qF1" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="6fg-Fx-0Pd"/>
-                            <constraint firstItem="i9j-PQ-aof" firstAttribute="centerY" secondItem="GTi-kB-GK2" secondAttribute="centerY" type="default" id="7nq-6z-IXL"/>
-                            <constraint firstItem="lvU-0d-qF1" firstAttribute="centerY" secondItem="9UJ-bM-UDb" secondAttribute="centerY" type="default" id="EAd-v0-Y2F"/>
-                            <constraint firstItem="i9j-PQ-aof" firstAttribute="leading" secondItem="GTi-kB-GK2" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="XSM-26-umw"/>
-                            <constraint firstItem="9UJ-bM-UDb" firstAttribute="top" secondItem="GTi-kB-GK2" secondAttribute="top" constant="20" symbolic="YES" type="default" id="pCN-6g-bUX"/>
+                            <constraint firstAttribute="trailing" secondItem="i9j-PQ-aof" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Ase-kp-PEp"/>
+                            <constraint firstAttribute="trailing" secondItem="9UJ-bM-UDb" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Nkh-Rs-JVg"/>
+                            <constraint firstItem="9UJ-bM-UDb" firstAttribute="top" secondItem="GTi-kB-GK2" secondAttribute="top" constant="20" symbolic="YES" type="default" id="WUo-m5-twe"/>
+                            <constraint firstItem="i9j-PQ-aof" firstAttribute="top" secondItem="9UJ-bM-UDb" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="dvI-vv-uWe"/>
+                            <constraint firstItem="9UJ-bM-UDb" firstAttribute="leading" secondItem="GTi-kB-GK2" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="k3b-r1-86x"/>
+                            <constraint firstItem="lvU-0d-qF1" firstAttribute="top" secondItem="i9j-PQ-aof" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="rze-8x-OSs"/>
+                            <constraint firstItem="i9j-PQ-aof" firstAttribute="leading" secondItem="GTi-kB-GK2" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="xG0-CS-9Hq"/>
+                            <constraint firstItem="lvU-0d-qF1" firstAttribute="centerX" secondItem="i9j-PQ-aof" secondAttribute="centerX" type="default" id="zr7-99-yzH"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Extraction (3/3)" id="rnS-KT-Ugg">
@@ -968,9 +969,6 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter descriptive name for the bean" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Agc-Md-Eqn">
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="281" id="WQ1-oe-YTn"/>
-                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/>
                                 <connections>
@@ -1037,26 +1035,27 @@
                                 </items>
                             </navigationBar>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.91372549530000002" green="0.89803922179999995" blue="0.87450981139999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="hHL-o2-clY" firstAttribute="centerY" secondItem="jC3-9l-BMe" secondAttribute="centerY" type="default" id="1sM-7a-reS"/>
                             <constraint firstItem="Agc-Md-Eqn" firstAttribute="centerX" secondItem="hHL-o2-clY" secondAttribute="centerX" type="default" id="2Lt-hI-wPV"/>
                             <constraint firstItem="Kyc-kO-LC1" firstAttribute="centerX" secondItem="ghC-6L-tQj" secondAttribute="centerX" type="default" id="2uH-Fc-EHc"/>
-                            <constraint firstItem="hHL-o2-clY" firstAttribute="baseline" secondItem="xEq-oC-MEA" secondAttribute="baseline" type="default" id="43h-a4-Meu"/>
                             <constraint firstItem="Agc-Md-Eqn" firstAttribute="top" secondItem="9Ya-ar-5en" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="5h5-LQ-Qba"/>
+                            <constraint firstItem="K5g-ln-AQ0" firstAttribute="baseline" secondItem="Kyc-kO-LC1" secondAttribute="baseline" type="default" id="F9h-0p-iIU"/>
                             <constraint firstItem="9Ya-ar-5en" firstAttribute="top" secondItem="ghC-6L-tQj" secondAttribute="top" constant="56" id="LTC-5k-f7U"/>
                             <constraint firstAttribute="trailing" secondItem="Agc-Md-Eqn" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="O1O-Eb-6id"/>
+                            <constraint firstItem="K5g-ln-AQ0" firstAttribute="leading" secondItem="xEq-oC-MEA" secondAttribute="leading" type="default" id="OgE-qE-MZC"/>
+                            <constraint firstItem="xEq-oC-MEA" firstAttribute="baseline" secondItem="hHL-o2-clY" secondAttribute="baseline" type="default" id="QoX-En-jjH"/>
                             <constraint firstItem="Agc-Md-Eqn" firstAttribute="leading" secondItem="9Ya-ar-5en" secondAttribute="leading" type="default" id="Vzr-9t-8rK"/>
                             <constraint firstAttribute="trailing" secondItem="jC3-9l-BMe" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="Wbf-lD-OSk"/>
-                            <constraint firstItem="xEq-oC-MEA" firstAttribute="leading" secondItem="Agc-Md-Eqn" secondAttribute="leading" type="default" id="aFF-rC-Dgh"/>
-                            <constraint firstItem="Kyc-kO-LC1" firstAttribute="baseline" secondItem="K5g-ln-AQ0" secondAttribute="baseline" type="default" id="bZr-bn-25o"/>
+                            <constraint firstItem="jC3-9l-BMe" firstAttribute="top" secondItem="ghC-6L-tQj" secondAttribute="top" constant="189" id="Yz6-Pn-mjE"/>
+                            <constraint firstItem="K5g-ln-AQ0" firstAttribute="leading" secondItem="Agc-Md-Eqn" secondAttribute="leading" type="default" id="aoO-yZ-RdF"/>
                             <constraint firstItem="dAe-1J-Z5P" firstAttribute="top" secondItem="ghC-6L-tQj" secondAttribute="top" type="default" id="bbT-z9-Mlf"/>
-                            <constraint firstItem="K5g-ln-AQ0" firstAttribute="leading" secondItem="ghC-6L-tQj" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="blM-BY-AMC"/>
                             <constraint firstItem="dAe-1J-Z5P" firstAttribute="centerX" secondItem="Agc-Md-Eqn" secondAttribute="centerX" type="default" id="dY6-6N-zm6"/>
+                            <constraint firstItem="K5g-ln-AQ0" firstAttribute="leading" secondItem="ghC-6L-tQj" secondAttribute="leading" constant="19" id="dyZ-la-6ui"/>
                             <constraint firstAttribute="trailing" secondItem="pNd-jx-t84" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="mTh-qS-7lC"/>
-                            <constraint firstItem="Kyc-kO-LC1" firstAttribute="centerY" secondItem="pNd-jx-t84" secondAttribute="centerY" type="default" id="q7g-KI-mpp"/>
-                            <constraint firstAttribute="bottom" secondItem="jC3-9l-BMe" secondAttribute="bottom" constant="185" id="wga-Xo-SQg"/>
-                            <constraint firstItem="pNd-jx-t84" firstAttribute="top" secondItem="ghC-6L-tQj" secondAttribute="top" constant="138" id="zhn-ni-dd4"/>
+                            <constraint firstItem="Kyc-kO-LC1" firstAttribute="centerY" secondItem="pNd-jx-t84" secondAttribute="centerY" type="default" id="ooA-vf-ESe"/>
+                            <constraint firstItem="pNd-jx-t84" firstAttribute="top" secondItem="ghC-6L-tQj" secondAttribute="top" constant="138" id="yos-Aw-LdD"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="oBX-Cx-tP7"/>
@@ -1273,7 +1272,7 @@
     <resources>
         <image name="20-gear-2.png" width="26" height="28"/>
         <image name="34-coffee.png" width="24" height="26"/>
-        <image name="78-stopwatch-white.png" width="22" height="26"/>
+        <image name="78-stopwatch-white.png" width="17" height="20"/>
         <image name="78-stopwatch.png" width="22" height="26"/>
         <image name="ibean-beancell-bean.png" width="200" height="198"/>
         <image name="ibean-extraction-dropdown-background.png" width="320" height="240"/>
@@ -1431,7 +1430,7 @@
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="OPZ-Pj-2Dz"/>
+        <segue reference="CyX-df-8ge"/>
         <segue reference="8Kh-dv-G2O"/>
         <segue reference="qk2-F5-M1s"/>
     </inferredMetricsTieBreakers>