From d63b571c2b256cd3bac5d8aa54f7e160bd486f2b Mon Sep 17 00:00:00 2001
From: Eddie Ehlin <eddiex@eddiex.se>
Date: Wed, 20 Mar 2013 21:53:45 +0100
Subject: Added support for disabling the extraction time roof in insta bean
 (values > 0 are considered enabled roof)

---
 .../UserInterfaceState.xcuserstate                 | Bin 58038 -> 60285 bytes
 .../xcdebugger/Breakpoints.xcbkptlist              |   6 +-
 iBean/iBean/InstantExtractionViewController.m      |   9 +-
 iBean/iBean/iPadStoryboard.storyboard              |   2 +-
 iBean/iBean/iPhoneStoryboard.storyboard            | 151 ++++++++++++++++++++-
 5 files changed, 162 insertions(+), 6 deletions(-)

(limited to 'iBean')

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 a4aeb08..ab4c43e 100644
Binary files a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate and b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
index 8003b60..a13acb1 100644
--- a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
+++ b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -8,11 +8,11 @@
          ignoreCount = "0"
          continueAfterRunningActions = "No"
          filePath = "iBean/InstantExtractionViewController.m"
-         timestampString = "385501866.06976"
+         timestampString = "385505467.151572"
          startingColumnNumber = "9223372036854775807"
          endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "97"
-         endingLineNumber = "97"
+         startingLineNumber = "104"
+         endingLineNumber = "104"
          landmarkName = "-haltExtractionTimer"
          landmarkType = "5">
       </FileBreakpoint>
diff --git a/iBean/iBean/InstantExtractionViewController.m b/iBean/iBean/InstantExtractionViewController.m
index 2b4c386..1b0aebd 100644
--- a/iBean/iBean/InstantExtractionViewController.m
+++ b/iBean/iBean/InstantExtractionViewController.m
@@ -73,7 +73,8 @@
   self.extractionProgress += 0.1f;
   self.extractionProgressLabel.text = [NSString stringWithFormat:@"%1.1f", self.extractionProgress];
   
-  if (self.extractionProgress >= self.extractionSettingStepper.value)
+  //We will only increment extractions iff extraction setting/roof is set to a value > 0
+  if (self.extractionProgress >= self.extractionSettingStepper.value && self.extractionSettingStepper.value > 0)
   {
     [self haltExtractionTimer];
     
@@ -89,6 +90,12 @@
 
 - (void) updateExtractionSettingLabel
 {
+  //If value is < 0 (change color to hint user that roof is disabled).
+  if (self.extractionSettingStepper.value > 0)
+    self.extractionSettingLabel.textColor = [UIColor blackColor];
+  else
+    self.extractionSettingLabel.textColor = [UIColor lightGrayColor];
+  
   self.extractionSettingLabel.text = [NSString stringWithFormat:@"%1.1f", self.extractionSettingStepper.value];
 }
 
diff --git a/iBean/iBean/iPadStoryboard.storyboard b/iBean/iBean/iPadStoryboard.storyboard
index ba076a3..e32b625 100644
--- a/iBean/iBean/iPadStoryboard.storyboard
+++ b/iBean/iBean/iPadStoryboard.storyboard
@@ -102,7 +102,7 @@
                                 <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">
+                            <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="900" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="xVi-QL-6wy">
                                 <connections>
                                     <action selector="setExtractionTimer:" destination="snc-Lv-58m" eventType="valueChanged" id="EOp-fY-mfJ"/>
                                 </connections>
diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard
index bf68193..308bbbb 100644
--- a/iBean/iBean/iPhoneStoryboard.storyboard
+++ b/iBean/iBean/iPhoneStoryboard.storyboard
@@ -97,7 +97,7 @@
                                 <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="bjC-aZ-VLh">
+                            <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="900" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="bjC-aZ-VLh">
                                 <constraints>
                                     <constraint firstAttribute="width" constant="94" id="xAB-MU-h9A"/>
                                 </constraints>
@@ -1343,6 +1343,155 @@
         <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="extractionProgressLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="extractionSettingLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="extractionSettingStepper" candidateClass="UIStepper"/>
+                <relationship kind="outlet" name="extractionStateLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="extractionTimesTableView" candidateClass="UITableView"/>
+            </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"/>
-- 
cgit v1.2.3