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

[Nekhelesh Ramananthan]

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

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

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== 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 @@
         title.text: Qt.formatTime(model.date) // Alarm time
         title.font.weight: Font.Normal
         subtitle.text: message // Alarm name
+        subtitle.textSize: Label.Medium
         summary.text:  alarmOccurrence
+        summary.textSize: Label.Medium
 
         Switch {
             id: alarmStatus
 
             objectName: "listAlarmStatus" + index
             anchors.verticalCenter: parent.verticalCenter
-            SlotsLayout.position: SlotsLayout.Trailing
-            SlotsLayout.overrideVerticalPositioning: true
             checked: model.enabled && (model.status === Alarm.Ready)
             onCheckedChanged: {
                 if (checked !== model.enabled) {

=== 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 @@
                 listViewHeight: units.gu(28)
                 titleText.text: i18n.tr("Alarm stops after")
                 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)
+                subText.textSize: Label.Medium
 
                 model: durationModel
 
@@ -148,6 +149,7 @@
                 listViewHeight: units.gu(28)
                 titleText.text: i18n.tr("Snooze for")
                 subText.text: i18n.tr("%1 minute", "%1 minutes", alarmSettings.snoozeDuration).arg(alarmSettings.snoozeDuration)
+                subText.textSize: Label.Medium
 
                 model: snoozeModel
 
@@ -202,6 +204,7 @@
                     id: timeAndDateLayout
                     title.text: i18n.tr("Change time and date")
                     subtitle.text: localTimeSource.localizedCurrentDateString + " " + localTimeSource.localizedCurrentTimeString
+                    subtitle.textSize: Label.Medium
 
                     Icon {
                         SlotsLayout.position: SlotsLayout.Trailing

=== 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 @@
 
                 title.text: i18n.tr("Repeat")
                 subtitle.text: _alarmRepeat.subText
+                subtitle.textSize: Label.Medium
             }
             onClicked: pageStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),
                                       {"alarm": _alarm, "alarmUtils": alarmUtils})
@@ -296,6 +297,7 @@
 
                 title.text: i18n.tr("Label")
                 subtitle.text: _alarm.message
+                subtitle.textSize: Label.Medium
             }
             onClicked: pageStack.push(Qt.resolvedUrl("AlarmLabel.qml"),
                                       {"alarm": _alarm})
@@ -316,6 +318,7 @@
 
                 title.text: i18n.tr("Sound")
                 subtitle.text: _alarmSound.subText
+                subtitle.textSize: Label.Medium
             }
             onClicked: pageStack.push(Qt.resolvedUrl("AlarmSound.qml"), {
                                           "alarmSound": _alarmSound,

=== 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 @@
         text: clock.localizedDateString
         textSize: Label.Medium
         opacity: 0
+        color: "#5D5D5D"
     }
 
     Row {
@@ -235,6 +236,7 @@
             id: location
             objectName: "location"
 
+            color: "#5D5D5D"
             anchors.verticalCenter: locationIcon.verticalCenter
 
             text: {

=== 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 @@
 
         anchors.centerIn: parent
 
+        color: "#5D5D5D"
         font.pixelSize: maxTimeFontSize
 
         text: {
@@ -74,6 +75,7 @@
 
         font.pixelSize: maxPeriodFontSize
         visible: text !== ""
+        color: "#5D5D5D"
         text: {
             if (localizedTimeString.search(Qt.locale().amText) !== -1) {
                 // 12 hour format detected with the localised AM text

=== 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 @@
         text: stopwatchFormatTime.millisToTimeString(milliseconds, true)
         font.pixelSize: units.dp(36)
         anchors.centerIn: parent
+        color: "#5D5D5D"
     }
 
     Label {
@@ -46,6 +47,7 @@
 
         text: stopwatchFormatTime.millisToString(milliseconds)
         textSize: Label.Large
+        color: "#5D5D5D"
         anchors {
             top: time.bottom
             topMargin: units.gu(1.5)

=== 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 @@
             Label {
                 text: model.cityName
                 objectName: "userCityNameText"
-                textSize: Label.Small
+                textSize: Label.Medium
                 width: parent.width
                 elide: Text.ElideRight
                 color: "#5d5d5d"
@@ -65,7 +65,7 @@
             Label {
                 text: model.countryName
                 objectName: "userCountryNameText"
-                textSize: Label.Small
+                textSize: Label.Medium
                 width: parent.width
                 elide: Text.ElideRight
                 color: "#888888"
@@ -123,7 +123,7 @@
             anchors.verticalCenter: parent.verticalCenter
 
             color: "#5d5d5d"
-            textSize: Label.Small
+            textSize: Label.Medium
             wrapMode: Text.WordWrap
             maximumLineCount: 2
             elide: Text.ElideRight

=== 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 @@
                 title.text: cityName
                 title.objectName: "defaultCityNameText"
                 subtitle.text: countryName
+                subtitle.textSize: Label.Medium
                 subtitle.objectName: "defaultCountryNameText"
 
                 Label {

=== 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 @@
   * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
   * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
   * Fixed alarm passed label being shown in the alarm description (LP: #1551307)
+  * Changed all labels font sizes from small to medium
+  * Removed vertical override on the alarm switch positioning in the alarms page.
+  * Ensured all labels respect the color specified in the design spec.
 
  -- Bartosz Kosiorek <[e-mail]>  Wed, 30 Dec 2015 01:43:24 +0100