Merge lp:~mihirsoni/ubuntu-calendar-app/ReminderDesignFix-3 into lp:ubuntu-calendar-app

[Mihir Soni]

Reminder Design Fix

Reminder Design Fix

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

PASSED: Continuous integration, rev:527
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/986/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1262
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1262/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/544

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/ReminderDesignFix-3]

528. By Mihir Soni on 2014-10-24

Fixed height issue

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

FAILED: Continuous integration, rev:528
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/988/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1272
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/546

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

review: Needs Fixing (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/ReminderDesignFix-3]

529. By Mihir Soni on 2014-11-06

merge with trunk

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

PASSED: Continuous integration, rev:529
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1012/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/44
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/9

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Code works fine and looks good, I have few improvements comments.

Added one inline comment regarding removing column.

Also can you add ScrollBar, depending on screen size we might need it ?

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calendar-app/ReminderDesignFix-3]

530. By Mihir Soni on 2014-11-11

Removed column , also added scrollbar

531. By Mihir Soni on 2014-11-11

merge from trunk

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

PASSED: Continuous integration, rev:530
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1025/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/142
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/22

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:531
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1026/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/144
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/23

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Hi Kunal,

Could you review this MP?

[Kunal Parmar (pkunal-parmar)]

looks good to me

review: Approve

=== modified file 'EventReminder.qml'
--- EventReminder.qml	2014-10-10 17:49:49 +0000
+++ EventReminder.qml	2014-11-11 12:50:57 +0000
@@ -49,58 +49,41 @@
             pop();
         }
     }
-
+    Scrollbar{
+        id:scrollList
+        flickableItem: _pageFlickable
+        anchors.fill :parent
+    }
     Flickable {
         id: _pageFlickable
 
+
         clip: true
         anchors.fill: parent
-        contentHeight: reminderModel.count * units.gu(7)
-
-        Column {
-            id: _reminderColumn
-
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
+        contentHeight: _reminders.itemHeight * reminderModel.count + units.gu(2)
+        ListItem.ItemSelector {
+            id: _reminders
+            expanded: true
+            model: reminderModel
+            delegate: selectorDelegate
+            selectedIndex: reminderModel.get
+            onSelectedIndexChanged: {
+                root.reminderTime = reminderModel.get(selectedIndex).value
             }
 
-            Repeater {
-                id: _reminders
-
-                model: reminderModel
-
-                ListItem.Standard {
-                    id: _reminderDelegate
-
-                    property alias isChecked: reminderCheckbox.checked
-
-                    text: label
-                    control: CheckBox {
-                        id: reminderCheckbox
-
-                        checked: root.reminderTime === value
-
-                        onClicked: {
-                            root.reminderTime = value
-                            if (checked) {
-                                // Ensures only one reminder option is selected
-                                for(var i=0; i<reminderModel.count; i++) {
-                                    if(_reminders.itemAt(i).isChecked &&
-                                            i !== index) {
-                                        _reminders.itemAt(i).isChecked = false
-                                    }
-                                }
-                            }
-
-                            else {
-                                checked = !checked
-                            }
-                        }
+            Component.onCompleted: {
+                for(var i=0; i<reminderModel.count; i++) {
+                    if (root.reminderTime === reminderModel.get(i).value){
+                        _reminders.selectedIndex = i
+                        return;
                     }
                 }
             }
         }
+        Component {
+            id: selectorDelegate
+            OptionSelectorDelegate { text: label; }
+        }
+
     }
 }