Merge lp:~vthompson/ubuntu-weather-app/reboot-add-sunrise-sunset-icons into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-07-30
Status: Merged
Approved by: Andrew Hayzen on 2015-08-02
Approved revision: 77
Merged at revision: 79
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-add-sunrise-sunset-icons
Merge into: lp:ubuntu-weather-app
Diff against target: 217 lines (+179/-2)
4 files modified
app/components/DayDelegate.qml (+2/-2)
app/graphics/extended-information_sunrise.svg (+88/-0)
app/graphics/extended-information_sunset.svg (+88/-0)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-add-sunrise-sunset-icons
Reviewer Review Type Date Requested Status
Andrew Hayzen 2015-07-30 Approve on 2015-08-02
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-07-30
Review via email: mp+266343@code.launchpad.net

Commit message

* Add sunrise and sunset icons from the spec

Description of the change

* Add sunrise and sunset icons from the spec

I extracted the sunrise vector graphic from the "FINAL Weather Icons.pdf" file and exported it to svg using Inkscape.

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/DayDelegate.qml'
2--- app/components/DayDelegate.qml 2015-07-25 22:19:03 +0000
3+++ app/components/DayDelegate.qml 2015-07-30 02:57:44 +0000
4@@ -227,13 +227,13 @@
5 ForecastDetailsDelegate {
6 id: sunriseForecast
7 forecast: i18n.tr("Sunrise")
8- imageName: "info"
9+ imageSource: "../graphics/extended-information_sunrise.svg"
10 }
11
12 ForecastDetailsDelegate {
13 id: sunsetForecast
14 forecast: i18n.tr("Sunset")
15- imageName: "info"
16+ imageSource: "../graphics/extended-information_sunset.svg"
17 }
18 }
19 }
20
21=== added file 'app/graphics/extended-information_sunrise.svg'
22--- app/graphics/extended-information_sunrise.svg 1970-01-01 00:00:00 +0000
23+++ app/graphics/extended-information_sunrise.svg 2015-07-30 02:57:44 +0000
24@@ -0,0 +1,88 @@
25+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
26+<!-- Created with Inkscape (http://www.inkscape.org/) -->
27+
28+<svg
29+ xmlns:dc="http://purl.org/dc/elements/1.1/"
30+ xmlns:cc="http://creativecommons.org/ns#"
31+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
32+ xmlns:svg="http://www.w3.org/2000/svg"
33+ xmlns="http://www.w3.org/2000/svg"
34+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
35+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
36+ width="90"
37+ height="90"
38+ id="svg3642"
39+ version="1.1"
40+ inkscape:version="0.91 r13725"
41+ viewBox="0 0 90 90"
42+ sodipodi:docname="sunrise.svg">
43+ <defs
44+ id="defs3644" />
45+ <sodipodi:namedview
46+ id="base"
47+ pagecolor="#ffffff"
48+ bordercolor="#666666"
49+ borderopacity="1.0"
50+ inkscape:pageopacity="0.0"
51+ inkscape:pageshadow="2"
52+ inkscape:zoom="5.5"
53+ inkscape:cx="1.4545455"
54+ inkscape:cy="32"
55+ inkscape:current-layer="layer1"
56+ showgrid="true"
57+ inkscape:document-units="px"
58+ inkscape:grid-bbox="true"
59+ inkscape:window-width="1855"
60+ inkscape:window-height="1056"
61+ inkscape:window-x="65"
62+ inkscape:window-y="24"
63+ inkscape:window-maximized="1" />
64+ <metadata
65+ id="metadata3647">
66+ <rdf:RDF>
67+ <cc:Work
68+ rdf:about="">
69+ <dc:format>image/svg+xml</dc:format>
70+ <dc:type
71+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
72+ <dc:title></dc:title>
73+ </cc:Work>
74+ </rdf:RDF>
75+ </metadata>
76+ <g
77+ id="layer1"
78+ inkscape:label="Layer 1"
79+ inkscape:groupmode="layer"
80+ transform="translate(0,26)">
81+ <path
82+ style="fill:#808080;fill-opacity:1"
83+ d="m 26.78212,5.9887068 -5.382513,-9.3529353 2.093211,-1.1925985 c 1.151271,-0.65592 2.107413,-1.174671 2.124765,-1.152765 0.313155,0.395325 10.541061,18.372014 10.541061,18.527102 0,0.121167 -0.536958,0.524286 -1.193238,0.895824 -0.656289,0.371547 -1.554939,0.889911 -1.99701,1.151919 L 32.164633,15.341641 26.78212,5.9887068 Z"
84+ id="path3437"
85+ inkscape:connector-curvature="0" />
86+ <path
87+ style="fill:#808080;fill-opacity:1"
88+ d="m 42.749893,0.3532757 0,-10.6823697 2.386485,0 2.386485,0 0,10.6823697 0,10.6823603 -2.386485,0 -2.386485,0 0,-10.6823603 z"
89+ id="path3439"
90+ inkscape:connector-curvature="0" />
91+ <path
92+ style="fill:#808080;fill-opacity:1"
93+ d="M 56.046025,14.195662 C 55.045972,13.59223 54.130753,13.062283 54.012196,13.018003 53.848144,12.956713 61.28128,-0.2748253 64.150641,-5.02921 l 0.436437,-0.723159 1.979793,1.141956 c 1.088883,0.6280825 2.017233,1.1784505 2.062989,1.2230456 0.08784,0.08559 -10.018844,17.7534264 -10.490561,18.3388854 -0.237942,0.295308 -0.520002,0.193464 -2.093274,-0.755856 z"
94+ id="path3441"
95+ inkscape:connector-curvature="0" />
96+ <path
97+ style="fill:#808080;fill-opacity:1"
98+ d="M 63.87093,22.143905 C 63.219591,21.005711 62.784261,20.007647 62.893962,19.904048 63.177039,19.63673 81.221725,9.1995467 81.276697,9.2713397 c 0.282537,0.369027 2.389788,4.1043953 2.339028,4.1462363 -0.03753,0.03096 -3.392335,1.976715 -7.455034,4.323898 -4.062708,2.347191 -8.225586,4.759875 -9.250839,5.361516 l -1.864089,1.093905 -1.174833,-2.05299 z"
99+ id="path3445"
100+ inkscape:connector-curvature="0" />
101+ <path
102+ style="fill:#808080;fill-opacity:1"
103+ d="m 1.8387093,32.887313 0,-2.53251 13.6075957,0 13.607586,0 0.620559,-1.761453 c 2.147886,-6.096807 5.892831,-9.823986 11.166354,-11.11338 2.201751,-0.538335 6.756111,-0.534681 8.727615,0.0072 5.170455,1.420614 9.12609,5.644305 11.040102,11.788227 l 0.407133,1.306881 13.481909,0 13.481911,0 0,2.272842 0,2.272842 -41.673339,0 c -22.920327,0 -42.3019986,0.0657 -43.0703737,0.146025 l -1.397052,0.146016 0,-2.532501 z M 55.616266,29.616128 c -0.413046,-2.094669 -2.175516,-4.507155 -4.292244,-5.875263 -4.577967,-2.958876 -9.971064,-2.49669 -13.914819,1.192491 -1.555938,1.455507 -2.841543,3.616272 -2.841543,4.775895 l 0,0.645552 10.597131,0 10.597131,0 -0.145656,-0.738675 z"
104+ id="path3447"
105+ inkscape:connector-curvature="0" />
106+ <path
107+ style="fill:#808080;fill-opacity:1"
108+ d="m 15.922288,18.850454 c -5.058325,-2.928024 -9.2259277,-5.40856 -9.2613247,-5.512285 -0.03537,-0.103734 0.459243,-1.078245 1.099215,-2.16558 l 1.163583,-1.9769753 0.719055,0.424107 C 10.038303,9.8529737 14.146156,12.22684 18.7714,14.89498 c 4.625235,2.668132 8.483391,4.91356 8.573679,4.989826 0.09029,0.07623 -0.37359,1.072584 -1.030833,2.214009 l -1.194993,2.075328 -9.196965,-5.323689 z"
109+ id="path3449"
110+ inkscape:connector-curvature="0" />
111+ </g>
112+</svg>
113
114=== added file 'app/graphics/extended-information_sunset.svg'
115--- app/graphics/extended-information_sunset.svg 1970-01-01 00:00:00 +0000
116+++ app/graphics/extended-information_sunset.svg 2015-07-30 02:57:44 +0000
117@@ -0,0 +1,88 @@
118+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
119+<!-- Created with Inkscape (http://www.inkscape.org/) -->
120+
121+<svg
122+ xmlns:dc="http://purl.org/dc/elements/1.1/"
123+ xmlns:cc="http://creativecommons.org/ns#"
124+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
125+ xmlns:svg="http://www.w3.org/2000/svg"
126+ xmlns="http://www.w3.org/2000/svg"
127+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
128+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
129+ width="90"
130+ height="90"
131+ id="svg3642"
132+ version="1.1"
133+ inkscape:version="0.91 r13725"
134+ viewBox="0 0 90 90"
135+ sodipodi:docname="sunset.svg">
136+ <defs
137+ id="defs3644" />
138+ <sodipodi:namedview
139+ id="base"
140+ pagecolor="#ffffff"
141+ bordercolor="#666666"
142+ borderopacity="1.0"
143+ inkscape:pageopacity="0.0"
144+ inkscape:pageshadow="2"
145+ inkscape:zoom="5.5"
146+ inkscape:cx="1.4545455"
147+ inkscape:cy="32"
148+ inkscape:current-layer="layer1"
149+ showgrid="true"
150+ inkscape:document-units="px"
151+ inkscape:grid-bbox="true"
152+ inkscape:window-width="1855"
153+ inkscape:window-height="1056"
154+ inkscape:window-x="65"
155+ inkscape:window-y="24"
156+ inkscape:window-maximized="1" />
157+ <metadata
158+ id="metadata3647">
159+ <rdf:RDF>
160+ <cc:Work
161+ rdf:about="">
162+ <dc:format>image/svg+xml</dc:format>
163+ <dc:type
164+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
165+ <dc:title></dc:title>
166+ </cc:Work>
167+ </rdf:RDF>
168+ </metadata>
169+ <g
170+ id="layer1"
171+ inkscape:label="Layer 1"
172+ inkscape:groupmode="layer"
173+ transform="translate(0,26)">
174+ <path
175+ style="fill:#808080;fill-opacity:1"
176+ d="m 63.036063,25.102202 5.382513,9.352936 -2.093211,1.192598 c -1.151271,0.65592 -2.107413,1.174671 -2.124765,1.152765 -0.313155,-0.395325 -10.541061,-18.372014 -10.541061,-18.527102 0,-0.121167 0.536958,-0.524286 1.193238,-0.895824 0.656289,-0.371547 1.554939,-0.889911 1.99701,-1.151919 l 0.803763,-0.476388 5.382513,9.352934 z"
177+ id="path3437"
178+ inkscape:connector-curvature="0" />
179+ <path
180+ style="fill:#808080;fill-opacity:1"
181+ d="m 47.06829,30.737633 0,10.68237 -2.386485,0 -2.386485,0 0,-10.68237 0,-10.68236 2.386485,0 2.386485,0 0,10.68236 z"
182+ id="path3439"
183+ inkscape:connector-curvature="0" />
184+ <path
185+ style="fill:#808080;fill-opacity:1"
186+ d="m 33.772158,16.895247 c 1.000053,0.603432 1.915272,1.133379 2.033829,1.177659 0.164052,0.06129 -7.269084,13.292828 -10.138445,18.047213 l -0.436437,0.723159 -1.979793,-1.141956 c -1.088883,-0.628083 -2.017233,-1.178451 -2.062989,-1.223046 -0.08784,-0.08559 10.018844,-17.753426 10.490561,-18.338885 0.237942,-0.295308 0.520002,-0.193464 2.093274,0.755856 z"
187+ id="path3441"
188+ inkscape:connector-curvature="0" />
189+ <path
190+ style="fill:#808080;fill-opacity:1"
191+ d="m 25.947253,8.947004 c 0.651339,1.138194 1.086669,2.136258 0.976968,2.239857 -0.283077,0.267318 -18.3277627,10.704501 -18.3827347,10.632708 -0.282537,-0.369027 -2.389788,-4.104395 -2.339028,-4.146236 0.03753,-0.03096 3.392335,-1.976715 7.4550337,-4.323898 4.062708,-2.347191 8.225586,-4.759875 9.250839,-5.361516 l 1.864089,-1.093905 1.174833,2.05299 z"
192+ id="path3445"
193+ inkscape:connector-curvature="0" />
194+ <path
195+ style="fill:#808080;fill-opacity:1"
196+ d="m 87.979474,-1.796404 0,2.53251 -13.607596,0 -13.607586,0 -0.620559,1.761453 c -2.147886,6.096807 -5.892831,9.823986 -11.166354,11.11338 -2.201751,0.538335 -6.756111,0.534681 -8.727615,-0.0072 C 35.079309,12.183125 31.123674,7.959434 29.209662,1.815512 l -0.407133,-1.306881 -13.481909,0 -13.4819107,0 0,-2.272842 0,-2.272842 41.6733387,0 c 22.920327,0 42.301999,-0.0657 43.070374,-0.146025 l 1.397052,-0.146016 0,2.532501 z M 34.201917,1.474781 c 0.413046,2.094669 2.175516,4.507155 4.292244,5.875263 4.577967,2.958876 9.971064,2.49669 13.914819,-1.192491 1.555938,-1.455507 2.841543,-3.616272 2.841543,-4.775895 l 0,-0.645552 -10.597131,0 -10.597131,0 0.145656,0.738675 z"
197+ id="path3447"
198+ inkscape:connector-curvature="0" />
199+ <path
200+ style="fill:#808080;fill-opacity:1"
201+ d="m 73.895895,12.240455 c 5.058325,2.928024 9.225928,5.40856 9.261325,5.512285 0.03537,0.103734 -0.459243,1.078245 -1.099215,2.16558 l -1.163583,1.976975 -0.719055,-0.424107 c -0.395487,-0.233253 -4.50334,-2.607119 -9.128584,-5.275259 -4.625235,-2.668132 -8.483391,-4.91356 -8.573679,-4.989826 -0.09029,-0.07623 0.37359,-1.072584 1.030833,-2.214009 l 1.194993,-2.075328 9.196965,5.323689 z"
202+ id="path3449"
203+ inkscape:connector-curvature="0" />
204+ </g>
205+</svg>
206
207=== modified file 'debian/changelog'
208--- debian/changelog 2015-07-29 22:23:40 +0000
209+++ debian/changelog 2015-07-30 02:57:44 +0000
210@@ -7,6 +7,7 @@
211 * Add chance of rain
212 * Add conditions text to day delegate.
213 * Default to OWM if the key file for TWC is blank.
214+ * Add sunrise and sunset icons from the spec
215
216 [ Andrew Hayzen ]
217 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: