Skip to content

Commit 7b03f75

Browse files
JakeLinJakeLin
authored
Merge pull request #66 from passerbyloo/master
Fix the warning and error for weather vc in sb
2 parents c384089 + a94eeea commit 7b03f75

File tree

1 file changed

+33
-38
lines changed

1 file changed

+33
-38
lines changed

‎SwiftWeather/Base.lproj/Main.storyboard‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
59
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
10+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
611
</dependencies>
712
<customFonts key="customFonts">
8-
<mutableArray key="weathericons-regular-webfont.ttf">
13+
<array key="weathericons-regular-webfont.ttf">
914
<string>WeatherIcons-Regular</string>
10-
<string>WeatherIcons-Regular</string>
11-
</mutableArray>
15+
</array>
1216
</customFonts>
1317
<scenes>
1418
<!--Weather View Controller-->
@@ -20,47 +24,38 @@
2024
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
2125
</layoutGuides>
2226
<view key="view" contentMode="top" id="8bC-Xf-vdC">
23-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
27+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2428
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2529
<subviews>
2630
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="background" translatesAutoresizingMaskIntoConstraints="NO" id="Y0n-Zr-Uo9">
27-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
31+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2832
</imageView>
2933
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8LB-3C-fUZ" userLabel="Tint View">
30-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
34+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
3135
<subviews>
3236
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gh8-e9-Cg0" userLabel="Weather Container View">
33-
<rect key="frame" x="0.0" y="30" width="600" height="345"/>
37+
<rect key="frame" x="0.0" y="30" width="375" height="345"/>
3438
<subviews>
3539
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="rnC-Hz-RdO">
36-
<rect key="frame" x="215" y="0.0" width="171" height="345"/>
40+
<rect key="frame" x="104.5" y="0.0" width="166" height="345"/>
3741
<subviews>
3842
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Melbourne" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="COR-kZ-hOu">
39-
<rect key="frame" x="0.0" y="0.0" width="171" height="43"/>
43+
<rect key="frame" x="0.0" y="0.0" width="166" height="43"/>
4044
<fontDescription key="fontDescription" type="system" pointSize="36"/>
41-
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
45+
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4246
<nil key="highlightedColor"/>
4347
</label>
4448
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hId-DS-ttH">
45-
<rect key="frame" x="6" y="43" width="160" height="209"/>
49+
<rect key="frame" x="3.5" y="43" width="159.5" height="208.5"/>
4650
<fontDescription key="fontDescription" name="WeatherIcons-Regular" family="Weather Icons" pointSize="144"/>
47-
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
51+
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4852
<nil key="highlightedColor"/>
49-
<variation key="heightClass=regular-widthClass=compact" fixedFrame="YES">
50-
<rect key="frame" x="5.5" y="21" width="159.5" height="208.5"/>
51-
</variation>
5253
</label>
5354
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="7" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lFc-pa-Aur">
54-
<rect key="frame" x="50" y="252" width="71" height="93"/>
55+
<rect key="frame" x="47.5" y="251.5" width="71" height="93.5"/>
5556
<fontDescription key="fontDescription" name="WeatherIcons-Regular" family="Weather Icons" pointSize="64"/>
56-
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
57+
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
5758
<nil key="highlightedColor"/>
58-
<variation key="heightClass=compact" misplaced="YES">
59-
<rect key="frame" x="50" y="252" width="71" height="94"/>
60-
</variation>
61-
<variation key="heightClass=regular-widthClass=compact" fixedFrame="YES">
62-
<rect key="frame" x="50" y="207.5" width="71" height="93"/>
63-
</variation>
6459
</label>
6560
</subviews>
6661
</stackView>
@@ -73,22 +68,22 @@
7368
</constraints>
7469
</view>
7570
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WCS-fc-TZZ" userLabel="Forecast Container View">
76-
<rect key="frame" x="0.0" y="425" width="600" height="115"/>
71+
<rect key="frame" x="0.0" y="492" width="375" height="115"/>
7772
<subviews>
78-
<stackView opaque="NO" contentMode="scaleToFill" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="rzR-3u-MJe">
79-
<rect key="frame" x="143" y="0.0" width="314" height="115"/>
73+
<stackView opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="314" placeholderIntrinsicHeight="115" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="rzR-3u-MJe">
74+
<rect key="frame" x="30.5" y="0.0" width="314" height="115"/>
8075
<subviews>
81-
<stackView opaque="NO" contentMode="scaleToFill" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="wXV-Go-iDR">
76+
<stackView opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="142" placeholderIntrinsicHeight="115" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="wXV-Go-iDR">
8277
<rect key="frame" x="0.0" y="0.0" width="142" height="115"/>
8378
<subviews>
84-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y4d-hQ-IEP" customClass="ForecastView" customModule="SwiftWeather" customModuleProvider="target">
79+
<view contentMode="scaleToFill" placeholderIntrinsicWidth="56" placeholderIntrinsicHeight="115" translatesAutoresizingMaskIntoConstraints="NO" id="y4d-hQ-IEP" customClass="ForecastView" customModule="SwiftWeather" customModuleProvider="target">
8580
<rect key="frame" x="0.0" y="0.0" width="56" height="115"/>
8681
<constraints>
8782
<constraint firstAttribute="height" constant="115" id="SKb-Zc-5Zr"/>
8883
</constraints>
8984
<userDefinedRuntimeAttributes>
9085
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
91-
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
86+
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
9287
</userDefinedRuntimeAttribute>
9388
<userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
9489
<userDefinedRuntimeAttribute type="string" keyPath="temperature" value="10"/>
@@ -98,7 +93,7 @@
9893
<rect key="frame" x="86" y="0.0" width="56" height="115"/>
9994
<userDefinedRuntimeAttributes>
10095
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
101-
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
96+
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
10297
</userDefinedRuntimeAttribute>
10398
<userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
10499
<userDefinedRuntimeAttribute type="string" keyPath="time" value="14:00"/>
@@ -113,11 +108,11 @@
113108
<stackView opaque="NO" contentMode="scaleToFill" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="6LM-Ly-chv">
114109
<rect key="frame" x="172" y="0.0" width="142" height="115"/>
115110
<subviews>
116-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8G3-c1-MSy" customClass="ForecastView" customModule="SwiftWeather" customModuleProvider="target">
111+
<view contentMode="scaleToFill" placeholderIntrinsicWidth="56" placeholderIntrinsicHeight="115" translatesAutoresizingMaskIntoConstraints="NO" id="8G3-c1-MSy" customClass="ForecastView" customModule="SwiftWeather" customModuleProvider="target">
117112
<rect key="frame" x="0.0" y="0.0" width="56" height="115"/>
118113
<userDefinedRuntimeAttributes>
119114
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
120-
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
115+
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
121116
</userDefinedRuntimeAttribute>
122117
<userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
123118
<userDefinedRuntimeAttribute type="string" keyPath="time" value="17:00"/>
@@ -128,7 +123,7 @@
128123
<rect key="frame" x="86" y="0.0" width="56" height="115"/>
129124
<userDefinedRuntimeAttributes>
130125
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
131-
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
126+
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
132127
</userDefinedRuntimeAttribute>
133128
<userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
134129
<userDefinedRuntimeAttribute type="string" keyPath="time" value="20:00"/>
@@ -152,7 +147,7 @@
152147
</constraints>
153148
</view>
154149
</subviews>
155-
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
150+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
156151
<constraints>
157152
<constraint firstItem="gh8-e9-Cg0" firstAttribute="centerY" secondItem="8LB-3C-fUZ" secondAttribute="centerY" id="32j-YN-mOd"/>
158153
<constraint firstItem="WCS-fc-TZZ" firstAttribute="width" secondItem="8LB-3C-fUZ" secondAttribute="width" multiplier="0.5" id="3IU-Kj-HHc"/>
@@ -196,7 +191,7 @@
196191
</variation>
197192
</view>
198193
</subviews>
199-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
194+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
200195
<constraints>
201196
<constraint firstItem="Y0n-Zr-Uo9" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" id="J6y-Jh-5dA"/>
202197
<constraint firstItem="Y0n-Zr-Uo9" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="SL6-YE-76Q"/>

0 commit comments

Comments
 (0)