diff options
| -rw-r--r-- | iBean/iBean.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate | bin | 64019 -> 66883 bytes | |||
| -rw-r--r-- | iBean/iBean/BeanCollectionExtractionScrollView.m | 5 | ||||
| -rw-r--r-- | iBean/iBean/iPhoneStoryboard.storyboard | 41 |
4 files changed, 33 insertions, 21 deletions
diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj index 65dc07f..64c42d5 100644 --- a/iBean/iBean.xcodeproj/project.pbxproj +++ b/iBean/iBean.xcodeproj/project.pbxproj @@ -159,6 +159,7 @@ 020C559F1691014E00D8224C /* iBean */ = { isa = PBXGroup; children = ( + 024CB02216C0543B009CBC15 /* Graphics */, 024CB02116C04BDD009CBC15 /* Categories */, 0276253316B58C2C00EE2F4E /* Settings */, 020C55D31695C2C800D8224C /* iBean */, @@ -304,6 +305,13 @@ name = Categories; sourceTree = "<group>"; }; + 024CB02216C0543B009CBC15 /* Graphics */ = { + isa = PBXGroup; + children = ( + ); + name = Graphics; + sourceTree = "<group>"; + }; 0276253316B58C2C00EE2F4E /* Settings */ = { isa = PBXGroup; children = ( 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 1776333..5e4e5cb 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.m b/iBean/iBean/BeanCollectionExtractionScrollView.m index 4833814..5a7b024 100644 --- a/iBean/iBean/BeanCollectionExtractionScrollView.m +++ b/iBean/iBean/BeanCollectionExtractionScrollView.m @@ -25,7 +25,10 @@ //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); + //1 - Set the height of the table cells + [bt setRowHeight:60.0f]; + //2 - Calculate the total height for the tableview (i.e.: numberOfRows*rowHeight) + bt.frame = CGRectMake(bt.frame.origin.x, bt.frame.origin.y, bt.frame.size.width, [bt numberOfRowsInSection:0]*bt.rowHeight); //Move down the note text view, so that it don't overlaps the table. UITextView *note = [self.subviews objectAtIndex:1]; diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index bb8cece..a4b3309 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -257,6 +257,7 @@ </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QkD-Ej-5zA"> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> + <color key="tintColor" red="1" green="0.03254181749" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <state key="normal" title="Reset extraction count"> <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"/> @@ -433,7 +434,7 @@ <scene sceneID="Z2f-rf-6sX"> <objects> <tableViewController id="0Fo-5M-9Kc" customClass="ThresholdViewController" sceneMemberID="viewController"> - <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="X8h-db-Tyy"> + <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="singleLineEtched" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="X8h-db-Tyy"> <rect key="frame" x="0.0" y="64" width="320" height="455"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> @@ -453,7 +454,7 @@ <constraint firstAttribute="height" constant="30" id="nXA-Jn-d5M"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits" returnKeyType="done"/> + <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/> <connections> <outlet property="delegate" destination="0Fo-5M-9Kc" id="XQI-QU-ohX"/> </connections> @@ -599,7 +600,7 @@ </label> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter a descriptive unique name here" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Vla-ab-hH3"> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits" returnKeyType="done"/> + <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/> <connections> <outlet property="delegate" destination="5Zc-ii-ZPi" id="z1c-9h-NJ9"/> </connections> @@ -773,7 +774,7 @@ <constraint firstAttribute="width" constant="281" id="Y2Z-eE-IrG"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits" returnKeyType="done"/> + <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/> <connections> <outlet property="delegate" destination="4CQ-Gd-pSW" id="yIu-PF-Q7X"/> </connections> @@ -929,7 +930,7 @@ <constraint firstAttribute="width" constant="281" id="WQ1-oe-YTn"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits" returnKeyType="done"/> + <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/> <connections> <outlet property="delegate" destination="YXO-0S-PzZ" id="MbB-Fx-v6j"/> </connections> @@ -1060,17 +1061,17 @@ <subviews> <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"/> + <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="nNM-14-LcQ"> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> - <constraint firstAttribute="height" constant="119" id="c6U-LT-2HV"/> + <constraint firstAttribute="height" constant="89" id="ulf-w1-iKE"/> </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"/> + <rect key="frame" x="0.0" y="22" width="320" height="60"/> <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"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="59"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k5L-1w-O9k"> @@ -1081,7 +1082,6 @@ </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"/> @@ -1110,17 +1110,18 @@ <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="k5L-1w-O9k" firstAttribute="leading" secondItem="GFY-k6-GqL" secondAttribute="leading" type="default" id="2cW-c9-WxX"/> + <constraint firstAttribute="trailing" secondItem="Xmw-e4-noZ" secondAttribute="trailing" constant="40" id="4EQ-61-O6m"/> <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 firstAttribute="trailing" secondItem="2GK-CS-zgy" secondAttribute="trailing" constant="20" type="default" id="C7U-b9-00Q"/> <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="Xmw-e4-noZ" firstAttribute="top" secondItem="GFY-k6-GqL" secondAttribute="top" constant="18" id="aUJ-34-sGe"/> <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 firstItem="2GK-CS-zgy" firstAttribute="top" secondItem="GFY-k6-GqL" secondAttribute="top" type="default" id="ofN-ns-fMn"/> </constraints> <connections> <outlet property="beanAmountLabel" destination="Xmw-e4-noZ" id="yOh-Jm-eCd"/> @@ -1137,7 +1138,7 @@ </connections> </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"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <constraints> <constraint firstAttribute="width" constant="280" id="0dh-2u-5Ao"/> <constraint firstAttribute="height" constant="194" id="hpC-9a-g7Y"/> @@ -1149,13 +1150,13 @@ </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 firstItem="WyC-9J-FOJ" firstAttribute="top" secondItem="nNM-14-LcQ" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="fPM-8S-dGh"/> <constraint firstAttribute="trailing" secondItem="nNM-14-LcQ" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="ffc-G9-gKf"/> + <constraint firstAttribute="bottom" secondItem="WyC-9J-FOJ" secondAttribute="bottom" constant="104" id="jDu-bz-Akj"/> </constraints> </scrollView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YJ7-1f-6ZW"> @@ -1377,8 +1378,8 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="9nO-3G-dWz"/> - <segue reference="OPZ-Pj-2Dz"/> <segue reference="qk2-F5-M1s"/> + <segue reference="OPZ-Pj-2Dz"/> + <segue reference="utz-eo-nc3"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file |