Skip to content

Commit c0a208d

Browse files
JakeLinJakeLin
committed
Merge pull request #11 from gizmou/master
Add Forecast feature to the app. Credits to Marc @gizmou
2 parents b125401 + 982cfae commit c0a208d

File tree

3 files changed

+226
-60
lines changed

3 files changed

+226
-60
lines changed

‎Swift Weather.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,11 @@
238238
TargetAttributes = {
239239
232FF1AD193F320D007015C4 = {
240240
CreatedOnToolsVersion = 6.0;
241+
DevelopmentTeam = 964HJ5SV2F;
241242
};
242243
232FF1BF193F320D007015C4 = {
243244
CreatedOnToolsVersion = 6.0;
245+
DevelopmentTeam = 964HJ5SV2F;
244246
TestTargetID = 232FF1AD193F320D007015C4;
245247
};
246248
};
@@ -483,6 +485,8 @@
483485
isa = XCBuildConfiguration;
484486
buildSettings = {
485487
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Swift Weather.app/Swift Weather";
488+
CODE_SIGN_IDENTITY = "iPhone Developer";
489+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
486490
FRAMEWORK_SEARCH_PATHS = (
487491
"$(SDKROOT)/Developer/Library/Frameworks",
488492
"$(inherited)",
@@ -495,6 +499,7 @@
495499
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
496500
METAL_ENABLE_DEBUG_INFO = YES;
497501
PRODUCT_NAME = "$(TARGET_NAME)";
502+
PROVISIONING_PROFILE = "";
498503
TEST_HOST = "$(BUNDLE_LOADER)";
499504
};
500505
name = Debug;
@@ -503,6 +508,8 @@
503508
isa = XCBuildConfiguration;
504509
buildSettings = {
505510
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Swift Weather.app/Swift Weather";
511+
CODE_SIGN_IDENTITY = "iPhone Developer";
512+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
506513
FRAMEWORK_SEARCH_PATHS = (
507514
"$(SDKROOT)/Developer/Library/Frameworks",
508515
"$(inherited)",
@@ -511,6 +518,7 @@
511518
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
512519
METAL_ENABLE_DEBUG_INFO = NO;
513520
PRODUCT_NAME = "$(TARGET_NAME)";
521+
PROVISIONING_PROFILE = "";
514522
TEST_HOST = "$(BUNDLE_LOADER)";
515523
};
516524
name = Release;

‎Swift Weather/Base.lproj/Main.storyboard‎

Lines changed: 76 additions & 4 deletions
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="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="6fQ-Nl-7m6">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="6fQ-Nl-7m6">
33
<dependencies>
4-
<deployment defaultVersion="1792" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
66
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
77
</dependencies>
88
<scenes>
@@ -21,7 +21,7 @@
2121
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pFo-WT-chN">
2222
<rect key="frame" x="85" y="262" width="150" height="61"/>
2323
<gestureRecognizers/>
24-
<fontDescription key="fontDescription" type="system" pointSize="17"/>
24+
<fontDescription key="fontDescription" type="boldSystem" pointSize="60"/>
2525
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
2626
<nil key="highlightedColor"/>
2727
</label>
@@ -52,6 +52,66 @@
5252
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
5353
<nil key="highlightedColor"/>
5454
</label>
55+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a0C-Hf-Zp7" userLabel="time1">
56+
<rect key="frame" x="20" y="378" width="70" height="21"/>
57+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
58+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
59+
<nil key="highlightedColor"/>
60+
</label>
61+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XqD-7W-w15" userLabel="temp1">
62+
<rect key="frame" x="20" y="475" width="70" height="21"/>
63+
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
64+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
65+
<nil key="highlightedColor"/>
66+
</label>
67+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u39-PS-YfO" userLabel="temp2">
68+
<rect key="frame" x="90" y="475" width="70" height="21"/>
69+
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
70+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
71+
<nil key="highlightedColor"/>
72+
</label>
73+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ygz-aR-Dgm" userLabel="temp3">
74+
<rect key="frame" x="160" y="475" width="70" height="21"/>
75+
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
76+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
77+
<nil key="highlightedColor"/>
78+
</label>
79+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fmF-7k-34e" userLabel="temp4">
80+
<rect key="frame" x="230" y="475" width="70" height="21"/>
81+
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
82+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
83+
<nil key="highlightedColor"/>
84+
</label>
85+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IzO-bv-S0A" userLabel="time2">
86+
<rect key="frame" x="90" y="378" width="70" height="21"/>
87+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
88+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
89+
<nil key="highlightedColor"/>
90+
</label>
91+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xSf-Yn-lT4" userLabel="time3">
92+
<rect key="frame" x="160" y="378" width="70" height="21"/>
93+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
94+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
95+
<nil key="highlightedColor"/>
96+
</label>
97+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GaH-Cr-ooc" userLabel="time4">
98+
<rect key="frame" x="230" y="378" width="70" height="21"/>
99+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
100+
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
101+
<nil key="highlightedColor"/>
102+
</label>
103+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S6u-Yw-H0l" userLabel="forecast1">
104+
<rect key="frame" x="25" y="407" width="60" height="60"/>
105+
</imageView>
106+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nuG-gB-2W8" userLabel="forecast2">
107+
<rect key="frame" x="95" y="407" width="60" height="60"/>
108+
</imageView>
109+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="N1n-ab-BDx" userLabel="forecast3">
110+
<rect key="frame" x="165" y="407" width="60" height="60"/>
111+
</imageView>
112+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cgr-vE-X2l" userLabel="forecast4">
113+
<rect key="frame" x="235" y="407" width="60" height="60"/>
114+
</imageView>
55115
</subviews>
56116
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
57117
<gestureRecognizers/>
@@ -73,10 +133,22 @@
73133
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
74134
<connections>
75135
<outlet property="icon" destination="jY1-M7-UCM" id="nel-6R-FZ4"/>
136+
<outlet property="image1" destination="S6u-Yw-H0l" id="W1e-qV-sTn"/>
137+
<outlet property="image2" destination="nuG-gB-2W8" id="Ktj-Fa-ydB"/>
138+
<outlet property="image3" destination="N1n-ab-BDx" id="Maz-fI-fzu"/>
139+
<outlet property="image4" destination="cgr-vE-X2l" id="kM1-xG-Qjz"/>
76140
<outlet property="loading" destination="BuS-AZ-bQn" id="eIN-E7-uuo"/>
77141
<outlet property="loadingIndicator" destination="fHX-FU-RfO" id="vUD-DL-vLg"/>
78142
<outlet property="location" destination="dUY-QF-CDf" id="Ktm-CT-4Ty"/>
143+
<outlet property="temp1" destination="XqD-7W-w15" id="Nno-IS-qke"/>
144+
<outlet property="temp2" destination="u39-PS-YfO" id="bl7-mA-B7u"/>
145+
<outlet property="temp3" destination="Ygz-aR-Dgm" id="TXM-u0-SPh"/>
146+
<outlet property="temp4" destination="fmF-7k-34e" id="ctn-rv-Yvv"/>
79147
<outlet property="temperature" destination="pFo-WT-chN" id="hje-YZ-KoF"/>
148+
<outlet property="time1" destination="a0C-Hf-Zp7" id="0cz-gW-nBi"/>
149+
<outlet property="time2" destination="IzO-bv-S0A" id="O5W-7D-abO"/>
150+
<outlet property="time3" destination="xSf-Yn-lT4" id="n8Q-Yn-sVN"/>
151+
<outlet property="time4" destination="GaH-Cr-ooc" id="NKo-0V-QXk"/>
80152
</connections>
81153
</viewController>
82154
<placeholder placeholderIdentifier="IBFirstResponder" id="D1u-Xu-ZGD" userLabel="First Responder" sceneMemberID="firstResponder"/>

0 commit comments

Comments
 (0)