Merge lp:~dragly/ubuntu-rssreader-app/initial-design into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Svenn-Arne Dragly]

Implemented design proposal with horizontal swipes between feeds on main screen.

Changed the layout of the app to show feeds in tabs in the main view. Sideways scrolling changes feed. Currently no page for "all" feeds - to be added. Very hackish solution to show multiple tabs with auto-generated QML on the fly. Needs upstream fix (see bug #1124071 for details).
The layout is based on a combination of Tabs + PageStack. The topmost element of the stack is the only with tabs (to avoid confusion with the back key on lower levels).
Feed list is accessible from the toolbar icon.
Single feeds may be seen via this menu.
Single entries are shown in a separate page.
Adding feeds is reflected in updated tabs in the main view.
Updated databasemodule.js with function to read feed information. Also removed global dbResult object in favor of functions returning values/objects. (Could possibly be replaced with asynchronous callbacks, but the LocalStorage API is synchronous, so this should not result in any problems.)

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

FAILED: Continuous integration, rev:9
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dragly/ubuntu-rssreader-app/initial-design/+merge/158862/+edit-commit-message

http://91.189.93.125:8080/job/ubuntu-rssreader-app-ci/7/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/7
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-rssreader-app-raring-amd64-ci/7

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

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~dragly/ubuntu-rssreader-app/initial-design/+merge/158862/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Joey Chan (qqworini)]

Well, I can approve but Jenkins Bot can't :P

Svenn-Arne, pls add commit message soon

[Svenn-Arne Dragly (dragly)]

> Well, I can approve but Jenkins Bot can't :P
>
> Svenn-Arne, pls add commit message soon

Thanks! I've added a commit message now.

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

review: Approve (continuous-integration)

=== renamed file 'NewsListPage.qml' => 'EntryListPage.qml'
--- NewsListPage.qml	2013-03-24 13:19:16 +0000
+++ EntryListPage.qml	2013-04-15 08:44:35 +0000
@@ -7,20 +7,19 @@
 
 import "databasemodule.js" as DB
 
