diff options
author | Eddie Ehlin <eddiex@eddiex.se> | 2013-01-07 21:38:52 +0100 |
---|---|---|
committer | Eddie Ehlin <eddiex@eddiex.se> | 2013-01-07 21:38:52 +0100 |
commit | b361a55094cb64149cb1543c0c76c99be00a3da3 (patch) | |
tree | bba62891d972698fe7e0fda335ac4a8610d469a6 /iBean | |
parent | d46524ff6d2761a22b49e6619a1815a6c290c3f3 (diff) | |
download | iBean-b361a55094cb64149cb1543c0c76c99be00a3da3.tar.gz iBean-b361a55094cb64149cb1543c0c76c99be00a3da3.zip |
Updated UI to get rid of tab bar control in the next-next wizard while adding bean collection. Tab bar only visible on first scene
Diffstat (limited to 'iBean')
-rw-r--r-- | iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate | bin | 30411 -> 31984 bytes | |||
-rw-r--r-- | iBean/iBean/BeanCollectionListViewController.m | 2 | ||||
-rw-r--r-- | iBean/iBean/iPhoneStoryboard.storyboard | 134 |
3 files changed, 68 insertions, 68 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 4948f3e..7042894 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/BeanCollectionListViewController.m b/iBean/iBean/BeanCollectionListViewController.m index dc16847..c7adf33 100644 --- a/iBean/iBean/BeanCollectionListViewController.m +++ b/iBean/iBean/BeanCollectionListViewController.m @@ -50,7 +50,7 @@ if ([segue.identifier isEqualToString:@"NewBeanCollectionInfoSegue"]) { //Tell the view controller that we'll be adding/handling a new bean collection - BeanCollectionInfoViewController *infoViewController = segue.destinationViewController; + BeanCollectionInfoViewController *infoViewController = (BeanCollectionInfoViewController *)[[segue.destinationViewController viewControllers] objectAtIndex:0]; //Create new bean collection and pass it on to the next view controller! self.beanCollection = [(AppDelegate*) [[UIApplication sharedApplication] delegate] createBeanCollection]; diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index 2f5d54b..304377c 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -28,9 +28,6 @@ </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> - <connections> - <segue destination="5Zc-ii-ZPi" kind="push" identifier="EditBeanCollectionInfoSegue" id="ndw-lE-35x"/> - </connections> </tableViewCell> </prototypes> <sections/> @@ -47,14 +44,14 @@ </barButtonItem> <barButtonItem key="rightBarButtonItem" systemItem="add" id="Wuc-np-Bjz"> <connections> - <segue destination="5Zc-ii-ZPi" kind="push" identifier="NewBeanCollectionInfoSegue" id="9nO-3G-dWz"/> + <segue destination="ryM-Nv-nnd" kind="modal" identifier="NewBeanCollectionInfoSegue" id="9nO-3G-dWz"/> </connections> </barButtonItem> </navigationItem> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="BXw-pd-TpS" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="773" y="427"/> + <point key="canvasLocation" x="1285" y="403"/> </scene> <!--Insta Bean View Controller - Insta bean--> <scene sceneID="Lvr-w4-t8a"> @@ -125,7 +122,7 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="cT9-Af-PM7" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="13" y="337"/> + <point key="canvasLocation" x="755" y="-353"/> </scene> <!--Tab Bar Controller--> <scene sceneID="49X-K1-BnE"> @@ -163,14 +160,14 @@ </navigationController> <placeholder placeholderIdentifier="IBFirstResponder" id="BKj-BM-fs1" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="773" y="-353"/> + <point key="canvasLocation" x="755" y="403"/> </scene> <!--Bean Collection Info View Controller - Information (1/3)--> <scene sceneID="zCd-OM-l6j"> <objects> <viewController id="5Zc-ii-ZPi" customClass="BeanCollectionInfoViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="clg-Db-36O"> - <rect key="frame" x="0.0" y="64" width="320" height="455"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Bean collection name:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X5J-eE-KuX"> @@ -186,19 +183,6 @@ <outlet property="delegate" destination="5Zc-ii-ZPi" id="z1c-9h-NJ9"/> </connections> </textField> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1gs-gr-J8Q"> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Continue"> - <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> - <state key="highlighted"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <segue destination="utP-dF-IAb" kind="push" identifier="BeanInfoBeanListSegue" id="M6f-zy-35z"/> - </connections> - </button> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Notes:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HFn-UM-1hs"> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -217,23 +201,32 @@ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <constraints> <constraint firstAttribute="trailing" secondItem="JHg-Fk-IL0" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="2fr-zF-6pL"/> + <constraint firstAttribute="bottom" secondItem="JHg-Fk-IL0" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="397-DJ-gRl"/> <constraint firstItem="Vla-ab-hH3" firstAttribute="top" secondItem="X5J-eE-KuX" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="5J8-Ne-fpj"/> - <constraint firstAttribute="bottom" secondItem="1gs-gr-J8Q" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="VSd-Mq-r04"/> <constraint firstItem="HFn-UM-1hs" firstAttribute="top" secondItem="Vla-ab-hH3" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="Web-Sf-Oc0"/> <constraint firstAttribute="trailing" secondItem="Vla-ab-hH3" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="YDR-qg-128"/> <constraint firstItem="JHg-Fk-IL0" firstAttribute="leading" secondItem="clg-Db-36O" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="cJm-Kv-XoV"/> <constraint firstItem="Vla-ab-hH3" firstAttribute="leading" secondItem="clg-Db-36O" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="egB-MU-Pd7"/> - <constraint firstItem="JHg-Fk-IL0" firstAttribute="centerX" secondItem="1gs-gr-J8Q" secondAttribute="centerX" type="default" id="ezd-bh-8GU"/> <constraint firstAttribute="trailing" secondItem="X5J-eE-KuX" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="g6w-E3-8FE"/> <constraint firstItem="HFn-UM-1hs" firstAttribute="leading" secondItem="clg-Db-36O" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="hEI-Yy-hJn"/> <constraint firstAttribute="trailing" secondItem="HFn-UM-1hs" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="mXY-BU-DsS"/> - <constraint firstItem="1gs-gr-J8Q" firstAttribute="top" secondItem="JHg-Fk-IL0" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="npr-fB-n82"/> <constraint firstItem="X5J-eE-KuX" firstAttribute="top" secondItem="clg-Db-36O" secondAttribute="top" constant="20" symbolic="YES" type="default" id="sN2-9x-2su"/> <constraint firstItem="X5J-eE-KuX" firstAttribute="leading" secondItem="clg-Db-36O" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="sk4-iU-NEc"/> <constraint firstItem="JHg-Fk-IL0" firstAttribute="top" secondItem="HFn-UM-1hs" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="viC-gO-ppl"/> </constraints> </view> - <navigationItem key="navigationItem" title="Information (1/3)" id="znt-MK-XJf"/> + <navigationItem key="navigationItem" title="Information (1/3)" id="znt-MK-XJf"> + <barButtonItem key="leftBarButtonItem" title="Cancel" id="x9O-iQ-Nw6"> + <connections> + <segue destination="C1o-is-nML" kind="modal" id="roV-hD-UY6"/> + </connections> + </barButtonItem> + <barButtonItem key="rightBarButtonItem" title="Next" id="HeX-Kh-3ba"> + <connections> + <segue destination="utP-dF-IAb" kind="push" identifier="BeanInfoBeanListSegue" id="fOV-Ys-L8Z"/> + </connections> + </barButtonItem> + </navigationItem> <connections> <outlet property="beanCollectionNameTextField" destination="Vla-ab-hH3" id="ZEz-IX-3Di"/> <outlet property="beanCollectionNoteTextView" destination="JHg-Fk-IL0" id="48Y-nc-5uX"/> @@ -241,32 +234,16 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="m7P-Kh-vW4" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="1340" y="-346"/> + <point key="canvasLocation" x="2247" y="403"/> </scene> <!--Bean Collection Bean List View Controller - Beans (2/3)--> <scene sceneID="A7y-oP-a8Z"> <objects> <viewController id="utP-dF-IAb" customClass="BeanCollectionBeanListViewController" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="2kX-jW-aIG"> - <rect key="frame" x="0.0" y="64" width="320" height="455"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qfS-rm-gBP"> - <constraints> - <constraint firstAttribute="width" constant="102" id="4aA-Ne-8TH"/> - </constraints> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Continue"> - <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/> - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="highlighted"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </state> - <connections> - <segue destination="49F-vz-WhB" kind="push" identifier="AddNewStep3Segue" id="KeQ-zN-iII"/> - </connections> - </button> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="bW3-E7-UoQ"> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <prototypes> @@ -292,21 +269,33 @@ <outlet property="delegate" destination="utP-dF-IAb" id="xQi-Ma-c2U"/> </connections> </tableView> + <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6cY-dj-XP0"> + <items> + <barButtonItem title="Edit" id="tKF-jM-0Uj"/> + <barButtonItem style="plain" systemItem="flexibleSpace" id="jlc-7u-JYn"/> + <barButtonItem systemItem="add" id="Uv7-P6-bFk"> + <connections> + <segue destination="YXO-0S-PzZ" kind="push" identifier="AddBeanSegue" id="h8P-86-6Pm"/> + </connections> + </barButtonItem> + </items> + </toolbar> </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <constraints> - <constraint firstItem="qfS-rm-gBP" firstAttribute="top" secondItem="bW3-E7-UoQ" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="6gI-ad-vco"/> + <constraint firstItem="6cY-dj-XP0" firstAttribute="top" secondItem="bW3-E7-UoQ" secondAttribute="bottom" type="default" id="Ake-zY-ggk"/> + <constraint firstItem="6cY-dj-XP0" firstAttribute="bottom" secondItem="2kX-jW-aIG" secondAttribute="bottom" type="default" id="DQ7-6h-Ix5"/> <constraint firstItem="bW3-E7-UoQ" firstAttribute="leading" secondItem="2kX-jW-aIG" secondAttribute="leading" type="default" id="Elg-2M-0HI"/> <constraint firstItem="bW3-E7-UoQ" firstAttribute="trailing" secondItem="2kX-jW-aIG" secondAttribute="trailing" type="default" id="FNP-lC-HMD"/> - <constraint firstItem="qfS-rm-gBP" firstAttribute="centerX" secondItem="bW3-E7-UoQ" secondAttribute="centerX" type="default" id="FhZ-ef-wOJ"/> + <constraint firstItem="6cY-dj-XP0" firstAttribute="leading" secondItem="2kX-jW-aIG" secondAttribute="leading" type="default" id="e3j-c1-awU"/> <constraint firstItem="bW3-E7-UoQ" firstAttribute="top" secondItem="2kX-jW-aIG" secondAttribute="top" type="default" id="nmp-pn-lgT"/> - <constraint firstAttribute="bottom" secondItem="qfS-rm-gBP" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="zAj-TD-Yo1"/> + <constraint firstItem="6cY-dj-XP0" firstAttribute="trailing" secondItem="2kX-jW-aIG" secondAttribute="trailing" type="default" id="xev-Mw-dfm"/> </constraints> </view> <navigationItem key="navigationItem" title="Beans (2/3)" id="AvU-FE-egp"> - <barButtonItem key="rightBarButtonItem" systemItem="add" id="GqH-Ye-0oU"> + <barButtonItem key="rightBarButtonItem" title="Next" id="GqH-Ye-0oU"> <connections> - <segue destination="YXO-0S-PzZ" kind="push" identifier="AddBeanSegue" id="COq-b9-noK"/> + <segue destination="49F-vz-WhB" kind="push" id="cxZ-CH-pu3"/> </connections> </barButtonItem> </navigationItem> @@ -316,26 +305,16 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="BhV-Dk-tNN" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="1759" y="-346"/> + <point key="canvasLocation" x="2730" y="403"/> </scene> <!--View Controller - Extraction (3/3)--> <scene sceneID="HiW-Hk-DPa"> <objects> <viewController id="49F-vz-WhB" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="GTi-kB-GK2"> - <rect key="frame" x="0.0" y="64" width="320" height="455"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KXT-Tp-RhX"> - <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> - <state key="normal" title="Done"> - <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> - <state key="highlighted"> - <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - </state> - </button> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extraction time (s):" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9UJ-bM-UDb"> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> @@ -357,27 +336,29 @@ <constraint firstItem="9UJ-bM-UDb" firstAttribute="leading" secondItem="GTi-kB-GK2" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="5UN-Uy-aQs"/> <constraint firstAttribute="trailing" secondItem="lvU-0d-qF1" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="6fg-Fx-0Pd"/> <constraint firstItem="i9j-PQ-aof" firstAttribute="centerY" secondItem="GTi-kB-GK2" secondAttribute="centerY" type="default" id="7nq-6z-IXL"/> - <constraint firstItem="i9j-PQ-aof" firstAttribute="centerX" secondItem="KXT-Tp-RhX" secondAttribute="centerX" type="default" id="8po-fO-MVm"/> <constraint firstItem="lvU-0d-qF1" firstAttribute="centerY" secondItem="9UJ-bM-UDb" secondAttribute="centerY" type="default" id="EAd-v0-Y2F"/> <constraint firstItem="i9j-PQ-aof" firstAttribute="leading" secondItem="GTi-kB-GK2" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="XSM-26-umw"/> <constraint firstItem="9UJ-bM-UDb" firstAttribute="top" secondItem="GTi-kB-GK2" secondAttribute="top" constant="20" symbolic="YES" type="default" id="pCN-6g-bUX"/> - <constraint firstAttribute="bottom" secondItem="KXT-Tp-RhX" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="yk5-nU-Njz"/> </constraints> </view> <navigationItem key="navigationItem" title="Extraction (3/3)" id="rnS-KT-Ugg"> - <barButtonItem key="rightBarButtonItem" systemItem="done" id="a0e-Mo-oEY"/> + <barButtonItem key="rightBarButtonItem" systemItem="done" id="a0e-Mo-oEY"> + <connections> + <segue destination="C1o-is-nML" kind="modal" identifier="CommitNewBeanCollectionSegue" id="CyX-df-8ge"/> + </connections> + </barButtonItem> </navigationItem> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="xVN-NA-gLQ" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="2236" y="-346"/> + <point key="canvasLocation" x="3298" y="403"/> </scene> <!--View Controller - Bean--> <scene sceneID="w0g-Bq-kR5"> <objects> <viewController id="YXO-0S-PzZ" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="ghC-6L-tQj"> - <rect key="frame" x="0.0" y="64" width="320" height="455"/> + <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Name:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ya-ar-5en"> @@ -445,7 +426,26 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="myk-um-Owg" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="1759" y="-1071"/> + <point key="canvasLocation" x="2730" y="-291"/> + </scene> + <!--Navigation Controller--> + <scene sceneID="kQ1-YP-ELW"> + <objects> + <navigationController id="ryM-Nv-nnd" sceneMemberID="viewController"> + <toolbarItems/> + <navigationItem key="navigationItem" id="8wh-nY-Nvr"/> + <navigationBar key="navigationBar" contentMode="scaleToFill" id="HMu-Um-JsA"> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> + <autoresizingMask key="autoresizingMask"/> + </navigationBar> + <nil name="viewControllers"/> + <connections> + <segue destination="5Zc-ii-ZPi" kind="relationship" relationship="rootViewController" id="BDp-Vb-EpW"/> + </connections> + </navigationController> + <placeholder placeholderIdentifier="IBFirstResponder" id="ikF-7S-dhL" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="1749" y="403"/> </scene> </scenes> <classes> @@ -491,6 +491,6 @@ <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> - <segue reference="ndw-lE-35x"/> + <segue reference="roV-hD-UY6"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file |