Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/minor-last-design-fixes into lp:ubuntu-clock-app

  1. minor-last-design-fixes
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 455
Merged at revision: 453
Proposed branch: lp:~nik90/ubuntu-clock-app/minor-last-design-fixes
Merge into: lp:ubuntu-clock-app
Diff against target: 193 lines (+21/-5)
9 files modified
app/alarm/AlarmDelegate.qml (+2/-2)
app/alarm/AlarmSettingsPage.qml (+3/-0)
app/alarm/EditAlarmPage.qml (+3/-0)
app/clock/ClockPage.qml (+2/-0)
app/components/DigitalMode.qml (+2/-0)
app/stopwatch/StopwatchFace.qml (+2/-0)
app/worldclock/UserWorldCityDelegate.qml (+3/-3)
app/worldclock/WorldCityList.qml (+1/-0)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/minor-last-design-fixes
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+287771@code.launchpad.net

Commit message

Minor last minute design changes which include,
- Increase font size of labels from Small to Medium
- Ensured all labels respect the color specified in the design spec
- Removed vertical overriding of alarm switch position in the alarms page

Description of the change

Minor last minute design changes which include,
- Increase font size of labels from Small to Medium
- Ensured all labels respect the color specified in the design spec
- Removed vertical overriding of alarm switch position in the alarms page

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM!

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

