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
1=== modified file 'app/alarm/AlarmDelegate.qml'
2--- app/alarm/AlarmDelegate.qml 2016-02-29 16:20:29 +0000
3+++ app/alarm/AlarmDelegate.qml 2016-03-02 12:13:44 +0000
4@@ -69,15 +69,15 @@
5 title.text: Qt.formatTime(model.date) // Alarm time
6 title.font.weight: Font.Normal
7 subtitle.text: message // Alarm name
8+ subtitle.textSize: Label.Medium
9 summary.text: alarmOccurrence
10+ summary.textSize: Label.Medium
11
12 Switch {
13 id: alarmStatus
14
15 objectName: "listAlarmStatus" + index
16 anchors.verticalCenter: parent.verticalCenter
17- SlotsLayout.position: SlotsLayout.Trailing
18- SlotsLayout.overrideVerticalPositioning: true
19 checked: model.enabled && (model.status === Alarm.Ready)
20 onCheckedChanged: {
21 if (checked !== model.enabled) {
22
23=== modified file 'app/alarm/AlarmSettingsPage.qml'
24--- app/alarm/AlarmSettingsPage.qml 2016-02-28 20:26:57 +0000
25+++ app/alarm/AlarmSettingsPage.qml 2016-03-02 12:13:44 +0000
26@@ -119,6 +119,7 @@
27 listViewHeight: units.gu(28)
28 titleText.text: i18n.tr("Alarm stops after")
29 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)
30+ subText.textSize: Label.Medium
31
32 model: durationModel
33
34@@ -148,6 +149,7 @@
35 listViewHeight: units.gu(28)
36 titleText.text: i18n.tr("Snooze for")
37 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.snoozeDuration).arg(alarmSettings.snoozeDuration)
38+ subText.textSize: Label.Medium
39
40 model: snoozeModel
41
42@@ -202,6 +204,7 @@
43 id: timeAndDateLayout
44 title.text: i18n.tr("Change time and date")
45 subtitle.text: localTimeSource.localizedCurrentDateString + " " + localTimeSource.localizedCurrentTimeString
46+ subtitle.textSize: Label.Medium
47
48 Icon {
49 SlotsLayout.position: SlotsLayout.Trailing
50
51=== modified file 'app/alarm/EditAlarmPage.qml'
52--- app/alarm/EditAlarmPage.qml 2016-02-25 22:16:54 +0000
53+++ app/alarm/EditAlarmPage.qml 2016-03-02 12:13:44 +0000
54@@ -281,6 +281,7 @@
55
56 title.text: i18n.tr("Repeat")
57 subtitle.text: _alarmRepeat.subText
58+ subtitle.textSize: Label.Medium
59 }
60 onClicked: pageStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),
61 {"alarm": _alarm, "alarmUtils": alarmUtils})
62@@ -296,6 +297,7 @@
63
64 title.text: i18n.tr("Label")
65 subtitle.text: _alarm.message
66+ subtitle.textSize: Label.Medium
67 }
68 onClicked: pageStack.push(Qt.resolvedUrl("AlarmLabel.qml"),
69 {"alarm": _alarm})
70@@ -316,6 +318,7 @@
71
72 title.text: i18n.tr("Sound")
73 subtitle.text: _alarmSound.subText
74+ subtitle.textSize: Label.Medium
75 }
76 onClicked: pageStack.push(Qt.resolvedUrl("AlarmSound.qml"), {
77 "alarmSound": _alarmSound,
78
79=== modified file 'app/clock/ClockPage.qml'
80--- app/clock/ClockPage.qml 2016-02-25 22:16:54 +0000
81+++ app/clock/ClockPage.qml 2016-03-02 12:13:44 +0000
82@@ -208,6 +208,7 @@
83 text: clock.localizedDateString
84 textSize: Label.Medium
85 opacity: 0
86+ color: "#5D5D5D"
87 }
88
89 Row {
90@@ -235,6 +236,7 @@
91 id: location
92 objectName: "location"
93
94+ color: "#5D5D5D"
95 anchors.verticalCenter: locationIcon.verticalCenter
96
97 text: {
98
99=== modified file 'app/components/DigitalMode.qml'
100--- app/components/DigitalMode.qml 2016-02-25 22:16:54 +0000
101+++ app/components/DigitalMode.qml 2016-03-02 12:13:44 +0000
102@@ -48,6 +48,7 @@
103
104 anchors.centerIn: parent
105
106+ color: "#5D5D5D"
107 font.pixelSize: maxTimeFontSize
108
109 text: {
110@@ -74,6 +75,7 @@
111
112 font.pixelSize: maxPeriodFontSize
113 visible: text !== ""
114+ color: "#5D5D5D"
115 text: {
116 if (localizedTimeString.search(Qt.locale().amText) !== -1) {
117 // 12 hour format detected with the localised AM text
118
119=== modified file 'app/stopwatch/StopwatchFace.qml'
120--- app/stopwatch/StopwatchFace.qml 2016-02-25 22:16:54 +0000
121+++ app/stopwatch/StopwatchFace.qml 2016-03-02 12:13:44 +0000
122@@ -39,6 +39,7 @@
123 text: stopwatchFormatTime.millisToTimeString(milliseconds, true)
124 font.pixelSize: units.dp(36)
125 anchors.centerIn: parent
126+ color: "#5D5D5D"
127 }
128
129 Label {
130@@ -46,6 +47,7 @@
131
132 text: stopwatchFormatTime.millisToString(milliseconds)
133 textSize: Label.Large
134+ color: "#5D5D5D"
135 anchors {
136 top: time.bottom
137 topMargin: units.gu(1.5)
138
139=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
140--- app/worldclock/UserWorldCityDelegate.qml 2016-02-25 22:16:54 +0000
141+++ app/worldclock/UserWorldCityDelegate.qml 2016-03-02 12:13:44 +0000
142@@ -56,7 +56,7 @@
143 Label {
144 text: model.cityName
145 objectName: "userCityNameText"
146- textSize: Label.Small
147+ textSize: Label.Medium
148 width: parent.width
149 elide: Text.ElideRight
150 color: "#5d5d5d"
151@@ -65,7 +65,7 @@
152 Label {
153 text: model.countryName
154 objectName: "userCountryNameText"
155- textSize: Label.Small
156+ textSize: Label.Medium
157 width: parent.width
158 elide: Text.ElideRight
159 color: "#888888"
160@@ -123,7 +123,7 @@
161 anchors.verticalCenter: parent.verticalCenter
162
163 color: "#5d5d5d"
164- textSize: Label.Small
165+ textSize: Label.Medium
166 wrapMode: Text.WordWrap
167 maximumLineCount: 2
168 elide: Text.ElideRight
169
170=== modified file 'app/worldclock/WorldCityList.qml'
171--- app/worldclock/WorldCityList.qml 2016-02-28 20:39:57 +0000
172+++ app/worldclock/WorldCityList.qml 2016-03-02 12:13:44 +0000
173@@ -336,6 +336,7 @@
174 title.text: cityName
175 title.objectName: "defaultCityNameText"
176 subtitle.text: countryName
177+ subtitle.textSize: Label.Medium
178 subtitle.objectName: "defaultCountryNameText"
179
180 Label {
181
182=== modified file 'debian/changelog'
183--- debian/changelog 2016-02-29 16:22:02 +0000
184+++ debian/changelog 2016-03-02 12:13:44 +0000
185@@ -28,6 +28,9 @@
186 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
187 * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
188 * Fixed alarm passed label being shown in the alarm description (LP: #1551307)
189+ * Changed all labels font sizes from small to medium
190+ * Removed vertical override on the alarm switch positioning in the alarms page.
191+ * Ensured all labels respect the color specified in the design spec.
192
193 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +0100
194

Subscribers

People subscribed via source and target branches