Merge lp:~nik90/ubuntu-clock-app/improve-setting-listitem into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Made the expandable list item used in AlarmSettings.qml into a generic component to avoid code duplication and also polished its visual style (related to side anchors and tick to indicate selected setting).

Made the expandable list item used in AlarmSettings.qml into a generic component to avoid code duplication and also polished its visual style (related to side anchors and tick to indicate selected setting).

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

FAILED: Continuous integration, rev:221
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/627/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2340/console

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/improve-setting-listitem]

222. By Nekhelesh Ramananthan on 2015-03-13

Updated copyright

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

PASSED: Continuous integration, rev:222
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/628/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2342
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2342/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/improve-setting-listitem]

223. By Nekhelesh Ramananthan on 2015-03-24

merged lp:ubuntu-clock-app

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

PASSED: Continuous integration, rev:223
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/631/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2407
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2407/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/improve-setting-listitem]

224. By Nekhelesh Ramananthan on 2015-03-28

Merged lp:ubuntu-clock-app

225. By Nekhelesh Ramananthan on 2015-03-31

merged lp:ubuntu-clock-app

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

PASSED: Continuous integration, rev:225
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/639/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2475
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2475/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/improve-setting-listitem]

226. By Nekhelesh Ramananthan on 2015-04-14

merged lp:ubuntu-clock-app

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

PASSED: Continuous integration, rev:226
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/641/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2594
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2594/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good to me, testing on krillin. Nice work!

review: Approve

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2015-03-12 23:22:12 +0000
+++ app/alarm/AlarmSettingsPage.qml	2015-04-14 11:08:13 +0000
@@ -116,140 +116,58 @@
                 }
             }
 
