Ubuntu Clock App

Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 into lp:ubuntu-clock-app

  1. ubuntu-clock-app-uitk1.3
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 406
Merged at revision: 421
Proposed branch: lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3
Merge into: lp:ubuntu-clock-app
Diff against target: 665 lines (+58/-54)
48 files modified
app/MainPage.qml (+4/-1)
app/alarm/AlarmDelegate.qml (+1/-1)
app/alarm/AlarmLabel.qml (+1/-1)
app/alarm/AlarmList.qml (+1/-1)
app/alarm/AlarmModelComponent.qml (+1/-1)
app/alarm/AlarmPage.qml (+1/-1)
app/alarm/AlarmRepeat.qml (+1/-1)
app/alarm/AlarmSettingsPage.qml (+1/-1)
app/alarm/AlarmSound.qml (+1/-1)
app/alarm/AlarmUtils.qml (+1/-1)
app/alarm/EditAlarmPage.qml (+2/-2)
app/alarm/SoundPeerPicker.qml (+1/-1)
app/clock/ClockPage.qml (+1/-1)
app/clock/MainClock.qml (+1/-1)
app/components/ActionIcon.qml (+1/-1)
app/components/AnalogMode.qml (+1/-1)
app/components/AnalogShadow.qml (+1/-1)
app/components/Background.qml (+1/-1)
app/components/Clock.qml (+1/-1)
app/components/ClockCircle.qml (+1/-1)
app/components/DigitalMode.qml (+1/-1)
app/components/DigitalShadow.qml (+1/-1)
app/components/EmptyState.qml (+1/-1)
app/components/ExpandableListItem.qml (+2/-2)
app/components/HeaderNavigation.qml (+1/-1)
app/components/Shadow.qml (+1/-1)
app/components/SubtitledListItem.qml (+1/-1)
app/stopwatch/LapListView.qml (+1/-1)
app/stopwatch/StopwatchFace.qml (+1/-1)
app/stopwatch/StopwatchPage.qml (+1/-1)
app/ubuntu-clock-app.qml (+1/-1)
app/upstreamcomponents/FakeHeader.qml (+4/-4)
app/upstreamcomponents/FastScroll.qml (+1/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+3/-3)
app/worldclock/AddWorldCityButton.qml (+1/-1)
app/worldclock/UserWorldCityDelegate.qml (+1/-1)
app/worldclock/UserWorldCityList.qml (+1/-1)
app/worldclock/WorldCityList.qml (+1/-1)
debian/changelog (+1/-0)
manifest.json.in (+1/-1)
tests/unit/MockClockApp.qml (+1/-1)
tests/unit/tst_alarm.qml (+1/-1)
tests/unit/tst_alarmLabel.qml (+1/-1)
tests/unit/tst_alarmRepeat.qml (+1/-1)
tests/unit/tst_alarmSound.qml (+1/-1)
tests/unit/tst_alarmUtils.qml (+1/-1)
tests/unit/tst_stopwatchUtils.qml (+1/-1)
tests/unit/tst_worldClock.qml (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3
Reviewer Review Type Date Requested Status
Bartosz Kosiorek Approve
Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Pending
Review via email: mp+276650@code.launchpad.net

Commit message

* Update to the new SDK Ubuntu Components 1.3

Description of the change

* Update to the new SDK Ubuntu Components 1.3

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:402
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/17/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/111/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Bartosz, I hope you don't mind that I proposed this branch for merging. Clock, Weather, and Calculator will all have similar issues with the new header that I want us to work together on. Please see this MP [1] to provide comments as this relates to Weather.

Functionally, currently this change for clock causes part of the fake header to be shown at the top of the app. This will need coordination/fixing.

1 - https://code.launchpad.net/~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump/+merge/276466

review: Needs Fixing
lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 updated
403. By Bartosz Kosiorek

Hide header

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:403
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/18/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/122/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Things that need to be looked into/fixed.

1. The old style header with the title "Clock" appears briefly when the app is started. This is similar to what we see in weather, but the weather app mp experiences the new header being momentarily shown, not the old header.
2. Exposing the bottom edge shows the old header while swiping and hitting "back"
3. The Settings action shows the old header after hitting "back"

review: Needs Fixing
Revision history for this message
Victor Thompson (vthompson) wrote :

EditAlarmPage uses "import Ubuntu.Components.Pickers 1.0" but it should be 1.3.

Do the tests need to be updated for any of this?

review: Needs Fixing
Revision history for this message
Victor Thompson (vthompson) wrote :

Any updated progress on this MP?

Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Hello Victor.

Unfortunately I was unable to manage to fix these header issues.
Do you have idea how it could be fixed?

I changed owner of this branch, so you could submit to it.

review: Needs Information
lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 updated
404. By Victor Thompson

Fixing FakeHeader issues

405. By Victor Thompson

Merge of trunk and update changelog

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:405
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/20/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/247/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Bartosz, I've fixed all the issues I had and updated the changelog.

review: Approve
lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 updated
406. By Victor Thompson

Fix manifest file as this is not a QML app.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:406
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/248/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/21/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Thanks Victor.

I found one small issue:
When I'm swiping page from the bottom edge to display alarm list, then header is moving up and down.

Could you please take a look at this?
It is not appear with previous SDK.

review: Needs Fixing
Revision history for this message
Victor Thompson (vthompson) wrote :

The Weather app had and has the same issue--we were unable to resolve it. We (popey, ahayzen, and myself) determined it to be sufficient for now in that case.

Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Thanks. Let's merge it then.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/MainPage.qml'
2--- app/MainPage.qml 2015-10-06 22:02:45 +0000
3+++ app/MainPage.qml 2015-12-11 02:20:37 +0000
4@@ -17,7 +17,7 @@
5 */
6
7 import QtQuick 2.4
8-import Ubuntu.Components 1.2
9+import Ubuntu.Components 1.3
10 import QtSystemInfo 5.0
11 import Qt.labs.settings 1.0
12 import "upstreamcomponents"
13@@ -84,6 +84,9 @@
14 }
15 }
16
17+ head.visible: false
18+ head.locked: true
19+
20 HeaderNavigation {
21 id: headerRow
22
23
24=== modified file 'app/alarm/AlarmDelegate.qml'
25--- app/alarm/AlarmDelegate.qml 2015-10-27 22:49:37 +0000
26+++ app/alarm/AlarmDelegate.qml 2015-12-11 02:20:37 +0000
27@@ -18,7 +18,7 @@
28
29 import QtQuick 2.4
30 import QtQuick.Layouts 1.1
31-import Ubuntu.Components 1.2
32+import Ubuntu.Components 1.3
33
34 ListItem {
35 id: root
36
37=== modified file 'app/alarm/AlarmLabel.qml'
38--- app/alarm/AlarmLabel.qml 2015-08-13 13:29:49 +0000
39+++ app/alarm/AlarmLabel.qml 2015-12-11 02:20:37 +0000
40@@ -17,7 +17,7 @@
41 */
42
43 import QtQuick 2.4
44-import Ubuntu.Components 1.2
45+import Ubuntu.Components 1.3
46
47 Page {
48 id: _alarmLabelPage
49
50=== modified file 'app/alarm/AlarmList.qml'
51--- app/alarm/AlarmList.qml 2015-08-25 11:26:57 +0000
52+++ app/alarm/AlarmList.qml 2015-12-11 02:20:37 +0000
53@@ -17,7 +17,7 @@
54 */
55
56 import QtQuick 2.4
57-import Ubuntu.Components 1.2
58+import Ubuntu.Components 1.3
59
60 UbuntuListView {
61 id: alarmListView
62
63=== modified file 'app/alarm/AlarmModelComponent.qml'
64--- app/alarm/AlarmModelComponent.qml 2015-08-14 05:34:49 +0000
65+++ app/alarm/AlarmModelComponent.qml 2015-12-11 02:20:37 +0000
66@@ -17,7 +17,7 @@
67 */
68
69 import QtQuick 2.4
70-import Ubuntu.Components 1.2
71+import Ubuntu.Components 1.3
72
73 AlarmModel {
74 id: alarmModel
75
76=== modified file 'app/alarm/AlarmPage.qml'
77--- app/alarm/AlarmPage.qml 2015-10-08 21:49:48 +0000
78+++ app/alarm/AlarmPage.qml 2015-12-11 02:20:37 +0000
79@@ -17,7 +17,7 @@
80 */
81
82 import QtQuick 2.4
83-import Ubuntu.Components 1.2
84+import Ubuntu.Components 1.3
85
86 Page {
87 id: alarmPage
88
89=== modified file 'app/alarm/AlarmRepeat.qml'
90--- app/alarm/AlarmRepeat.qml 2015-08-13 13:29:49 +0000
91+++ app/alarm/AlarmRepeat.qml 2015-12-11 02:20:37 +0000
92@@ -17,7 +17,7 @@
93 */
94
95 import QtQuick 2.4
96-import Ubuntu.Components 1.2
97+import Ubuntu.Components 1.3
98
99 Page {
100 id: _alarmRepeatPage
101
102=== modified file 'app/alarm/AlarmSettingsPage.qml'
103--- app/alarm/AlarmSettingsPage.qml 2015-10-06 21:22:34 +0000
104+++ app/alarm/AlarmSettingsPage.qml 2015-12-11 02:20:37 +0000
105@@ -20,7 +20,7 @@
106 import QtQuick.Layouts 1.1
107 import WorldClock 1.0
108 import Alarm 1.0
109-import Ubuntu.Components 1.2
110+import Ubuntu.Components 1.3
111 import "../components"
112
113 Page {
114
115=== modified file 'app/alarm/AlarmSound.qml'
116--- app/alarm/AlarmSound.qml 2015-10-21 12:18:35 +0000
117+++ app/alarm/AlarmSound.qml 2015-12-11 02:20:37 +0000
118@@ -20,7 +20,7 @@
119 import Alarm 1.0
120 import QtMultimedia 5.0
121 import Ubuntu.Content 1.1
122-import Ubuntu.Components 1.2
123+import Ubuntu.Components 1.3
124 import QtQuick.Layouts 1.1
125 import Qt.labs.folderlistmodel 2.1
126
127
128=== modified file 'app/alarm/AlarmUtils.qml'
129--- app/alarm/AlarmUtils.qml 2015-10-27 22:49:37 +0000
130+++ app/alarm/AlarmUtils.qml 2015-12-11 02:20:37 +0000
131@@ -17,7 +17,7 @@
132 */
133
134 import QtQuick 2.4
135-import Ubuntu.Components 1.2
136+import Ubuntu.Components 1.3
137
138 /*
139 Qt Object containing a collection of useful alarm functions
140
141=== modified file 'app/alarm/EditAlarmPage.qml'
142--- app/alarm/EditAlarmPage.qml 2015-10-08 21:49:48 +0000
143+++ app/alarm/EditAlarmPage.qml 2015-12-11 02:20:37 +0000
144@@ -19,8 +19,8 @@
145 import QtQuick 2.4
146 import WorldClock 1.0
147 import Alarm 1.0
148-import Ubuntu.Components 1.2
149-import Ubuntu.Components.Pickers 1.0
150+import Ubuntu.Components 1.3
151+import Ubuntu.Components.Pickers 1.3
152 import "../components"
153
154 Page {
155
156=== modified file 'app/alarm/SoundPeerPicker.qml'
157--- app/alarm/SoundPeerPicker.qml 2015-08-21 13:36:56 +0000
158+++ app/alarm/SoundPeerPicker.qml 2015-12-11 02:20:37 +0000
159@@ -17,7 +17,7 @@
160 */
161
162 import QtQuick 2.4
163-import Ubuntu.Components 1.2
164+import Ubuntu.Components 1.3
165 import Ubuntu.Content 1.1
166
167 Page {
168
169=== modified file 'app/clock/ClockPage.qml'
170--- app/clock/ClockPage.qml 2015-10-06 22:34:27 +0000
171+++ app/clock/ClockPage.qml 2015-12-11 02:20:37 +0000
172@@ -19,7 +19,7 @@
173 import QtQuick 2.4
174 import U1db 1.0 as U1db
175 import QtPositioning 5.2
176-import Ubuntu.Components 1.2
177+import Ubuntu.Components 1.3
178 import WorldClock 1.0
179 import "../components"
180 import "../worldclock"
181
182=== modified file 'app/clock/MainClock.qml'
183--- app/clock/MainClock.qml 2015-05-27 16:03:23 +0000
184+++ app/clock/MainClock.qml 2015-12-11 02:20:37 +0000
185@@ -17,7 +17,7 @@
186 */
187
188 import QtQuick 2.4
189-import Ubuntu.Components 1.2
190+import Ubuntu.Components 1.3
191 import "../components"
192
193 Clock {
194
195=== modified file 'app/components/ActionIcon.qml'
196--- app/components/ActionIcon.qml 2015-08-20 15:46:48 +0000
197+++ app/components/ActionIcon.qml 2015-12-11 02:20:37 +0000
198@@ -17,7 +17,7 @@
199 */
200
201 import QtQuick 2.4
202-import Ubuntu.Components 1.2
203+import Ubuntu.Components 1.3
204
205 AbstractButton {
206 id: abstractButton
207
208=== modified file 'app/components/AnalogMode.qml'
209--- app/components/AnalogMode.qml 2015-10-06 22:34:27 +0000
210+++ app/components/AnalogMode.qml 2015-12-11 02:20:37 +0000
211@@ -17,7 +17,7 @@
212 */
213
214 import QtQuick 2.4
215-import Ubuntu.Components 1.2
216+import Ubuntu.Components 1.3
217
218 ClockCircle {
219 id: _innerCircleAnalog
220
221=== modified file 'app/components/AnalogShadow.qml'
222--- app/components/AnalogShadow.qml 2015-08-14 05:34:49 +0000
223+++ app/components/AnalogShadow.qml 2015-12-11 02:20:37 +0000
224@@ -17,7 +17,7 @@
225 */
226
227 import QtQuick 2.4
228-import Ubuntu.Components 1.2
229+import Ubuntu.Components 1.3
230
231 Flipable {
232 id: analogShadow
233
234=== modified file 'app/components/Background.qml'
235--- app/components/Background.qml 2015-08-14 05:34:49 +0000
236+++ app/components/Background.qml 2015-12-11 02:20:37 +0000
237@@ -17,7 +17,7 @@
238 */
239
240 import QtQuick 2.4
241-import Ubuntu.Components 1.2
242+import Ubuntu.Components 1.3
243
244 /*
245 Component to set the background of the app
246
247=== modified file 'app/components/Clock.qml'
248--- app/components/Clock.qml 2015-10-06 22:34:27 +0000
249+++ app/components/Clock.qml 2015-12-11 02:20:37 +0000
250@@ -17,7 +17,7 @@
251 */
252
253 import QtQuick 2.4
254-import Ubuntu.Components 1.2
255+import Ubuntu.Components 1.3
256
257 /*
258 Generic clock component which has a digital and analog mode. A flip animation
259
260=== modified file 'app/components/ClockCircle.qml'
261--- app/components/ClockCircle.qml 2015-08-14 05:34:49 +0000
262+++ app/components/ClockCircle.qml 2015-12-11 02:20:37 +0000
263@@ -17,7 +17,7 @@
264 */
265
266 import QtQuick 2.4
267-import Ubuntu.Components 1.2
268+import Ubuntu.Components 1.3
269 import QtGraphicalEffects 1.0
270
271 /*
272
273=== modified file 'app/components/DigitalMode.qml'
274--- app/components/DigitalMode.qml 2015-09-16 15:13:36 +0000
275+++ app/components/DigitalMode.qml 2015-12-11 02:20:37 +0000
276@@ -17,7 +17,7 @@
277 */
278
279 import QtQuick 2.4
280-import Ubuntu.Components 1.2
281+import Ubuntu.Components 1.3
282
283 ClockCircle {
284 id: _innerCircle
285
286=== modified file 'app/components/DigitalShadow.qml'
287--- app/components/DigitalShadow.qml 2015-08-14 05:34:49 +0000
288+++ app/components/DigitalShadow.qml 2015-12-11 02:20:37 +0000
289@@ -17,7 +17,7 @@
290 */
291
292 import QtQuick 2.4
293-import Ubuntu.Components 1.2
294+import Ubuntu.Components 1.3
295
296 Flipable {
297 id: digitalShadow
298
299=== modified file 'app/components/EmptyState.qml'
300--- app/components/EmptyState.qml 2015-08-14 05:34:49 +0000
301+++ app/components/EmptyState.qml 2015-12-11 02:20:37 +0000
302@@ -17,7 +17,7 @@
303 */
304
305 import QtQuick 2.4
306-import Ubuntu.Components 1.2
307+import Ubuntu.Components 1.3
308
309 /*
310 Component which displays an empty state (approved by design). It offers an
311
312=== modified file 'app/components/ExpandableListItem.qml'
313--- app/components/ExpandableListItem.qml 2015-06-03 16:05:03 +0000
314+++ app/components/ExpandableListItem.qml 2015-12-11 02:20:37 +0000
315@@ -17,8 +17,8 @@
316 */
317
318 import QtQuick 2.4
319-import Ubuntu.Components 1.2
320-import Ubuntu.Components.ListItems 1.0 as ListItem
321+import Ubuntu.Components 1.3
322+import Ubuntu.Components.ListItems 1.3 as ListItem
323
324 /*
325 Component which extends the SDK Expandable list item and provides a easy
326
327=== modified file 'app/components/HeaderNavigation.qml'
328--- app/components/HeaderNavigation.qml 2015-09-11 13:13:17 +0000
329+++ app/components/HeaderNavigation.qml 2015-12-11 02:20:37 +0000
330@@ -17,7 +17,7 @@
331 */
332
333 import QtQuick 2.4
334-import Ubuntu.Components 1.2
335+import Ubuntu.Components 1.3
336
337 Item {
338 id: headerRow
339
340=== modified file 'app/components/Shadow.qml'
341--- app/components/Shadow.qml 2015-08-14 05:34:49 +0000
342+++ app/components/Shadow.qml 2015-12-11 02:20:37 +0000
343@@ -17,7 +17,7 @@
344 */
345
346 import QtQuick 2.4
347-import Ubuntu.Components 1.2
348+import Ubuntu.Components 1.3
349
350 Item {
351 id: _shadowContainer
352
353=== modified file 'app/components/SubtitledListItem.qml'
354--- app/components/SubtitledListItem.qml 2015-08-14 05:34:49 +0000
355+++ app/components/SubtitledListItem.qml 2015-12-11 02:20:37 +0000
356@@ -17,7 +17,7 @@
357 */
358
359 import QtQuick 2.4
360-import Ubuntu.Components 1.2
361+import Ubuntu.Components 1.3
362
363 /*
364 This component is almost an identical copy of the SDK's subtitled with the
365
366=== modified file 'app/stopwatch/LapListView.qml'
367--- app/stopwatch/LapListView.qml 2015-09-09 20:26:22 +0000
368+++ app/stopwatch/LapListView.qml 2015-12-11 02:20:37 +0000
369@@ -18,7 +18,7 @@
370
371 import QtQuick 2.4
372 import QtQuick.Layouts 1.1
373-import Ubuntu.Components 1.2
374+import Ubuntu.Components 1.3
375 import Stopwatch 1.0
376
377 ListView {
378
379=== modified file 'app/stopwatch/StopwatchFace.qml'
380--- app/stopwatch/StopwatchFace.qml 2015-08-26 22:41:34 +0000
381+++ app/stopwatch/StopwatchFace.qml 2015-12-11 02:20:37 +0000
382@@ -18,7 +18,7 @@
383
384 import QtQuick 2.4
385 import Stopwatch 1.0
386-import Ubuntu.Components 1.2
387+import Ubuntu.Components 1.3
388 import "../components"
389
390 ClockCircle {
391
392=== modified file 'app/stopwatch/StopwatchPage.qml'
393--- app/stopwatch/StopwatchPage.qml 2015-09-11 12:08:23 +0000
394+++ app/stopwatch/StopwatchPage.qml 2015-12-11 02:20:37 +0000
395@@ -18,7 +18,7 @@
396
397 import QtQuick 2.4
398 import Stopwatch 1.0
399-import Ubuntu.Components 1.2
400+import Ubuntu.Components 1.3
401
402 Item {
403 id: _stopwatchPage
404
405=== modified file 'app/ubuntu-clock-app.qml'
406--- app/ubuntu-clock-app.qml 2015-10-11 20:10:27 +0000
407+++ app/ubuntu-clock-app.qml 2015-12-11 02:20:37 +0000
408@@ -20,7 +20,7 @@
409 import WorldClock 1.0
410 import U1db 1.0 as U1db
411 import Alarm 1.0
412-import Ubuntu.Components 1.2
413+import Ubuntu.Components 1.3
414 import "components"
415
416 MainView {
417
418=== modified file 'app/upstreamcomponents/FakeHeader.qml'
419--- app/upstreamcomponents/FakeHeader.qml 2015-08-14 05:34:49 +0000
420+++ app/upstreamcomponents/FakeHeader.qml 2015-12-11 02:20:37 +0000
421@@ -17,22 +17,22 @@
422 */
423
424 import QtQuick 2.4
425-import Ubuntu.Components 1.2
426+import Ubuntu.Components 1.3
427
428 Column {
429 id: fakeHeader
430
431- height: units.gu(9)
432+ height: units.gu(6.125)
433
434 Rectangle {
435- height: units.gu(7)
436+ height: units.gu(6)
437 width: parent.width
438 color: Theme.palette.normal.background
439 }
440
441 Rectangle {
442 color: "#C9C9C9"
443- height: units.gu(2)
444+ height: units.gu(0.125)
445 anchors.left: parent.left
446 anchors.right: parent.right
447 }
448
449=== modified file 'app/upstreamcomponents/FastScroll.qml'
450--- app/upstreamcomponents/FastScroll.qml 2015-08-24 09:56:38 +0000
451+++ app/upstreamcomponents/FastScroll.qml 2015-12-11 02:20:37 +0000
452@@ -41,7 +41,7 @@
453
454 // FastScroll.qml
455 import QtQuick 2.4
456-import Ubuntu.Components 1.2
457+import Ubuntu.Components 1.3
458 import "FastScroll.js" as Sections
459
460 Item {
461
462=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
463--- app/upstreamcomponents/PageWithBottomEdge.qml 2015-05-27 16:03:23 +0000
464+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-12-11 02:20:37 +0000
465@@ -62,8 +62,8 @@
466
467 */
468
469-import QtQuick 2.2
470-import Ubuntu.Components 1.2
471+import QtQuick 2.4
472+import Ubuntu.Components 1.3
473
474 Page {
475 id: page
476@@ -175,7 +175,7 @@
477 z: 1
478 width: tipLabel.paintedWidth + units.gu(6)
479 height: bottomEdge.tipHeight + units.gu(1)
480- color: Theme.palette.normal.overlay
481+ backgroundColor: Theme.palette.normal.overlay
482 Label {
483 id: tipLabel
484
485
486=== modified file 'app/worldclock/AddWorldCityButton.qml'
487--- app/worldclock/AddWorldCityButton.qml 2015-08-20 15:41:34 +0000
488+++ app/worldclock/AddWorldCityButton.qml 2015-12-11 02:20:37 +0000
489@@ -17,7 +17,7 @@
490 */
491
492 import QtQuick 2.4
493-import Ubuntu.Components 1.2
494+import Ubuntu.Components 1.3
495 import "../components"
496
497 AbstractButton {
498
499=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
500--- app/worldclock/UserWorldCityDelegate.qml 2015-10-08 19:56:37 +0000
501+++ app/worldclock/UserWorldCityDelegate.qml 2015-12-11 02:20:37 +0000
502@@ -17,7 +17,7 @@
503 */
504
505 import QtQuick 2.4
506-import Ubuntu.Components 1.2
507+import Ubuntu.Components 1.3
508 import "../components"
509
510 ListItem {
511
512=== modified file 'app/worldclock/UserWorldCityList.qml'
513--- app/worldclock/UserWorldCityList.qml 2015-08-29 01:45:19 +0000
514+++ app/worldclock/UserWorldCityList.qml 2015-12-11 02:20:37 +0000
515@@ -19,7 +19,7 @@
516 import QtQuick 2.4
517 import WorldClock 1.0
518 import U1db 1.0 as U1db
519-import Ubuntu.Components 1.2
520+import Ubuntu.Components 1.3
521
522 ListView {
523 id: worldCityColumn
524
525=== modified file 'app/worldclock/WorldCityList.qml'
526--- app/worldclock/WorldCityList.qml 2015-10-29 22:14:42 +0000
527+++ app/worldclock/WorldCityList.qml 2015-12-11 02:20:37 +0000
528@@ -18,7 +18,7 @@
529
530 import QtQuick 2.4
531 import WorldClock 1.0
532-import Ubuntu.Components 1.2
533+import Ubuntu.Components 1.3
534 import "../components"
535 import "../upstreamcomponents"
536
537
538=== modified file 'debian/changelog'
539--- debian/changelog 2015-10-27 22:49:37 +0000
540+++ debian/changelog 2015-12-11 02:20:37 +0000
541@@ -2,6 +2,7 @@
542
543 [ Bartosz Kosiorek ]
544 * Fix alarm difference time description, during DST change (LP: #1510694)
545+ * Move to use the new SDK components v1.3 (LP: #1508363)
546
547 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 27 Oct 2015 23:49:19 +0100
548
549
550=== modified file 'manifest.json.in'
551--- manifest.json.in 2015-10-29 22:14:42 +0000
552+++ manifest.json.in 2015-12-11 02:20:37 +0000
553@@ -1,7 +1,7 @@
554 {
555 "name": "com.ubuntu.clock",
556 "description": "A sophisticated clock app for Ubuntu Touch",
557- "framework": "ubuntu-sdk-15.04",
558+ "framework": "ubuntu-sdk-15.04.1",
559 "architecture": "@CLICK_ARCH@",
560 "title": "Clock",
561 "icon": "clock@30.png",
562
563=== modified file 'tests/unit/MockClockApp.qml'
564--- tests/unit/MockClockApp.qml 2015-10-06 22:34:27 +0000
565+++ tests/unit/MockClockApp.qml 2015-12-11 02:20:37 +0000
566@@ -19,7 +19,7 @@
567 import QtQuick 2.4
568 import WorldClock 1.0
569 import U1db 1.0 as U1db
570-import Ubuntu.Components 1.2
571+import Ubuntu.Components 1.3
572 import "../../app"
573 import "../../app/components"
574 import "../../app/clock"
575
576=== modified file 'tests/unit/tst_alarm.qml'
577--- tests/unit/tst_alarm.qml 2015-10-27 22:49:37 +0000
578+++ tests/unit/tst_alarm.qml 2015-12-11 02:20:37 +0000
579@@ -18,7 +18,7 @@
580
581 import QtQuick 2.4
582 import WorldClock 1.0
583-import Ubuntu.Components 1.2
584+import Ubuntu.Components 1.3
585 import "../../app/alarm"
586
587 MainView {
588
589=== modified file 'tests/unit/tst_alarmLabel.qml'
590--- tests/unit/tst_alarmLabel.qml 2015-08-12 16:57:29 +0000
591+++ tests/unit/tst_alarmLabel.qml 2015-12-11 02:20:37 +0000
592@@ -17,7 +17,7 @@
593 */
594
595 import QtQuick 2.4
596-import Ubuntu.Components 1.2
597+import Ubuntu.Components 1.3
598 import "../../app/alarm"
599
600 MainView {
601
602=== modified file 'tests/unit/tst_alarmRepeat.qml'
603--- tests/unit/tst_alarmRepeat.qml 2015-08-12 18:50:48 +0000
604+++ tests/unit/tst_alarmRepeat.qml 2015-12-11 02:20:37 +0000
605@@ -19,7 +19,7 @@
606 import QtQuick 2.4
607 import QtTest 1.0
608 import Ubuntu.Test 1.0
609-import Ubuntu.Components 1.2
610+import Ubuntu.Components 1.3
611 import "../../app/alarm"
612
613 MainView {
614
615=== modified file 'tests/unit/tst_alarmSound.qml'
616--- tests/unit/tst_alarmSound.qml 2015-08-28 18:50:21 +0000
617+++ tests/unit/tst_alarmSound.qml 2015-12-11 02:20:37 +0000
618@@ -19,7 +19,7 @@
619 import QtQuick 2.4
620 import QtTest 1.0
621 import Ubuntu.Test 1.0
622-import Ubuntu.Components 1.2
623+import Ubuntu.Components 1.3
624 import Qt.labs.folderlistmodel 2.1
625 import "../../app/alarm"
626
627
628=== modified file 'tests/unit/tst_alarmUtils.qml'
629--- tests/unit/tst_alarmUtils.qml 2015-10-27 22:49:37 +0000
630+++ tests/unit/tst_alarmUtils.qml 2015-12-11 02:20:37 +0000
631@@ -18,7 +18,7 @@
632
633 import QtQuick 2.4
634 import QtTest 1.0
635-import Ubuntu.Components 1.2
636+import Ubuntu.Components 1.3
637 import "../../app/alarm"
638
639 TestCase {
640
641=== modified file 'tests/unit/tst_stopwatchUtils.qml'
642--- tests/unit/tst_stopwatchUtils.qml 2015-08-26 22:50:57 +0000
643+++ tests/unit/tst_stopwatchUtils.qml 2015-12-11 02:20:37 +0000
644@@ -19,7 +19,7 @@
645 import QtQuick 2.4
646 import QtTest 1.0
647 import Stopwatch 1.0
648-import Ubuntu.Components 1.2
649+import Ubuntu.Components 1.3
650 import "../../app/stopwatch"
651
652 TestCase {
653
654=== modified file 'tests/unit/tst_worldClock.qml'
655--- tests/unit/tst_worldClock.qml 2015-08-17 13:07:38 +0000
656+++ tests/unit/tst_worldClock.qml 2015-12-11 02:20:37 +0000
657@@ -19,7 +19,7 @@
658 import QtQuick 2.4
659 import QtTest 1.0
660 import Ubuntu.Test 1.0
661-import Ubuntu.Components 1.2
662+import Ubuntu.Components 1.3
663
664 MockClockApp {
665 id: clockApp

Subscribers

People subscribed via source and target branches