Merge lp:~mzanetti/reminders-app/new-notebooks-design into lp:~notes-app-dev/reminders-app/new-design

[Michael Zanetti]

Implement NotebookDelegate according to new design

[lp:~mzanetti/reminders-app/new-notebooks-design]

98. By Michael Zanetti on 2014-05-05

merge

[David Planella (dpm)]

Looks really good!

One thing I've noticed, and that's related to the same comment on the notes MP [1]:

151 + return QStringLiteral("today");

This will need internationalization.

Would it not be better to just return a date from the plugin and then let the frontend figure out how it wants to display it? I.e. do the fuzzy date naming via JS.

[1] https://code.launchpad.net/~mzanetti/reminders-app/notes-headers/+merge/218328

review: Needs Fixing

[lp:~mzanetti/reminders-app/new-notebooks-design]

99. By Michael Zanetti on 2014-05-06

merge upstream

100. By Michael Zanetti on 2014-05-06

make it translatable

101. By Michael Zanetti on 2014-05-06

merge upstream

102. By Michael Zanetti on 2014-05-06

add context comments for translators

103. By Michael Zanetti on 2014-05-06

use wording like David proposed

104. By Michael Zanetti on 2014-05-08

finetuning reminders removal

Unmerged revisions

104. By Michael Zanetti on 2014-05-08

finetuning reminders removal

=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml	2014-05-05 17:46:10 +0000
+++ src/app/qml/components/NotebooksDelegate.qml	2014-05-05 23:15:38 +0000
@@ -17,46 +17,67 @@
  */
 
 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
-    property color notebookColor
-
-    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
-            color: root.notebookColor
-        }
-        Label {
-            anchors { left: parent.left; right: parent.right }
-            text: root.shareStatus
-            wrapMode: Text.WordWrap
-            textFormat: Text.StyledText
-        }
+    height: units.gu(9)
+
+    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)
+    RowLayout {
+        anchors.fill: parent
+        anchors.margins: 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: "medium"
+                font.bold: true
+            }
+            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/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2014-05-05 23:02:32 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2014-05-05 23:15:38 +0000
@@ -109,13 +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")
-                notebookColor: preferences.colorForNotebook(model.guid)
-
                 onClicked: {
                     print("selected notebook:", model.guid)
                     root.openNotebook(name, model.guid)

=== 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-05 23:15:38 +0000
@@ -75,6 +75,38 @@
     }
 }
 
+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) {
+        return QStringLiteral("today");
+    }
+    if (updateDate == today.addDays(-1)) {
+        return QStringLiteral("yesterday");
+    }
+    if (updateDate <= today.addDays(-7)) {
+        return QStringLiteral("last week");
+    }
+    if (updateDate <= today.addDays(-14)) {
+        return QStringLiteral("two weeks ago");
+    }
+    return QString("on %1").arg(updateDate.toString("MMMM yyyy"));
+}
+
 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-05 23:15:38 +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-05 23:15:38 +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-05 23:15:38 +0000
@@ -36,7 +36,9 @@
         RoleGuid,
         RoleName,
         RoleNoteCount,
-        RolePublished
+        RolePublished,
+        RoleLastUpdated,
+        RoleLastUpdatedString
     };
     explicit Notebooks(QObject *parent = 0);
 

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-05-05 23:15:38 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-05-05 23:15:38 +0000
@@ -363,6 +363,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);