Ubuntu Shorts App

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

  1. link-color-and-default-feed
  2. Merge into trunk
Proposed by Joey Chan
Status: Merged
Approved by: Roman Shchekin
Approved revision: 112
Merged at revision: 110
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/link-color-and-default-feed
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 216 lines (+82/-19)
7 files modified
OrganicGrid.qml (+1/-1)
RssFeedPage.qml (+30/-6)
feeds/AppendFeedPage.qml (+16/-2)
feeds/ChooseTopicPage.qml (+15/-1)
feeds/CreateTopicPage.qml (+1/-0)
imgSeparator.js (+8/-1)
rssreader-app.qml (+11/-8)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/link-color-and-default-feed
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+190836@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
112. By Joey Chan

just want to trigger jenkins bot rebuild

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
186186
187 organicFlickable.scrollToStart()187 organicFlickable.scrollToStart()
188 currentLoadedIndex += numAdd188 currentLoadedIndex += numAdd
189 organicFlickable.canAdd = true
189 console.timeEnd("reload_grid")190 console.timeEnd("reload_grid")
190 }191 }
191192
@@ -210,7 +211,6 @@
210 var imageArray = [article.image]211 var imageArray = [article.image]
211 var hasImage = (article.image !== "");212 var hasImage = (article.image !== "");
212213
213 // Pick the type of size we will use for this item from the sequence
214 // prevent two ImgOneA appear together214 // prevent two ImgOneA appear together
215 var alignType215 var alignType
216 do {216 do {
217217
=== 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 @@
299 mediaDownloadInProgress = mediaDownloadInProgress - 1299 mediaDownloadInProgress = mediaDownloadInProgress - 1
300 }300 }
301301
302 Label {302 Row {
303 id: label_time303 width: parent.width - units.gu(4)
304 text: DateUtils.formatRelativeTime(i18n, pubdate)304 height: labelTime.paintedHeight
305 fontSize: "small"
306 anchors.horizontalCenter: parent.horizontalCenter305 anchors.horizontalCenter: parent.horizontalCenter
307 width: parent.width - units.gu(4)306 spacing: units.gu(1)
307
308 Image {
309 id: imgFavourite
310 anchors.verticalCenter: labelTime.verticalCenter
311 fillMode: Image.PreserveAspectCrop
312 source: Qt.resolvedUrl("./icons_tmp/favorite-selected.svg")
313 sourceSize.height: rssItem == null ? 0 : (rssItem.favourite == "1" ? units.gu(2) : 0)
314 visible: rssItem == null ? false : (rssItem.favourite == "1")
315 smooth: true
316 }
317
318 Label {
319 id: labelTime
320 text: DateUtils.formatRelativeTime(i18n, pubdate)
321 fontSize: "small"
322 width: parent.width - units.gu(3)
323 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
324 }
308 }325 }
326// Label {
327// id: label_time
328// text: DateUtils.formatRelativeTime(i18n, pubdate)
329// fontSize: "small"
330// anchors.horizontalCenter: parent.horizontalCenter
331// width: parent.width - units.gu(4)
332// }
309333
310 Label {334 Label {
311 fontSize: "large"335 fontSize: "large"
@@ -317,7 +341,7 @@
317341
318 Label {342 Label {
319 text: content343 text: content
320 linkColor: UbuntuColors.orange // Temporary. Mb bad color, but better than dark blue.344 linkColor: "white"
321 anchors.horizontalCenter: parent.horizontalCenter345 anchors.horizontalCenter: parent.horizontalCenter
322 width: parent.width - units.gu(4)346 width: parent.width - units.gu(4)
323 wrapMode: Text.WrapAtWordBoundaryOrAnywhere347 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
324348
=== 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 @@
179 placeholderText: i18n.tr("Type a keyword or URL")179 placeholderText: i18n.tr("Type a keyword or URL")
180180
181 width: parent.width - units.gu(4)181 width: parent.width - units.gu(4)
182 height:units.gu(5)
182 anchors {183 anchors {
183 horizontalCenter: parent.horizontalCenter184 horizontalCenter: parent.horizontalCenter
184 }185 }
185 primaryItem: Image {186 primaryItem: Image {
186 height: parent.height*0.5187 height: parent.height*0.5
187 width: parent.height*0.5188 width: height
188 anchors.verticalCenter: parent.verticalCenter189 anchors.verticalCenter: parent.verticalCenter
189 anchors.verticalCenterOffset: -units.gu(0.2)190// anchors.verticalCenterOffset: -units.gu(0.2)
190 source: Qt.resolvedUrl("../icons_tmp/find.svg")191 source: Qt.resolvedUrl("../icons_tmp/find.svg")
192 smooth: true
193
194 MouseArea {
195 anchors.fill: parent
196 onClicked: {
197 if (Qt.inputMethod.visible)
198 tfFeedUrl.accapt()
199 }
200 }
191 }201 }
192202
193 onAccepted: {203 onAccepted: {
204 accapt()
205 }
206
207 function accapt() {
194 Qt.inputMethod.hide()208 Qt.inputMethod.hide()
195 var userInput = text209 var userInput = text
196210
197211
=== 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 @@
92 width: parent.width92 width: parent.width
93 clip: true93 clip: true
94 anchors {94 anchors {
95 fill: parent95 left: parent.left; right: parent.right
96 top: parent.top; bottom: parent.bottom
97 bottomMargin: Qt.inputMethod.keyboardRectangle.height
96 }98 }
9799
98 model: suggestionTopicsModel100 model: suggestionTopicsModel
@@ -113,11 +115,23 @@
113 placeholderText: i18n.tr(" + New topic")115 placeholderText: i18n.tr(" + New topic")
114116
115 width: parent.width - units.gu(4)117 width: parent.width - units.gu(4)
118 height:units.gu(5)
116 anchors {119 anchors {
117 horizontalCenter: parent.horizontalCenter120 horizontalCenter: parent.horizontalCenter
118 verticalCenter: parent.verticalCenter121 verticalCenter: parent.verticalCenter
119 }122 }
120123
124 Connections {
125 id: connKeyBroad
126 target: Qt.inputMethod
127
128 onVisibleChanged: {
129 if (Qt.inputMethod.visible) {
130 suggestionTopics.positionViewAtEnd()
131 }
132 }
133 }
134
121 onAccepted: {135 onAccepted: {
122 Qt.inputMethod.hide()136 Qt.inputMethod.hide()
123 if (text.replace(/^\s+|\s+$/g, '') != "") { // Check that text contains only spaces.137 if (text.replace(/^\s+|\s+$/g, '') != "") { // Check that text contains only spaces.
124138
=== 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 @@
111 placeholderText: i18n.tr("Type topic name")111 placeholderText: i18n.tr("Type topic name")
112112
113 width: parent.width - units.gu(4)113 width: parent.width - units.gu(4)
114 height:units.gu(5)
114 anchors {115 anchors {
115 horizontalCenter: parent.horizontalCenter116 horizontalCenter: parent.horizontalCenter
116 }117 }
117118
=== 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 @@
1111
12 for (var i=0; i<image_array.length; i++)12 for (var i=0; i<image_array.length; i++)
13 {13 {
14 image_array[i] = image_array[i].split('src=')[1].split(/"|'/)[1]14 try {
15 image_array[i] = image_array[i].split('src=')[1].split(/"|'/)[1]
16 if (image_array[i].indexOf("//") === 0)
17 image_array[i] = "http:" + image_array[i]
18 }
19 catch(err) {
20 ; // do nothing
21 }
15 }22 }
1623
17 imageArray = image_array24 imageArray = image_array
1825
=== 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 @@
28 var result = DB.feedsCount()28 var result = DB.feedsCount()
2929
30 if (result.count < 1) {30 if (result.count < 1) {
31 DB.addFeed("" , "http://news.yahoo.com/rss/topstories")31 DB.addTag("Ubuntu")
32 DB.addFeed("" , "http://news.yahoo.com/rss/tech")32 DB.addFeed("" , "http://developer.ubuntu.com/feed/")
33 DB.addFeed("" , "http://www.engadget.com/rss.xml")33 DB.addFeed("" , "http://design.canonical.com/feed/")
34 DB.addTag("news");
35 DB.addTag("tech");
36 DB.addTag("engadget")
37 DB.addFeedTag(1, 1)34 DB.addFeedTag(1, 1)
38 DB.addFeedTag(2, 2)35 DB.addFeedTag(2, 1)
39 DB.addFeedTag(3, 3)36 DB.addTag("Canonical")
37 DB.addFeed("" , "http://voices.canonical.com/feed/atom/")
38 DB.addFeed("" , "http://insights.ubuntu.com/feed/")
39 DB.addFeed("" , "http://blog.canonical.com/feed/")
40 DB.addFeedTag(3, 2)
41 DB.addFeedTag(4, 2)
42 DB.addFeedTag(5, 2)
40 topicManagement.reloadTopics()43 topicManagement.reloadTopics()
41 refresh()44 refresh()
42 } else {45 } else {

Subscribers

People subscribed via source and target branches