Skip to content

Commit 7b238c7

Browse files
author
Sam Davies
committed
Updates storyboard and adds images for tab buttons
1 parent e5e5d8b commit 7b238c7

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

20-uiviewcontroller-edges/ExtendedLayout/ExtendedLayout/Base.lproj/Main.storyboard

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</subviews>
2424
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
2525
</view>
26-
<tabBarItem key="tabBarItem" title="Scroll" id="4sn-aO-G54"/>
26+
<tabBarItem key="tabBarItem" title="Scroll" image="tabimage" id="4sn-aO-G54"/>
2727
<connections>
2828
<outlet property="scrollView" destination="5Ng-Kr-Avb" id="MJP-qa-TKd"/>
2929
</connections>
@@ -70,7 +70,7 @@
7070
<scene sceneID="nrX-hh-hTJ">
7171
<objects>
7272
<navigationController definesPresentationContext="YES" id="2xF-cH-OtX" sceneMemberID="viewController">
73-
<tabBarItem key="tabBarItem" title="Nav/Simple" id="I2F-xl-o9z"/>
73+
<tabBarItem key="tabBarItem" title="Nav/Simple" image="tabimage" id="I2F-xl-o9z"/>
7474
<navigationBar key="navigationBar" contentMode="scaleToFill" id="LKN-aW-g27">
7575
<autoresizingMask key="autoresizingMask"/>
7676
</navigationBar>
@@ -91,10 +91,11 @@
9191
<viewControllerLayoutGuide type="bottom" id="hWK-tc-dZQ"/>
9292
</layoutGuides>
9393
<view key="view" contentMode="scaleToFill" id="aHt-uF-AJ0">
94-
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
94+
<rect key="frame" x="0.0" y="64" width="320" height="455"/>
9595
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
9696
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
9797
</view>
98+
<extendedEdge key="edgesForExtendedLayout"/>
9899
<navigationItem key="navigationItem" id="OPd-Oe-FT1"/>
99100
</viewController>
100101
<placeholder placeholderIdentifier="IBFirstResponder" id="Tp6-vq-yCq" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -105,7 +106,7 @@
105106
<scene sceneID="I5u-07-aYc">
106107
<objects>
107108
<navigationController definesPresentationContext="YES" id="hWq-XW-DjL" sceneMemberID="viewController">
108-
<tabBarItem key="tabBarItem" title="Nav/Scroll" id="uSz-Ta-on9"/>
109+
<tabBarItem key="tabBarItem" title="Nav/Scroll" image="tabimage" id="uSz-Ta-on9"/>
109110
<navigationBar key="navigationBar" contentMode="scaleToFill" id="F3n-4T-1bC">
110111
<autoresizingMask key="autoresizingMask"/>
111112
</navigationBar>
@@ -177,7 +178,7 @@
177178
<outlet property="delegate" destination="fQo-Xo-m5z" id="Qlg-2P-Rvi"/>
178179
</connections>
179180
</tableView>
180-
<tabBarItem key="tabBarItem" title="Table" id="avA-4z-XCt"/>
181+
<tabBarItem key="tabBarItem" title="Table" image="tabimage" id="avA-4z-XCt"/>
181182
</tableViewController>
182183
<placeholder placeholderIdentifier="IBFirstResponder" id="1xI-da-6TQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
183184
</objects>
@@ -187,7 +188,7 @@
187188
<scene sceneID="hio-Ra-aIB">
188189
<objects>
189190
<navigationController definesPresentationContext="YES" id="9RB-7c-ldV" sceneMemberID="viewController">
190-
<tabBarItem key="tabBarItem" title="Nav/Table" id="ylQ-eI-e29"/>
191+
<tabBarItem key="tabBarItem" title="Nav/Table" image="tabimage" id="ylQ-eI-e29"/>
191192
<navigationBar key="navigationBar" contentMode="scaleToFill" id="8N6-cc-SDg">
192193
<autoresizingMask key="autoresizingMask"/>
193194
</navigationBar>
@@ -222,6 +223,13 @@
222223
<point key="canvasLocation" x="-1304" y="-372"/>
223224
</scene>
224225
</scenes>
226+
<resources>
227+
<image name="tabimage" width="30" height="30"/>
228+
<image name="tabimage" width="30" height="30"/>
229+
<image name="tabimage" width="30" height="30"/>
230+
<image name="tabimage" width="30" height="30"/>
231+
<image name="tabimage" width="30" height="30"/>
232+
</resources>
225233
<simulatedMetricsContainer key="defaultSimulatedMetrics">
226234
<simulatedStatusBarMetrics key="statusBar"/>
227235
<simulatedOrientationMetrics key="orientation"/>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x",
6+
"filename" : "first.png"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x",
11+
"filename" : "first@2x.png"
12+
}
13+
],
14+
"info" : {
15+
"version" : 1,
16+
"author" : "xcode"
17+
}
18+
}
253 Bytes
Loading
402 Bytes
Loading

0 commit comments

Comments
 (0)