Merge lp:~andrewsomething/ubuntu-rssreader-app/sharing into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Andrew Starr-Bochicchio]

Add ability to share articles using the friends api. LP: #1219301

This adds the ability to share articles. There is one minor issue with the Popover being hard to read, but that is a known bug in the UI Toolkit:

https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1201864

Not sure if that's a blocker...

[Andrew Starr-Bochicchio (andrewsomething)]

Looks like that is probably the same bug as in LP #1205094, which is Fix Committed:

https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205094

[Roman Shchekin (mrqtros)]

Must Ubuntu.OnlineAccounts and Friends modules be manually installed or not?
I've got errors: "module "Ubuntu.OnlineAccounts" is not installed". Same for "Friends".

BTW, I think that:
property var article: rssListview.model.get(rssListview.currentIndex)
is bad practice. Better will be set property "article" in PopupUtils.open() method when creating Popover.

And this
article.shareAccountId = accts.accountId
is not pretty clear code too. Use additional property instead of mixing all data in one.

[Andrew Starr-Bochicchio (andrewsomething)]

Thanks for the review.

On Sun, Sep 1, 2013 at 5:33 AM, Roman Shchekin <email address hidden> wrote:
> Must Ubuntu.OnlineAccounts and Friends modules be manually installed or not?
> I've got errors: "module "Ubuntu.OnlineAccounts" is not installed". Same for "Friends".

My understanding is that they should be part of the default image.
They're going to be used for contact sync and are also used by the
Facebook and Friends apps. Though I don't actually have a device
running Ubuntu Touch, so I don't know if this is a reality yet. I
guess the SDK isn't pulling them in yet. I think the packages are
qtdeclarative5-accounts-plugin and qtdeclarative5-friends-plugin. I'm
running saucy, and they are already present here...

> BTW, I think that:
> property var article: rssListview.model.get(rssListview.currentIndex)
> is bad practice. Better will be set property "article" in PopupUtils.open() method when creating Popover.
>
> And this article.shareAccountId = accts.accountId
> is not pretty clear code too. Use additional property instead of mixing all data in one.

I'll try to pretty this up sometime today. This is my first real step
into the QML world. Is there any kind of widely accepted style guide
akin to Python's PEP8?

Thanks!

-- Andrew Starr-Bochicchio

   Ubuntu Developer <https://launchpad.net/~andrewsomething>
   Debian Developer <http://qa.debian.org/developer.php?login=asb>
   PGP/GPG Key ID: D53FDCB1

[lp:~andrewsomething/ubuntu-rssreader-app/sharing]

53. By Andrew Starr-Bochicchio on 2013-09-01

Don't mix account data into article property.

54. By Andrew Starr-Bochicchio on 2013-09-01

Remerge on trunk.

[Joey Chan (qqworini)]

Neither do I have qtdeclarative5-accounts-plugin and qtdeclarative5-friends-plugin, using Kubuntu 12.04

Also I can't access FB and twitter in China, so sorry I can't test it

[Andrew Starr-Bochicchio (andrewsomething)]

On Tue, Sep 3, 2013 at 10:19 PM, Joey Chan <email address hidden> wrote:
> Also I can't access FB and twitter in China, so sorry I can't test it

There are Sina and Sohu plugins as well.

[Joey Chan (qqworini)]

Sounds good, but I don't have those plugins in my 12.04 ... that's the problem

> On Tue, Sep 3, 2013 at 10:19 PM, Joey Chan <email address hidden> wrote:
> > Also I can't access FB and twitter in China, so sorry I can't test it
>
> There are Sina and Sohu plugins as well.

[Ken VanDine (ken-vandine)]

You should add depends for qtdeclarative5-accounts-plugin and qtdeclarative5-friends0.2 to the package. Also note, that there has been an API version bump in friends recently, use 0.2 now.

review: Needs Fixing

[lp:~andrewsomething/ubuntu-rssreader-app/sharing]

55. By Andrew Starr-Bochicchio on 2013-09-04

Add dependencies to the Debian packaging and bump Friends version.

[Andrew Starr-Bochicchio (andrewsomething)]

On Wed, Sep 4, 2013 at 9:33 AM, Ken VanDine <email address hidden> wrote:
> You should add depends for qtdeclarative5-accounts-plugin and qtdeclarative5-friends0.2 to the package. Also note, that there has been an API version bump in friends recently, use 0.2 now.

Done. I hadn't notice that the packaging is kept in this branch.
Strangely, QtCreator doesn't display the debian directory in the
project view, just the filesystem view...

[lp:~andrewsomething/ubuntu-rssreader-app/sharing]

56. By Andrew Starr-Bochicchio on 2013-09-24

Handle there not being a sharing account more gracefully.

57. By Andrew Starr-Bochicchio on 2013-09-25

