aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie Ehlin <eddiex@eddiex.se>2013-03-20 22:14:22 +0100
committerEddie Ehlin <eddiex@eddiex.se>2013-03-20 22:14:22 +0100
commit880c672cd236b2fc094a5738847da5e5501a1744 (patch)
tree53b75f59e6bafd885ec0f4523e7d729e441df4ec
parentd63b571c2b256cd3bac5d8aa54f7e160bd486f2b (diff)
downloadiBean-880c672cd236b2fc094a5738847da5e5501a1744.tar.gz
iBean-880c672cd236b2fc094a5738847da5e5501a1744.zip
Changed default value for insta bean extraction timer (for new installs) from 25.0 to 0.0.
-rw-r--r--iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstatebin60285 -> 60644 bytes
-rw-r--r--iBean/iBean/AppDelegate+Storage.m2
-rw-r--r--iBean/iBean/iPadStoryboard.storyboard149
3 files changed, 1 insertions, 150 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 ab4c43e..05ee8a9 100644
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/iBean/iBean/AppDelegate+Storage.m b/iBean/iBean/AppDelegate+Storage.m
index a98cd41..718d2c2 100644
--- a/iBean/iBean/AppDelegate+Storage.m
+++ b/iBean/iBean/AppDelegate+Storage.m
@@ -70,7 +70,7 @@
if (config != nil)
{
//Set default configuration values:
- config.instantExtractionTimer = [NSNumber numberWithDouble:25.0f];
+ config.instantExtractionTimer = [NSNumber numberWithDouble:0.0f];
}
else
{
diff --git a/iBean/iBean/iPadStoryboard.storyboard b/iBean/iBean/iPadStoryboard.storyboard
index e32b625..587d0b7 100644
--- a/iBean/iBean/iPadStoryboard.storyboard
+++ b/iBean/iBean/iPadStoryboard.storyboard
@@ -1369,155 +1369,6 @@
<image name="ibean-extraction-dropdown-background.png" width="320" height="240"/>
<image name="instant-extraction-ipad.png" width="697" height="412"/>
</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" statusBarStyle="blackTranslucent"/>
<simulatedOrientationMetrics key="orientation"/>