lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-new-design

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-clock-app at revision 442

Jenkins Bot: Approve (continuous-integration) on 2016-02-25

Nekhelesh Ramananthan: Approve on 2016-02-25

Bartosz Kosiorek: Approve on 2016-02-17

Diff: 2371 lines (+525/-765)

37 files modified

app/MainPage.qml (+3/-2)
app/alarm/AlarmDelegate.qml (+94/-128)
app/alarm/AlarmRepeat.qml (+19/-30)
app/alarm/AlarmSettingsPage.qml (+74/-89)
app/alarm/AlarmSound.qml (+29/-59)
app/alarm/EditAlarmPage.qml (+31/-12)
app/clock/ClockPage.qml (+18/-13)
app/clock/MainClock.qml (+5/-4)
app/components/ActionIcon.qml (+4/-3)
app/components/AnalogMode.qml (+53/-0)
app/components/Background.qml (+0/-32)
app/components/CMakeLists.txt (+0/-2)
app/components/Clock.qml (+2/-5)
app/components/ClockCircle.qml (+16/-25)
app/components/DigitalMode.qml (+2/-2)
app/components/EmptyState.qml (+1/-1)
app/components/ExpandableListItem.qml (+25/-32)
app/components/HeaderNavigation.qml (+8/-31)
app/components/SubtitledListItem.qml (+0/-59)
app/graphics/CMakeLists.txt (+3/-3)
app/graphics/Stopwatch_Placeholder.svg (+0/-19)
app/graphics/WorldClock_Placeholder.svg (+0/-21)
app/stopwatch/LapListView.qml (+18/-22)
app/stopwatch/StopwatchFace.qml (+22/-28)
app/stopwatch/StopwatchPage.qml (+25/-8)
app/ubuntu-clock-app.qml (+1/-11)
app/upstreamcomponents/FastScroll.qml (+2/-2)
app/worldclock/AddWorldCityButton.qml (+7/-13)
app/worldclock/UserWorldCityDelegate.qml (+8/-6)
app/worldclock/WorldCityList.qml (+10/-37)
backend/modules/Stopwatch/formattime.cpp (+1/-10)
po/com.ubuntu.clock.pot (+39/-39)
tests/unit/ClockTestCase.qml (+1/-1)
tests/unit/tst_alarmLabel.qml (+1/-1)
tests/unit/tst_alarmRepeat.qml (+1/-1)
tests/unit/tst_alarmUtils.qml (+2/-2)
tests/unit/tst_stopwatchUtils.qml (+0/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1528241: Clock should implement new UI according to UX desgin	Medium	Fix Released
Bug #1543472: Update all list item components for all relevant views	Medium	Fix Released
Bug #1543475: Stopwatch: start button too wide	Low	Fix Released
Bug #1543479: Stopwatch - Clock face should be tappable/clickable to start/stop timer	Wishlist	Fix Released
Bug #1543501: settings: wrong font colour (purple) for section titles	Low	Fix Released

Link a bug report

Related blueprints

475. By Nekhelesh Ramananthan on 2016-02-25

Fixed the failing worldcity AP tests

474. By Nekhelesh Ramananthan on 2016-02-25

removed outdated comment

473. By Nekhelesh Ramananthan on 2016-02-25

Fixed failing stopwatchUtils and alarmUtils unit tests

472. By Nekhelesh Ramananthan on 2016-02-25

Fixed failing tst_alarmLabel.qml unit tests

471. By Michal Predotka on 2016-02-22

Update clock hands graphics

470. By Bartosz Kosiorek on 2016-02-20

Some small shadow fixes

469. By Bartosz Kosiorek on 2016-02-20

Add shadows to clock hands

468. By Bartosz Kosiorek on 2016-02-20

FIx Second hand

467. By Bartosz Kosiorek on 2016-02-20

Add shadows to hands

466. By Bartosz Kosiorek on 2016-02-20

Clock hands improvements