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
=== modified file 'app/MainPage.qml'
--- app/MainPage.qml 2015-10-06 22:02:45 +0000
+++ app/MainPage.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import QtSystemInfo 5.021import QtSystemInfo 5.0
22import Qt.labs.settings 1.022import Qt.labs.settings 1.0
23import "upstreamcomponents"23import "upstreamcomponents"
@@ -84,6 +84,9 @@
84 }84 }
85 }85 }
8686
87 head.visible: false
88 head.locked: true
89
87 HeaderNavigation {90 HeaderNavigation {
88 id: headerRow91 id: headerRow
8992
9093
=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml 2015-10-27 22:49:37 +0000
+++ app/alarm/AlarmDelegate.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
23ListItem {23ListItem {
24 id: root24 id: root
2525
=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml 2015-08-13 13:29:49 +0000
+++ app/alarm/AlarmLabel.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Page {22Page {
23 id: _alarmLabelPage23 id: _alarmLabelPage
2424
=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml 2015-08-25 11:26:57 +0000
+++ app/alarm/AlarmList.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22UbuntuListView {22UbuntuListView {
23 id: alarmListView23 id: alarmListView
2424
=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml 2015-08-14 05:34:49 +0000
+++ app/alarm/AlarmModelComponent.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22AlarmModel {22AlarmModel {
23 id: alarmModel23 id: alarmModel
2424
=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml 2015-10-08 21:49:48 +0000
+++ app/alarm/AlarmPage.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Page {22Page {
23 id: alarmPage23 id: alarmPage
2424
=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml 2015-08-13 13:29:49 +0000
+++ app/alarm/AlarmRepeat.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Page {22Page {
23 id: _alarmRepeatPage23 id: _alarmRepeatPage
2424
=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml 2015-10-06 21:22:34 +0000
+++ app/alarm/AlarmSettingsPage.qml 2015-12-11 02:20:37 +0000
@@ -20,7 +20,7 @@
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import WorldClock 1.021import WorldClock 1.0
22import Alarm 1.022import Alarm 1.0
23import Ubuntu.Components 1.223import Ubuntu.Components 1.3
24import "../components"24import "../components"
2525
26Page {26Page {
2727
=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml 2015-10-21 12:18:35 +0000
+++ app/alarm/AlarmSound.qml 2015-12-11 02:20:37 +0000
@@ -20,7 +20,7 @@
20import Alarm 1.020import Alarm 1.0
21import QtMultimedia 5.021import QtMultimedia 5.0
22import Ubuntu.Content 1.122import Ubuntu.Content 1.1
23import Ubuntu.Components 1.223import Ubuntu.Components 1.3
24import QtQuick.Layouts 1.124import QtQuick.Layouts 1.1
25import Qt.labs.folderlistmodel 2.125import Qt.labs.folderlistmodel 2.1
2626
2727
=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml 2015-10-27 22:49:37 +0000
+++ app/alarm/AlarmUtils.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22/*22/*
23 Qt Object containing a collection of useful alarm functions23 Qt Object containing a collection of useful alarm functions
2424
=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml 2015-10-08 21:49:48 +0000
+++ app/alarm/EditAlarmPage.qml 2015-12-11 02:20:37 +0000
@@ -19,8 +19,8 @@
19import QtQuick 2.419import QtQuick 2.4
20import WorldClock 1.020import WorldClock 1.0
21import Alarm 1.021import Alarm 1.0
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import Ubuntu.Components.Pickers 1.023import Ubuntu.Components.Pickers 1.3
24import "../components"24import "../components"
2525
26Page {26Page {
2727
=== modified file 'app/alarm/SoundPeerPicker.qml'
--- app/alarm/SoundPeerPicker.qml 2015-08-21 13:36:56 +0000
+++ app/alarm/SoundPeerPicker.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Content 1.121import Ubuntu.Content 1.1
2222
23Page {23Page {
2424
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2015-10-06 22:34:27 +0000
+++ app/clock/ClockPage.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import U1db 1.0 as U1db20import U1db 1.0 as U1db
21import QtPositioning 5.221import QtPositioning 5.2
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import WorldClock 1.023import WorldClock 1.0
24import "../components"24import "../components"
25import "../worldclock"25import "../worldclock"
2626
=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml 2015-05-27 16:03:23 +0000
+++ app/clock/MainClock.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
23Clock {23Clock {
2424
=== modified file 'app/components/ActionIcon.qml'
--- app/components/ActionIcon.qml 2015-08-20 15:46:48 +0000
+++ app/components/ActionIcon.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22AbstractButton {22AbstractButton {
23 id: abstractButton23 id: abstractButton
2424
=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml 2015-10-06 22:34:27 +0000
+++ app/components/AnalogMode.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22ClockCircle {22ClockCircle {
23 id: _innerCircleAnalog23 id: _innerCircleAnalog
2424
=== modified file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml 2015-08-14 05:34:49 +0000
+++ app/components/AnalogShadow.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Flipable {22Flipable {
23 id: analogShadow23 id: analogShadow
2424
=== modified file 'app/components/Background.qml'
--- app/components/Background.qml 2015-08-14 05:34:49 +0000
+++ app/components/Background.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22/*22/*
23 Component to set the background of the app23 Component to set the background of the app
2424
=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml 2015-10-06 22:34:27 +0000
+++ app/components/Clock.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22/*22/*
23 Generic clock component which has a digital and analog mode. A flip animation23 Generic clock component which has a digital and analog mode. A flip animation
2424
=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml 2015-08-14 05:34:49 +0000
+++ app/components/ClockCircle.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import QtGraphicalEffects 1.021import QtGraphicalEffects 1.0
2222
23/*23/*
2424
=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml 2015-09-16 15:13:36 +0000
+++ app/components/DigitalMode.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22ClockCircle {22ClockCircle {
23 id: _innerCircle23 id: _innerCircle
2424
=== modified file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml 2015-08-14 05:34:49 +0000
+++ app/components/DigitalShadow.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Flipable {22Flipable {
23 id: digitalShadow23 id: digitalShadow
2424
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml 2015-08-14 05:34:49 +0000
+++ app/components/EmptyState.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22/*22/*
23 Component which displays an empty state (approved by design). It offers an23 Component which displays an empty state (approved by design). It offers an
2424
=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml 2015-06-03 16:05:03 +0000
+++ app/components/ExpandableListItem.qml 2015-12-11 02:20:37 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23/*23/*
24 Component which extends the SDK Expandable list item and provides a easy24 Component which extends the SDK Expandable list item and provides a easy
2525
=== modified file 'app/components/HeaderNavigation.qml'
--- app/components/HeaderNavigation.qml 2015-09-11 13:13:17 +0000
+++ app/components/HeaderNavigation.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Item {22Item {
23 id: headerRow23 id: headerRow
2424
=== modified file 'app/components/Shadow.qml'
--- app/components/Shadow.qml 2015-08-14 05:34:49 +0000
+++ app/components/Shadow.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Item {22Item {
23 id: _shadowContainer23 id: _shadowContainer
2424
=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml 2015-08-14 05:34:49 +0000
+++ app/components/SubtitledListItem.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22/*22/*
23 This component is almost an identical copy of the SDK's subtitled with the23 This component is almost an identical copy of the SDK's subtitled with the
2424
=== modified file 'app/stopwatch/LapListView.qml'
--- app/stopwatch/LapListView.qml 2015-09-09 20:26:22 +0000
+++ app/stopwatch/LapListView.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
22import Stopwatch 1.022import Stopwatch 1.0
2323
24ListView {24ListView {
2525
=== modified file 'app/stopwatch/StopwatchFace.qml'
--- app/stopwatch/StopwatchFace.qml 2015-08-26 22:41:34 +0000
+++ app/stopwatch/StopwatchFace.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import Stopwatch 1.020import Stopwatch 1.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
22import "../components"22import "../components"
2323
24ClockCircle {24ClockCircle {
2525
=== modified file 'app/stopwatch/StopwatchPage.qml'
--- app/stopwatch/StopwatchPage.qml 2015-09-11 12:08:23 +0000
+++ app/stopwatch/StopwatchPage.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import Stopwatch 1.020import Stopwatch 1.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
23Item {23Item {
24 id: _stopwatchPage24 id: _stopwatchPage
2525
=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml 2015-10-11 20:10:27 +0000
+++ app/ubuntu-clock-app.qml 2015-12-11 02:20:37 +0000
@@ -20,7 +20,7 @@
20import WorldClock 1.020import WorldClock 1.0
21import U1db 1.0 as U1db21import U1db 1.0 as U1db
22import Alarm 1.022import Alarm 1.0
23import Ubuntu.Components 1.223import Ubuntu.Components 1.3
24import "components"24import "components"
2525
26MainView {26MainView {
2727
=== modified file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml 2015-08-14 05:34:49 +0000
+++ app/upstreamcomponents/FakeHeader.qml 2015-12-11 02:20:37 +0000
@@ -17,22 +17,22 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Column {22Column {
23 id: fakeHeader23 id: fakeHeader
2424
25 height: units.gu(9)25 height: units.gu(6.125)
2626
27 Rectangle {27 Rectangle {
28 height: units.gu(7)28 height: units.gu(6)
29 width: parent.width29 width: parent.width
30 color: Theme.palette.normal.background30 color: Theme.palette.normal.background
31 }31 }
32 32
33 Rectangle {33 Rectangle {
34 color: "#C9C9C9"34 color: "#C9C9C9"
35 height: units.gu(2)35 height: units.gu(0.125)
36 anchors.left: parent.left36 anchors.left: parent.left
37 anchors.right: parent.right37 anchors.right: parent.right
38 }38 }
3939
=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml 2015-08-24 09:56:38 +0000
+++ app/upstreamcomponents/FastScroll.qml 2015-12-11 02:20:37 +0000
@@ -41,7 +41,7 @@
4141
42// FastScroll.qml42// FastScroll.qml
43import QtQuick 2.443import QtQuick 2.4
44import Ubuntu.Components 1.244import Ubuntu.Components 1.3
45import "FastScroll.js" as Sections45import "FastScroll.js" as Sections
4646
47Item {47Item {
4848
=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml 2015-05-27 16:03:23 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-12-11 02:20:37 +0000
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.266import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page
@@ -175,7 +175,7 @@
175 z: 1175 z: 1
176 width: tipLabel.paintedWidth + units.gu(6)176 width: tipLabel.paintedWidth + units.gu(6)
177 height: bottomEdge.tipHeight + units.gu(1)177 height: bottomEdge.tipHeight + units.gu(1)
178 color: Theme.palette.normal.overlay178 backgroundColor: Theme.palette.normal.overlay
179 Label {179 Label {
180 id: tipLabel180 id: tipLabel
181181
182182
=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml 2015-08-20 15:41:34 +0000
+++ app/worldclock/AddWorldCityButton.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
23AbstractButton {23AbstractButton {
2424
=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml 2015-10-08 19:56:37 +0000
+++ app/worldclock/UserWorldCityDelegate.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
23ListItem {23ListItem {
2424
=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml 2015-08-29 01:45:19 +0000
+++ app/worldclock/UserWorldCityList.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import WorldClock 1.020import WorldClock 1.0
21import U1db 1.0 as U1db21import U1db 1.0 as U1db
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
2323
24ListView {24ListView {
25 id: worldCityColumn25 id: worldCityColumn
2626
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2015-10-29 22:14:42 +0000
+++ app/worldclock/WorldCityList.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import WorldClock 1.020import WorldClock 1.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
22import "../components"22import "../components"
23import "../upstreamcomponents"23import "../upstreamcomponents"
2424
2525
=== modified file 'debian/changelog'
--- debian/changelog 2015-10-27 22:49:37 +0000
+++ debian/changelog 2015-12-11 02:20:37 +0000
@@ -2,6 +2,7 @@
22
3 [ Bartosz Kosiorek ]3 [ Bartosz Kosiorek ]
4 * Fix alarm difference time description, during DST change (LP: #1510694)4 * Fix alarm difference time description, during DST change (LP: #1510694)
5 * Move to use the new SDK components v1.3 (LP: #1508363)
56
6 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 27 Oct 2015 23:49:19 +01007 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 27 Oct 2015 23:49:19 +0100
78
89
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-10-29 22:14:42 +0000
+++ manifest.json.in 2015-12-11 02:20:37 +0000
@@ -1,7 +1,7 @@
1{1{
2 "name": "com.ubuntu.clock",2 "name": "com.ubuntu.clock",
3 "description": "A sophisticated clock app for Ubuntu Touch",3 "description": "A sophisticated clock app for Ubuntu Touch",
4 "framework": "ubuntu-sdk-15.04",4 "framework": "ubuntu-sdk-15.04.1",
5 "architecture": "@CLICK_ARCH@",5 "architecture": "@CLICK_ARCH@",
6 "title": "Clock",6 "title": "Clock",
7 "icon": "clock@30.png",7 "icon": "clock@30.png",
88
=== modified file 'tests/unit/MockClockApp.qml'
--- tests/unit/MockClockApp.qml 2015-10-06 22:34:27 +0000
+++ tests/unit/MockClockApp.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import WorldClock 1.020import WorldClock 1.0
21import U1db 1.0 as U1db21import U1db 1.0 as U1db
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import "../../app"23import "../../app"
24import "../../app/components"24import "../../app/components"
25import "../../app/clock"25import "../../app/clock"
2626
=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml 2015-10-27 22:49:37 +0000
+++ tests/unit/tst_alarm.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import WorldClock 1.020import WorldClock 1.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
22import "../../app/alarm"22import "../../app/alarm"
2323
24MainView {24MainView {
2525
=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml 2015-08-12 16:57:29 +0000
+++ tests/unit/tst_alarmLabel.qml 2015-12-11 02:20:37 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../../app/alarm"21import "../../app/alarm"
2222
23MainView {23MainView {
2424
=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml 2015-08-12 18:50:48 +0000
+++ tests/unit/tst_alarmRepeat.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import "../../app/alarm"23import "../../app/alarm"
2424
25MainView {25MainView {
2626
=== modified file 'tests/unit/tst_alarmSound.qml'
--- tests/unit/tst_alarmSound.qml 2015-08-28 18:50:21 +0000
+++ tests/unit/tst_alarmSound.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import Qt.labs.folderlistmodel 2.123import Qt.labs.folderlistmodel 2.1
24import "../../app/alarm"24import "../../app/alarm"
2525
2626
=== modified file 'tests/unit/tst_alarmUtils.qml'
--- tests/unit/tst_alarmUtils.qml 2015-10-27 22:49:37 +0000
+++ tests/unit/tst_alarmUtils.qml 2015-12-11 02:20:37 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
22import "../../app/alarm"22import "../../app/alarm"
2323
24TestCase {24TestCase {
2525
=== modified file 'tests/unit/tst_stopwatchUtils.qml'
--- tests/unit/tst_stopwatchUtils.qml 2015-08-26 22:50:57 +0000
+++ tests/unit/tst_stopwatchUtils.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Stopwatch 1.021import Stopwatch 1.0
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import "../../app/stopwatch"23import "../../app/stopwatch"
2424
25TestCase {25TestCase {
2626
=== modified file 'tests/unit/tst_worldClock.qml'
--- tests/unit/tst_worldClock.qml 2015-08-17 13:07:38 +0000
+++ tests/unit/tst_worldClock.qml 2015-12-11 02:20:37 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
2323
24MockClockApp {24MockClockApp {
25 id: clockApp25 id: clockApp

Subscribers

People subscribed via source and target branches