Merge lp:~nik90/ubuntu-clock-app/implement-snooze-settings into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Implement Alarm Snooze settings option as per design spec

Implement Alarm Snooze settings option as per design spec [1]. You will need image 228 or higher to test alarm snooze functionality!

Also do note that this MP is more about exposing alarm snooze settings in the clock app and less about the actual UI itself since I used the settings wireframes to implement it. I was told by the designer that we will be getting proper visual specs for the entire settings page.

[1] https://docs.google.com/presentation/d/1JvDyhsW17d1-Mz8OY1YMBKwfRI2z9qgyRjbujEsxEMk/edit#slide=id.g18895458d_024

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/446/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/233
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/93

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/446/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/implement-snooze-settings]

90. By Nekhelesh Ramananthan on 2014-09-08

merged trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:90
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/451/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/246
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/98

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/451/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Reviewing the C++ parts of this MP; looks fine.

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

tested on flo. Works well, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2014-09-04 13:50:49 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-09-08 13:10:00 +0000
@@ -28,6 +28,7 @@
 
     title: i18n.tr("Settings")
     visible: false
+    flickable: null
 
     Connections {
         target: clockApp
@@ -56,151 +57,240 @@
         }
     }
 
-    Column {
-        id: _settingsColumn
-
+    ListModel {
+        id: snoozeModel
+        Component.onCompleted: initialise()
+
+        function initialise() {
+            snoozeModel.append({ "duration": 2, "text": i18n.tr("%1 minutes").arg(2) })
+            snoozeModel.append({ "duration": 4, "text": i18n.tr("%1 minutes").arg(4) })
+            snoozeModel.append({ "duration": 5, "text": i18n.tr("%1 minutes").arg(5) })
+            snoozeModel.append({ "duration": 10, "text": i18n.tr("%1 minutes").arg(10) })
+        }
+    }
+
+    Flickable {
+        id: settingsPlugin
+
+        contentHeight: _settingsColumn.height
         anchors.fill: parent
-
-        ListItem.Base {
-            height: 2 * implicitHeight
-
-            Label {
-                color: UbuntuColors.midAubergine
-                text: i18n.tr("Alarm volume")
-                anchors.top: parent.top
-                anchors.topMargin: units.gu(1)
-            }
-
-            Slider {
-                anchors.centerIn: parent
-                width: parent.width
-
-                minimumValue: 1
-                maximumValue: 100
-                value: alarmSettings.volume
-
-                onValueChanged: {
-                    alarmSettings.volume = formatValue(value)
-                }
-            }
-        }
-
-        ListItem.Expandable {
-            id: _alarmDuration
+        clip: true
+
+        Column {
+            id: _settingsColumn
 
             anchors {
+                top: parent.top
                 left: parent.left
                 right: parent.right
-                margins: units.gu(-2)
-            }
-
-            collapseOnClick: true
-            expandedHeight: _contentColumn.height + units.gu(1)
-
-            Column {
-                id: _contentColumn
-                width: parent.width
-
-                Item {
-                    width: parent.width
-                    height: _alarmDuration.collapsedHeight
-
-                    SubtitledListItem {
-                        id: _header
-                        text: i18n.tr("Silence after")
-                        subText: i18n.tr("%1 minutes").arg(alarmSettings.duration)
-                        onClicked: _alarmDuration.expanded = true
-
-                        Icon {
-                            id: _upArrow
-
-                            width: units.gu(2)
-                            height: width
-                            anchors.right: parent.right
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            name: "go-down"
-                            color: "Grey"
-                            rotation: _alarmDuration.expanded ? 180 : 0
-
-                            Behavior on rotation {
-                                UbuntuNumberAnimation {}
-                            }
-                        }
-                    }
-                }
-
-                ListView {
-                    id: _resultsList
-                    clip: true
-                    model: durationModel
-                    width: parent.width
-                    height: units.gu(24)
-                    delegate: ListItem.Standard {
-                        text: model.text
-                        onClicked: {
-                            alarmSettings.duration = duration
-                            _alarmDuration.expanded = false
-                        }
-                    }
-                }
-            }
-        }
-
-        ListItem.Base {
-            Label {
-                text: i18n.tr("Vibration")
-                color: UbuntuColors.midAubergine
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            Switch {
-                id: vibrateSwitch
-
-                anchors {
-                    right: parent.right
-                    verticalCenter: parent.verticalCenter
-                }
-
-                checked: alarmSettings.vibration === "pulse"
-                onCheckedChanged: {
-                    if(checked) {
-                        alarmSettings.vibration = "pulse"
-                    } else {
-                        alarmSettings.vibration = "none"
-                    }
-                }
-            }
-
-            onClicked: {
-                vibrateSwitch.checked = !vibrateSwitch.checked
-            }
-        }
-
-        SubtitledListItem {
-            text: i18n.tr("Change time and date")
-            subText: {
-                /*
+            }
+
+            ListItem.Base {
+                height: 2 * implicitHeight
+
+                Label {
+                    color: UbuntuColors.midAubergine
+                    text: i18n.tr("Alarm volume")
+                    anchors.top: parent.top
+                    anchors.topMargin: units.gu(1)
+                }
+
+                Slider {
+                    anchors.centerIn: parent
+                    width: parent.width
+
+                    minimumValue: 1
+                    maximumValue: 100
+                    value: alarmSettings.volume
+
+                    onValueChanged: {
+                        alarmSettings.volume = formatValue(value)
+                    }
+                }
+            }
+
+            ListItem.Expandable {
+                id: _alarmDuration
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(-2)
+                }
+
+                collapseOnClick: true
+                expandedHeight: _contentColumn.height + units.gu(1)
+
+                Column {
+                    id: _contentColumn
+                    width: parent.width
+
+                    Item {
+                        width: parent.width
+                        height: _alarmDuration.collapsedHeight
+
+                        SubtitledListItem {
+                            id: _header
+                            text: i18n.tr("Silence after")
+                            subText: i18n.tr("%1 minutes").arg(alarmSettings.duration)
+                            onClicked: _alarmDuration.expanded = true
+
+                            Icon {
+                                id: _upArrow
+
+                                width: units.gu(2)
+                                height: width
+                                anchors.right: parent.right
+                                anchors.verticalCenter: parent.verticalCenter
+
+                                name: "go-down"
+                                color: "Grey"
+                                rotation: _alarmDuration.expanded ? 180 : 0
+
+                                Behavior on rotation {
+                                    UbuntuNumberAnimation {}
+                                }
+                            }
+                        }
+                    }
+
+                    ListView {
+                        id: _resultsList
+                        clip: true
+                        interactive: false
+                        model: durationModel
+                        width: parent.width
+                        height: units.gu(24)
+                        delegate: ListItem.Standard {
+                            text: model.text
+                            onClicked: {
+                                alarmSettings.duration = duration
+                                _alarmDuration.expanded = false
+                            }
+                        }
+                    }
+                }
+            }
+
+            ListItem.Expandable {
+                id: _alarmSnooze
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(-2)
+                }
+
+                collapseOnClick: true
+                expandedHeight: _snoozeContentColumn.height + units.gu(1)
+
+                Column {
+                    id: _snoozeContentColumn
+                    width: parent.width
+
+                    Item {
+                        width: parent.width
+                        height: _alarmSnooze.collapsedHeight
+
+                        SubtitledListItem {
+                            id: _snoozeHeader
+                            text: i18n.tr("Snooze for")
+                            subText: i18n.tr("%1 minutes").arg(alarmSettings.snoozeDuration)
+                            onClicked: _alarmSnooze.expanded = true
+
+                            Icon {
+                                id: _snoozeUpArrow
+
+                                width: units.gu(2)
+                                height: width
+                                anchors.right: parent.right
+                                anchors.verticalCenter: parent.verticalCenter
+
+                                name: "go-down"
+                                color: "Grey"
+                                rotation: _alarmSnooze.expanded ? 180 : 0
+
+                                Behavior on rotation {
+                                    UbuntuNumberAnimation {}
+                                }
+                            }
+                        }
+                    }
+
+                    ListView {
+                        id: _snoozeResultsList
+                        clip: true
+                        interactive: false
+                        model: snoozeModel
+                        width: parent.width
+                        height: units.gu(24)
+
+                        delegate: ListItem.Standard {
+                            text: model.text
+                            onClicked: {
+                                alarmSettings.snoozeDuration = duration
+                                _alarmSnooze.expanded = false
+                            }
+                        }
+                    }
+                }
+            }
+
+            ListItem.Base {
+                Label {
+                    text: i18n.tr("Vibration")
+                    color: UbuntuColors.midAubergine
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                Switch {
+                    id: vibrateSwitch
+
+                    anchors {
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                    }
+
+                    checked: alarmSettings.vibration === "pulse"
+                    onCheckedChanged: {
+                        if(checked) {
+                            alarmSettings.vibration = "pulse"
+                        } else {
+                            alarmSettings.vibration = "none"
+                        }
+                    }
+                }
+
+                onClicked: {
+                    vibrateSwitch.checked = !vibrateSwitch.checked
+                }
+            }
+
+            SubtitledListItem {
+                text: i18n.tr("Change time and date")
+                subText: {
+                    /*
                   FIXME: When the upstream QT bug at
                   https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed
                   it will be possible to receive a datetime object directly
                   instead of using this hack.
                 */
-                var localTime = new Date
-                        (
-                            localTimeSource.localDateString.split(":")[0],
-                            localTimeSource.localDateString.split(":")[1]-1,
-                            localTimeSource.localDateString.split(":")[2],
-                            localTimeSource.localTimeString.split(":")[0],
-                            localTimeSource.localTimeString.split(":")[1],
-                            localTimeSource.localTimeString.split(":")[2],
-                            localTimeSource.localTimeString.split(":")[3]
-                            )
-                return localTime.toLocaleString()
-            }
+                    var localTime = new Date
+                            (
+                                localTimeSource.localDateString.split(":")[0],
+                                localTimeSource.localDateString.split(":")[1]-1,
+                                localTimeSource.localDateString.split(":")[2],
+                                localTimeSource.localTimeString.split(":")[0],
+                                localTimeSource.localTimeString.split(":")[1],
+                                localTimeSource.localTimeString.split(":")[2],
+                                localTimeSource.localTimeString.split(":")[3]
+                                )
+                    return localTime.toLocaleString()
+                }
 
-            onClicked: {
-                Qt.openUrlExternally("settings:///system/time-date")
+                onClicked: {
+                    Qt.openUrlExternally("settings:///system/time-date")
+                }
             }
         }
     }

=== modified file 'backend/modules/Alarm/Settings/alarmsettings.cpp'
--- backend/modules/Alarm/Settings/alarmsettings.cpp	2014-08-02 14:54:00 +0000
+++ backend/modules/Alarm/Settings/alarmsettings.cpp	2014-09-08 13:10:00 +0000
@@ -66,6 +66,16 @@
         }
     }
 
