From bdfc47a541e47dce3e2f322b257baf40a8a0b659 Mon Sep 17 00:00:00 2001
From: Eddie Ehlin <eddiex@eddiex.se>
Date: Wed, 6 Mar 2013 22:24:45 +0100
Subject: Fixed bug: Extraction timers now have a max value of 900s, and every
 display of such timer is based on 0.5s (one decimal).

---
 iBean/iBean.xcodeproj/project.pbxproj               |   2 +-
 .../UserInterfaceState.xcuserstate                  | Bin 51051 -> 53036 bytes
 iBean/iBean/InstantExtractionViewController.m       |   2 +-
 iBean/iBean/iPhoneStoryboard.storyboard             |   6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'iBean')

diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj
index de5877f..a12e995 100644
--- a/iBean/iBean.xcodeproj/project.pbxproj
+++ b/iBean/iBean.xcodeproj/project.pbxproj
@@ -187,7 +187,6 @@
 		020C559F1691014E00D8224C /* iBean */ = {
 			isa = PBXGroup;
 			children = (
-				024CB02216C0543B009CBC15 /* Graphics */,
 				024CB02116C04BDD009CBC15 /* Categories */,
 				0276253316B58C2C00EE2F4E /* Settings */,
 				020C55D31695C2C800D8224C /* iBean */,
@@ -207,6 +206,7 @@
 		020C55A01691014E00D8224C /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				024CB02216C0543B009CBC15 /* Graphics */,
 				020C55A11691014E00D8224C /* iBean-Info.plist */,
 				020C55A21691014E00D8224C /* InfoPlist.strings */,
 				020C55A51691014E00D8224C /* main.m */,
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 be5f765..8d9eb34 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/InstantExtractionViewController.m b/iBean/iBean/InstantExtractionViewController.m
index 0d22105..0c06826 100644
--- a/iBean/iBean/InstantExtractionViewController.m
+++ b/iBean/iBean/InstantExtractionViewController.m
@@ -85,7 +85,7 @@
 
 - (void) updateExtractionSettingLabel
 {
-  self.extractionSettingLabel.text = [NSString stringWithFormat:@"%1.0f", self.extractionSettingStepper.value];
+  self.extractionSettingLabel.text = [NSString stringWithFormat:@"%1.1f", self.extractionSettingStepper.value];
 }
 
 - (void) haltExtractionTimer
diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard
index ece0e9a..d633fbf 100644
--- a/iBean/iBean/iPhoneStoryboard.storyboard
+++ b/iBean/iBean/iPhoneStoryboard.storyboard
@@ -98,7 +98,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="60" translatesAutoresizingMaskIntoConstraints="NO" id="bjC-aZ-VLh">
+                            <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">
                                 <connections>
                                     <action selector="setExtractionTimer:" destination="b3D-qj-cdZ" eventType="valueChanged" id="OWg-MT-u0R"/>
                                 </connections>
@@ -921,7 +921,7 @@
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="lvU-0d-qF1">
+                            <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="900" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="lvU-0d-qF1">
                                 <connections>
                                     <action selector="extractionSettingStepperChanged:" destination="49F-vz-WhB" eventType="valueChanged" id="Tht-18-lS4"/>
                                 </connections>
@@ -1439,8 +1439,8 @@
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="OPZ-Pj-2Dz"/>
         <segue reference="8Kh-dv-G2O"/>
+        <segue reference="CyX-df-8ge"/>
         <segue reference="qk2-F5-M1s"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
-- 
cgit v1.2.3