Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1564398 into lp:ubuntu-calendar-app

[Arthur Mello]

Refactor on the EventReminder option selector page
Change EventRepetition page to show all options when OptionSelector is expanded

Refactor on the EventReminder option selector page
Change EventRepetition page to show all options when OptionSelector is expanded

This is not a complete solution for bug #1564398 but implements some changes to reduce the issue

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

PASSED: Continuous integration, rev:812
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/818/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/841/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/818/rebuild

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1564398]

813. By Arthur Mello on 2016-04-05

Merge with trunk

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

PASSED: Continuous integration, rev:813
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/821/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/845/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/821/rebuild

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1564398]

814. By Arthur Mello on 2016-04-05

Stop using Ubuntu.Components.ListItems

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

PASSED: Continuous integration, rev:814
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/824/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/849/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/824/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

=== removed file 'EventReminder.qml'
--- EventReminder.qml	2016-03-21 19:45:40 +0000
+++ EventReminder.qml	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This file is part of Ubuntu Calendar App
- *
- * Ubuntu Calendar 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 Calendar 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.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-Page{
-    id:root
-    objectName: "eventReminder"
-
-    property var audibleReminder: null
-    property var reminderModel: null
-    property var eventTitle: null
-    property int reminderTime: -1
-
-    signal reminderTimeUpdated(int value);
-
-    visible: false
-    flickable: null
-    title: i18n.tr("Reminder")
-
-    head.backAction: Action{
-        iconName:"back"
-        onTriggered:{
-            reminderTimeUpdated(reminderTime)
-            pop();
-        }
-    }
-    Scrollbar{
-        id:scrollList
-        flickableItem: _pageFlickable
-        anchors.fill :parent
-    }
-    Flickable {
-        id: _pageFlickable
-
-
-        clip: true
-        anchors.fill: parent
-        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
-            }
-
-            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; }
-        }
-
-    }
-}

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2016-03-31 18:25:00 +0000
+++ EventRepetition.qml	2016-04-05 19:07:19 +0000
@@ -164,7 +164,7 @@
             }
 
             model: Defines.recurrenceLabel
-            containerHeight: itemHeight * 4
+            containerHeight: itemHeight * model.length
             onExpandedChanged: Qt.inputMethod.hide();
         }
 

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-31 18:25:00 +0000
+++ NewEvent.qml	2016-04-05 19:07:19 +0000
@@ -740,15 +740,25 @@
 
                 onClicked:{
                     var stack = pageStack
-                    if (!stack)
+                    if (!stack) {
                         stack = bottomEdgePageStack
-
-                    var reminderPick = stack.push(Qt.resolvedUrl("EventReminder.qml"),
-                                                   {"reminderTime": root.reminderValue,
-                                                    "reminderModel": reminderModel,
-                                                    "eventTitle": titleEdit.text})
-                    reminderPick.reminderTimeUpdated.connect(function(value) {
-                        root.reminderValue = value
+                    }
+
+                    var reminderSelectedIndex = 0
+                    if (eventReminder.reminderValue !== -1) {
+                        for (var i=0; i<reminderModel.count; ++i) {
+                            if (reminderModel.get(i).value === eventReminder.reminderValue) {
+                                reminderSelectedIndex = i
+                            }
+                        }
+                    }
+
+                    var reminderPick = stack.push(Qt.resolvedUrl("OptionSelectorPage.qml"),
+                                                   {"title": i18n.tr("Reminder"),
+                                                    "model": reminderModel,
+                                                    "selectedIndex": reminderSelectedIndex})
+                    reminderPick.selectedIndexChanged.connect(function() {
+                        root.reminderValue = reminderModel.get(reminderPick.selectedIndex).value
                     })
                 }
             }

=== added file 'OptionSelectorPage.qml'
--- OptionSelectorPage.qml	1970-01-01 00:00:00 +0000
+++ OptionSelectorPage.qml	2016-04-05 19:07:19 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *                                                                      
+ * This file is part of Ubuntu Calendar App
+ *
+ * Ubuntu Calendar 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 Calendar 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.4
+import Ubuntu.Components 1.3
+
+Page {
+    id: optionSelectorPage
+
+    property alias title: pageHeader.title
+    property alias model: optionsList.model
+    property alias selectedIndex: optionsList.selectedIndex
+
+    header: PageHeader {
+        id: pageHeader
+
+        flickable: optionsList
+    }
+
+    ListView {
+        id: optionsList
+
+        property int selectedIndex
+
+        anchors.fill: parent
+
+        delegate: ListItem {
+            id: optionItem
+
+            height: layout.height
+
+            onClicked: optionsList.selectedIndex = index
+
+            ListItemLayout {
+                id: layout
+
+                title.text: label
+
+                Icon {
+                    name: "tick"
+                    SlotsLayout.position: SlotsLayout.Trailing;
+                    width: units.gu(2)
+                    visible: optionsList.selectedIndex === index
+                }
+            }
+        }
+    }
+}