+    it = properties.find("SnoozeDuration");
+
+    if (it != properties.end()) {
+        const int snoozeDuration = it.value().toInt();
+        if (m_snoozeDuration != snoozeDuration) {
+            m_snoozeDuration = snoozeDuration;
+            emit snoozeDurationChanged();
+        }
+    }
+
     it = properties.find("HapticFeedback");
 
     if (it != properties.end()) {
@@ -97,6 +107,7 @@
 
     m_volume = map["DefaultVolume"].toInt();
     m_duration = map["Duration"].toInt();
+    m_snoozeDuration = map["SnoozeDuration"].toInt();
     m_vibration = map["HapticFeedback"].toString();
 }
 
@@ -124,6 +135,11 @@
     return m_duration;
 }
 
+int AlarmSettings::snoozeDuration() const
+{
+    return m_snoozeDuration;
+}
+
 QString AlarmSettings::vibration() const
 {
     return m_vibration;
@@ -157,6 +173,20 @@
     setDBusProperty("Duration", QVariant(m_duration));
 }
 
+void AlarmSettings::setSnoozeDuration(int snoozeDuration)
+{
+    if(m_snoozeDuration == snoozeDuration) {
+        // Don't send the snooze duration over dbus if it is the same one already
+        return;
+    }
+
+    // Change the property and let qml know about it
+    m_snoozeDuration = snoozeDuration;
+    emit snoozeDurationChanged();
+
+    setDBusProperty("SnoozeDuration", QVariant(m_snoozeDuration));
+}
+
 void AlarmSettings::setVibration(QString vibration)
 {
     if(m_vibration == vibration) {

=== modified file 'backend/modules/Alarm/Settings/alarmsettings.h'
--- backend/modules/Alarm/Settings/alarmsettings.h	2014-08-02 14:54:00 +0000
+++ backend/modules/Alarm/Settings/alarmsettings.h	2014-09-08 13:10:00 +0000
@@ -38,6 +38,12 @@
                 WRITE setDuration
                 NOTIFY durationChanged)
 
+    // Property to control the snooze duration
+    Q_PROPERTY(int snoozeDuration
+               READ snoozeDuration
+               WRITE setSnoozeDuration
+               NOTIFY snoozeDurationChanged)
+
     // Property to control the haptic feedback mode
     Q_PROPERTY(QString vibration
                READ vibration
@@ -53,6 +59,9 @@
     // Function to return the alarm duration
     int duration() const;
 
+    // Function to return the snooze duration
+    int snoozeDuration() const;
+
     // Function to return the alarm haptic mode
     QString vibration() const;
 
@@ -62,6 +71,9 @@
     // Function to set the alarm duration
     void setDuration(int duration);
 
+    // Function to set the snooze duration
+    void setSnoozeDuration(int snoozeDuration);
+
     // Function to set the alarm haptic mode
     void setVibration(QString vibration);
 
@@ -72,6 +84,9 @@
     // Signal to notify the duration change to QML
     void durationChanged();
 
+    // Signal to notify the snooze duration change to QML
+    void snoozeDurationChanged();
+
     // Signal to notify the vibration mode change to QML
     void vibrationChanged();
 
@@ -82,6 +97,9 @@
     // Keep a store of the alarm duration
     int m_duration;
 
+    // Keep a store of the alarm snooze duration
+    int m_snoozeDuration;
+
     // Keep a store of the alarm haptic mode
     QString m_vibration;
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-04 22:03:57 +0000
+++ debian/changelog	2014-09-08 13:10:00 +0000
@@ -29,6 +29,7 @@
   * Added pressed visual state to the settings button (LP: #1364553)
   * Fixed no UI hint being show to add cities (LP: #1362263)
   * Fixed add world city being triggered accidentally (LP: #1359180)
+  * Added alarm snooze settings (LP: #1354400)
 
   [Zsombor Egri]
   * Fixed alarm status toggle being reverted immediately (LP: #1272337)