ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #07395
[Merge] lp:~mrqtros/ubuntu-rssreader-app/ubuntu-rssreader-app-fix-1534540 into lp:ubuntu-rssreader-app
Roman Shchekin has proposed merging lp:~mrqtros/ubuntu-rssreader-app/ubuntu-rssreader-app-fix-1534540 into lp:ubuntu-rssreader-app.
Commit message:
https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1534540
Requested reviews:
Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
Ubuntu Shorts Developers (ubuntu-shorts-dev)
Related bugs:
Bug #1534540 in Ubuntu Shorts App: "Name of channel not chaning (redesign GUI?)"
https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1534540
For more details, see:
https://code.launchpad.net/~mrqtros/ubuntu-rssreader-app/ubuntu-rssreader-app-fix-1534540/+merge/282841
Fix of: https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1534540
--
Your team Ubuntu Shorts Developers is requested to review the proposed merge of lp:~mrqtros/ubuntu-rssreader-app/ubuntu-rssreader-app-fix-1534540 into lp:ubuntu-rssreader-app.
=== modified file 'shorts/qml/components/ArticleViewItem.qml'
--- shorts/qml/components/ArticleViewItem.qml 2015-10-24 07:06:24 +0000
+++ shorts/qml/components/ArticleViewItem.qml 2016-01-16 10:56:25 +0000
@@ -18,7 +18,7 @@
Item {
id: articleViewRoot
- signal articleStatusChanged(int tagId, int articleId, string status)
+ signal articleStatusChanged(var article, string status)
signal articleFavouriteChanged(var article, string favourite)
property bool showEmptyPlaceholder: true
@@ -108,7 +108,7 @@
if (modelItem.status != "1") {
var dbResult = DB.updateArticleStatus(modelItem.id, "1")
if (dbResult.rowsAffected == 1) {
- articleStatusChanged(modelItem.tagId, modelItem.id, "1")
+ articleStatusChanged(modelItem, "1")
}
}
}
=== modified file 'shorts/qml/components/FakeHeader.qml'
--- shorts/qml/components/FakeHeader.qml 2015-10-24 07:06:24 +0000
+++ shorts/qml/components/FakeHeader.qml 2016-01-16 10:56:25 +0000
@@ -22,17 +22,17 @@
Column {
id: fakeHeader
- height: units.gu(9)
+ height: units.gu(6)
Rectangle {
- height: units.gu(7)
+ height: units.gu(5)
width: parent.width
}
- Rectangle {
- color: "#F5F5F5" // old purple "#C9C9C9"
- height: units.gu(2)
- anchors.left: parent.left
- anchors.right: parent.right
- }
+// Rectangle {
+// color: "#F5F5F5" // old purple "#C9C9C9"
+// height: units.gu(2)
+// anchors.left: parent.left
+// anchors.right: parent.right
+// }
}
=== modified file 'shorts/qml/components/NetworkManager.qml'
--- shorts/qml/components/NetworkManager.qml 2016-01-04 18:43:45 +0000
+++ shorts/qml/components/NetworkManager.qml 2016-01-16 10:56:25 +0000
@@ -15,8 +15,8 @@
Item {
id: networkManagerRoot
- signal downloadFinished(int tagId)
- signal downloadStarted(int tagId)
+ signal downloadFinished(int topicId)
+ signal downloadStarted(int topicId)
property string operationStatus: "success"
property bool __useGFA: optionsKeeper.useGoogleSearch
=== modified file 'shorts/qml/pages/ArticleViewPage.qml'
--- shorts/qml/pages/ArticleViewPage.qml 2015-10-24 07:06:24 +0000
+++ shorts/qml/pages/ArticleViewPage.qml 2016-01-16 10:56:25 +0000
@@ -24,12 +24,12 @@
function setFeed(model, index) {
innerArticleView.setFeed(model, index)
- title = innerArticleView.feedTitle
}
+ title: innerArticleView.feedTitle
+
ArticleViewItem {
id: innerArticleView
-
anchors.fill: parent
}
=== modified file 'shorts/qml/shorts-app.qml'
--- shorts/qml/shorts-app.qml 2016-01-04 11:46:35 +0000
+++ shorts/qml/shorts-app.qml 2016-01-16 10:56:25 +0000
@@ -71,10 +71,7 @@
return
}
- var feeds
- if (topicId !== 0)
- feeds = DB.loadFeedsFromTag(topicId)
- else feeds = DB.loadFeeds()
+ var feeds = topicId ? DB.loadFeedsFromTag(topicId) : DB.loadFeeds()
var feedarray = []
for (var i=0; i< feeds.rows.length; i++) {
@@ -83,15 +80,15 @@
networkManager.updateFeeds(feedarray, topicId)
}
- function reloadViews(tagId) {
+ function reloadViews(topicId) {
// savedTab.reload() // Doesn't change with network update.
- tagId = tagId || 0
+ topicId = topicId || 0
shortsTab.reloadTab()
- if (tagId == 0 || !repeater.containsTopic(tagId))
+ if (topicId == 0 || !repeater.containsTopic(topicId))
repeater.reloadTabs()
- tabstabs.selectTopic(tagId)
+ tabstabs.selectTopic(topicId)
}
// refresh "Saved" Tab
@@ -287,11 +284,14 @@
/* Used for keeping status in sync across tabs.
*/
- function updateStatusInModels(tagId, articleId, status) {
+ function updateStatusInModels(article, status) {
+ var topicId = article.tagId
+ var articleId = article.id
+
savedTab.updateStatusInModel(articleId, status)
shortsTab.updateStatusInModel(articleId, status)
for(var i = 0; i < repeater.count; i++) {
- if (repeater.itemAt(i).topicId == tagId) {
+ if (repeater.itemAt(i).topicId == topicId) {
repeater.itemAt(i).updateStatusInModel(articleId, status)
break
}
@@ -301,13 +301,13 @@
/* Used for keeping favourite in sync across tabs.
*/
function updateFavouriteInModels(article, fav) {
- var tagId = article.tagId
+ var topicId = article.tagId
var articleId = article.id
savedTab.updateFavouriteInModel(article, fav)
shortsTab.updateFavouriteInModel(articleId, fav)
for(var i = 0; i < repeater.count; i++) {
- if (repeater.itemAt(i).topicId == tagId) {
+ if (repeater.itemAt(i).topicId == topicId) {
repeater.itemAt(i).updateFavouriteInModel(articleId, fav)
return
}
@@ -416,7 +416,7 @@
target: articlePage.articleView
onArticleStatusChanged: {
- tabstabs.updateStatusInModels(tagId, articleId, status)
+ tabstabs.updateStatusInModels(article, status)
}
onArticleFavouriteChanged: {
@@ -444,7 +444,7 @@
id: networkManager
onDownloadFinished: {
- reloadViews(tagId)
+ reloadViews(topicId)
}
onDownloadStarted: {
@@ -503,49 +503,6 @@
} // Component
Component {
- id: addReadsPopoverComp
-
- ActionSelectionPopover {
- id: addReadsPopover
- objectName: "addreadspopover"
-
- actions: ActionList {
- id: popoverActionsList
-
- Action {
- text: i18n.tr("+ Add feeds")
- onTriggered: {
- /* When we want to show "Append feed" page from
- * any page except of "Choose topic",
- * we should clear it (mark as dirty).
- * ATTENTION: similar call can be found in hotkeys section.
- */
- pageStack.push(appendFeedPage, {"isDirty" : true})
- }
- }
-
- Action {
- text: i18n.tr("Add online accounts")
- onTriggered: {
- PopupUtils.open(errorDialogComponent, null,
- {"text" : i18n.tr("Online accounts are not available for now"),
- "title" : i18n.tr("We are sorry")})
- }
- }
-
- Action {
- text: i18n.tr("Import subscriptions")
- onTriggered: {
- PopupUtils.open(errorDialogComponent, null,
- {"text" : i18n.tr("Importing subscriptions is not available for now"),
- "title" : i18n.tr("We are sorry")})
- }
- }
- } // ActionList
- } // ActionSelectionPopover
- } // Component
-
- Component {
id: errorDialogComponent
Dialog {
