Merge lp:~qqworini/ubuntu-rssreader-app/link-color-and-default-feed into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

fix bug

Bug #1217291: [RSS Reader] Article view link styling
Bug #1236309: [RSS Reader] Add a search button right from the textfield until we have a search button in the keyboard
Bug #1238694: Change default feeds
* and a grid bug

add a "saved" icon in article page

fix bug

Bug #1217291: [RSS Reader] Article view link styling
Bug #1236309: [RSS Reader] Add a search button right from the textfield until we have a search button in the keyboard
Bug #1238694: Change default feeds
* and a grid bug

add a "saved" icon in article page

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

FAILED: Continuous integration, rev:111
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/100/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/965
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/100

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/100/rebuild

review: Needs Fixing (continuous-integration)

[lp:~qqworini/ubuntu-rssreader-app/link-color-and-default-feed]

112. By Joey Chan on 2013-10-13

just want to trigger jenkins bot rebuild

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

FAILED: Continuous integration, rev:112
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/101/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/966
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/101

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/101/rebuild

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'OrganicGrid.qml'
--- OrganicGrid.qml	2013-10-12 16:47:49 +0000
+++ OrganicGrid.qml	2013-10-13 16:39:13 +0000
@@ -186,6 +186,7 @@
 
         organicFlickable.scrollToStart()
         currentLoadedIndex += numAdd
+        organicFlickable.canAdd = true
         console.timeEnd("reload_grid")
     }
 
@@ -210,7 +211,6 @@
             var imageArray = [article.image]
             var hasImage = (article.image !== "");
 
-            // Pick the type of size we will use for this item from the sequence
             // prevent two ImgOneA appear together
             var alignType
             do {

=== modified file 'RssFeedPage.qml'
--- RssFeedPage.qml	2013-10-13 14:02:57 +0000
+++ RssFeedPage.qml	2013-10-13 16:39:13 +0000
@@ -299,13 +299,37 @@
                     mediaDownloadInProgress = mediaDownloadInProgress - 1
                 }
 
