Updated instant extraction view (iPhone & iPad) with pressable display (instead of ugly button).

5 files changed, 71 insertions, 212 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 6173785..4fcc5fd 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/InstantExtractionViewController.h b/iBean/iBean/InstantExtractionViewController.h
index 10b387a..c6a1c78 100644
--- a/iBean/iBean/InstantExtractionViewController.h
+++ b/iBean/iBean/InstantExtractionViewController.h
@@ -22,9 +22,9 @@
 
 /* UI Outlets */
 @property (weak, nonatomic) IBOutlet UILabel *extractionSettingLabel;
-@property (weak, nonatomic) IBOutlet UIButton *extractionButton;
 @property (weak, nonatomic) IBOutlet UIStepper *extractionSettingStepper;
 @property (weak, nonatomic) IBOutlet UILabel *extractionProgressLabel;
+@property (weak, nonatomic) IBOutlet UILabel *extractionStateLabel;
 
 /* UI Actions */
 - (IBAction)startExtraction:(id)sender;
diff --git a/iBean/iBean/InstantExtractionViewController.m b/iBean/iBean/InstantExtractionViewController.m
index d489485..825d7ec 100644
--- a/iBean/iBean/InstantExtractionViewController.m
+++ b/iBean/iBean/InstantExtractionViewController.m
@@ -97,7 +97,7 @@
 - (void) timerInterrupted
 {
   //Return UI to "Start extraction" state.
-  [self.extractionButton setTitle:@"Start extraction" forState:UIControlStateNormal];
+  [self.extractionStateLabel setText:@"Press to start"];
   [self.extractionSettingStepper setEnabled:YES];
   self.extractionInProgress = NO;
 }
