Merge lp:~rpadovani/reminders-app/betterGradient into lp:reminders-app

[Riccardo Padovani]

Better gradient on preview images

Better gradient on preview images

[lp:~rpadovani/reminders-app/betterGradient]

105. By Riccardo Padovani on 2014-05-09

Merge with trunk

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-05-08 12:15:21 +0000
+++ debian/control	2014-05-09 15:03:52 +0000
@@ -22,6 +22,7 @@
          qtdeclarative5-evernote0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-quicklayouts-plugin,
          qtdeclarative5-qtquick2-plugin,
          signon-plugin-oauth2 (>= 0.19-0~57~),
          suru-icon-theme | ubuntu-mobile-icons,

=== modified file 'manifest.json'
--- manifest.json	2014-05-06 14:34:45 +0000
+++ manifest.json	2014-05-09 15:03:52 +0000
@@ -19,4 +19,4 @@
     "x-test": {
         "autopilot": "reminders"
     }
-}
+}
\ No newline at end of file

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-02-15 17:05:32 +0000
+++ src/app/CMakeLists.txt	2014-05-09 15:03:52 +0000
@@ -3,7 +3,7 @@
 set(reminders_SRCS
     main.cpp
     camerahelper.cpp
-    accountpreference.cpp
+    preferences.cpp
     ${QML_SRCS}
 )
 

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-05-06 17:54:50 +0000
+++ src/app/main.cpp	2014-05-09 15:03:52 +0000
@@ -21,7 +21,7 @@
  */
 
 #include "camerahelper.h"
-#include "accountpreference.h"
+#include "preferences.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickView>
@@ -101,8 +101,8 @@
     view.engine()->rootContext()->setContextProperty("cameraHelper", &helper);
 
     // Set up account preferences
-    AccountPreference preferences;
-    view.engine()->rootContext()->setContextProperty("accountPreference", &preferences);
+    Preferences preferences;
+    view.engine()->rootContext()->setContextProperty("preferences", &preferences);
 
     QString qmlfile;
     const QString filePath = QLatin1String("qml/reminders.qml");

=== renamed file 'src/app/accountpreference.cpp' => 'src/app/preferences.cpp'
--- src/app/accountpreference.cpp	2014-02-08 18:43:27 +0000
+++ src/app/preferences.cpp	2014-05-09 15:03:52 +0000
@@ -19,21 +19,54 @@
  * Authors: Michael Zanetti <[e-mail]>
  *          Riccardo Padovani <[e-mail]>
  */
-#include "accountpreference.h"
+#include "preferences.h"
 
-AccountPreference::AccountPreference(QObject *parent): QObject(parent),
+Preferences::Preferences(QObject *parent): QObject(parent),
     m_settings(QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/com.ubuntu.reminders/reminders.conf", QSettings::IniFormat)
 {
-
+    m_notebookColors.append("#35af44");
+    m_notebookColors.append("#298bd6");
+    m_notebookColors.append("#d33781");
+    m_notebookColors.append("#b68b01");
+    m_notebookColors.append("#db3131");
+    m_notebookColors.append("#2ba098");
 }
 
-QString AccountPreference::accountName() const
+QString Preferences::accountName() const
 {
     return m_settings.value("accountName").toString();
 }
 
-void AccountPreference::setAccountName(const QString &accountName)
+void Preferences::setAccountName(const QString &accountName)
 {
     m_settings.setValue("accountName", accountName);
     emit accountNameChanged();
 }
+
+
+QString Preferences::colorForNotebook(const QString &notebookGuid)
+{
+    m_settings.beginGroup("notebookColors");
+    QString colorName = m_settings.value(notebookGuid).toString();
+
+    if (colorName.isEmpty()) {
+        QHash<QString, int> usedColors;
+        foreach (const QString &tmp, m_settings.allKeys()) {
+            usedColors[m_settings.value(tmp).toString()]++;
+        }
+
+        while (colorName.isEmpty()) {
+            foreach (const QString &c, m_notebookColors) {
+                if (usedColors[c] == 0) {
+                    colorName = c;
+                    break;
+                }
+                usedColors[c]--;
+            }
+        }
+
+        m_settings.setValue(notebookGuid, colorName);
+    }
+    m_settings.endGroup();
+    return colorName;
+}

=== renamed file 'src/app/accountpreference.h' => 'src/app/preferences.h'
--- src/app/accountpreference.h	2014-02-08 18:43:27 +0000
+++ src/app/preferences.h	2014-05-09 15:03:52 +0000
@@ -20,28 +20,34 @@
  *          Riccardo Padovani <[e-mail]>
  */
 
-#ifndef ACCOUNTPREFERENCE_H
-#define ACCOUNTPREFERENCE_H
+#ifndef PREFERENCE_H
+#define PREFERENCE_H
 
 #include <QSettings>
 #include <QStandardPaths>
 #include <QObject>
 #include <QDebug>
+#include <QList>
+#include <QColor>
 
-class AccountPreference: public QObject
+class Preferences: public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString accountName READ accountName WRITE setAccountName NOTIFY accountNameChanged)
+
 public:
-    AccountPreference(QObject *parent = 0);
+    Preferences(QObject *parent = 0);
     QString accountName() const;
     void setAccountName(const QString &accountName);
 
+    Q_INVOKABLE QString colorForNotebook(const QString &notebookGuid);
+
 signals:
     void accountNameChanged();
 
 private:
     QSettings m_settings;
+    QList<QString> m_notebookColors;
 };
 
 #endif

=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml	2014-01-28 08:31:37 +0000
+++ src/app/qml/components/NotebooksDelegate.qml	2014-05-09 15:03:52 +0000
@@ -17,44 +17,72 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 
 Empty {
     id: root
-    height: units.gu(6)
-
-    property string name
-    property int noteCount
-    property string shareStatus
-
-    Column {
-        id: contentColumn
-        anchors {
-            top: parent.top
-            topMargin: units.gu(1)
-            left: parent.left
-            leftMargin: units.gu(2)
-            right: resourceImage.left
-            rightMargin: units.gu(2)
-        }
-        Label {
-            anchors { left: parent.left; right: parent.right }
-            text: root.name
-            font.bold: true
-            elide: Text.ElideRight
-        }
-        Label {
-            anchors { left: parent.left; right: parent.right }
-            text: root.shareStatus
-            wrapMode: Text.WordWrap
-            textFormat: Text.StyledText
-        }
+    height: units.gu(10)
+
+    property string notebookColor: preferences.colorForNotebook(model.guid)
+
+    Rectangle {
+        anchors.fill: parent
+        color: "#f9f9f9"
+        anchors.bottomMargin: units.dp(1)
     }
 
-    Label {
-        id: resourceImage
-        anchors { top: parent.top; right: parent.right; bottom: parent.bottom; topMargin: units.gu(1); rightMargin: units.gu(2) }
-        text: i18n.tr("%1 note", "%1 notes", root.noteCount).arg(root.noteCount)
+    Base {
+        anchors.fill: parent
+        progression: true
+
+        onClicked: root.clicked()
+
+        RowLayout {
+            anchors { fill: parent; topMargin: units.gu(1); bottomMargin: units.gu(1) }
+
+            Item {
+                anchors { top: parent.top; bottom: parent.bottom }
+                width: units.gu(1)
+                Rectangle {
+                    anchors { top: parent.top; bottom: parent.bottom; horizontalCenter: parent.horizontalCenter; margins: units.gu(1.5) }
+                    width: units.gu(.5)
+                    color: root.notebookColor
+                    radius: width / 2
+                }
+            }
+
+            ColumnLayout {
+                height: parent.height
+                Layout.fillWidth: true
+
+                Label {
+                    text: model.name
+                    color: root.notebookColor
+                    fontSize: "large"
+                }
+                Label {
+                    text: i18n.tr("Last edited %1").arg(model.lastUpdatedString)
+                    fontSize: "small"
+                    color: "black"
+                }
+                Label {
+                    Layout.fillHeight: true
+                    text: model.published ? i18n.tr("Shared") : i18n.tr("Private")
+                    color: model.published ? "black" : "#b3b3b3"
+                    fontSize: "x-small"
+                    verticalAlignment: Text.AlignVCenter
+                    font.bold: model.published
+                }
+            }
+
+            Label {
+                Layout.fillHeight: true
+                verticalAlignment: Text.AlignVCenter
+                text: "(" + model.noteCount + ")"
+                color: "#b3b3b3"
+            }
+        }
     }
 }

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2014-05-06 19:30:14 +0000
+++ src/app/qml/components/NotesDelegate.qml	2014-05-09 15:03:52 +0000
@@ -17,49 +17,123 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 
 Empty {
     id: root
-    height: units.gu(9)
+    height: units.gu(12)
 
     property string title
     property date creationDate
     property string content
     property string resource
-
-    Column {
-        id: contentColumn
-        spacing: units.gu(1)
-        anchors {
-            top: parent.top
-            topMargin: units.gu(1)
-            left: parent.left
-            leftMargin: units.gu(2)
-            right: resourceImage.left
-            rightMargin: units.gu(2)
-        }
-        Label {
-            anchors { left: parent.left; right: parent.right }
-            text: root.title
-            font.bold: true
-            elide: Text.ElideRight
-        }
-        Label {
-            anchors { left: parent.left; right: parent.right }
-            text: "<font color=\"#dd4814\">"+ Qt.formatDate(root.creationDate) + "</font>  " + root.content
-            wrapMode: Text.WordWrap
-            textFormat: Text.StyledText
-            maximumLineCount: 2
-            fontSize: "small"
-        }
-    }
-
-    Image {
-        id: resourceImage
-        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
-        source: root.resource
-        sourceSize.height: units.gu(9)
+    property string notebookColor: preferences.colorForNotebook(model.guid)
+
+    showDivider: false;
+
+    ColumnLayout {
+        anchors { fill: parent; leftMargin: units.gu(1); rightMargin: units.gu(1) }
+        spacing: 0
+
+        Rectangle {
+            Layout.fillWidth: true
+            height: units.gu(0.4)
+            color: root.notebookColor
+        }
+
+        Rectangle {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            color: "white"
+
+            RowLayout {
+                anchors.fill: parent
+                spacing: 0
+
+                Rectangle {
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+
+                    gradient: Gradient {
+                        GradientStop{ position: 0.8; color: "transparent" }
+                        GradientStop{ position: 1; color: "#d9d9d9" }
+                    }
+
+                    Base {
+                        anchors.fill: parent
+                        progression: true
+                        showDivider: false
+
+                        onClicked: root.clicked()   // Propagate the signal
+
+                        ColumnLayout {
+                            anchors { fill: parent; topMargin: units.gu(1); bottomMargin: units.gu(1) }
+
+                            Label {
+                                Layout.fillWidth: true
+                                text: root.title
+                                font.weight: Font.Light
+                                elide: Text.ElideRight
+                                color: root.notebookColor
+                            } 
+
+                            Label {
+                                Layout.fillWidth: true
+                                Layout.fillHeight: true
+                                text: root.content
+                                wrapMode: Text.WordWrap
+                                textFormat: Text.StyledText
+                                maximumLineCount: 2
+                                fontSize: "small"
+                                color: "black"
+                            }
+
+                            Label {
+                                Layout.minimumWidth: parent.width + units.gu(2)
+                                text: Qt.formatDateTime(root.creationDate, "dddd, hh:mm")
+                                color: "#b3b3b3"
+                                fontSize: "small"
+                                horizontalAlignment: Text.AlignRight
+                            }
+                        }
+                    }
+                }
+
+                Image {
+                    source: root.resource
+                    sourceSize.height: units.gu(11.6)
+
+                    Layout.maximumWidth: parent.width / 2
+
+                    Rectangle {
+                        height: parent.width / 4 
+                        width: parent.height
+
+                        anchors {verticalCenter: parent.verticalCenter; horizontalCenter: parent.horizontalCenter; horizontalCenterOffset: parent.width/2 - height/2 }
+                        rotation: 90
+                        
+                        gradient: Gradient {
+                            GradientStop{ position: 0; color: "#383838" }
+                            GradientStop{ position: 1; color: "transparent" }
+                        }
+                    }
+                
+                    Rectangle {
+                        height: parent.width / 4 
+                        width: parent.height
+
+                        anchors {verticalCenter: parent.verticalCenter; horizontalCenter: parent.horizontalCenter; horizontalCenterOffset: -parent.width/2 + height/2 }
+                        rotation: 270
+                        
+                        gradient: Gradient {
+                            GradientStop{ position: 0; color: "#383838" }
+                            GradientStop{ position: 1; color: "transparent" }
+                        }
+                    }
+                }
+            }
+        }
     }
 }

=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml	2014-02-17 23:32:36 +0000
+++ src/app/qml/components/RemindersDelegate.qml	2014-05-09 15:03:52 +0000
@@ -17,184 +17,115 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.Pickers 0.1
+import Evernote 0.1
 
-Empty {
+Base {
     id: root
-    height: expanded ? mainColumn.height : implicitHeight
+    height: units.gu(10)
     clip: true
+    progression: true
+    removable: true
+
+    backgroundIndicator: Row {
+        x: root.__contents.x > 0 ? root.__contents.x - width : 0
+        height: childrenRect.height
+        width: childrenRect.width
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: units.gu(1)
+
+        Icon {
+            height: units.gu(3)
+            width: height
+            anchors.verticalCenter: parent.verticalCenter
+            name: root.note.reminderDone ? "clear" : "select"
+        }
+
+        Label {
+            id: confirmRemovalDialog
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.note.reminderDone ? i18n.tr("Clear reminder") : i18n.tr("Mark as done")
+        }
+    }
 
     property var note
 
-    property bool expanded: false
-
-    onExpandedChanged: {
-        if (expanded) {
-            if (note.hasReminderTime) {
-                datePicker.date.setDate(note.reminderTime.getDate())
-            }
-        } else {
-            note.save();
-        }
-    }
-
     Behavior on height {
         UbuntuNumberAnimation {}
     }
 
+    onItemRemoved: {
+        // Revert "removal"
+        root.cancelItemRemoval();
+        root.height = units.gu(10)
+        print("marking reminder as", !note.reminderDone, " done for note", note.title);
+        if (!note.reminderDone) {
+            note.reminderDone = true;
+        } else {
+            note.reminder = false;
+        }
+
+        NotesStore.saveNote(note.guid)
+    }
+
     Column {
         id: mainColumn
-        anchors { left: parent.left; right: parent.right; top: parent.top; leftMargin: units.gu(2); rightMargin: units.gu(2) }
+        anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: units.gu(1) }
         spacing: units.gu(2)
         height: implicitHeight + units.gu(1)
 
-        Row {
-            anchors { left: parent.left; right: parent.right }
-            height: root.implicitHeight
-            spacing: units.gu(1)
-
-            CheckBox {
-                id: checkBox
-                anchors.verticalCenter: parent.verticalCenter
-                checked: note.reminderDone
-                onClicked: {
-                    note.reminderDone = checked;
-                    note.save();
-                }
-            }
-
-            Label {
-                anchors.verticalCenter: parent.verticalCenter
-                text: note.title
-                width: parent.width - checkBox.width - reminderTimeRow.width - parent.spacing * 2
-            }
-            Row {
-                id: reminderTimeRow
-                anchors { top: parent.top; bottom: parent.bottom }
-                spacing: units.gu(2)
-
-                Label {
-                    id: timeLabel
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: Qt.formatDate(note.reminderTime)
-                    visible: note.hasReminderTime
-                    Component.onCompleted: print("Got reminder time", note.reminderTime)
-                }
-                Icon {
-                    id: alarmIcon
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: units.gu(4)
-                    height: width
-                    name: "alarm-clock"
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: root.expanded = !root.expanded;
-                    }
-                }
-            }
-        }
-
-
-        Row {
-            id: datePicker
-            width: childrenRect.width
-            height: monthPicker.height
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: units.gu(1)
-
-            property var date: new Date()
-            property int minYear: 2010
-            property bool editing: false
-
-            Picker {
-                id: dayPicker
-                model: getDays(monthPicker.selectedIndex, yearPicker.selectedIndex + 2010)
-                function getDays(month, year) {
-                    switch(month) {
-                    case 1:
-                        if (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)) {
-                            return 29;
-                        }
-                        return 28;
-                    case 3:
-                    case 5:
-                    case 8:
-                    case 10:
-                        return 30;
-                    default:
-                        return 31;
-                    }
-                }
-                delegate: PickerDelegate {
-                    Label {
-                        anchors.centerIn: parent
-                        text: modelData + 1
-                    }
-                }
-                selectedIndex: datePicker.date.getDate() - 1
-                onSelectedIndexChanged: {
-                    datePicker.date.setDate(selectedIndex + 1)
-                }
-            }
-            Picker {
-                id: monthPicker
-                model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"]
-                delegate: PickerDelegate {
-                    Label {
-                        anchors.centerIn: parent
-                        text: modelData
-                    }
-                }
-                selectedIndex: datePicker.date.getMonth()
-                onSelectedIndexChanged: {
-                    var selectedDay = dayPicker.selectedIndex;
-                    datePicker.date.setMonth(selectedIndex)
-                    dayPicker.selectedIndex = selectedDay;
-                }
-            }
-            Picker {
-                id: yearPicker
-                model: 100
-                circular: false
-                delegate: PickerDelegate {
-                    Label {
-                        anchors.centerIn: parent
-                        text: datePicker.minYear + modelData
-                    }
-                }
-                selectedIndex: datePicker.date.getFullYear() - datePicker.minYear
-                onSelectedIndexChanged: {
-                    var selectedDay = dayPicker.selectedIndex;
-                    datePicker.date.setFullYear(selectedIndex + datePicker.minYear)
-                    dayPicker.selectedIndex = selectedDay;
-                }
-            }
-        }
-
-        Row {
-            spacing: units.gu(2)
-            anchors { left: parent.left; right: parent.right }
-            height: childrenRect.height
-
-            Button {
-                text: "Clear"
-                width: (parent.width - parent.spacing) / 2
-                onClicked: {
-                    note.hasReminderTime = false;
-                    root.expanded = false;
-                }
-            }
-            Button {
-                text: "OK"
-                width: (parent.width - parent.spacing) / 2
-                onClicked: {
-                    print("setting date to ", datePicker.date)
-                    note.reminderTime = datePicker.date
-                    root.expanded = false;
+        RowLayout {
+            anchors { left: parent.left; right: parent.right }
+            height: units.gu(8)
+            spacing: units.gu(1)
+
+            UbuntuShape {
+                Layout.fillHeight: true
+                width: height
+                color: preferences.colorForNotebook(note.notebookGuid)
+                radius: "medium"
+
+                Column {
+                    anchors.centerIn: parent
+                    Label {
+                        text: note.hasReminderTime ? Qt.formatDateTime(note.reminderTime, "hh") : "00"
+                        color: "white"
+                        horizontalAlignment: Text.AlignHCenter
+                        font.bold: true
+                        fontSize: "large"
+                    }
+                    Label {
+                        text: note.hasReminderTime ? Qt.formatDateTime(note.reminderTime, "mm") : "00"
+                        color: "white"
+                        horizontalAlignment: Text.AlignHCenter
+                        fontSize: "large"
+                    }
+                }
+            }
+
+            Column {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                spacing: units.gu(1)
+
+                Label {
+                    text: note.title
+                    fontSize: "large"
+                    horizontalAlignment: Text.AlignLeft
+                    color: "black"
+                }
+                Label {
+                    text: note.plaintextContent
+                    fontSize: "small"
+                    horizontalAlignment: Text.AlignLeft
+                    maximumLineCount: 2
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    color: "black"
                 }
             }
         }

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-05-07 16:07:59 +0000
+++ src/app/qml/reminders.qml	2014-05-09 15:03:52 +0000
@@ -55,8 +55,7 @@
         }
     }
 
-    // Temporary background color. This can be changed to other suitable backgrounds when we get official mockup designs
-    backgroundColor: UbuntuColors.coolGrey
+    backgroundColor: "#dddddd"
 
     property var accountPage;
 
@@ -100,7 +99,7 @@
 
     function doLogin() {
         print("got accounts:", accounts.count)
-        var accountName = accountPreference.accountName;
+        var accountName = preferences.accountName;
         if (accountName) {
             var i;
             for (i = 0; i < accounts.count; i++) {
@@ -160,7 +159,7 @@
         target: UserStore
         onUsernameChanged: {
             print("Logged in as user:", UserStore.username);
-            accountPreference.accountName = UserStore.username;
+            preferences.accountName = UserStore.username;
         }
     }
 
@@ -231,7 +230,7 @@
                         var component = Qt.createComponent(Qt.resolvedUrl("ui/NotesPage.qml"))
                         var page = component.createObject();
                         print("opening note page for notebook", notebookGuid)
-                        pagestack.push(page, {title: title/*, filter: notebookGuid*/});
+                        pagestack.push(page, {title: title, filter: notebookGuid});
                         page.selectedNoteChanged.connect(function() {
                             print("foo", page.selectedNote);
                             if (page.selectedNote) {
@@ -250,6 +249,14 @@
                 title: i18n.tr("Reminders")
                 page: RemindersPage {
                     id: remindersPage
+
+                    onSelectedNoteChanged: {
+                        if (selectedNote !== null) {
+                            root.displayNote(selectedNote);
+                        } else {
+                            sideViewLoader.clear();
+                        }
+                    }
                 }
             }
         }

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2014-05-07 07:45:37 +0000
+++ src/app/qml/ui/NotePage.qml	2014-05-09 15:03:52 +0000
@@ -42,8 +42,7 @@
             text: note.reminder ? "Reminder (set)" : "Reminder"
             iconName: "alarm-clock"
             onTriggered: {
-                note.reminder = !note.reminder
-                NotesStore.saveNote(note.guid)
+                pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), {title: root.title, note: root.note});
             }
         }
         ToolbarButton {

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2014-04-30 21:53:07 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2014-05-09 15:03:52 +0000
@@ -109,12 +109,9 @@
             model: notebooks
             anchors { left: parent.left; right: parent.right }
             height: parent.height - y - buttonRow.height - keyboardRect.height
+            clip: true
 
             delegate: NotebooksDelegate {
-                name: model.name
-                noteCount: model.noteCount
-                shareStatus: model.publised ? i18n.tr("Shared") : i18n.tr("Private")
-
                 onClicked: {
                     print("selected notebook:", model.guid)
                     root.openNotebook(name, model.guid)

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-05-07 08:09:41 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-05-09 15:03:52 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Evernote 0.1
@@ -119,6 +120,7 @@
             creationDate: model.created
             content: model.plaintextContent
             resource: model.resourceUrls.length > 0 ? model.resourceUrls[0] : ""
+            notebookColor: preferences.colorForNotebook(model.notebookGuid)
 
             Component.onCompleted: {
                 if (!model.plaintextContent) {
@@ -135,17 +137,15 @@
         section.property: "createdString"
         section.delegate: Empty {
             height: units.gu(5)
-            Item {
-                anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(1) }
+            showDivider: false
+            RowLayout {
+                anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
                 Label {
                     text: section
-                    anchors.left: parent.left
-                    anchors.verticalCenter: parent.verticalCenter
+                    Layout.fillWidth: true
                 }
                 Label {
                     text: "(" + notes.sectionCount("createdString", section) + ")"
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
                 }
             }
         }

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2014-04-30 21:53:07 +0000
+++ src/app/qml/ui/RemindersPage.qml	2014-05-09 15:03:52 +0000
@@ -17,13 +17,16 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Evernote 0.1
 import "../components"
 
 Page {
-    id: remindersPage
+    id: root
+
+    property var selectedNote: null
 
     tools: ToolbarItems {
         ToolbarButton {
@@ -63,16 +66,36 @@
         anchors.fill: parent
 
         delegate: RemindersDelegate {
+            width: remindersListView.width
             note: notes.note(guid)
+
+            Component.onCompleted: {
+                if (!model.plaintextContent) {
+                    NotesStore.refreshNoteContent(model.guid)
+                }
+            }
+
+            onClicked: {
+                root.selectedNote = NotesStore.note(guid);
+            }
         }
 
         model: notes
 
         section.criteria: ViewSection.FullString
         section.property: "reminderTimeString"
-        section.delegate: Standard {
-            height: units.gu(3)
-            text: section
+        section.delegate: Empty {
+            height: units.gu(5)
+            RowLayout {
+                anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
+                Label {
+                    text: section
+                    Layout.fillWidth: true
+                }
+                Label {
+                    text: "(" + notes.sectionCount("reminderTimeString", section) + ")"
+                }
+            }
         }
 
         ActivityIndicator {

=== added file 'src/app/qml/ui/SetReminderPage.qml'
--- src/app/qml/ui/SetReminderPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/SetReminderPage.qml	2014-05-09 15:03:52 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders 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.0
+import Ubuntu.Components 0.1
+import Evernote 0.1
+import "../components"
+
+Page {
+    id: root
+    title: setReminderView.title
+    property alias note: setReminderView.note
+
+    signal editNote(var note)
+
+    SetReminderView {
+        id: setReminderView
+        anchors.fill: parent
+    }
+}

=== added file 'src/app/qml/ui/SetReminderView.qml'
--- src/app/qml/ui/SetReminderView.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/SetReminderView.qml	2014-05-09 15:03:52 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * reminders 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.0
+import QtQuick.Layouts 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Pickers 0.1
+import Evernote 0.1
+import "../components"
+
+Item {
+    id: root
+    property string title: note.title
+    property var note
+
+    ColumnLayout {
+        anchors { top: parent.top; topMargin: units.gu(2); horizontalCenter: parent.horizontalCenter }
+        spacing: units.gu(2)
+
+        Label {
+            text: i18n.tr("Select date and time for the reminder:")
+            Layout.fillWidth: true
+        }
+
+        DatePicker {
+            id: datePicker
+            date: note.hasReminderTime ? note.reminderTime : new Date()
+        }
+
+        DatePicker {
+            id: timePicker
+            mode: "Hours|Minutes"
+            date: note.hasReminderTime ? note.reminderTime : new Date()
+        }
+
+        RowLayout {
+            Layout.fillWidth: true
+
+            Button {
+                text: i18n.tr("Clear reminder")
+                Layout.fillWidth: true
+                onClicked: {
+                    note.reminder = false;
+                    NotesStore.saveNote(note.guid);
+                    pageStack.pop();
+                }
+            }
+
+            Button {
+                Layout.fillWidth: true
+                text: i18n.tr("Set reminder")
+                onClicked: {
+                    note.reminder = true;
+                    var date = datePicker.date
+                    var time = timePicker.date
+                    date.setHours(time.getHours());
+                    date.setMinutes(time.getMinutes());
+                    note.reminderTime = date;
+                    print("set reminder time to", Qt.formatDate(date))
+                    NotesStore.saveNote(note.guid)
+                    pageStack.pop();
+                }
+            }
+
+        }
+    }
+}

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-05-06 16:44:19 +0000
+++ src/plugin/Evernote/note.cpp	2014-05-09 15:03:52 +0000
@@ -140,7 +140,7 @@
 
 QString Note::plaintextContent() const
 {
-    return m_content.toPlaintext();
+    return m_content.toPlaintext().trimmed();
 }
 
 bool Note::reminder() const
@@ -223,8 +223,15 @@
         return QString();
     }
 
+    if (reminderDone()) {
+        return gettext("Done");
+    }
+
     QDate reminderDate = m_reminderTime.date();
     QDate today = QDate::currentDate();
+    if (m_reminderTime.isNull()) {
+        return gettext("No date");
+    }
     if (reminderDate < today) {
         return gettext("Overdue");
     }

=== modified file 'src/plugin/Evernote/notebook.cpp'
--- src/plugin/Evernote/notebook.cpp	2014-02-18 14:04:33 +0000
+++ src/plugin/Evernote/notebook.cpp	2014-05-09 15:03:52 +0000
@@ -22,6 +22,8 @@
 #include "notesstore.h"
 #include "note.h"
 
+#include <libintl.h>
+
 #include <QDebug>
 
 Notebook::Notebook(QString guid, QObject *parent) :
@@ -75,6 +77,44 @@
     }
 }
 
+QDateTime Notebook::lastUpdated() const
+{
+    return m_lastUpdated;
+}
+
+void Notebook::setLastUpdated(const QDateTime &lastUpdated)
+{
+    if (m_lastUpdated != lastUpdated) {
+        m_lastUpdated = lastUpdated;
+        emit lastUpdatedChanged();
+    }
+}
+
+QString Notebook::lastUpdatedString() const
+{
+    QDate updateDate = m_lastUpdated.date();
+    QDate today = QDate::currentDate();
+    if (updateDate == today) {
+        // TRANSLATORS: this is part of a longer string - "Last updated: today"
+        return gettext("today");
+    }
+    if (updateDate == today.addDays(-1)) {
+        // TRANSLATORS: this is part of a longer string - "Last updated: yesterday"
+        return gettext("yesterday");
+    }
+    if (updateDate <= today.addDays(-7)) {
+        // TRANSLATORS: this is part of a longer string - "Last updated: last week"
+        return gettext("last week");
+    }
+    if (updateDate <= today.addDays(-14)) {
+        // TRANSLATORS: this is part of a longer string - "Last updated: two weeks ago"
+        return gettext("two weeks ago");
+    }
+    // TRANSLATORS: this is used in the notes list to group notes created on the same month
+    // the first parameter refers to a month name and the second to a year
+    return QString(gettext("on %1 %2")).arg(QLocale::system().standaloneMonthName(updateDate.month())).arg(updateDate.year());
+}
+
 void Notebook::noteAdded(const QString &noteGuid, const QString &notebookGuid)
 {
     Q_UNUSED(noteGuid)

=== modified file 'src/plugin/Evernote/notebook.h'
--- src/plugin/Evernote/notebook.h	2014-01-27 13:00:41 +0000
+++ src/plugin/Evernote/notebook.h	2014-05-09 15:03:52 +0000
@@ -22,6 +22,7 @@
 #define NOTEBOOK_H
 
 #include <QObject>
+#include <QDateTime>
 
 class Notebook : public QObject
 {
@@ -31,6 +32,8 @@
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(int noteCount READ noteCount NOTIFY noteCountChanged)
     Q_PROPERTY(bool published READ published NOTIFY publishedChanged)
+    Q_PROPERTY(QDateTime lastUpdated READ lastUpdated NOTIFY lastUpdatedChanged)
+    Q_PROPERTY(QString lastUpdatedString READ lastUpdatedString NOTIFY lastUpdatedChanged)
 
 public:
     explicit Notebook(QString guid, QObject *parent = 0);
@@ -45,10 +48,16 @@
     bool published() const;
     void setPublished(bool published);
 
+    QDateTime lastUpdated() const;
+    void setLastUpdated(const QDateTime &lastUpdated);
+
+    QString lastUpdatedString() const;
+
 signals:
     void nameChanged();
     void noteCountChanged();
     void publishedChanged();
+    void lastUpdatedChanged();
 
 private slots:
     void noteAdded(const QString &noteGuid, const QString &notebookGuid);
@@ -59,6 +68,7 @@
     QString m_name;
     int m_noteCount;
     bool m_published;
+    QDateTime m_lastUpdated;
 };
 
 #endif // NOTEBOOK_H

=== modified file 'src/plugin/Evernote/notebooks.cpp'
--- src/plugin/Evernote/notebooks.cpp	2014-04-30 21:53:07 +0000
+++ src/plugin/Evernote/notebooks.cpp	2014-05-09 15:03:52 +0000
@@ -59,6 +59,10 @@
         return notebook->noteCount();
     case RolePublished:
         return notebook->published();
+    case RoleLastUpdated:
+        return notebook->lastUpdated();
+    case RoleLastUpdatedString:
+        return notebook->lastUpdatedString();
     }
     return QVariant();
 }
@@ -75,7 +79,9 @@
     roles.insert(RoleGuid, "guid");
     roles.insert(RoleName, "name");
     roles.insert(RoleNoteCount, "noteCount");
-    roles.insert(RolePublished, "publised");
+    roles.insert(RolePublished, "published");
+    roles.insert(RoleLastUpdated, "lastUpdated");
+    roles.insert(RoleLastUpdatedString, "lastUpdatedString");
     return roles;
 }
 

=== modified file 'src/plugin/Evernote/notebooks.h'
--- src/plugin/Evernote/notebooks.h	2014-04-30 21:53:07 +0000
+++ src/plugin/Evernote/notebooks.h	2014-05-09 15:03:52 +0000
@@ -36,7 +36,9 @@
         RoleGuid,
         RoleName,
         RoleNoteCount,
-        RolePublished
+        RolePublished,
+        RoleLastUpdated,
+        RoleLastUpdatedString
     };
     explicit Notebooks(QObject *parent = 0);
 

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2014-05-06 16:22:06 +0000
+++ src/plugin/Evernote/notes.cpp	2014-05-09 15:03:52 +0000
@@ -59,11 +59,12 @@
         m_onlyReminders = onlyReminders;
         emit onlyRemindersChanged();
         if (onlyReminders) {
-            setSortRole(NotesStore::RoleReminderTime);
+            setSortRole(NotesStore::RoleReminderSorting);
+            sort(0, Qt::AscendingOrder);
         } else {
             setSortRole(NotesStore::RoleCreated);
+            sort(0, Qt::DescendingOrder);
         }
-        sort(0, Qt::AscendingOrder);
 
         invalidateFilter();
     }

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-05-06 21:21:14 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-05-09 15:03:52 +0000
@@ -121,6 +121,10 @@
         return m_notes.at(index.row())->plaintextContent();
     case RoleResourceUrls:
         return m_notes.at(index.row())->resourceUrls();
+    case RoleReminderSorting:
+        // done reminders get [phone] (this will break sorting in year 2286 :P)
+        return QVariant::fromValue(m_notes.at(index.row())->reminderTime().toMSecsSinceEpoch() +
+                (m_notes.at(index.row())->reminderDone() ? 10000000000000 : 0));
     }
     return QVariant();
 }
@@ -227,6 +231,8 @@
             QString guid = QString::fromStdString(result.guid);
             QDateTime created = QDateTime::fromMSecsSinceEpoch(result.created);
             note = new Note(guid, created, this);
+            connect(note, &Note::reminderChanged, this, &NotesStore::emitDataChanged);
+            connect(note, &Note::reminderDoneChanged, this, &NotesStore::emitDataChanged);
         }
 
         note->setTitle(QString::fromStdString(result.title));
@@ -377,6 +383,7 @@
         }
         notebook->setName(QString::fromStdString(result.name));
         notebook->setPublished(result.published);
+        notebook->setLastUpdated(QDateTime::fromMSecsSinceEpoch(result.serviceUpdated));
 
         if (newNoteNotebook) {
             m_notebooksHash.insert(notebook->guid(), notebook);
@@ -412,6 +419,8 @@
     QString guid = QString::fromStdString(result.guid);
     QDateTime created = QDateTime::fromMSecsSinceEpoch(result.created);
     Note *note = new Note(guid, created, this);
+    connect(note, &Note::reminderChanged, this, &NotesStore::emitDataChanged);
+    connect(note, &Note::reminderDoneChanged, this, &NotesStore::emitDataChanged);
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
     note->setEnmlContent(QString::fromStdString(result.content));
@@ -428,6 +437,10 @@
 void NotesStore::saveNote(const QString &guid)
 {
     Note *note = m_notesHash.value(guid);
+    if (!note) {
+        qWarning() << "Can't save note. Guid not found:" << guid;
+        return;
+    }
     SaveNoteJob *job = new SaveNoteJob(note, this);
     connect(job, &SaveNoteJob::jobDone, this, &NotesStore::saveNoteJobDone);
     EvernoteConnection::instance()->enqueue(job);
@@ -512,3 +525,13 @@
     m_notebooks.removeAll(notebook);
     notebook->deleteLater();
 }
+
+void NotesStore::emitDataChanged()
+{
+    Note *note = qobject_cast<Note*>(sender());
+    if (!note) {
+        return;
+    }
+    int idx = m_notes.indexOf(note);
+    emit dataChanged(index(idx), index(idx));
+}

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-05-06 21:21:14 +0000
+++ src/plugin/Evernote/notesstore.h	2014-05-09 15:03:52 +0000
@@ -69,7 +69,8 @@
         RoleHtmlContent,
         RoleRichTextContent,
         RolePlaintextContent,
-        RoleResourceUrls
+        RoleResourceUrls,
+        RoleReminderSorting
     };
 
     ~NotesStore();
@@ -131,6 +132,7 @@
     void createNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result);
     void expungeNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
 
+    void emitDataChanged();
 private:
     explicit NotesStore(QObject *parent = 0);
     static NotesStore *s_instance;