-import QtWebKit 3.0
-
 Page {
 
     signal backRequst
+    property string feedLink: ""
 
     /* 1. Loading data from database by url.
      * 2. Appending data to ListModel for displaying.
      */
     function loadEntriesByUrl(strUrl) {
         newsListModel.clear()
-        var isAll = (strUrl === "")
-        DB.loadEntries(strUrl, isAll)
-        var entries = DB.dbResult.rows
+        var isAll = (feedLink === "")
+        var entries = DB.loadEntries(feedLink, isAll)
+//        var entries = DB.dbResult.rows
         for (var i = 0; i < entries.length; i++) {
             newsListModel.append({"title":entries.item(i).title,
                                      "pubDate":entries.item(i).pubDate,
@@ -28,6 +27,11 @@
                                      "description":entries.item(i).description,
                                      "hash":entries.item(i).hash})
         }
+        console.log("Loaded entries by URL " + strUrl)
+    }
+
+    onFeedLinkChanged: {
+        loadEntriesByUrl(feedLink)
     }
 
     tools: ToolbarActions {
@@ -43,12 +47,8 @@
     ListView {
         id: newsList
 
-        width: parent.width
-        height: units.gu(40)
         clip: true
-        anchors {
-            top: parent.top
-        }
+        anchors.fill: parent
 
         model: ListModel {
             id: newsListModel
@@ -64,29 +64,13 @@
             }
 
             onClicked: {
-                contentLabel.loadHtml((model.content !== "")? model.content : model.description) // FIRST WAY
+                mainPageStack.push(singleEntryPage)
+                singleEntryPage.content.loadHtml((model.content !== "")? model.content : model.description) // FIRST WAY
                 // contentLabel.text = (model.content != "")? model.content : model.description // SECOND WAY
             }
         } // delegate
     } // ListView
 
-    /* FIRST WAY OF DISPLAYING FEED */
-    WebView {
-        id: contentLabel
-        width: parent.width
-
-
-        onNavigationRequested: {
-            if (request.navigationType == 0)
-                request.action = 1
-        }
-
-        anchors {
-            top: newsList.bottom
-            bottom: parent.bottom
-        }
-    }
-
     /* SECOND WAY OF DISPLAYING FEED. DOES NOT WORK ON MY QT5 LIBS, BUG */
     //    Flickable {
     //        id: tmpLabelFlick

=== added file 'EntryListTab.qml'
--- EntryListTab.qml	1970-01-01 00:00:00 +0000
+++ EntryListTab.qml	2013-04-15 08:44:35 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Tab {
+//    title: i18n.tr("News") // todo replace with feed name
+    property alias entryListPage: entryListPageLocal
+    property alias feedLink: entryListPageLocal.feedLink
+
+    page: EntryListPage {
+        id: entryListPageLocal
+    }
+}

=== modified file 'FeedListPage.qml'
--- FeedListPage.qml	2013-03-24 13:19:16 +0000
+++ FeedListPage.qml	2013-04-15 08:44:35 +0000
@@ -11,19 +11,21 @@
     id: pageItself
 
     signal feedSelected(string selectedFeed)
+    signal feedsReloaded
+    signal feedDeleted(string feedLink)
 
     ListView {
         id: feedList
 
         function reloadFeeds() {
             feedListModel.clear()
-            DB.loadFeeds()
-            var feeds = DB.dbResult
-            for (var i = 0; i < feeds.rows.length; i++) {
-                feedListModel.append({"link":feeds.rows.item(i).link,
-                                         "displayName":feeds.rows.item(i).displayName,
-                                         "siteLink":feeds.rows.item(i).siteLink,
-                                         "description":feeds.rows.item(i).description})
+            var feeds = DB.loadFeeds()
+//            var feeds = DB.dbResult
+            for (var i = 0; i < feeds.length; i++) {
+                feedListModel.append({"link":feeds.item(i).link,
+                                         "displayName":feeds.item(i).displayName,
+                                         "siteLink":feeds.item(i).siteLink,
+                                         "description":feeds.item(i).description})
             }
         }
 
@@ -195,6 +197,7 @@
                     //                    DB.addEntry(curUrl, entry.title, entry.pubDate, Qt.md5(entry.title) /*TODO MORE DATA IN HASH*/,
                     //                                entry.description, entry.content)
                 }
+                feedsReloaded()
             }
             break
             case XmlListModel.Loading:
@@ -251,10 +254,12 @@
                     onTriggered: {
                         PopupUtils.close(popover)
                         var link = feedListModel.get(feedList.currentIndex).link
-                        DB.deleteFeed(link)
-                        if (DB.dbResult.rowsAffected > 0)
+                        var dbResult = DB.deleteFeed(link)
+                        if (dbResult.rowsAffected > 0) {
                             DB.removeEntriesOfFeed(link)
                             feedListModel.remove(feedList.currentIndex)
+                        }
+                        feedDeleted(link)
                     }
                 }
 
@@ -264,6 +269,7 @@
                         PopupUtils.close(popover)
                         DB.dropTables()
                         feedListModel.clear()
+                        feedsReloaded()
                     }
                 }
             } // ActionList

=== added file 'SingleEntryPage.qml'
--- SingleEntryPage.qml	1970-01-01 00:00:00 +0000
+++ SingleEntryPage.qml	2013-04-15 08:44:35 +0000
@@ -0,0 +1,20 @@
+import QtQuick 2.0
+
+import QtWebKit 3.0
+
+Rectangle {
+    width: 30
+    height: 30
+    property alias content: contentLabel
+
+    /* FIRST WAY OF DISPLAYING FEED */
+    WebView {
+        id: contentLabel
+        anchors.fill: parent
+
+        onNavigationRequested: {
+            if (request.navigationType == 0)
+                request.action = 1
+        }
+    }
+}

