Merge lp:~mzanetti/reminders-app/refresh-note-on-view into lp:~notes-app-dev/reminders-app/new-design

[Michael Zanetti]

refresh note content when opening it for viewing
also drops some handcraftet indicator stuff replacing it by the proper loading mechanism

[David Planella (dpm)]

This works great for the note's textual content.

However, for attachments I've noticed that after I've added one attachment, for subsequent ones I need to open the note twice to see any new images added from the web. E.g.

1. Phone: Open the app
2. Phone: Create a new note on the web, add some text
3. Phone: On the app's notes list, pull the toolbar and hit Refresh
4. Phone: Tap on the newly added note to see the content
5. Phone: Go back to the list of notes with by pulling the toolbar and tapping on Back
6. Desktop: Add an attachment (image) on the web
7. Phone: On the app, tap on that same note. You'll see the new attachment fetched and displayed as expected
8. Phone: Go back to the list of notes with by pulling the toolbar and tapping on Back
9. Desktop: Add a second image to the same note on the web
10. Phone: Tap on the same note to see the content

Actual:

- The second image is not entirely loaded, it is shown as a small square in the note, but it never gets fetched
- If you go back to the list of notes and then tap on the note to reopen it, the second image will then be shown as expected

Expected:

- The second image should be shown after opening the note, no two refreshes would be required

[lp:~mzanetti/reminders-app/refresh-note-on-view]

104. By Michael Zanetti on 2014-05-09

reload the note if resources change

[Michael Zanetti (mzanetti)]

good catch! fixed.

[David Planella (dpm)]

LGTM now, thanks!

review: Approve

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-05-09 09:02:54 +0000
+++ src/app/qml/reminders.qml	2014-05-09 13:03:12 +0000
@@ -71,10 +71,11 @@
 
     function displayNote(note) {
         if (root.narrowMode) {
+            print("creating noteview");
             var component = Qt.createComponent(Qt.resolvedUrl("ui/NotePage.qml"));
-            var page = component.createObject();
+            var page = component.createObject(root, {note: note});
             page.editNote.connect(function(note) {root.switchToEditMode(note)})
-            pagestack.push(page, {note: note})
+            pagestack.push(page)
         } else {
             var view = sideViewLoader.embed(Qt.resolvedUrl("ui/NoteView.qml"))
             view.note = note;

=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml	2014-05-07 07:55:08 +0000
+++ src/app/qml/ui/NoteView.qml	2014-05-09 13:03:12 +0000
@@ -29,30 +29,14 @@
 
     signal editNote(var note)
 
-    QtObject {
-        id: priv
-        property bool loading: false
-    }
-
-    Component.onCompleted: {
-        if (note.enmlContent.length === 0) {
-            NotesStore.refreshNoteContent(root.note.guid)
-            priv.loading = true;
-        }
-    }
-
-    Connections {
-        target: NotesStore
-        onNoteChanged: {
-            if (guid === root.note.guid) {
-                priv.loading = false;
-            }
-        }
+    onNoteChanged: {
+        print("refreshing note:", root.note.guid)
+        NotesStore.refreshNoteContent(root.note.guid)
     }
 
     ActivityIndicator {
         anchors.centerIn: parent
-        running: priv.loading
+        running: root.note.loading
         visible: running
     }
 
@@ -62,7 +46,6 @@
     Flickable {
         anchors { fill: parent }
         contentHeight: height
-        visible: !priv.loading
 
         UbuntuWebView {
             id: noteTextArea
@@ -72,6 +55,13 @@
                 loadHtml(html, "file:///")
             }
 
+            Connections {
+                target: note
+                onResourcesChanged: {
+                    noteTextArea.loadHtml(noteTextArea.html, "file:///")
+                }
+            }
+
             experimental.preferences.navigatorQtObjectEnabled: true
             experimental.preferredMinimumContentsWidth: root.width
             experimental.userScripts: [Qt.resolvedUrl("reminders-scripts.js")]

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-05-08 17:42:55 +0000
+++ src/plugin/Evernote/note.cpp	2014-05-09 13:03:12 +0000
@@ -305,6 +305,7 @@
 {
     Resource *resource = new Resource(data, hash, fileName, type, this);
     m_resources.insert(hash, resource);
+    emit resourcesChanged();
     return resource;
 }
 
@@ -312,6 +313,7 @@
 {
     Resource *resource = new Resource(fileName);
     m_resources.insert(resource->hash(), resource);
+    emit resourcesChanged();
     return resource;
 }
 
@@ -330,6 +332,7 @@
 
     Resource *resource = addResource(fileName.path());
     m_content.attachFile(position, resource->hash(), resource->type());
+    emit resourcesChanged();
     emit contentChanged();
 
     // Cleanup imported file.

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2014-05-06 20:05:25 +0000
+++ src/plugin/Evernote/note.h	2014-05-09 13:03:12 +0000
@@ -44,7 +44,7 @@
     Q_PROPERTY(QString richTextContent READ richTextContent WRITE setRichTextContent NOTIFY contentChanged)
     Q_PROPERTY(QString enmlContent READ enmlContent WRITE setEnmlContent NOTIFY contentChanged)
     Q_PROPERTY(QString plaintextContent READ plaintextContent NOTIFY contentChanged)
-    Q_PROPERTY(QStringList resourceUrls READ resourceUrls NOTIFY contentChanged)
+    Q_PROPERTY(QStringList resourceUrls READ resourceUrls NOTIFY resourcesChanged)
     Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
     Q_PROPERTY(bool hasReminderTime READ hasReminderTime WRITE setHasReminderTime NOTIFY reminderTimeChanged)
     Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
@@ -134,6 +134,7 @@
     void titleChanged();
     void notebookGuidChanged();
     void contentChanged();
+    void resourcesChanged();
     void reminderChanged();
     void reminderTimeChanged();
     void reminderDoneChanged();