diff options
Diffstat (limited to 'iBean')
| -rw-r--r-- | iBean/iBean.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate | bin | 36309 -> 36973 bytes | |||
| -rw-r--r-- | iBean/iBean/BeanCollectionExtractionScrollView.h | 13 | ||||
| -rw-r--r-- | iBean/iBean/BeanCollectionExtractionScrollView.m | 53 | ||||
| -rw-r--r-- | iBean/iBean/BeanCollectionExtractionViewController.h | 3 | ||||
| -rw-r--r-- | iBean/iBean/BeanCollectionExtractionViewController.m | 33 | ||||
| -rw-r--r-- | iBean/iBean/iPhoneStoryboard.storyboard | 209 |
7 files changed, 238 insertions, 79 deletions
diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj index f809461..22eba16 100644 --- a/iBean/iBean.xcodeproj/project.pbxproj +++ b/iBean/iBean.xcodeproj/project.pbxproj @@ -35,6 +35,7 @@ 024F676D16A4A61D004A1201 /* InstantExtractionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 024F676C16A4A61D004A1201 /* InstantExtractionViewController.m */; }; 02E557AE16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 02E557AD16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m */; }; 02E557B116A9CFB50080FBBA /* BeanCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 02E557B016A9CFB50080FBBA /* BeanCell.m */; }; + 02E557BA16AC85A20080FBBA /* BeanCollectionExtractionScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 02E557B916AC85A20080FBBA /* BeanCollectionExtractionScrollView.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -86,6 +87,8 @@ 02E557AD16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollectionExtractionViewController.m; sourceTree = "<group>"; }; 02E557AF16A9CFB50080FBBA /* BeanCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCell.h; sourceTree = "<group>"; }; 02E557B016A9CFB50080FBBA /* BeanCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCell.m; sourceTree = "<group>"; }; + 02E557B816AC85A20080FBBA /* BeanCollectionExtractionScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollectionExtractionScrollView.h; sourceTree = "<group>"; }; + 02E557B916AC85A20080FBBA /* BeanCollectionExtractionScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollectionExtractionScrollView.m; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -273,6 +276,8 @@ 02E557B016A9CFB50080FBBA /* BeanCell.m */, 02E557AC16A9C1E40080FBBA /* BeanCollectionExtractionViewController.h */, 02E557AD16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m */, + 02E557B816AC85A20080FBBA /* BeanCollectionExtractionScrollView.h */, + 02E557B916AC85A20080FBBA /* BeanCollectionExtractionScrollView.m */, ); name = BeanCollectionExtraction; sourceTree = "<group>"; @@ -362,6 +367,7 @@ 024F676D16A4A61D004A1201 /* InstantExtractionViewController.m in Sources */, 02E557AE16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m in Sources */, 02E557B116A9CFB50080FBBA /* BeanCell.m in Sources */, + 02E557BA16AC85A20080FBBA /* BeanCollectionExtractionScrollView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; 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 d93e807..863f4fe 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/BeanCollectionExtractionScrollView.h b/iBean/iBean/BeanCollectionExtractionScrollView.h new file mode 100644 index 0000000..40ac170 --- /dev/null +++ b/iBean/iBean/BeanCollectionExtractionScrollView.h @@ -0,0 +1,13 @@ +// +// BeanCollectionExtractionScrollView.h +// iBean +// +// Created by Eddie Ehlin on 2013-01-20. +// Copyright (c) 2013 Eddie Ehlin. All rights reserved. +// + +#import <UIKit/UIKit.h> + +@interface BeanCollectionExtractionScrollView : UIScrollView + +@end diff --git a/iBean/iBean/BeanCollectionExtractionScrollView.m b/iBean/iBean/BeanCollectionExtractionScrollView.m new file mode 100644 index 0000000..ea42000 --- /dev/null +++ b/iBean/iBean/BeanCollectionExtractionScrollView.m @@ -0,0 +1,53 @@ +// +// BeanCollectionExtractionScrollView.m +// iBean +// +// Created by Eddie Ehlin on 2013-01-20. +// Copyright (c) 2013 Eddie Ehlin. All rights reserved. +// + +#import "BeanCollectionExtractionScrollView.h" + +@implementation BeanCollectionExtractionScrollView + +- (id)initWithFrame:(CGRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code + } + return self; +} + +- (void) layoutSubviews +{ + [super layoutSubviews]; + + //Resize the UITableView containing all the beans + UITableView *bt = [self.subviews objectAtIndex:0]; + bt.frame = CGRectMake(bt.frame.origin.x, bt.frame.origin.y, bt.frame.size.width, [bt numberOfRowsInSection:0]*60+20); + + //Move down the note text view, so that it don't overlaps the table. + UITextView *note = [self.subviews objectAtIndex:1]; + note.frame = CGRectMake(note.frame.origin.x, (bt.frame.origin.y + bt.frame.size.height)+15, note.frame.size.width, note.frame.size.height); + + //Set the content size to the scroll view. + //Note: If the note is hidden, then we should not include it (the same goes for the padding between note and table) + [self setContentSize: CGSizeMake(self.contentSize.width, bt.frame.size.height + (note.isHidden ? -15 : note.frame.size.height))]; + + //http://developer.apple.com/library/ios/#documentation/WindowsViews/Conceptual/UIScrollView_pg/CreatingBasicScrollViews/CreatingBasicScrollViews.html#//apple_ref/doc/uid/TP40008179-CH101-SW14 + UIEdgeInsets insets = UIEdgeInsetsMake(0, 0, /*padding@bottom*/50, 0); + [self setContentInset:insets]; + [self setScrollIndicatorInsets:insets]; +} + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect +{ + // Drawing code +} +*/ + +@end diff --git a/iBean/iBean/BeanCollectionExtractionViewController.h b/iBean/iBean/BeanCollectionExtractionViewController.h index 4f7a608..1cb0f67 100644 --- a/iBean/iBean/BeanCollectionExtractionViewController.h +++ b/iBean/iBean/BeanCollectionExtractionViewController.h @@ -19,6 +19,9 @@ /* UI Outlets */ @property (weak, nonatomic) IBOutlet UITableView *beanTableView; +@property (weak, nonatomic) IBOutlet UITextView *beanCollectionNoteTextView; +@property (weak, nonatomic) IBOutlet UILabel *extractionProgressLabel; +@property (weak, nonatomic) IBOutlet UIButton *extractionButton; /* UI Actions */ diff --git a/iBean/iBean/BeanCollectionExtractionViewController.m b/iBean/iBean/BeanCollectionExtractionViewController.m index e89324c..4c26ab6 100644 --- a/iBean/iBean/BeanCollectionExtractionViewController.m +++ b/iBean/iBean/BeanCollectionExtractionViewController.m @@ -7,6 +7,7 @@ // #import "BeanCollectionExtractionViewController.h" +#import "BeanCollectionInfoViewController.h" #import "BeanCollection+Interface.h" #import "BeanCell.h" #import "Bean+Interface.h" @@ -30,12 +31,14 @@ { [super viewDidLoad]; // Do any additional setup after loading the view. + } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; [self initViewController]; + } - (void)didReceiveMemoryWarning @@ -44,6 +47,15 @@ // Dispose of any resources that can be recreated. } +- (void) prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender +{ + if ([segue.identifier isEqualToString:@"EditBeanCollectionSegue"]) + { + BeanCollectionInfoViewController *infoViewController = (BeanCollectionInfoViewController *)[[segue.destinationViewController viewControllers] objectAtIndex:0]; + [infoViewController initWithModeAndBeanCollection:YES :self.beanCollection]; + } +} + /***************************************************** Utility methods *****************************************************/ @@ -51,7 +63,25 @@ - (void) initViewController { NSLog(@"BeanCollectionExtraction - initViewController"); - self.navigationItem.title = self.beanCollection.name; + if (self.beanCollection != nil) + { + self.navigationItem.title = self.beanCollection.name; + self.extractionProgressLabel.text = [self.beanCollection.extractionTime stringValue]; + + if (![self.beanCollection.note isEqualToString:@""]) + { + self.beanCollectionNoteTextView.text = self.beanCollection.note; + } + else + { + NSLog(@"Note is empty!"); + [self.beanCollectionNoteTextView setHidden:YES]; + } + } + else + { +#warning TODO - Add an error message? + } } - (void) initWithBeanCollection:(BeanCollection *)bc @@ -89,7 +119,6 @@ Bean *currentBean = [self.beanCollection.beans objectAtIndex:indexPath.row]; [cell initWithNameGrindSettingAndAmount:currentBean.name :currentBean.grindSetting :currentBean.amount]; - return cell; } diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index f496545..df40f8a 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -641,95 +641,143 @@ <rect key="frame" x="0.0" y="64" width="320" height="455"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" allowsSelection="NO" rowHeight="60" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="nNM-14-LcQ"> - <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> - <constraints> - <constraint firstAttribute="height" constant="265" id="MZh-YD-ebb"/> - </constraints> - <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="BeanCell" rowHeight="60" id="GFY-k6-GqL" customClass="BeanCell"> - <rect key="frame" x="0.0" y="46" width="320" height="61"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="10" y="1" width="300" height="59"/> - <autoresizingMask key="autoresizingMask"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k5L-1w-O9k"> - <constraints> - <constraint firstAttribute="height" constant="43" id="U2T-ao-Szq"/> - <constraint firstAttribute="width" constant="48" id="V9C-sk-j6i"/> - </constraints> - </imageView> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Bean name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6BI-CV-5ED"> - <constraints> - <constraint firstAttribute="width" constant="149" id="R75-YN-6cj"/> - <constraint firstAttribute="height" constant="21" id="cPO-Kr-w2I"/> - </constraints> - <fontDescription key="fontDescription" type="system" pointSize="15"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Grind setting" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SEv-Mc-lOV"> - <constraints> - <constraint firstAttribute="height" constant="21" id="aa2-WE-QFC"/> - </constraints> - <fontDescription key="fontDescription" type="system" pointSize="12"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Amount" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xmw-e4-noZ"> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </label> - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2GK-CS-zgy"> - <constraints> - <constraint firstAttribute="height" constant="59" id="DQy-8I-fQ4"/> - <constraint firstAttribute="width" constant="87" id="ERq-Fo-mp1"/> - </constraints> - </imageView> - </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> + <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lWi-pD-I1j" customClass="BeanCollectionExtractionScrollView"> + <subviews> + <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="prototypes" style="grouped" separatorStyle="none" allowsSelection="NO" rowHeight="60" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="nNM-14-LcQ"> + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> <constraints> - <constraint firstAttribute="trailing" secondItem="Xmw-e4-noZ" secondAttribute="trailing" constant="30" id="1K7-bD-fde"/> - <constraint firstItem="2GK-CS-zgy" firstAttribute="leading" secondItem="SEv-Mc-lOV" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="2VR-qW-jA5"/> - <constraint firstItem="Xmw-e4-noZ" firstAttribute="top" secondItem="GFY-k6-GqL" secondAttribute="top" constant="19" id="3Qi-cA-7pg"/> - <constraint firstItem="2GK-CS-zgy" firstAttribute="top" secondItem="GFY-k6-GqL" secondAttribute="top" constant="1" id="43d-zJ-99N"/> - <constraint firstItem="6BI-CV-5ED" firstAttribute="leading" secondItem="k5L-1w-O9k" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="4Kv-4c-Gvf"/> - <constraint firstItem="k5L-1w-O9k" firstAttribute="leading" secondItem="GFY-k6-GqL" secondAttribute="leading" constant="10" id="8Uv-2a-9so"/> - <constraint firstItem="SEv-Mc-lOV" firstAttribute="leading" secondItem="k5L-1w-O9k" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="8f2-UX-Sae"/> - <constraint firstItem="k5L-1w-O9k" firstAttribute="centerY" secondItem="2GK-CS-zgy" secondAttribute="centerY" type="default" id="NTN-Lv-EKt"/> - <constraint firstItem="2GK-CS-zgy" firstAttribute="leading" secondItem="6BI-CV-5ED" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="PUO-UO-1ph"/> - <constraint firstItem="6BI-CV-5ED" firstAttribute="top" secondItem="k5L-1w-O9k" secondAttribute="top" type="default" id="duo-SS-MKg"/> - <constraint firstItem="SEv-Mc-lOV" firstAttribute="bottom" secondItem="k5L-1w-O9k" secondAttribute="bottom" type="default" id="fZo-8g-3Tu"/> + <constraint firstAttribute="height" constant="119" id="c6U-LT-2HV"/> </constraints> + <prototypes> + <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" reuseIdentifier="BeanCell" rowHeight="60" id="GFY-k6-GqL" customClass="BeanCell"> + <rect key="frame" x="0.0" y="46" width="320" height="61"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> + <rect key="frame" x="10" y="1" width="300" height="59"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k5L-1w-O9k"> + <constraints> + <constraint firstAttribute="height" constant="43" id="U2T-ao-Szq"/> + <constraint firstAttribute="width" constant="48" id="V9C-sk-j6i"/> + </constraints> + </imageView> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Bean name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6BI-CV-5ED"> + <constraints> + <constraint firstAttribute="width" constant="149" id="R75-YN-6cj"/> + <constraint firstAttribute="height" constant="21" id="cPO-Kr-w2I"/> + </constraints> + <fontDescription key="fontDescription" type="system" pointSize="15"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </label> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Grind setting" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SEv-Mc-lOV"> + <constraints> + <constraint firstAttribute="height" constant="21" id="aa2-WE-QFC"/> + </constraints> + <fontDescription key="fontDescription" type="system" pointSize="12"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </label> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Amount" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xmw-e4-noZ"> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + </label> + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2GK-CS-zgy"> + <constraints> + <constraint firstAttribute="height" constant="59" id="DQy-8I-fQ4"/> + <constraint firstAttribute="width" constant="87" id="ERq-Fo-mp1"/> + </constraints> + </imageView> + </subviews> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + </view> + <constraints> + <constraint firstAttribute="trailing" secondItem="Xmw-e4-noZ" secondAttribute="trailing" constant="30" id="1K7-bD-fde"/> + <constraint firstItem="2GK-CS-zgy" firstAttribute="leading" secondItem="SEv-Mc-lOV" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="2VR-qW-jA5"/> + <constraint firstItem="Xmw-e4-noZ" firstAttribute="top" secondItem="GFY-k6-GqL" secondAttribute="top" constant="19" id="3Qi-cA-7pg"/> + <constraint firstItem="2GK-CS-zgy" firstAttribute="top" secondItem="GFY-k6-GqL" secondAttribute="top" constant="1" id="43d-zJ-99N"/> + <constraint firstItem="6BI-CV-5ED" firstAttribute="leading" secondItem="k5L-1w-O9k" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="4Kv-4c-Gvf"/> + <constraint firstItem="k5L-1w-O9k" firstAttribute="leading" secondItem="GFY-k6-GqL" secondAttribute="leading" constant="10" id="8Uv-2a-9so"/> + <constraint firstItem="SEv-Mc-lOV" firstAttribute="leading" secondItem="k5L-1w-O9k" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="8f2-UX-Sae"/> + <constraint firstItem="k5L-1w-O9k" firstAttribute="centerY" secondItem="2GK-CS-zgy" secondAttribute="centerY" type="default" id="NTN-Lv-EKt"/> + <constraint firstItem="2GK-CS-zgy" firstAttribute="leading" secondItem="6BI-CV-5ED" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="PUO-UO-1ph"/> + <constraint firstItem="6BI-CV-5ED" firstAttribute="top" secondItem="k5L-1w-O9k" secondAttribute="top" type="default" id="duo-SS-MKg"/> + <constraint firstItem="SEv-Mc-lOV" firstAttribute="bottom" secondItem="k5L-1w-O9k" secondAttribute="bottom" type="default" id="fZo-8g-3Tu"/> + </constraints> + <connections> + <outlet property="beanAmountLabel" destination="Xmw-e4-noZ" id="yOh-Jm-eCd"/> + <outlet property="beanGrindSettingLabel" destination="SEv-Mc-lOV" id="bmF-mE-K60"/> + <outlet property="beanImageLeft" destination="k5L-1w-O9k" id="PTO-SU-myY"/> + <outlet property="beanImageRight" destination="2GK-CS-zgy" id="MVl-xR-hyY"/> + <outlet property="beanNameLabel" destination="6BI-CV-5ED" id="frx-6h-S3f"/> + </connections> + </tableViewCell> + </prototypes> <connections> - <outlet property="beanAmountLabel" destination="Xmw-e4-noZ" id="yOh-Jm-eCd"/> - <outlet property="beanGrindSettingLabel" destination="SEv-Mc-lOV" id="bmF-mE-K60"/> - <outlet property="beanImageLeft" destination="k5L-1w-O9k" id="PTO-SU-myY"/> - <outlet property="beanImageRight" destination="2GK-CS-zgy" id="MVl-xR-hyY"/> - <outlet property="beanNameLabel" destination="6BI-CV-5ED" id="frx-6h-S3f"/> + <outlet property="dataSource" destination="aA5-tc-vwr" id="0Ql-EZ-yrJ"/> + <outlet property="delegate" destination="aA5-tc-vwr" id="Xh6-L2-tMD"/> </connections> - </tableViewCell> - </prototypes> - <connections> - <outlet property="dataSource" destination="aA5-tc-vwr" id="0Ql-EZ-yrJ"/> - <outlet property="delegate" destination="aA5-tc-vwr" id="Xh6-L2-tMD"/> - </connections> - </tableView> + </tableView> + <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WyC-9J-FOJ"> + <color key="backgroundColor" red="0.76163383149999997" green="0.71550439180000003" blue="0.62799370050000003" alpha="1" colorSpace="calibratedRGB"/> + <constraints> + <constraint firstAttribute="width" constant="280" id="0dh-2u-5Ao"/> + <constraint firstAttribute="height" constant="194" id="hpC-9a-g7Y"/> + </constraints> + <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> + </textView> + </subviews> + <color key="backgroundColor" red="0.1960784314" green="0.30980392159999998" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/> + <constraints> + <constraint firstAttribute="bottom" secondItem="WyC-9J-FOJ" secondAttribute="bottom" constant="74" id="3KA-yz-mZ6"/> + <constraint firstItem="nNM-14-LcQ" firstAttribute="leading" secondItem="lWi-pD-I1j" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="Fjx-gD-Ph5"/> + <constraint firstItem="nNM-14-LcQ" firstAttribute="top" secondItem="lWi-pD-I1j" secondAttribute="top" constant="20" symbolic="YES" type="default" id="FtY-Zh-q0q"/> + <constraint firstItem="WyC-9J-FOJ" firstAttribute="top" secondItem="nNM-14-LcQ" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="LTt-nF-7bI"/> + <constraint firstItem="WyC-9J-FOJ" firstAttribute="centerX" secondItem="lWi-pD-I1j" secondAttribute="centerX" type="default" id="LYg-dX-YRT"/> + <constraint firstItem="WyC-9J-FOJ" firstAttribute="centerX" secondItem="nNM-14-LcQ" secondAttribute="centerX" type="default" id="UBK-TG-UP6"/> + <constraint firstAttribute="trailing" secondItem="nNM-14-LcQ" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="ffc-G9-gKf"/> + </constraints> + </scrollView> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YJ7-1f-6ZW"> + <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/> + <state key="normal" title="Button"> + <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> + </button> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extraction counter" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OLN-e5-oOe"> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <nil key="highlightedColor"/> + </label> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> + <color key="backgroundColor" red="0.34650985049999999" green="0.21581921879999999" blue="0.1054245046" alpha="1" colorSpace="calibratedRGB"/> <constraints> - <constraint firstItem="nNM-14-LcQ" firstAttribute="leading" secondItem="Wfz-bK-fv9" secondAttribute="leading" type="default" id="Wqq-SO-grV"/> - <constraint firstItem="nNM-14-LcQ" firstAttribute="top" secondItem="Wfz-bK-fv9" secondAttribute="top" type="default" id="g4Q-jg-4CN"/> - <constraint firstItem="nNM-14-LcQ" firstAttribute="trailing" secondItem="Wfz-bK-fv9" secondAttribute="trailing" type="default" id="gLN-37-rpr"/> + <constraint firstItem="lWi-pD-I1j" firstAttribute="top" secondItem="Wfz-bK-fv9" secondAttribute="top" constant="-20" id="23s-Qj-OI3"/> + <constraint firstAttribute="bottom" secondItem="OLN-e5-oOe" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="5Qr-Sh-PDH"/> + <constraint firstItem="lWi-pD-I1j" firstAttribute="leading" secondItem="Wfz-bK-fv9" secondAttribute="leading" constant="-20" id="GCr-R6-byk"/> + <constraint firstItem="lWi-pD-I1j" firstAttribute="centerX" secondItem="Wfz-bK-fv9" secondAttribute="centerX" type="default" id="TpB-6n-I3J"/> + <constraint firstAttribute="trailing" secondItem="YJ7-1f-6ZW" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="gAH-4W-K42"/> + <constraint firstItem="OLN-e5-oOe" firstAttribute="leading" secondItem="Wfz-bK-fv9" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="lYU-wl-w14"/> + <constraint firstItem="YJ7-1f-6ZW" firstAttribute="top" secondItem="lWi-pD-I1j" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="oQd-Hn-Q7R"/> + <constraint firstItem="YJ7-1f-6ZW" firstAttribute="centerY" secondItem="OLN-e5-oOe" secondAttribute="centerY" type="default" id="rZZ-sg-nWO"/> </constraints> </view> <navigationItem key="navigationItem" id="nKM-NZ-clm"> - <barButtonItem key="rightBarButtonItem" systemItem="edit" id="ikw-nF-0l3"/> + <barButtonItem key="rightBarButtonItem" systemItem="edit" id="ikw-nF-0l3"> + <connections> + <segue destination="ryM-Nv-nnd" kind="modal" identifier="EditBeanCollectionSegue" id="utz-eo-nc3"/> + </connections> + </barButtonItem> </navigationItem> <connections> + <outlet property="beanCollectionNoteTextView" destination="WyC-9J-FOJ" id="ajj-RC-E9O"/> <outlet property="beanTableView" destination="nNM-14-LcQ" id="fOr-10-Kts"/> + <outlet property="extractionButton" destination="YJ7-1f-6ZW" id="tvs-fK-NQd"/> + <outlet property="extractionProgressLabel" destination="OLN-e5-oOe" id="X73-Gr-2yj"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="ZA6-Ra-Cp0" userLabel="First Responder" sceneMemberID="firstResponder"/> @@ -772,10 +820,16 @@ <relationship kind="outlet" name="beanListTableView" candidateClass="UITableView"/> </relationships> </class> + <class className="BeanCollectionExtractionScrollView" superclassName="UIScrollView"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCollectionExtractionScrollView.h"/> + </class> <class className="BeanCollectionExtractionViewController" superclassName="UIViewController"> <source key="sourceIdentifier" type="project" relativePath="./Classes/BeanCollectionExtractionViewController.h"/> <relationships> + <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"/> </relationships> </class> <class className="BeanCollectionInfoViewController" superclassName="UIViewController"> @@ -839,6 +893,7 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="utz-eo-nc3"/> <segue reference="OPZ-Pj-2Dz"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file |