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

[Michael Zanetti]

This adds support for the colors as shown in the new design.

Changes AccountPreference to be a generic Preferences class and adds a method colorForNotebook(notebookGuid). This picks the least used color of our available ones and stores its usage into the settings. This way we can keep the same colors for the same notebooks all the time.

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

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

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

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/color]

94. By Michael Zanetti on 2014-05-05

added colorForNotebook() method to preferences

95. By Michael Zanetti on 2014-05-05

rename preferences

[Riccardo Padovani (rpadovani)]

Working as expected, thanks!

review: Approve

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-02-15 17:05:32 +0000
+++ src/app/CMakeLists.txt	2014-05-05 18:01:04 +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-03-17 22:26:42 +0000
+++ src/app/main.cpp	2014-05-05 18:01:04 +0000
@@ -21,7 +21,7 @@
  */
 
 #include "camerahelper.h"
-#include "accountpreference.h"
+#include "preferences.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickView>
@@ -100,8 +100,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);
 
     // load the qml file
     if (qmlfile.isEmpty()) {

=== 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-05 18:01:04 +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-05 18:01:04 +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-05 18:01:04 +0000
@@ -27,6 +27,7 @@
     property string name
     property int noteCount
     property string shareStatus
+    property color notebookColor
 
     Column {
         id: contentColumn
@@ -43,6 +44,7 @@
             text: root.name
             font.bold: true
             elide: Text.ElideRight
+            color: root.notebookColor
         }
         Label {
             anchors { left: parent.left; right: parent.right }

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2014-01-27 13:00:41 +0000
+++ src/app/qml/components/NotesDelegate.qml	2014-05-05 18:01:04 +0000
@@ -28,6 +28,7 @@
     property date creationDate
     property string content
     property string resource
+    property color notebookColor
 
     Column {
         id: contentColumn
@@ -45,6 +46,7 @@
             text: root.title
             font.bold: true
             elide: Text.ElideRight
+            color: root.notebookColor
         }
         Label {
             anchors { left: parent.left; right: parent.right }

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-03-13 18:12:25 +0000
+++ src/app/qml/reminders.qml	2014-05-05 18:01:04 +0000
@@ -123,7 +123,7 @@
 
         pagestack.push(rootTabs)
         print("got accounts:", accounts.count)
-        var accountName = accountPreference.accountName;
+        var accountName = preferences.accountName;
         if (accountName) {
             var i;
             for (i = 0; i < accounts.count; i++) {
@@ -151,7 +151,7 @@
         target: UserStore
         onUsernameChanged: {
             print("Logged in as user:", UserStore.username);
-            accountPreference.accountName = UserStore.username;
+            preferences.accountName = UserStore.username;
         }
     }
 
@@ -219,7 +219,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) {

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2014-03-19 16:26:36 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2014-05-05 18:01:04 +0000
@@ -113,6 +113,7 @@
                 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)

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-03-13 18:11:32 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-05-05 18:01:04 +0000
@@ -110,6 +110,7 @@
             creationDate: model.created
             content: model.plaintextContent
             resource: model.resourceUrls.length > 0 ? model.resourceUrls[0] : ""
+            notebookColor: preferences.colorForNotebook(model.notebookGuid)
 
             Component.onCompleted: NotesStore.refreshNoteContent(model.guid)