Merge lp:~mzanetti/reminders-app/init-account-rework into lp:reminders-app

[Michael Zanetti]

Only load the AccountSelectorPage if there are more than 1 accounts available.

[lp:~mzanetti/reminders-app/init-account-rework]

46. By Michael Zanetti on 2014-01-31

revert unneeded change

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

FAILED: Continuous integration, rev:46
http://91.189.93.70:8080/job/reminders-app-ci/90/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/886
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/90

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/init-account-rework]

47. By Michael Zanetti on 2014-01-31

update deps

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

+ property alias accounts: listView.model

You didn't add

id: listView

to listView in AccountSelectorPage.qml, so if there are 2 accounts there is an error:

QQmlComponent: Component is not ready
file:///home/rpadovani/Documents/ubuntu/touch/core-apps/init-account-rework-build/src/app/qml/reminders.qml:80: TypeError: Cannot read property 'accountSelected' of null

review: Needs Fixing

[lp:~mzanetti/reminders-app/init-account-rework]

48. By Michael Zanetti on 2014-02-03

fix invalid alias reference

[Michael Zanetti (mzanetti)]

> + property alias accounts: listView.model
>
> You didn't add
>
> id: listView
>
> to listView in AccountSelectorPage.qml, so if there are 2 accounts there is an
> error:
>
> QQmlComponent: Component is not ready
> file:///home/rpadovani/Documents/ubuntu/touch/core-apps/init-account-rework-
> build/src/app/qml/reminders.qml:80: TypeError: Cannot read property
> 'accountSelected' of null

fixed

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

FAILED: Continuous integration, rev:48
http://91.189.93.70:8080/job/reminders-app-ci/95/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/935/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/95/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/95/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/init-account-rework]

49. By Michael Zanetti on 2014-02-05

resolve conflicts

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Looks good to me! Good work!

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-01-30 12:53:13 +0000
+++ debian/control	2014-02-05 09:33:17 +0000
@@ -19,7 +19,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          account-plugin-evernote,
-         qmlscene,
+         qtdeclarative5-accounts-plugin,
          qtdeclarative5-evernote0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-01-27 13:00:41 +0000
+++ src/app/qml/reminders.qml	2014-02-05 09:33:17 +0000
@@ -21,12 +21,14 @@
 //import "components"
 import "ui"
 import Evernote 0.1
+import Ubuntu.OnlineAccounts 0.1
 
 /*!
     \brief MainView with a Label and Button elements.
 */
 
 MainView {
+    id: root
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "mainView"
 
@@ -45,10 +47,38 @@
     // Temporary background color. This can be changed to other suitable backgrounds when we get official mockup designs
     backgroundColor: UbuntuColors.coolGrey
 
+    AccountServiceModel {
+        id: accounts
+        service: "evernote"
+    }
+
+    AccountService {
+        id: accountService
+        onObjectHandleChanged: authenticate(null);
+        onAuthenticated: {
+            console.log("Access token is " + reply.AccessToken)
+            EvernoteConnection.token = reply.AccessToken;
+        }
+        onAuthenticationError: {
+            console.log("Authentication failed, code " + error.code)
+        }
+    }
+
     Component.onCompleted: {
         pagestack.push(rootTabs)
-        if (EvernoteConnection.token.length === 0) {
-            pagestack.push(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
+        print("got accounts:", accounts.count)
+        switch (accounts.count) {
+        case 0:
+            print("No account available! Please setup an account in the system settings");
+            break;
+        case 1:
+            accountService.objectHandle = accounts.get(0, "accountServiceHandle");
+            break;
+        default:
+            var component = Qt.createComponent(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
+            var page = component.createObject(root, {accounts: accounts});
+            page.accountSelected.connect(function(handle) { accountService.objectHandle = handle; pagestack.pop(); });
+            pagestack.push(page);
         }
     }
 

=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml	2014-01-27 13:00:41 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml	2014-02-05 09:33:17 +0000
@@ -26,43 +26,27 @@
     id: root
     title: "Select Evernote account"
 
-    AccountServiceModel {
-        id: accounts
-        // Use the Evernote service
-        service: "evernote"
-    }
+    property alias accounts: listView.model
+
+    signal accountSelected(var handle)
 
     Column {
         anchors { fill: parent; margins: units.gu(2) }
         spacing: units.gu(1)
 
         ListView {
+            id: listView
             width: parent.width
             height: units.gu(10)
             model: accounts
+
             delegate: Standard {
                 text: displayName
-
-                // FIXME: remove this Item wrapper once Ubuntu ListItems are fixed to hold non-visual items
-                Item {
-                    AccountService {
-                        id: accountService
-                        objectHandle: accountServiceHandle
-                        // Print the access token on the console
-                        onAuthenticated: {
-                            console.log("Access token is " + reply.AccessToken)
-                            EvernoteConnection.token = reply.AccessToken;
-                            pagestack.pop();
-                        }
-                        onAuthenticationError: { console.log("Authentication failed, code " + error.code) }
-                    }
-                }
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: accountService.authenticate(null)
+                    onClicked: root.accountSelected(accountServiceHandle)
                 }
             }
         }
-
     }
 }