gicon is deprecated, use theme instead.

Unmerged revisions

57. By Andrew Starr-Bochicchio on 2013-09-25

gicon is deprecated, use theme instead.

56. By Andrew Starr-Bochicchio on 2013-09-24

Handle there not being a sharing account more gracefully.

55. By Andrew Starr-Bochicchio on 2013-09-04

Add dependencies to the Debian packaging and bump Friends version.

54. By Andrew Starr-Bochicchio on 2013-09-01

Remerge on trunk.

53. By Andrew Starr-Bochicchio on 2013-09-01

Don't mix account data into article property.

52. By Andrew Starr-Bochicchio on 2013-08-31

Add ability to share articles using the friends api.

=== modified file 'RssFeedPage.qml'
--- RssFeedPage.qml	2013-09-03 16:58:01 +0000
+++ RssFeedPage.qml	2013-09-04 14:36:57 +0000
@@ -10,6 +10,9 @@
 import QtQuick.XmlListModel 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1 as Popups
+import Friends 0.2
+import Ubuntu.OnlineAccounts 0.1
 import "./dateutils.js" as DateUtils
 
 Page {
@@ -40,6 +43,20 @@
 
         ToolbarButton {
             action: Action {
+                id: shareAction
+                objectName: "share"
+
+                iconSource: Qt.resolvedUrl("./icons_tmp/share.svg")
+                text: i18n.tr("Share")
+
+                onTriggered: {
+                    PopupUtils.open(shareAccountsComponent)
+                }
+            }
+        }
+
+        ToolbarButton {
+            action: Action {
                 text:  i18n.tr("Open site")
                 iconSource: Qt.resolvedUrl("./icons_tmp/go-to.svg")
                 onTriggered:
@@ -132,4 +149,107 @@
             }
         } // Flickable
     } // Component
+
+    //////// Sharing feature
+    FriendsDispatcher {
+        id: friends
+        onSendComplete: {
+             if (success) {
+                 console.log ("Send completed successfully");
+             } else {
+                 console.log ("Send failed: " + errorMessage);
+             }
+         }
+    }
+
+    Component {
+         id: shareDialogComponent
+
+         Popups.Dialog {
+             id: shareDialog
+
+             property var article: null
+             property var account: null
+
+             title: i18n.tr("Share on ") + account.serviceName
+             text: i18n.tr("Edit your message below")
+
+             TextArea {
+                 id: shareMsg
+                 text: {
+                     return article.title + '\n\n' + article.description + '\n\n' + article.link
+                 }
+             }
+
+             Button {
+                 id: shareButton
+                 text: i18n.tr('Share')
+                 onClicked: {
+                     friends.sendForAccountAsync(account.id, shareMsg.text)
+                     PopupUtils.close(shareDialog)
+                 }
+             }
+
+             Button {
+                 id: shareCancel
+                 text: i18n.tr('Cancel')
+                 onClicked: {
+                     PopupUtils.close(shareDialog)
+                 }
+             }
+         }
+    }
+
+    Component {
+        id: shareAccountsComponent
+
+        Popups.Popover {
+            id: shareAccountsPopover
+
+            Column {
+                id: shareAccountsLayout
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    right: parent.right
+                }
+
+                AccountServiceModel {
+                    id: socialAccounts
+                    serviceType: 'microblogging'
+                }
+
+                Repeater {
+                    model: socialAccounts
+                    delegate: ListItem.Subtitled {
+                        id: socialAccountsItem
+                        property var accts: AccountService {
+                            id: accts
+                            objectHandle: accountServiceHandle
+                            onAuthenticated: { console.log("Access token is " + reply.AccessToken) }
+                            onAuthenticationError: { console.log("Authentication failed, code " + error.code) }
+                        }
+                        text: accts.provider.displayName
+                        subText: accts.displayName
+
+                        icon: 'image://gicon/'+accts.provider.iconName
+                        fallbackIconSource: Qt.resolvedUrl("./icons_tmp/share.svg")
+
+                        property var account: {
+                            'id': accts.accountId,
+                            'serviceName': accts.service.displayName
+                        }
+                        property var article: rssListview.model.get(rssListview.currentIndex)
+
+                        onClicked: {
+                            PopupUtils.close(shareAccountsPopover)
+                            PopupUtils.open(shareDialogComponent, null,
+                                           {"article" : article,
+                                            "account": account})
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

=== modified file 'debian/control'
--- debian/control	2013-08-15 15:54:31 +0000
+++ debian/control	2013-09-04 14:36:57 +0000
@@ -17,6 +17,8 @@
          qtdeclarative5-xmllistmodel-plugin,
          libqt5webkit5-qmlwebkitplugin,
          qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-accounts-plugin,
+         qtdeclarative5-friends0.2
 Description: RSS Reader application
  Core RSS Reader application