-                Label {
-                    id: label_time
-                    text: DateUtils.formatRelativeTime(i18n, pubdate)
-                    fontSize: "small"
+                Row {
+                    width: parent.width - units.gu(4)
+                    height: labelTime.paintedHeight
                     anchors.horizontalCenter: parent.horizontalCenter
-                    width: parent.width - units.gu(4)
+                    spacing: units.gu(1)
+
+                    Image {
+                        id: imgFavourite
+                        anchors.verticalCenter: labelTime.verticalCenter
+                        fillMode: Image.PreserveAspectCrop
+                        source: Qt.resolvedUrl("./icons_tmp/favorite-selected.svg")
+                        sourceSize.height: rssItem == null ? 0 : (rssItem.favourite == "1" ? units.gu(2) : 0)
+                        visible: rssItem == null ? false : (rssItem.favourite == "1")
+                        smooth: true
+                    }
+
+                    Label {
+                        id: labelTime
+                        text: DateUtils.formatRelativeTime(i18n, pubdate)
+                        fontSize: "small"
+                        width: parent.width - units.gu(3)
+                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    }
                 }
+//                Label {
+//                    id: label_time
+//                    text: DateUtils.formatRelativeTime(i18n, pubdate)
+//                    fontSize: "small"
+//                    anchors.horizontalCenter: parent.horizontalCenter
+//                    width: parent.width - units.gu(4)
+//                }
 
                 Label {
                     fontSize: "large"
@@ -317,7 +341,7 @@
 
                 Label {
                     text: content
-                    linkColor: UbuntuColors.orange // Temporary. Mb bad color, but better than dark blue.
+                    linkColor: "white"
                     anchors.horizontalCenter: parent.horizontalCenter
                     width: parent.width - units.gu(4)
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere

=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-10-10 18:42:03 +0000
+++ feeds/AppendFeedPage.qml	2013-10-13 16:39:13 +0000
@@ -179,18 +179,32 @@
             placeholderText: i18n.tr("Type a keyword or URL")
 
             width: parent.width - units.gu(4)
+            height:units.gu(5)
             anchors {
                 horizontalCenter: parent.horizontalCenter
             }
             primaryItem: Image {
                 height: parent.height*0.5
-                width: parent.height*0.5
+                width: height
                 anchors.verticalCenter: parent.verticalCenter
-                anchors.verticalCenterOffset: -units.gu(0.2)
+//                anchors.verticalCenterOffset: -units.gu(0.2)
                 source: Qt.resolvedUrl("../icons_tmp/find.svg")
+                smooth: true
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        if (Qt.inputMethod.visible)
+                            tfFeedUrl.accapt()
+                    }
+                }
             }
 
             onAccepted: {
+                accapt()
+            }
+
+            function accapt() {
                 Qt.inputMethod.hide()
                 var userInput = text
 

=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2013-10-10 18:42:03 +0000
+++ feeds/ChooseTopicPage.qml	2013-10-13 16:39:13 +0000
@@ -92,7 +92,9 @@
         width: parent.width
         clip: true
         anchors {
-            fill: parent
+            left: parent.left; right: parent.right
+            top: parent.top; bottom: parent.bottom
+            bottomMargin: Qt.inputMethod.keyboardRectangle.height
         }
 
         model: suggestionTopicsModel
@@ -113,11 +115,23 @@
                 placeholderText: i18n.tr(" + New topic")
 
                 width: parent.width - units.gu(4)
+                height:units.gu(5)
                 anchors {
                     horizontalCenter: parent.horizontalCenter
                     verticalCenter: parent.verticalCenter
                 }
 
+                Connections {
+                    id: connKeyBroad
+                    target: Qt.inputMethod
+
+                    onVisibleChanged: {
+                        if (Qt.inputMethod.visible) {
+                            suggestionTopics.positionViewAtEnd()
+                        }
+                    }
+                }
+
                 onAccepted: {
                     Qt.inputMethod.hide()
                     if (text.replace(/^\s+|\s+$/g, '') != "") { // Check that text contains only spaces.

=== modified file 'feeds/CreateTopicPage.qml'
--- feeds/CreateTopicPage.qml	2013-10-10 18:42:03 +0000
+++ feeds/CreateTopicPage.qml	2013-10-13 16:39:13 +0000
@@ -111,6 +111,7 @@
             placeholderText: i18n.tr("Type topic name")
 
             width: parent.width - units.gu(4)
+            height:units.gu(5)
             anchors {
                 horizontalCenter: parent.horizontalCenter
             }

=== modified file 'imgSeparator.js'
--- imgSeparator.js	2013-07-29 18:31:05 +0000
+++ imgSeparator.js	2013-10-13 16:39:13 +0000
@@ -11,7 +11,14 @@
 
     for (var i=0; i<image_array.length; i++)
     {
-        image_array[i] = image_array[i].split('src=')[1].split(/"|'/)[1]
+        try {
+            image_array[i] = image_array[i].split('src=')[1].split(/"|'/)[1]
+            if (image_array[i].indexOf("//") === 0)
+                image_array[i] = "http:" + image_array[i]
+        }
+        catch(err) {
+            ; // do nothing
+        }
     }
 
     imageArray = image_array

=== modified file 'rssreader-app.qml'
--- rssreader-app.qml	2013-10-13 13:31:28 +0000
+++ rssreader-app.qml	2013-10-13 16:39:13 +0000
@@ -28,15 +28,18 @@
         var result = DB.feedsCount()
 
         if (result.count < 1) {
-            DB.addFeed("" , "http://news.yahoo.com/rss/topstories")
-            DB.addFeed("" , "http://news.yahoo.com/rss/tech")
-            DB.addFeed("" , "http://www.engadget.com/rss.xml")
-            DB.addTag("news");
-            DB.addTag("tech");
-            DB.addTag("engadget")
+            DB.addTag("Ubuntu")
+            DB.addFeed("" , "http://developer.ubuntu.com/feed/")
+            DB.addFeed("" , "http://design.canonical.com/feed/")
             DB.addFeedTag(1, 1)
-            DB.addFeedTag(2, 2)
-            DB.addFeedTag(3, 3)
+            DB.addFeedTag(2, 1)
+            DB.addTag("Canonical")
+            DB.addFeed("" , "http://voices.canonical.com/feed/atom/")
+            DB.addFeed("" , "http://insights.ubuntu.com/feed/")
+            DB.addFeed("" , "http://blog.canonical.com/feed/")
+            DB.addFeedTag(3, 2)
+            DB.addFeedTag(4, 2)
+            DB.addFeedTag(5, 2)
             topicManagement.reloadTopics()
             refresh()
         } else {