diff options
| -rw-r--r-- | iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate | bin | 60644 -> 60015 bytes | |||
| -rw-r--r-- | iBean/iBean/.DS_Store | bin | 6148 -> 6148 bytes | |||
| -rw-r--r-- | iBean/iBean/Graphics/ibean-app-icon-1024-1024.png | bin | 0 -> 48088 bytes | |||
| -rw-r--r-- | iBean/iBean/iPadStoryboard.storyboard | 153 | ||||
| -rw-r--r-- | iBean/iBean/iPhoneStoryboard.storyboard | 4 |
5 files changed, 153 insertions, 4 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 Binary files differindex 05ee8a9..a43a47d 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/.DS_Store b/iBean/iBean/.DS_Store Binary files differindex 352b5f0..84f9c26 100644 --- a/iBean/iBean/.DS_Store +++ b/iBean/iBean/.DS_Store diff --git a/iBean/iBean/Graphics/ibean-app-icon-1024-1024.png b/iBean/iBean/Graphics/ibean-app-icon-1024-1024.png Binary files differnew file mode 100644 index 0000000..e73f44e --- /dev/null +++ b/iBean/iBean/Graphics/ibean-app-icon-1024-1024.png diff --git a/iBean/iBean/iPadStoryboard.storyboard b/iBean/iBean/iPadStoryboard.storyboard index 587d0b7..9205ed9 100644 --- a/iBean/iBean/iPadStoryboard.storyboard +++ b/iBean/iBean/iPadStoryboard.storyboard @@ -60,7 +60,7 @@ </objects> <point key="canvasLocation" x="2363" y="-173"/> </scene> - <!--Instant Extraction View Controller - Insta bean--> + <!--Instant Extraction View Controller - Extraction Timer--> <scene sceneID="Ncj-5f-EGN"> <objects> <viewController id="snc-Lv-58m" customClass="InstantExtractionViewController" sceneMemberID="viewController"> @@ -175,7 +175,7 @@ <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"/> + <tabBarItem key="tabBarItem" title="Extraction Timer" image="78-stopwatch.png" id="x5n-0b-kTy"/> <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackTranslucent"/> <connections> <outlet property="extractionProgressLabel" destination="fba-0S-Ta7" id="I5t-3D-y43"/> @@ -1369,6 +1369,155 @@ <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"/> diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index 308bbbb..ee27d1b 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -58,7 +58,7 @@ </objects> <point key="canvasLocation" x="1303" y="-153"/> </scene> - <!--Instant Extraction View Controller - Insta bean--> + <!--Instant Extraction View Controller - Extraction Timer--> <scene sceneID="Lvr-w4-t8a"> <objects> <viewController id="b3D-qj-cdZ" customClass="InstantExtractionViewController" sceneMemberID="viewController"> @@ -167,7 +167,7 @@ <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"/> + <tabBarItem key="tabBarItem" title="Extraction Timer" image="78-stopwatch.png" id="K06-La-tNv"/> <connections> <outlet property="extractionProgressLabel" destination="lEG-3K-UB7" id="JzM-Tz-DiG"/> <outlet property="extractionSettingLabel" destination="6By-yy-oRj" id="jMq-Bk-pTR"/> |
