Ubuntu Clock App

Merge lp://qastaging/~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 into lp://qastaging/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://qastaging/~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3
Merge into: lp://qastaging/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://qastaging/~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.qastaging.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://qastaging/~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://qastaging/~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://qastaging/~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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches