Merge lp:~mzanetti/reminders-app/basic-workflow into lp:reminders-app

[Michael Zanetti]

Implemented basic app workflow

This implements the basic add workflow for viewing, editing, creating and deleting notes.

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

FAILED: Continuous integration, rev:31
http://91.189.93.70:8080/job/reminders-app-ci/44/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/454
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/44/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/44/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

[David Planella (dpm)]

The prerequisite branches have now been approved, but it seems this one has a couple of conflicts.

review: Needs Fixing

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/reminders-app-autolanding/22/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/635
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-autolanding/22
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/22

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Works well after the merge

review: Approve

[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 23:59:04 +0000
+++ src/app/app.pro	2014-01-10 10:14:02 +0000
@@ -14,7 +14,8 @@
     qml/ui/SearchNotesPage.qml \
     qml/components/ToolbarSpacer.qml \
     qml/components/NotesDelegate.qml \
-    qml/components/NotebooksDelegate.qml
+    qml/components/NotebooksDelegate.qml \
+    qml/ui/EditNotePage.qml
 
 # Copy qml to build dir for running with qtcreator
 qmlfolder.source = src/app/qml

=== added file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/EditNotePage.qml	2014-01-10 10:14:02 +0000
@@ -0,0 +1,105 @@
+/*
+ * 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
+import Evernote 0.1
+import "../components"
+
+Page {
+    id: root
+    property var note
+
+    tools: ToolbarItems {
+        ToolbarButton {
+            text: "save"
+            iconName: "select"
+            onTriggered: {
+                var title = titleTextField.text ? titleTextField.text : i18n.tr("Untitled");
+                var notebookGuid = notebookSelector.selectedGuid;
+                var text = noteTextArea.text;
+
+                if (note) {
+                    note.title = titleTextField.text
+                    note.notebookGuid = notebookSelector.selectedGuid
+                    note.htmlContent = noteTextArea.text
+                    NotesStore.saveNote(note.guid);
+                } else {
+                    NotesStore.createNote(title, notebookGuid, text);
+                }
+
+                pagestack.pop();
+            }
+        }
+        ToolbarSpacer {}
+
+        ToolbarButton {
+            text: "attach"
+        }
+        ToolbarButton {
+            text: "camera"
+            iconName: "camera-symbolic"
+        }
+        ToolbarButton {
+            text: "rtf"
+        }
+
+    }
+
+    Column {
+        anchors.fill: parent
+        anchors.margins: units.gu(2)
+        spacing: units.gu(1)
+
+        TextField {
+            id: titleTextField
+            text: root.note ? root.note.title : ""
+            placeholderText: "Untitled"
+            height: units.gu(5)
+            anchors { left: parent.left; right: parent.right }
+        }
+
+        Divider {
+            anchors { leftMargin: -units.gu(2); rightMargin: -units.gu(2) }
+            height: units.gu(2)
+        }
+
+        OptionSelector {
+            id: notebookSelector
+            text: i18n.tr("Notebook")
+            model: Notebooks {}
+            property string selectedGuid: model.notebook(selectedIndex).guid
+
+            delegate: OptionSelectorDelegate {
+                text: model.name
+            }
+        }
+
+        TextArea {
+            id: noteTextArea
+            anchors { left: parent.left; right: parent.right }
+            height: parent.height - y
+            highlighted: true
+
+            textFormat: TextEdit.RichText
+            text: root.note ? root.note.htmlContent : ""
+        }
+    }
+}
+

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2013-12-14 22:38:57 +0000
+++ src/app/qml/ui/NotePage.qml	2014-01-10 10:14:02 +0000
@@ -19,33 +19,52 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Evernote 0.1
+import "../components"
 
 Page {
+    id: root
     title: note.title
     property var note
 
     Component.onCompleted: NotesStore.refreshNoteContent(note.guid)
 
-    Column {
-        anchors.fill: parent
-        spacing: units.gu(1)
-        Button {
-            width: parent.width
-            text: "save"
-            onClicked: {
-                note.htmlContent = noteTextArea.text
-                note.save();
-            }
-        }
-
-        TextArea {
-            id: noteTextArea
-            anchors { left: parent.left; right: parent.right }
-            height: parent.height - y
-
-            textFormat: TextEdit.RichText
-            text: note.htmlContent
-        }
+    tools: ToolbarItems {
+        ToolbarButton {
+            text: "delete"
+            iconName: "delete"
+            onTriggered: {
+                NotesStore.deleteNote(note.guid);
+                pagestack.pop();
+            }
+        }
+        ToolbarSpacer {}
+        ToolbarButton {
+            text: note.reminder ? "reminder (set)" : "reminder"
+            iconName: "alarm-clock"
+            onTriggered: {
+                note.reminder = !note.reminder
+                NotesStore.saveNote(note.guid)
+            }
+        }
+        ToolbarButton {
+            text: "edit"
+            iconName: "edit"
+            onTriggered: {
+                pagestack.pop()
+                pagestack.push(Qt.resolvedUrl("EditNotePage.qml"), {note: root.note})
+            }
+        }
+    }
+
+    TextArea {
+        id: noteTextArea
+        anchors { fill: parent; margins: units.gu(2) }
+        height: parent.height - y
+        highlighted: true
+        readOnly: true
+
+        textFormat: TextEdit.RichText
+        text: note.htmlContent
     }
 }
 

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2013-12-14 23:59:04 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2014-01-10 10:14:02 +0000
@@ -33,28 +33,111 @@
 
     tools: ToolbarItems {
         ToolbarButton {
+            text: "search"
+            iconName: "search"
+            onTriggered: {
+                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
+            }
+        }
+
+        ToolbarSpacer { }
+
+        ToolbarButton {
             text: "add notebook"
+            iconName: "add"
             onTriggered: {
-                NotesStore.createNotebook("new notebook");
+                contentColumn.newNotebook = true;
             }
         }
     }
 
+
     Notebooks {
         id: notebooks
     }
 
-    ListView {
+    Column {
+        id: contentColumn
         anchors.fill: parent
-        model: notebooks
-
-        delegate: NotebooksDelegate {
-            name: model.name
-            noteCount: model.noteCount
-            shareStatus: model.publised ? i18n.tr("shared") : i18n.tr("private")
-
-            onClicked: {
-                pagestack.push(Qt.resolvedUrl("NotesPage.qml"), {title: name, filter: guid});
+        property bool newNotebook: false
+
+        states: [
+            State {
+                name: "newNotebook"; when: contentColumn.newNotebook
+                PropertyChanges { target: newNotebookContainer; opacity: 1; height: newNotebookContainer.implicitHeight }
+                PropertyChanges { target: buttonRow; opacity: 1; height: cancelButton.height + units.gu(4) }
+            }
+        ]
+
+        Empty {
+            id: newNotebookContainer
+            height: 0
+            visible: opacity > 0
+            opacity: 0
+            clip: true
+
+            Behavior on height {
+                UbuntuNumberAnimation {}
+            }
+            Behavior on opacity {
+                UbuntuNumberAnimation {}
+            }
+
+            onVisibleChanged: {
+                newNoteTitleTextField.forceActiveFocus();
+            }
+
+            TextField {
+                id: newNoteTitleTextField
+                anchors { left: parent.left; right: parent.right; margins: units.gu(2); verticalCenter: parent.verticalCenter }
+            }
+        }
+
+        ListView {
+            model: notebooks
+            anchors { left: parent.left; right: parent.right }
+            height: parent.height - y - buttonRow.height
+
+            delegate: NotebooksDelegate {
+                name: model.name
+                noteCount: model.noteCount
+                shareStatus: model.publised ? i18n.tr("shared") : i18n.tr("private")
+
+                onClicked: {
+                    pagestack.push(Qt.resolvedUrl("NotesPage.qml"), {title: name, filter: guid});
+                }
+            }
+        }
+
+        Item {
+            id: buttonRow
+            anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
+            height: 0
+            visible: height > 0
+            clip: true
+
+            Behavior on height {
+                UbuntuNumberAnimation {}
+            }
+
+            Button {
+                id: cancelButton
+                anchors { left: parent.left; verticalCenter: parent.verticalCenter }
+                text: i18n.tr("Cancel")
+                onClicked: {
+                    newNoteTitleTextField.text = "";
+                    contentColumn.newNotebook = false
+                }
+            }
+            Button {
+                anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+                text: i18n.tr("Save")
+                enabled: newNoteTitleTextField.text.length > 0
+                onClicked: {
+                    NotesStore.createNotebook(newNoteTitleTextField.text);
+                    newNoteTitleTextField.text = "";
+                    contentColumn.newNotebook = false
+                }
             }
         }
     }

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-12-14 22:38:57 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-01-10 10:14:02 +0000
@@ -47,12 +47,9 @@
 
         ToolbarButton {
             text: "add note"
-            enabled: notes.filterNotebookGuid.length > 0
+            iconName: "add"
             onTriggered: {
-                var content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\"><en-note><div><br clear=\"none\"/>"
-                content = content + "fobar"
-                content = content + "<br clear=\"none\"/></div><div><br clear=\"none\"/></div></en-note>"
-                NotesStore.createNote("Untitled", notes.filterNotebookGuid, content);
+                pagestack.push(Qt.resolvedUrl("EditNotePage.qml"));
             }
         }
     }

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2013-11-29 20:38:11 +0000
+++ src/app/qml/ui/RemindersPage.qml	2014-01-10 10:14:02 +0000
@@ -20,10 +20,30 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Evernote 0.1
+import "../components"
 
 Page {
     id: remindersPage
 
+    tools: ToolbarItems {
+        ToolbarButton {
+            text: "search"
+            iconName: "search"
+            onTriggered: {
+                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
+            }
+        }
+
+        ToolbarSpacer { }
+
+        ToolbarButton {
+            text: "add"
+            iconName: "add"
+            onTriggered: {
+            }
+        }
+    }
+
     Notes {
         id: notes
         onlyReminders: true

=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2013-12-14 22:38:57 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2014-01-10 10:14:02 +0000
@@ -26,6 +26,7 @@
 #include "notes.h"
 #include "notebooks.h"
 #include "note.h"
+#include "notebook.h"
 #include "resourceimageprovider.h"
 
 #include <QtQml>
@@ -54,6 +55,7 @@
     qmlRegisterType<Notes>("Evernote", 0, 1, "Notes");
     qmlRegisterType<Notebooks>("Evernote", 0, 1, "Notebooks");
     qmlRegisterUncreatableType<Note>("Evernote", 0, 1, "Note", "Cannot create Notes in QML. Use NotesStore.createNote() instead.");
+    qmlRegisterUncreatableType<Notebook>("Evernote", 0, 1, "Notebook", "Cannot create Notes in QML. Use NotesStore.createNotebook() instead.");
 }
 
 void EvernotePlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-14 22:38:57 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2014-01-10 10:14:02 +0000
@@ -55,6 +55,7 @@
 
     try {
         startJob();
+        emitJobDone(EvernoteConnection::ErrorCodeNoError, QString());
     } catch (const TTransportException & e) {
 
         // The connection broke down. libthrift + evernote servers seem to be quite flaky
@@ -63,6 +64,7 @@
         try {
             resetConnection();
             startJob();
+            emitJobDone(EvernoteConnection::ErrorCodeNoError, QString());
         } catch (const TTransportException &e) {
             // Giving up... the connection seems to be down for real.
             qWarning() << "Cannot reestablish connection:" << e.what();
@@ -92,8 +94,6 @@
         qWarning() << "EDAMNotFoundException" << e.what();
         emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
     }
-
-    emitJobDone(EvernoteConnection::ErrorCodeNoError, QString());
 }
 
 QString EvernoteJob::token()

=== modified file 'src/plugin/Evernote/notebooks.cpp'
--- src/plugin/Evernote/notebooks.cpp	2013-12-14 23:59:04 +0000
+++ src/plugin/Evernote/notebooks.cpp	2014-01-10 10:14:02 +0000
@@ -65,6 +65,11 @@
     return roles;
 }
 
+Notebook *Notebooks::notebook(int index)
+{
+    return NotesStore::instance()->notebook(m_list.at(index));
+}
+
 void Notebooks::refresh()
 {
     NotesStore::instance()->refreshNotebooks();

=== modified file 'src/plugin/Evernote/notebooks.h'
--- src/plugin/Evernote/notebooks.h	2014-01-10 09:07:23 +0000
+++ src/plugin/Evernote/notebooks.h	2014-01-10 10:14:02 +0000
@@ -41,6 +41,8 @@
     int rowCount(const QModelIndex &parent) const;
     QHash<int, QByteArray> roleNames() const;
 
+    Q_INVOKABLE Notebook *notebook(int index);
+
 public slots:
     void refresh();
 

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-14 23:59:04 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-01-10 10:14:02 +0000
@@ -279,9 +279,16 @@
     }
 }
 
-void NotesStore::createNote(const QString &title, const QString &notebookGuid, const QString &content)
-{
-    CreateNoteJob *job = new CreateNoteJob(title, notebookGuid, content);
+void NotesStore::createNote(const QString &title, const QString &notebookGuid, const QString &htmlContent)
+{
+    EnmlDocument enmlDoc;
+    enmlDoc.setHtml(htmlContent);
+    createNote(title, notebookGuid, enmlDoc);
+}
+
+void NotesStore::createNote(const QString &title, const QString &notebookGuid, const EnmlDocument &content)
+{
+    CreateNoteJob *job = new CreateNoteJob(title, notebookGuid, content.enml());
     connect(job, &CreateNoteJob::jobDone, this, &NotesStore::createNoteJobDone);
     EvernoteConnection::instance()->enqueue(job);
 }

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-01-10 09:07:23 +0000
+++ src/plugin/Evernote/notesstore.h	2014-01-10 10:14:02 +0000
@@ -22,6 +22,7 @@
 #define NOTESSTORE_H
 
 #include "evernoteconnection.h"
+#include "utils/enmldocument.h"
 
 // Thrift
 #include <arpa/inet.h> // seems thrift forgot this one
@@ -75,7 +76,8 @@
     QList<Note*> notes() const;
 
     Q_INVOKABLE Note* note(const QString &guid);
-    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
+    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &htmlContent);
+    void createNote(const QString &title, const QString &notebookGuid, const EnmlDocument &content);
     Q_INVOKABLE void saveNote(const QString &guid);
     Q_INVOKABLE void deleteNote(const QString &guid);
     Q_INVOKABLE void findNotes(const QString &searchWords);