@@ -111,7 +111,7 @@
   if (([(AppDelegate*) [[UIApplication sharedApplication] delegate] getTimer] == nil) || self.extractionInProgress == NO)
   {
     self.extractionProgress = 0.0f;
-    [self.extractionButton setTitle:@"Stop extraction" forState:UIControlStateNormal];
+    [self.extractionStateLabel setText:@"Press to stop"];
     [self.extractionSettingStepper setEnabled:NO];
     self.extractionInProgress = YES;
     
diff --git a/iBean/iBean/iPadStoryboard.storyboard b/iBean/iBean/iPadStoryboard.storyboard
index 884b2bd..43803d6 100644
--- a/iBean/iBean/iPadStoryboard.storyboard
+++ b/iBean/iBean/iPadStoryboard.storyboard
@@ -68,23 +68,12 @@
                         <rect key="frame" x="0.0" y="20" width="768" height="955"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="instant-extraction-ipad.png" translatesAutoresizingMaskIntoConstraints="NO" id="hGb-ty-bIf"/>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="0.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fba-0S-Ta7">
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="309" id="YMN-3Q-wGd"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="124"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <nil key="highlightedColor"/>
-                                <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <size key="shadowOffset" width="2" height="1"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q1Z-8l-rFs">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3SK-4t-P4A">
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="151" id="vNe-y4-ctc"/>
+                                    <constraint firstAttribute="height" constant="406" id="zO0-cr-z1f"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                <state key="normal" title="Start extraction">
+                                <state key="normal" image="instant-extraction-ipad.png">
                                     <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
@@ -92,48 +81,65 @@
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <action selector="startExtraction:" destination="snc-Lv-58m" eventType="touchUpInside" id="i6E-hk-iYW"/>
+                                    <action selector="startExtraction:" destination="snc-Lv-58m" eventType="touchUpInside" id="65u-SH-4I9"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="0.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fba-0S-Ta7">
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="309" id="YMN-3Q-wGd"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="144"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                                <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <size key="shadowOffset" width="2" height="1"/>
+                            </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="XX" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A29-JZ-SFZ">
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="609" id="iM1-g3-74F"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="900" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="xVi-QL-6wy">
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="94" id="OBb-ve-ERa"/>
-                                </constraints>
                                 <connections>
                                     <action selector="setExtractionTimer:" destination="snc-Lv-58m" eventType="valueChanged" id="EOp-fY-mfJ"/>
                                 </connections>
                             </stepper>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.40000000000000013" contentMode="left" text="Press to start" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VJ9-6L-0fR">
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="39" id="hPd-5L-OZv"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="32"/>
+                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="fba-0S-Ta7" firstAttribute="centerY" secondItem="hGb-ty-bIf" secondAttribute="centerY" type="default" id="1w5-ra-SvJ"/>
-                            <constraint firstItem="fba-0S-Ta7" firstAttribute="centerX" secondItem="Q1Z-8l-rFs" secondAttribute="centerX" type="default" id="5qU-nn-IDp"/>
-                            <constraint firstItem="hGb-ty-bIf" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="20" symbolic="YES" type="default" id="D1M-hg-K5h"/>
-                            <constraint firstItem="fba-0S-Ta7" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="DXm-OF-sSU"/>
-                            <constraint firstAttribute="trailing" secondItem="xVi-QL-6wy" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="G0O-sj-OLi"/>
+                            <constraint firstItem="fba-0S-Ta7" firstAttribute="leading" secondItem="VJ9-6L-0fR" secondAttribute="leading" type="default" id="BIA-1I-GPm"/>
+                            <constraint firstAttribute="trailing" secondItem="3SK-4t-P4A" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="EAy-gu-sto"/>
+                            <constraint firstItem="VJ9-6L-0fR" firstAttribute="centerX" secondItem="3SK-4t-P4A" secondAttribute="centerX" type="default" id="Fn4-X1-mgN"/>
                             <constraint firstItem="A29-JZ-SFZ" firstAttribute="centerY" secondItem="xVi-QL-6wy" secondAttribute="centerY" type="default" id="H26-k9-Hrr"/>
-                            <constraint firstItem="xVi-QL-6wy" firstAttribute="leading" secondItem="A29-JZ-SFZ" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="U2D-w8-j1u"/>
-                            <constraint firstItem="fba-0S-Ta7" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="68" id="XMx-7P-ZuH"/>
-                            <constraint firstAttribute="trailing" secondItem="fba-0S-Ta7" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="aMq-hL-bSl"/>
-                            <constraint firstAttribute="bottom" secondItem="Q1Z-8l-rFs" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="jAH-sv-LAR"/>
+                            <constraint firstItem="fba-0S-Ta7" firstAttribute="centerY" secondItem="3SK-4t-P4A" secondAttribute="centerY" type="default" id="LXb-Rx-BW9"/>
+                            <constraint firstItem="xVi-QL-6wy" firstAttribute="top" secondItem="3SK-4t-P4A" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="PEq-Vh-8MB"/>
+                            <constraint firstItem="fba-0S-Ta7" firstAttribute="trailing" secondItem="VJ9-6L-0fR" secondAttribute="trailing" type="default" id="RRa-XY-gQg"/>
+                            <constraint firstItem="3SK-4t-P4A" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="WA1-Rg-W1s"/>
+                            <constraint firstItem="VJ9-6L-0fR" firstAttribute="trailing" secondItem="xVi-QL-6wy" secondAttribute="trailing" type="default" id="Wqp-na-wti"/>
                             <constraint firstItem="A29-JZ-SFZ" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="nYl-JE-Sq7"/>
-                            <constraint firstItem="xVi-QL-6wy" firstAttribute="top" secondItem="hGb-ty-bIf" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="qyi-qF-JkO"/>
-                            <constraint firstAttribute="trailing" secondItem="hGb-ty-bIf" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="tWR-dZ-Wlv"/>
-                            <constraint firstItem="hGb-ty-bIf" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="uYB-hR-s1m"/>
+                            <constraint firstItem="VJ9-6L-0fR" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="369" id="qZZ-cg-KNe"/>
+                            <constraint firstItem="3SK-4t-P4A" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="20" symbolic="YES" type="default" id="tNh-sD-r9U"/>
+                            <constraint firstItem="xVi-QL-6wy" firstAttribute="leading" secondItem="A29-JZ-SFZ" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="yoA-ii-xSP"/>
                         </constraints>
                     </view>
                     <tabBarItem key="tabBarItem" title="Insta bean" image="78-stopwatch.png" id="x5n-0b-kTy"/>
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/>
                     <connections>
-                        <outlet property="extractionButton" destination="Q1Z-8l-rFs" id="THa-Jh-Tnl"/>
                         <outlet property="extractionProgressLabel" destination="fba-0S-Ta7" id="I5t-3D-y43"/>
                         <outlet property="extractionSettingLabel" destination="A29-JZ-SFZ" id="Ctr-IB-zCl"/>
                         <outlet property="extractionSettingStepper" destination="xVi-QL-6wy" id="GMr-dJ-oNm"/>
+                        <outlet property="extractionStateLabel" destination="VJ9-6L-0fR" id="WxL-6I-r6T"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="lBg-Db-hdn" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1414,10 +1420,10 @@
             <relationships>
                 <relationship kind="action" name="setExtractionTimer:"/>
                 <relationship kind="action" name="startExtraction:"/>
-                <relationship kind="outlet" name="extractionButton" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="extractionProgressLabel" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="extractionSettingLabel" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="extractionSettingStepper" candidateClass="UIStepper"/>
+                <relationship kind="outlet" name="extractionStateLabel" candidateClass="UILabel"/>
             </relationships>
         </class>
         <class className="NSLayoutConstraint" superclassName="NSObject">
diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard
index fb0db74..75a27b0 100644
--- a/iBean/iBean/iPhoneStoryboard.storyboard
+++ b/iBean/iBean/iPhoneStoryboard.storyboard
@@ -66,27 +66,12 @@
                         <rect key="frame" x="0.0" y="20" width="320" height="499"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="instant-extraction-iphone.png" translatesAutoresizingMaskIntoConstraints="NO" id="IFF-H2-0dN">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="08M-Z3-AVH">
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="180" id="ZfW-Ua-Qpd"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="0.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lEG-3K-UB7">
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="120" id="Qal-Jd-LoQ"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="86"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <nil key="highlightedColor"/>
-                                <color key="shadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                <size key="shadowOffset" width="1" height="1"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tqq-sa-xOv">
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="151" id="4N9-BM-D1u"/>
+                                    <constraint firstAttribute="height" constant="181" id="S6V-4V-Q0q"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                <state key="normal" title="Start extraction">
+                                <state key="normal" image="instant-extraction-iphone.png">
                                     <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
@@ -94,9 +79,19 @@
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <action selector="startExtraction:" destination="b3D-qj-cdZ" eventType="touchUpInside" id="3og-GU-Y4N"/>
+                                    <action selector="startExtraction:" destination="b3D-qj-cdZ" eventType="touchUpInside" id="POP-cb-jZT"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="0.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lEG-3K-UB7">
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="120" id="Qal-Jd-LoQ"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="86"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                                <color key="shadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                <size key="shadowOffset" width="1" height="1"/>
+                            </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="25.0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6By-yy-oRj">
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -110,30 +105,36 @@
                                     <action selector="setExtractionTimer:" destination="b3D-qj-cdZ" eventType="valueChanged" id="OWg-MT-u0R"/>
                                 </connections>
                             </stepper>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.40000000000000013" contentMode="left" text="Press to start" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Exd-Qz-k8n">
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="bottom" secondItem="Tqq-sa-xOv" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="5Ym-7L-8ew"/>
-                            <constraint firstItem="IFF-H2-0dN" firstAttribute="top" secondItem="NBj-4q-93f" secondAttribute="top" constant="20" symbolic="YES" type="default" id="6Rh-kR-fCa"/>
+                            <constraint firstItem="lEG-3K-UB7" firstAttribute="top" secondItem="NBj-4q-93f" secondAttribute="top" constant="51" id="3VI-FF-M7b"/>
+                            <constraint firstItem="Exd-Qz-k8n" firstAttribute="top" secondItem="NBj-4q-93f" secondAttribute="top" constant="168" id="3km-yn-poN"/>
+                            <constraint firstItem="Exd-Qz-k8n" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="CWq-c1-PZo"/>
                             <constraint firstItem="6By-yy-oRj" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="GeL-hb-8dO"/>
-                            <constraint firstItem="lEG-3K-UB7" firstAttribute="centerY" secondItem="IFF-H2-0dN" secondAttribute="centerY" type="default" id="HNN-xY-hTV"/>
-                            <constraint firstAttribute="trailing" secondItem="IFF-H2-0dN" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="M4v-PQ-ia3"/>
+                            <constraint firstItem="bjC-aZ-VLh" firstAttribute="top" secondItem="08M-Z3-AVH" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="PUE-ps-wpg"/>
                             <constraint firstAttribute="trailing" secondItem="lEG-3K-UB7" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="W1F-DA-pzd"/>
+                            <constraint firstItem="08M-Z3-AVH" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="YK9-4J-r5V"/>
                             <constraint firstItem="bjC-aZ-VLh" firstAttribute="leading" secondItem="6By-yy-oRj" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="gqd-LV-oGI"/>
-                            <constraint firstItem="bjC-aZ-VLh" firstAttribute="top" secondItem="IFF-H2-0dN" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="iIr-v2-gtB"/>
-                            <constraint firstItem="IFF-H2-0dN" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="o2C-bw-hfg"/>
-                            <constraint firstItem="Tqq-sa-xOv" firstAttribute="centerX" secondItem="lEG-3K-UB7" secondAttribute="centerX" type="default" id="pFS-wc-Hgo"/>
+                            <constraint firstAttribute="trailing" secondItem="Exd-Qz-k8n" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="hNm-0v-TZ6"/>
                             <constraint firstItem="lEG-3K-UB7" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="sSe-lI-xMk"/>
+                            <constraint firstItem="08M-Z3-AVH" firstAttribute="top" secondItem="NBj-4q-93f" secondAttribute="top" constant="20" symbolic="YES" type="default" id="uT1-YQ-jSm"/>
                             <constraint firstAttribute="trailing" secondItem="bjC-aZ-VLh" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="vjV-8h-RcP"/>
+                            <constraint firstAttribute="trailing" secondItem="08M-Z3-AVH" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="xhG-BC-gVb"/>
                             <constraint firstItem="6By-yy-oRj" firstAttribute="centerY" secondItem="bjC-aZ-VLh" secondAttribute="centerY" type="default" id="zq4-iE-v07"/>
                         </constraints>
                     </view>
                     <tabBarItem key="tabBarItem" title="Insta bean" image="78-stopwatch.png" id="K06-La-tNv"/>
                     <connections>
-                        <outlet property="extractionButton" destination="Tqq-sa-xOv" id="FDa-X0-Fdl"/>
                         <outlet property="extractionProgressLabel" destination="lEG-3K-UB7" id="JzM-Tz-DiG"/>
                         <outlet property="extractionSettingLabel" destination="6By-yy-oRj" id="jMq-Bk-pTR"/>
                         <outlet property="extractionSettingStepper" destination="bjC-aZ-VLh" id="DHB-HD-dFN"/>
+                        <outlet property="extractionStateLabel" destination="Exd-Qz-k8n" id="ufI-rD-d4M"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="cT9-Af-PM7" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1303,162 +1304,14 @@
         <image name="ibean-extraction-dropdown-background.png" width="320" height="240"/>
         <image name="instant-extraction-iphone.png" width="599" height="355"/>
     </resources>
-    <classes>
-        <class className="AddBeanViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/AddBeanViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="amountStepperChanged:"/>
-                <relationship kind="action" name="cancelBean:"/>
-                <relationship kind="action" name="commitBean:"/>
-                <relationship kind="action" name="grinderSettingStepperChanged:"/>
-                <relationship kind="outlet" name="addBeanNavigationBar" candidateClass="UINavigationBar"/>
-                <relationship kind="outlet" name="amountLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="amountStepper" candidateClass="UIStepper"/>
-                <relationship kind="outlet" name="beanNameTextField" candidateClass="UITextField"/>
-                <relationship kind="outlet" name="grinderSettingLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="grinderSettingStepper" candidateClass="UIStepper"/>
-            </relationships>
-        </class>
-        <class className="BeanCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCell.h"/>
-            <relationships>
-                <relationship kind="outlet" name="beanAmountLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="beanGrindSettingLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="beanImageLeft" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="beanImageRight" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="beanNameLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="BeanCollectionBeanListViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCollectionBeanListViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="toggleEditMode:"/>
-                <relationship kind="outlet" name="beanListBottomToolbar" candidateClass="UIToolbar"/>
-                <relationship kind="outlet" name="beanListEditButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="beanListTableView" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="BeanCollectionExtractionViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCollectionExtractionViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="showExtractionTimer:"/>
-                <relationship kind="action" name="startExtraction:"/>
-                <relationship kind="outlet" name="beanCollectionNoteTextView" candidateClass="UITextView"/>
-                <relationship kind="outlet" name="beanTableView" candidateClass="UITableView"/>
-                <relationship kind="outlet" name="extractionButton" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="extractionProgressLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="extractionTimerView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="toggleExtractionTimerButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="BeanCollectionInfoViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCollectionInfoViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="cancelBeanCollection:"/>
-                <relationship kind="action" name="keyboardDisplayed:" candidateClass="NSNotification"/>
-                <relationship kind="action" name="keyboardHidden:" candidateClass="NSNotification"/>
-                <relationship kind="outlet" name="beanCollectionNameTextField" candidateClass="UITextField"/>
-                <relationship kind="outlet" name="beanCollectionNextButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="beanCollectionNoteTextView" candidateClass="UITextView"/>
-                <relationship kind="outlet" name="beanCollectionNoteTextViewShadowView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="beanCollectionScrollView" candidateClass="UIScrollView"/>
-            </relationships>
-        </class>
-        <class className="BeanCollectionListViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCollectionListViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="toggleEditMode:"/>
-                <relationship kind="outlet" name="beanCollectionsListEditButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="EditBeanViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditBeanViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="amountStepperChanged:"/>
-                <relationship kind="action" name="commitBean:"/>
-                <relationship kind="action" name="grinderSettingStepperChanged:"/>
-                <relationship kind="outlet" name="amountLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="amountStepper" candidateClass="UIStepper"/>
-                <relationship kind="outlet" name="beanNameTextField" candidateClass="UITextField"/>
-                <relationship kind="outlet" name="grinderSettingLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="grinderSettingStepper" candidateClass="UIStepper"/>
-            </relationships>
-        </class>
-        <class className="ExtractionViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ExtractionViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="extractionSettingStepperChanged:"/>
-                <relationship kind="outlet" name="extractionSettingLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="extractionSettingStepper" candidateClass="UIStepper"/>
-            </relationships>
-        </class>
-        <class className="InstantExtractionViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/InstantExtractionViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="setExtractionTimer:"/>
-                <relationship kind="action" name="startExtraction:"/>
-                <relationship kind="outlet" name="extractionButton" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="extractionProgressLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="extractionSettingLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="extractionSettingStepper" candidateClass="UIStepper"/>
-            </relationships>
-        </class>
-        <class className="NSLayoutConstraint" superclassName="NSObject">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/>
-        </class>
-        <class className="SettingsViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="countExtractionsSwitchChanged:"/>
-                <relationship kind="action" name="extractionCountStepperChanged:"/>
-                <relationship kind="action" name="resetExtractionCount:"/>
-                <relationship kind="action" name="useThresholdsSwitchChanged:"/>
-                <relationship kind="outlet" name="countExtractionsSwitch" candidateClass="UISwitch"/>
-                <relationship kind="outlet" name="extractionCountLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="extractionCountStepper" candidateClass="UIStepper"/>
-                <relationship kind="outlet" name="resetExtractionCountButton" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="useThresholdsSwitch" candidateClass="UISwitch"/>
-            </relationships>
-        </class>
-        <class className="ThresholdCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ThresholdCell.h"/>
-            <relationships>
-                <relationship kind="action" name="switchChanged:"/>
-                <relationship kind="outlet" name="enabledSwitch" candidateClass="UISwitch"/>
-                <relationship kind="outlet" name="nameLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="valueLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="ThresholdListViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ThresholdListViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="toggleEditMode:"/>
-                <relationship kind="outlet" name="thresholdListBottomToolbar" candidateClass="UIToolbar"/>
-                <relationship kind="outlet" name="thresholdListEditButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="thresholdListTableView" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="ThresholdViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ThresholdViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="commitThreshold:"/>
-                <relationship kind="action" name="valueStepperChanged:"/>
-                <relationship kind="outlet" name="thresholdEnabledSwitch" candidateClass="UISwitch"/>
-                <relationship kind="outlet" name="thresholdNameTextField" candidateClass="UITextField"/>
-                <relationship kind="outlet" name="thresholdRecurringSwitch" candidateClass="UISwitch"/>
-                <relationship kind="outlet" name="thresholdValueLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="thresholdValueStepper" candidateClass="UIStepper"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="OPZ-Pj-2Dz"/>
         <segue reference="9nO-3G-dWz"/>
-        <segue reference="qk2-F5-M1s"/>
+        <segue reference="OPZ-Pj-2Dz"/>
+        <segue reference="EsA-2d-QNt"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file