=== added file 'TodayPage.qml'
--- TodayPage.qml	1970-01-01 00:00:00 +0000
+++ TodayPage.qml	2013-04-15 08:44:35 +0000
@@ -0,0 +1,77 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+import "databasemodule.js" as DB
+import "tabshelper.js" as TabsHelper
+
+Page {
+    id: todayPage
+    visible: false
+    property bool firstRefresh: true
+
+    signal requestFeedListPage
+
+    function refresh() {
+        if(firstRefresh) {
+            todayTabs.destroy()
+            firstRefresh = false
+        }
+        var tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; Tabs {id: todayTabs; anchors.fill: parent;"
+        var feeds = DB.loadFeeds()
+        if(feeds.length > 0) {
+            for(var i = 0; i < feeds.length; i++) {
+                var feed = feeds[i];
+                console.log("displayName: " + feed.displayName)
+    //            ourTabs.__tabsModel.children[i].title = feed.displayName
+    //            ourTabs.__tabsModel.children[i].entryListPage.loadEntriesByUrl(feed.link)
+                tabsString += "EntryListTab {"
+                tabsString += "title: \"" + feed.displayName + "\";"
+                tabsString += "feedLink: \"" + feed.link + "\";"
+                tabsString += "}"
+            }
+        } else {
+            var labelText  = i18n.tr("No feeds added.\nClick the feed icon in the toolbar to get started.")
+            tabsString += "Tab { title: \"No feeds\"; page: Page { anchors.fill: parent; Label { anchors.centerIn: parent; text: \"" + labelText + "\"; } } }"
+        }
+        tabsString += "}"; // END Tabs component
+
+        console.log(tabsString)
+        console.log(TabsHelper.tabsObject)
+        if(TabsHelper.tabsObject !== null) {
+            TabsHelper.tabsObject.destroy()
+        }
+
+        TabsHelper.tabsObject = Qt.createQmlObject(tabsString,
+                                           todayPage, "todayTabs")
+    }
+
+    tools: ToolbarActions {
+        Action {
+            objectName: "action"
+            id: sampleAction
+
+            iconSource: Qt.resolvedUrl("avatar.png")
+            text: i18n.tr("Feeds")
+
+            onTriggered: {
+//                mainPageStack.push(feedListPage)
+                requestFeedListPage()
+            }
+        }
+
+//        back: Action {
+//            onTriggered: {
+//                console.log("Back triggered!")
+//            }
+//        }
+    }
+
+    Tabs {
+        id: todayTabs
+        anchors.fill: parent
+
+        Tab {
+
+        }
+    }
+}

=== modified file 'databasemodule.js'
--- databasemodule.js	2013-03-24 13:19:16 +0000
+++ databasemodule.js	2013-04-15 08:44:35 +0000
@@ -22,20 +22,23 @@
 
 /* This variable will store result of any operation with database.
  */
-var dbResult
+//var dbResult
 
 /* Load all feed from database.
  * Mb later we will need some criteria, such as tag, date and so on!
  */
 function loadFeeds() {
     var db = openStdDataBase()
-
+    var dbResultLocal
+    var feeds
     db.transaction(function(tx) {
         ensureFeedTableExists(tx)
-        dbResult = tx.executeSql("SELECT * FROM UserFeeds")
-        console.log("SELECTED: ", dbResult.rows.length)
+        dbResultLocal = tx.executeSql("SELECT * FROM UserFeeds")
+        console.log("SELECTED: ", dbResultLocal.rows.length)
+        feeds = dbResultLocal.rows
     }
     )
+    return feeds;
 }
 
 /* Add feed to database.
@@ -46,6 +49,7 @@
         console.log("Database, AddFeed: 0.link can't be empty")
         return
     }
+    var dbResult
 
     d.displayName = d.displayName || ""
     d.siteLink = d.siteLink || ""
@@ -70,13 +74,14 @@
         console.log("INSERT ID", dbResult.insertId)
     }
     )
+    return dbResult
 }
 
 /* Update information about feed with new information.
  */
 function updateFeedWithInfo(link, d) {
     var db = openStdDataBase()
-
+    var dbResult
     db.transaction(function (tx) {
         ensureFeedTableExists(tx)
         dbResult = tx.executeSql('UPDATE UserFeeds SET displayName=?, siteLink=?, description=? WHERE link=?',
@@ -84,19 +89,23 @@
         console.log("UPDATE, AFFECTED ROWS", dbResult.rowsAffected)
     }
     )
+    return dbResult
 }
 
 /* Delete feed from database.
  */
 function deleteFeed(link) {
     var db = openStdDataBase()
-
+    var result
     db.transaction(function (tx) {
+        var dbResultLocal
         ensureFeedTableExists(tx)
-        dbResult = tx.executeSql('DELETE FROM UserFeeds WHERE link = ?', [link])
-        console.log("DELETE, AFFECTED ROWS", dbResult.rowsAffected)
+        dbResultLocal = tx.executeSql('DELETE FROM UserFeeds WHERE link = ?', [link])
+        console.log("DELETE, AFFECTED ROWS", dbResultLocal.rowsAffected)
+        result = dbResultLocal
     }
     )
+    return result
 }
 
 /* Select all entries from database.
@@ -104,22 +113,43 @@
 function loadEntries(feedLink, all) {
     all = all || false
     var db = openStdDataBase()
+    var entries;
 
     db.transaction(function(tx) {
         ensureEntriesTableExists(tx)
+        var dbResultLocal
         if (all)
-            dbResult = tx.executeSql('SELECT * FROM FeedEntries')
-        else dbResult = tx.executeSql('SELECT * FROM FeedEntries WHERE feedLink = ?', [feedLink])
-        console.log("loadEntries, SELECTED ROWS", dbResult.rows.length)
-    }
-    )
+            dbResultLocal = tx.executeSql('SELECT * FROM FeedEntries')
+        else dbResultLocal = tx.executeSql('SELECT * FROM FeedEntries WHERE feedLink = ?', [feedLink])
+        console.log("loadEntries, SELECTED ROWS", dbResultLocal.rows.length)
+        entries = dbResultLocal.rows;
+    }
+    )
+    return entries;
+}
+
+/* Select all entries from database.
+ */
+function loadFeed(feedLink) {
+    var db = openStdDataBase()
+    var feed = {displayName: "Unknown"}
+    db.transaction(function(tx) {
+        ensureEntriesTableExists(tx)
+        var dbResult = tx.executeSql('SELECT * FROM UserFeeds WHERE link = ?', [feedLink])
+        console.log("feedName, SELECTED ROWS", dbResult.rows.length)
+        if(dbResult.rows.length > 0) {
+            feed = dbResult.rows.item(0)
+        }
+    }
+    )
+    return feed
 }
 
 /* Append entry to database.
  */
 function addEntry(feedLink, hash, d) {
     var db = openStdDataBase()
-
+    var dbResult
     if (feedLink === undefined || hash === undefined) {
         console.log("Database, addEntry: feedLink and hash can't be undefined")
         return
@@ -142,18 +172,20 @@
         // console.log("ENTRY INSERT ID", dbResult.insertId)
     }
     )
+    return dbResult
 }
 
 /* Remove all entries from database by feed link.
  */
 function removeEntriesOfFeed(feedLink) {
     var db = openStdDataBase()
-
+    var dbResult
     db.transaction(function(tx) {
         ensureEntriesTableExists(tx)
         dbResult = tx.executeSql('DELETE FROM FeedEntries WHERE feedLink = ?', [feedLink])
     }
     )
+    return dbResult
 }
 
 /* Only for debug purposes.

=== modified file 'rssreader.qmlproject'
--- rssreader.qmlproject	2013-03-02 20:42:07 +0000
+++ rssreader.qmlproject	2013-04-15 08:44:35 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "rssreader.qml"
+    mainFile: "ubuntu-rssreader-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {

=== added file 'tabshelper.js'
--- tabshelper.js	1970-01-01 00:00:00 +0000
+++ tabshelper.js	2013-04-15 08:44:35 +0000
@@ -0,0 +1,1 @@
+var tabsObject = null;

=== modified file 'ubuntu-rssreader-app.qml'
--- ubuntu-rssreader-app.qml	2013-04-11 21:21:44 +0000
+++ ubuntu-rssreader-app.qml	2013-04-15 08:44:35 +0000
@@ -9,6 +9,8 @@
            second Tab has a single ToolbarAction.
 */
 
+import "databasemodule.js" as DB
+
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "rssreader"
@@ -17,89 +19,62 @@
     width: units.gu(50)
     height: units.gu(75)
 
-    
-    Tabs {
-        id: tabs
+    PageStack {
+        id: mainPageStack
+        Component.onCompleted: {
+            push(todayPage)
+            todayPage.refresh()
+        }
         anchors.fill: parent
-
-        Tab {
-            objectName: "Tab1"
-            
-            title: i18n.tr("RSS Reader")
-            
-            page: FeedListPage {
-                id: feedListPage
-
-                onFeedSelected: {
-                    console.log("Feed SELECTED, switch tab next")
-                    newsListPage.loadEntriesByUrl(selectedFeed)
-                    tabs.selectedTabIndex = 1
-                }
-            }
-        }
-
-        Tab {
-            title: i18n.tr("News") // todo replace with feed name
-
-            page: NewsListPage {
-                id: newsListPage
-
-                onBackRequst: {
-                    tabs.selectedTabIndex = 0
-                }
-            }
-        }
-        
-        // Second tab begins here
-        Tab {
-            objectName: "Tab2"
-            
-            title: i18n.tr("Optional Screen")
-            page: Page {
-                id: secondPage
-                anchors.margins: units.gu(2)
-                
-                tools: ToolbarActions {
-                    Action {
-                        objectName: "action"
-                        id: sampleAction
-                        
-                        iconSource: Qt.resolvedUrl("avatar.png")
-                        text: i18n.tr("Tap me!")
-                        
-                        onTriggered: {
-                            label.text = i18n.tr("Toolbar icon tapped")
-                        }
-                    }
-
-                    back: Action {
-                        onTriggered: {
-                            console.log("Back triggered!")
-                        }
-                    }
-                }
-
-
-                
-                Column {
-                    anchors.centerIn: parent
-                    Label {
-                        id: label
-                        objectName: "label"
-                        
-                        text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
-                    }
-
-                    Button {
-                        text: "Toolbar Test"
-                        width: units.gu(15)
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        onClicked: {
-                            secondPage.tools.active = true
-                        }
-                    }
-                }
-            }
+        __showHeader: false
+        TodayPage {
+            id: todayPage
+            visible: false
+            onRequestFeedListPage: mainPageStack.push(feedListPage)
+        }
+
+        FeedListPage {
+            id: feedListPage
+            visible: false
+            anchors.fill: parent
+            onFeedSelected: {
+                if(selectedFeed != "") {
+                    mainPageStack.push(selectedEntryListPageView)
+                    selectedEntryListPage.feedLink = selectedFeed
+                    var feed = DB.loadFeed(selectedFeed)
+                    selectedEntryTab.title = feed.displayName
+                } else {
+                    mainPageStack.clear()
+                    mainPageStack.push(todayPage)
+                }
+            }
+            onFeedsReloaded: {
+                todayPage.refresh()
+            }
+            onFeedDeleted: {
+                todayPage.refresh()
+            }
+        }
+        Page {
+            anchors.fill: parent
+            id: selectedEntryListPageView
+            visible: false
+            Tabs {
+                anchors.fill: parent
+                Tab {
+                    id: selectedEntryTab
+                    title: i18n.tr("Selected feed") // todo replace with feed name
+                    page: EntryListPage {
+                        anchors.fill: parent
+                        id: selectedEntryListPage
+                    }
+                }
+            }
+        }
+        SingleEntryPage {
+            id: singleEntryPage
+            visible: false
+            anchors.fill: parent
         }
     }
 }