FAILED: Continuous integration, rev:455
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1108/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/666/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1108/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml 2016-02-29 16:20:29 +0000
+++ app/alarm/AlarmDelegate.qml 2016-03-02 12:13:44 +0000
@@ -69,15 +69,15 @@
69 title.text: Qt.formatTime(model.date) // Alarm time69 title.text: Qt.formatTime(model.date) // Alarm time
70 title.font.weight: Font.Normal70 title.font.weight: Font.Normal
71 subtitle.text: message // Alarm name71 subtitle.text: message // Alarm name
72 subtitle.textSize: Label.Medium
72 summary.text: alarmOccurrence73 summary.text: alarmOccurrence
74 summary.textSize: Label.Medium
7375
74 Switch {76 Switch {
75 id: alarmStatus77 id: alarmStatus
7678
77 objectName: "listAlarmStatus" + index79 objectName: "listAlarmStatus" + index
78 anchors.verticalCenter: parent.verticalCenter80 anchors.verticalCenter: parent.verticalCenter
79 SlotsLayout.position: SlotsLayout.Trailing
80 SlotsLayout.overrideVerticalPositioning: true
81 checked: model.enabled && (model.status === Alarm.Ready)81 checked: model.enabled && (model.status === Alarm.Ready)
82 onCheckedChanged: {82 onCheckedChanged: {
83 if (checked !== model.enabled) {83 if (checked !== model.enabled) {
8484
=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml 2016-02-28 20:26:57 +0000
+++ app/alarm/AlarmSettingsPage.qml 2016-03-02 12:13:44 +0000
@@ -119,6 +119,7 @@
119 listViewHeight: units.gu(28)119 listViewHeight: units.gu(28)
120 titleText.text: i18n.tr("Alarm stops after")120 titleText.text: i18n.tr("Alarm stops after")
121 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)121 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)
122 subText.textSize: Label.Medium
122123
123 model: durationModel124 model: durationModel
124125
@@ -148,6 +149,7 @@
148 listViewHeight: units.gu(28)149 listViewHeight: units.gu(28)
149 titleText.text: i18n.tr("Snooze for")150 titleText.text: i18n.tr("Snooze for")
150 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.snoozeDuration).arg(alarmSettings.snoozeDuration)151 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.snoozeDuration).arg(alarmSettings.snoozeDuration)
152 subText.textSize: Label.Medium
151153
152 model: snoozeModel154 model: snoozeModel
153155
@@ -202,6 +204,7 @@
202 id: timeAndDateLayout204 id: timeAndDateLayout
203 title.text: i18n.tr("Change time and date")205 title.text: i18n.tr("Change time and date")
204 subtitle.text: localTimeSource.localizedCurrentDateString + " " + localTimeSource.localizedCurrentTimeString206 subtitle.text: localTimeSource.localizedCurrentDateString + " " + localTimeSource.localizedCurrentTimeString
207 subtitle.textSize: Label.Medium
205208
206 Icon {209 Icon {
207 SlotsLayout.position: SlotsLayout.Trailing210 SlotsLayout.position: SlotsLayout.Trailing
208211
=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml 2016-02-25 22:16:54 +0000
+++ app/alarm/EditAlarmPage.qml 2016-03-02 12:13:44 +0000
@@ -281,6 +281,7 @@
281281
282 title.text: i18n.tr("Repeat")282 title.text: i18n.tr("Repeat")
283 subtitle.text: _alarmRepeat.subText283 subtitle.text: _alarmRepeat.subText
284 subtitle.textSize: Label.Medium
284 }285 }
285 onClicked: pageStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),286 onClicked: pageStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),
286 {"alarm": _alarm, "alarmUtils": alarmUtils})287 {"alarm": _alarm, "alarmUtils": alarmUtils})
@@ -296,6 +297,7 @@
296297
297 title.text: i18n.tr("Label")298 title.text: i18n.tr("Label")
298 subtitle.text: _alarm.message299 subtitle.text: _alarm.message
300 subtitle.textSize: Label.Medium
299 }301 }
300 onClicked: pageStack.push(Qt.resolvedUrl("AlarmLabel.qml"),302 onClicked: pageStack.push(Qt.resolvedUrl("AlarmLabel.qml"),
301 {"alarm": _alarm})303 {"alarm": _alarm})
@@ -316,6 +318,7 @@
316318
317 title.text: i18n.tr("Sound")319 title.text: i18n.tr("Sound")
318 subtitle.text: _alarmSound.subText320 subtitle.text: _alarmSound.subText
321 subtitle.textSize: Label.Medium
319 }322 }
320 onClicked: pageStack.push(Qt.resolvedUrl("AlarmSound.qml"), {323 onClicked: pageStack.push(Qt.resolvedUrl("AlarmSound.qml"), {
321 "alarmSound": _alarmSound,324 "alarmSound": _alarmSound,
322325
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2016-02-25 22:16:54 +0000
+++ app/clock/ClockPage.qml 2016-03-02 12:13:44 +0000
@@ -208,6 +208,7 @@
208 text: clock.localizedDateString208 text: clock.localizedDateString
209 textSize: Label.Medium209 textSize: Label.Medium
210 opacity: 0210 opacity: 0
211 color: "#5D5D5D"
211 }212 }
212213
213 Row {214 Row {
@@ -235,6 +236,7 @@
235 id: location236 id: location
236 objectName: "location"237 objectName: "location"
237238
239 color: "#5D5D5D"
238 anchors.verticalCenter: locationIcon.verticalCenter240 anchors.verticalCenter: locationIcon.verticalCenter
239241
240 text: {242 text: {
241243
=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml 2016-02-25 22:16:54 +0000
+++ app/components/DigitalMode.qml 2016-03-02 12:13:44 +0000
@@ -48,6 +48,7 @@
4848
49 anchors.centerIn: parent49 anchors.centerIn: parent
5050
51 color: "#5D5D5D"
51 font.pixelSize: maxTimeFontSize52 font.pixelSize: maxTimeFontSize
5253
53 text: {54 text: {
@@ -74,6 +75,7 @@
7475
75 font.pixelSize: maxPeriodFontSize76 font.pixelSize: maxPeriodFontSize
76 visible: text !== ""77 visible: text !== ""
78 color: "#5D5D5D"
77 text: {79 text: {
78 if (localizedTimeString.search(Qt.locale().amText) !== -1) {80 if (localizedTimeString.search(Qt.locale().amText) !== -1) {
79 // 12 hour format detected with the localised AM text81 // 12 hour format detected with the localised AM text
8082
=== modified file 'app/stopwatch/StopwatchFace.qml'
--- app/stopwatch/StopwatchFace.qml 2016-02-25 22:16:54 +0000
+++ app/stopwatch/StopwatchFace.qml 2016-03-02 12:13:44 +0000
@@ -39,6 +39,7 @@
39 text: stopwatchFormatTime.millisToTimeString(milliseconds, true)39 text: stopwatchFormatTime.millisToTimeString(milliseconds, true)
40 font.pixelSize: units.dp(36)40 font.pixelSize: units.dp(36)
41 anchors.centerIn: parent41 anchors.centerIn: parent
42 color: "#5D5D5D"
42 }43 }
4344
44 Label {45 Label {
@@ -46,6 +47,7 @@
4647
47 text: stopwatchFormatTime.millisToString(milliseconds)48 text: stopwatchFormatTime.millisToString(milliseconds)
48 textSize: Label.Large49 textSize: Label.Large
50 color: "#5D5D5D"
49 anchors {51 anchors {
50 top: time.bottom52 top: time.bottom
51 topMargin: units.gu(1.5)53 topMargin: units.gu(1.5)
5254
=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml 2016-02-25 22:16:54 +0000
+++ app/worldclock/UserWorldCityDelegate.qml 2016-03-02 12:13:44 +0000
@@ -56,7 +56,7 @@
56 Label {56 Label {
57 text: model.cityName57 text: model.cityName
58 objectName: "userCityNameText"58 objectName: "userCityNameText"
59 textSize: Label.Small59 textSize: Label.Medium
60 width: parent.width60 width: parent.width
61 elide: Text.ElideRight61 elide: Text.ElideRight
62 color: "#5d5d5d"62 color: "#5d5d5d"
@@ -65,7 +65,7 @@
65 Label {65 Label {
66 text: model.countryName66 text: model.countryName
67 objectName: "userCountryNameText"67 objectName: "userCountryNameText"
68 textSize: Label.Small68 textSize: Label.Medium
69 width: parent.width69 width: parent.width
70 elide: Text.ElideRight70 elide: Text.ElideRight
71 color: "#888888"71 color: "#888888"
@@ -123,7 +123,7 @@
123 anchors.verticalCenter: parent.verticalCenter123 anchors.verticalCenter: parent.verticalCenter
124124
125 color: "#5d5d5d"125 color: "#5d5d5d"
126 textSize: Label.Small126 textSize: Label.Medium
127 wrapMode: Text.WordWrap127 wrapMode: Text.WordWrap
128 maximumLineCount: 2128 maximumLineCount: 2
129 elide: Text.ElideRight129 elide: Text.ElideRight
130130
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2016-02-28 20:39:57 +0000
+++ app/worldclock/WorldCityList.qml 2016-03-02 12:13:44 +0000
@@ -336,6 +336,7 @@
336 title.text: cityName336 title.text: cityName
337 title.objectName: "defaultCityNameText"337 title.objectName: "defaultCityNameText"
338 subtitle.text: countryName338 subtitle.text: countryName
339 subtitle.textSize: Label.Medium
339 subtitle.objectName: "defaultCountryNameText"340 subtitle.objectName: "defaultCountryNameText"
340341
341 Label {342 Label {
342343
=== modified file 'debian/changelog'
--- debian/changelog 2016-02-29 16:22:02 +0000
+++ debian/changelog 2016-03-02 12:13:44 +0000
@@ -28,6 +28,9 @@
28 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.28 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
29 * Fixed colors being broken with OTA-10 SDK (LP: #1550716)29 * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
30 * Fixed alarm passed label being shown in the alarm description (LP: #1551307)30 * Fixed alarm passed label being shown in the alarm description (LP: #1551307)
31 * Changed all labels font sizes from small to medium
32 * Removed vertical override on the alarm switch positioning in the alarms page.
33 * Ensured all labels respect the color specified in the design spec.
3134
32 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +010035 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +0100
3336

Subscribers

People subscribed via source and target branches