-            ListItem.Expandable {
+            ExpandableListItem {
                 id: _alarmDuration
 
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                collapseOnClick: true
-                expandedHeight: _contentColumn.height + units.gu(1)
-
-                Column {
-                    id: _contentColumn
-
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                        margins: units.gu(-2)
-                    }
-
-                    Item {
-                        width: parent.width
-                        height: _alarmDuration.collapsedHeight
-
-                        SubtitledListItem {
-                            id: _header
-                            text: i18n.tr("Silence after")
-                            subText: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)
-                            onClicked: _alarmDuration.expanded = true
-
-                            Icon {
-                                id: _upArrow
-
-                                width: units.gu(2)
-                                height: width
-                                anchors.right: parent.right
-                                anchors.rightMargin: units.gu(2)
-                                anchors.verticalCenter: parent.verticalCenter
-
-                                name: "go-down"
-                                color: "Grey"
-                                rotation: _alarmDuration.expanded ? 180 : 0
-
-                                Behavior on rotation {
-                                    UbuntuNumberAnimation {}
-                                }
-                            }
-                        }
-                    }
-
-                    ListView {
-                        id: _resultsList
-
-                        interactive: false
-                        model: durationModel
-                        width: parent.width
-                        height: units.gu(24)
-
-                        delegate: ListItem.Standard {
-                            text: model.text
-                            onClicked: {
-                                alarmSettings.duration = duration
-                                _alarmDuration.expanded = false
-                            }
-                        }
+                listViewHeight: units.gu(24)
+                text: i18n.tr("Silence after")
+                subText: i18n.tr("%1 minute", "%1 minutes", alarmSettings.duration).arg(alarmSettings.duration)
+
+                model: durationModel
+
+                delegate: ListItem.Standard {
+                    text: model.text
+                    onClicked: {
+                        alarmSettings.duration = duration
+                        _alarmDuration.expanded = false
+                    }
+
+                    Icon {
+                        width: units.gu(2)
+                        height: width
+                        name: "ok"
+                        visible: alarmSettings.duration === duration
+                        anchors.right: parent.right
+                        anchors.rightMargin: units.gu(2)
+                        anchors.verticalCenter: parent.verticalCenter
                     }
                 }
             }
 
-            ListItem.Expandable {
+            ExpandableListItem {
                 id: _alarmSnooze
 
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                collapseOnClick: true
-                expandedHeight: _snoozeContentColumn.height + units.gu(1)
-
-                Column {
-                    id: _snoozeContentColumn
-
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                        margins: units.gu(-2)
-                    }
-
-                    Item {
-                        width: parent.width
-                        height: _alarmSnooze.collapsedHeight
-
-                        SubtitledListItem {
-                            id: _snoozeHeader
-                            text: i18n.tr("Snooze for")
-                            subText: i18n.tr("%1 minute", "%1 minutes", alarmSettings.snoozeDuration).arg(alarmSettings.snoozeDuration)
-                            onClicked: _alarmSnooze.expanded = true
-
-                            Icon {
-                                id: _snoozeUpArrow
-
-                                width: units.gu(2)
-                                height: width
-                                anchors.right: parent.right
-                                anchors.rightMargin: units.gu(2)
-                                anchors.verticalCenter: parent.verticalCenter
-
-                                name: "go-down"
-                                color: "Grey"
-                                rotation: _alarmSnooze.expanded ? 180 : 0
-
-                                Behavior on rotation {
-                                    UbuntuNumberAnimation {}
-                                }
-                            }
-                        }
-                    }
-
-                    ListView {
-                        id: _snoozeResultsList
-
-                        interactive: false
-                        model: snoozeModel
-                        width: parent.width
-                        height: units.gu(24)
-
-                        delegate: ListItem.Standard {
-                            text: model.text
-                            onClicked: {
-                                alarmSettings.snoozeDuration = duration
-                                _alarmSnooze.expanded = false
-                            }
-                        }
+                listViewHeight: units.gu(24)
+                text: i18n.tr("Snooze for")
+                subText: i18n.tr("%1 minute", "%1 minutes", alarmSettings.snoozeDuration).arg(alarmSettings.snoozeDuration)
+
+                model: snoozeModel
+
+                delegate: ListItem.Standard {
+                    text: model.text
+                    onClicked: {
+                        alarmSettings.snoozeDuration = duration
+                        _alarmSnooze.expanded = false
+                    }
+
+                    Icon {
+                        width: units.gu(2)
+                        height: width
+                        name: "ok"
+                        visible: alarmSettings.snoozeDuration === duration
+                        anchors.right: parent.right
+                        anchors.rightMargin: units.gu(2)
+                        anchors.verticalCenter: parent.verticalCenter
                     }
                 }
             }

=== added file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml	1970-01-01 00:00:00 +0000
+++ app/components/ExpandableListItem.qml	2015-04-14 11:08:13 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+/*
+ Component which extends the SDK Expandable list item and provides a easy
+ to use component where the title, subtitle and a listview can be displayed. It
+ matches the design specification provided for clock.
+*/
+
+ListItem.Expandable {
+    id: expandableListItem
+
+    // Public APIs
+    property ListModel model
+    property Component delegate
+    property alias text: expandableHeader.text
+    property alias subText: expandableHeader.subText
+    property alias listViewHeight: expandableList.height
+
+    anchors {
+        left: parent.left
+        right: parent.right
+        margins: units.gu(-2)
+    }
+
+    collapseOnClick: true
+    expandedHeight: contentColumn.height + units.gu(1)
+
+    Column {
+        id: contentColumn
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Item {
+            width: parent.width
+            height: expandableListItem.collapsedHeight
+
+            SubtitledListItem {
+                id: expandableHeader
+                onClicked: expandableListItem.expanded = true
+
+                Icon {
+                    id: arrow
+
+                    width: units.gu(2)
+                    height: width
+                    anchors.right: parent.right
+                    anchors.rightMargin: units.gu(2)
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    name: "go-down"
+                    color: "Grey"
+                    rotation: expandableListItem.expanded ? 180 : 0
+
+                    Behavior on rotation {
+                        UbuntuNumberAnimation {}
+                    }
+                }
+            }
+        }
+
+        ListView {
+            id: expandableList
+            width: parent.width
+            interactive: false
+            model: expandableListItem.model
+            delegate: expandableListItem.delegate
+        }
+    }
+}
+

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-06 13:34:43 +0000
+++ debian/changelog	2015-04-14 11:08:13 +0000
@@ -12,6 +12,8 @@
   * Fixed empty state description not wrapping (LP: #1428165)
   * Fixed edit alarm crash issue in vivid (thanks to Zsombor) (LP: #1429273)
   * Fixed strings not following gettext-style plural forms. (LP: #1431446)
+  * Created a generic expandable listitem component for the settings page to avoid
+    code duplication in AlarmSettings.qml
   * Renabled create alarm tests on device which were disabled due to upstream bug
     in autopilot. (LP: #1426108)
   * Fixed timezone difference label overflowing into the clock (LP: #1440732)

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-04-06 13:33:55 +0000
+++ po/com.ubuntu.clock.pot	2015-04-14 11:08:13 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-06 15:32+0200\n"
+"POT-Creation-Date: 2015-04-14 13:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -69,8 +69,8 @@
 #: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
 #: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
 #: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
-#: ../app/alarm/AlarmSettingsPage.qml:146
-#: ../app/alarm/AlarmSettingsPage.qml:215
+#: ../app/alarm/AlarmSettingsPage.qml:124
+#: ../app/alarm/AlarmSettingsPage.qml:152
 #, qt-format
 msgid "%1 minute"
 msgid_plural "%1 minutes"
@@ -81,19 +81,19 @@
 msgid "Alarm volume"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:145
+#: ../app/alarm/AlarmSettingsPage.qml:123
 msgid "Silence after"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:214
+#: ../app/alarm/AlarmSettingsPage.qml:151
 msgid "Snooze for"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:259
+#: ../app/alarm/AlarmSettingsPage.qml:177
 msgid "Vibration"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:293
+#: ../app/alarm/AlarmSettingsPage.qml:211
 msgid "Change time and date"
 msgstr ""