Merge lp:~mzanetti/reminders-app/notesdelegate into lp:reminders-app

[Michael Zanetti]

added a NotesDelegate to roughly reflect design wireframe

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

FAILED: Continuous integration, rev:24
http://91.189.93.70:8080/job/reminders-app-ci/38/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/441
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/38/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/38/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/38/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:27
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mzanetti/reminders-app/notesdelegate/+merge/199013/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/39/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/442
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/39/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/39

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/39/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:27
http://91.189.93.70:8080/job/reminders-app-ci/49/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/505
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/49
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/49

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/49/rebuild

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'src/app/app.pro'
--- src/app/app.pro	2013-12-14 00:08:13 +0000
+++ src/app/app.pro	2013-12-14 00:08:13 +0000
@@ -13,6 +13,7 @@
     qml/ui/NotePage.qml \
     qml/ui/SearchNotesPage.qml \
     qml/components/ToolbarSpacer.qml \
+    qml/components/NotesDelegate.qml \
 
 # Copy qml to build dir for running with qtcreator
 qmlfolder.source = src/app/qml

=== added file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/NotesDelegate.qml	2013-12-14 00:08:13 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app 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-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.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Empty {
+    id: root
+    height: units.gu(9)
+
+    property string title
+    property date creationDate
+    property string content
+
+    Column {
+        id: contentColumn
+        spacing: units.gu(1)
+        anchors {
+            top: parent.top
+            topMargin: units.gu(1)
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            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
+        }
+    }
+}

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/NotePage.qml	2013-12-14 00:08:13 +0000
@@ -24,6 +24,8 @@
     title: note.title
     property var note
 
+    Component.onCompleted: NotesStore.refreshNoteContent(note.guid)
+
     Column {
         anchors.fill: parent
         spacing: units.gu(1)

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-12-14 00:08:13 +0000
+++ src/app/qml/ui/NotesPage.qml	2013-12-14 00:08:13 +0000
@@ -65,9 +65,12 @@
         anchors { left: parent.left; right: parent.right }
         height: parent.height - y
         model: notes
+        clip: true
 
-        delegate: Standard {
-            text: title
+        delegate: NotesDelegate {
+            title: model.title
+            creationDate: model.created
+            content: NotesStore.note(model.guid).plaintextContent
 
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})

=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	2013-12-14 00:08:13 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2013-12-14 00:08:13 +0000
@@ -59,13 +59,20 @@
         ListView {
             anchors { left: parent.left; right: parent.right }
             height: parent.height - y
+            clip: true
 
             model: Notes {
                 onlySearchResults: true
             }
 
-            delegate: Standard {
-                text: title
+            delegate: NotesDelegate {
+                title: model.title
+                creationDate: model.created
+                content: NotesStore.note(model.guid).plaintextContent
+
+                onClicked: {
+                    pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
+                }
             }
         }
 

=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.cpp'
--- src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-12-14 00:08:13 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-12-14 00:08:13 +0000
@@ -28,7 +28,7 @@
 
 void FetchNoteJob::startJob()
 {
-    client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, true, false, false);
+    client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, false, false, false);
 }
 
 void FetchNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-12-14 00:08:13 +0000
+++ src/plugin/Evernote/note.cpp	2013-12-14 00:08:13 +0000
@@ -21,8 +21,10 @@
 #include "note.h"
 
 #include "notesstore.h"
+#include "utils/html2enmlconverter.h"
 
 #include <QDateTime>
+#include <QDebug>
 
 Note::Note(const QString &guid, const QDateTime &created, QObject *parent) :
     QObject(parent),
@@ -77,10 +79,17 @@
 {
     if (m_content != content) {
         m_content = content;
+        m_plaintextContent = Html2EnmlConverter::enml2plaintext(content);
+        qDebug() << "plaintext content is" << m_plaintextContent;
         emit contentChanged();
     }
 }
 
+QString Note::plaintextContent() const
+{
+    return m_plaintextContent;
+}
+
 bool Note::reminder() const
 {
     return m_reminderOrder > 0;

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2013-12-14 00:08:13 +0000
+++ src/plugin/Evernote/note.h	2013-12-14 00:08:13 +0000
@@ -15,6 +15,7 @@
     Q_PROPERTY(QDateTime created READ created CONSTANT)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString content READ content WRITE setContent NOTIFY contentChanged)
+    Q_PROPERTY(QString plaintextContent READ plaintextContent NOTIFY contentChanged)
     Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
     Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
     Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
@@ -38,6 +39,9 @@
     QString content() const;
     void setContent(const QString &content);
 
+    QString plaintextContent() const;
+    void setPlaintextContent(const QString &plaintextContent);
+
     // This is the QML representation as we don't want to deal with timestamps there.
     // setting it to false will reset the reminderOrder to 0, setting it to true will
     // create a new timestamp for it.
@@ -83,6 +87,7 @@
     QDateTime m_created;
     QString m_title;
     QString m_content;
+    QString m_plaintextContent;
     qint64 m_reminderOrder;
     QDateTime m_reminderTime;
     QDateTime m_reminderDoneTime;

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-14 00:08:13 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-12-14 00:08:13 +0000
@@ -113,7 +113,6 @@
 
 Note *NotesStore::note(const QString &guid)
 {
-    refreshNoteContent(guid);
     return m_notesHash.value(guid);
 }
 

=== modified file 'src/plugin/Evernote/utils/html2enmlconverter.cpp'
--- src/plugin/Evernote/utils/html2enmlconverter.cpp	2013-11-25 19:06:38 +0000
+++ src/plugin/Evernote/utils/html2enmlconverter.cpp	2013-12-14 00:08:13 +0000
@@ -82,3 +82,25 @@
 
     return evml;
 }
+
+QString Html2EnmlConverter::enml2plaintext(const QString &enml)
+{
+    // output
+    QString plaintext;
+
+    // input
+    QXmlStreamReader reader(enml);
+
+    while (!reader.atEnd() && !reader.hasError()) {
+        QXmlStreamReader::TokenType token = reader.readNext();
+
+        // Write all normal text inside <body> </body> to output
+        if (token == QXmlStreamReader::Characters) {
+            plaintext.append(reader.text().toString());
+            plaintext.append(' ');
+        }
+    }
+
+    plaintext.remove('\n');
+    return plaintext;
+}

=== modified file 'src/plugin/Evernote/utils/html2enmlconverter.h'
--- src/plugin/Evernote/utils/html2enmlconverter.h	2013-11-25 19:06:38 +0000
+++ src/plugin/Evernote/utils/html2enmlconverter.h	2013-12-14 00:08:13 +0000
@@ -9,6 +9,8 @@
     Html2EnmlConverter();
 
     static QString html2enml(const QString &html);
+
+    static QString enml2plaintext(const QString &enml);
 };
 
 #endif // HTML2ENMLCONVERTER_H