Skip to content

Commit 9776f94

Browse files
committed
versioning foo
1 parent aca882f commit 9776f94

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

bk2ch02p051ImageAndTraitCollection/ImageAndTraitCollection/Base.lproj/Main.storyboard

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6206.9" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7026.1"/>
5-
<capability name="Constraints with attributes relative to the layout margin" minToolsVersion="6.0"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
5+
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
66
</dependencies>
77
<scenes>
88
<!--View Controller-->
@@ -23,8 +23,8 @@
2323
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lkV-av-Duv">
2424
<rect key="frame" x="34" y="197" width="124" height="122"/>
2525
</imageView>
26-
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NnX-B9-0RT">
27-
<rect key="frame" x="422" y="39" width="153" height="30"/>
26+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NnX-B9-0RT">
27+
<rect key="frame" x="529" y="39" width="46" height="30"/>
2828
<state key="normal" title="Button">
2929
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
3030
</state>

bk2ch02p056marsSlicing/ch15p406marsSlicing/Base.lproj/Main.storyboard

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6185.7" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6181.2"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
55
</dependencies>
66
<scenes>
77
<!--View Controller-->
@@ -48,14 +48,11 @@
4848
</scene>
4949
</scenes>
5050
<resources>
51-
<image name="Mars" width="108" height="108"/>
51+
<image name="Mars" width="108" height="26"/>
5252
</resources>
5353
<simulatedMetricsContainer key="defaultSimulatedMetrics">
5454
<simulatedStatusBarMetrics key="statusBar"/>
5555
<simulatedOrientationMetrics key="orientation"/>
56-
<simulatedScreenMetrics key="destination" type="retina4">
57-
<size key="portraitSize" width="320" height="568"/>
58-
<size key="landscapeSize" width="568" height="320"/>
59-
</simulatedScreenMetrics>
56+
<simulatedScreenMetrics key="destination" type="retina4"/>
6057
</simulatedMetricsContainer>
6158
</document>

bk2ch02p056marsSlicing/ch15p406marsSlicing/Images.xcassets/AppIcon.appiconset/Contents.json

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"idiom" : "iphone",
1515
"size" : "60x60",
1616
"scale" : "2x"
17+
},
18+
{
19+
"idiom" : "iphone",
20+
"size" : "60x60",
21+
"scale" : "3x"
1722
}
1823
],
1924
"info" : {

bk2ch02p056marsSlicing/ch15p406marsSlicing/Images.xcassets/Mars.imageset/Contents.json

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
"idiom" : "universal",
2323
"filename" : "[email protected]",
2424
"scale" : "2x"
25+
},
26+
{
27+
"idiom" : "universal",
28+
"scale" : "3x"
2529
}
2630
],
2731
"info" : {

0 commit comments

Comments
 (0)