Merge lp:~nik90/podbird/downloaded-view-devel into lp:podbird/devel

[Nekhelesh Ramananthan]

This MP implements the following,
- Moved the settings option to set podcasts list/grid view to the settings page
- Added back the add new podcasts option as a header button rather than a dedicated tab since it rarely used once the user has added all podcasts he needs.
- Replaced What's New Tab with the Episodes Tab and then adds What's New view and Downloaded View as header sections.

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-05-12 21:35:11 +0000
+++ app/podbird.qml	2015-05-13 11:43:12 +0000
@@ -55,7 +55,7 @@
     // visible on application start.
     function refreshModels() {
         if (tabs.selectedTabIndex === 0) {
-            whatsNewTab.refreshModel()
+            episodesTab.refreshModel()
         } else if (tabs.selectedTabIndex === 1) {
             podcastPage.item.refreshModel()
         }
@@ -239,9 +239,8 @@
                 }
             }
 
-            WhatsNewTab {
-                id: whatsNewTab
-                objectName: "whatsNewTab"
+            EpisodesTab {
+                id: episodesTab
             }
 
             Tab {
@@ -259,21 +258,6 @@
             }
 
             Tab {
-                id: searchTab
-
-                title: i18n.tr("Add New Podcasts")
-
-                // Dynamically load/unload the search tab as required
-                page: Loader {
-                    parent: searchTab
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.bottom: parent.bottom
-                    source: (tabs.selectedTab === searchTab) ? Qt.resolvedUrl("ui/SearchPage.qml") : ""
-                }
-            }
-
-            Tab {
                 id: settingsTab
 
                 title: i18n.tr("Settings")
 
=== renamed file 'app/ui/WhatsNewTab.qml' => 'app/ui/EpisodesTab.qml'
--- app/ui/WhatsNewTab.qml	2015-05-02 09:24:19 +0000
+++ app/ui/EpisodesTab.qml	2015-05-13 11:43:12 +0000
@@ -12,7 +12,7 @@
 Tab {
     id: whatsNewTab
 
-    title: i18n.tr("What's New")
+    title: i18n.tr("Episodes")
 
     property var today: new Date()
     property int dayToMs: 86400000
@@ -20,33 +20,45 @@
     property bool episodesUpdating: false
 
     page: Page {
-        id: whatsNewPage
+        id: episodesPage
+
+        flickable: null
+
+        head {
+            sections {
+                model: [i18n.tr("What's New"), i18n.tr("Downloaded")]
+                onSelectedIndexChanged: {
+                    refreshModel();
+                }
+            }
+        }
 
         state: "default"
         states: [
             PageHeadState {
                 name: "default"
-                head: whatsNewPage.head
+                head: episodesPage.head
                 actions: [
                     Action {
                         iconName: "search"
                         text: i18n.tr("Search Episode")
                         onTriggered: {
-                            whatsNewPage.state = "search"
+                            episodesPage.state = "search"
                             searchField.item.forceActiveFocus()
                         }
                     },
 
                     Action {
                         iconName: "select"
+                        visible: episodesPage.head.sections.selectedIndex === 0
                         text: i18n.tr("Mark all listened")
                         onTriggered: {
                             var db = Podcasts.init();
                             db.transaction(function (tx) {
-                                for (var i=0; i<whatsNewModel.count; i++) {
-                                    tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [whatsNewModel.get(i).guid]);
+                                for (var i=0; i<episodesModel.count; i++) {
+                                    tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [episodesModel.get(i).guid]);
                                 }
-                                whatsNewModel.clear()
+                                episodesModel.clear()
                             });
                         }
                     },
@@ -54,17 +66,37 @@
                     Action {
                         iconName: "save"
                         text: i18n.tr("Download all")
-                        onTriggered: {
-                            var db = Podcasts.init();
-                            db.transaction(function (tx) {
-                                for (var i=0; i<whatsNewModel.count; i++) {
-                                    if (!whatsNewModel.get(i).downloadedfile) {
-                                        whatsNewModel.setProperty(i, "queued", 1)
-                                        tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [whatsNewModel.get(i).guid]);
-                                        downloader.addDownload(whatsNewModel.get(i).guid, whatsNewModel.get(i).audiourl);
-                                    }
-                                }
-                            });
+                        visible: episodesPage.head.sections.selectedIndex === 0
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodesModel.count; i++) {
+                                    if (!episodesModel.get(i).downloadedfile) {
+                                        episodesModel.setProperty(i, "queued", 1)
+                                        tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodesModel.get(i).guid]);
+                                        downloader.addDownload(episodesModel.get(i).guid, episodesModel.get(i).audiourl);
+                                    }
+                                }
+                            });
+                        }
+                    },
+
+                    Action {
+                        iconName: "delete"
+                        text: i18n.tr("Delete all")
+                        visible: episodesPage.head.sections.selectedIndex === 1
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodesModel.count; i++) {
+                                    if (episodesModel.get(i).downloadedfile) {
+                                        fileManager.deleteFile(episodesModel.get(i).downloadedfile);
+                                        tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [episodesModel.get(i).guid]);
+                                        episodesModel.setProperty(i, "downloadedfile", "")
+                                    }
+                                }
+                            });
+                            refreshModel();
                         }
                     }
                 ]
@@ -72,19 +104,19 @@
 
             PageHeadState {
                 name: "search"
-                head: whatsNewPage.head
+                head: episodesPage.head
                 backAction: Action {
                     iconName: "back"
                     text: i18n.tr("Back")
                     onTriggered: {
                         episodeList.forceActiveFocus()
-                        whatsNewPage.state = "default"
+                        episodesPage.state = "default"
                     }
                 }
 
                 contents: Loader {
                     id: searchField
-                    sourceComponent: whatsNewPage.state === "search" ? searchFieldComponent : undefined
+                    sourceComponent: episodesPage.state === "search" ? searchFieldComponent : undefined
                     anchors.left: parent ? parent.left : undefined
                     anchors.right: parent ? parent.right : undefined
                     anchors.rightMargin: units.gu(2)
@@ -111,7 +143,7 @@
                 verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
             }
 
-            sourceComponent: whatsNewModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
+            sourceComponent: episodesModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
         }
 
         Component {
@@ -119,21 +151,21 @@
             EmptyState {
                 iconHeight: units.gu(12)
                 iconWidth: units.gu(22)
-                iconSource: whatsNewModel.count === 0 ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
-                title: whatsNewModel.count === 0 ? i18n.tr("No New Episodes") : i18n.tr("No Episodes Found")
-                subTitle: whatsNewModel.count === 0 ? i18n.tr("No more episodes to listen to!") : i18n.tr("No Episodes found matching the search term.")
+                iconSource: episodesModel.count === 0 ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
+                title: episodesModel.count === 0 ? episodesPage.head.sections.selectedIndex === 0 ? i18n.tr("No New Episodes") : i18n.tr("No Downloaded Episodes") : i18n.tr("No Episodes Found")
+                subTitle: episodesModel.count === 0 ? episodesPage.head.sections.selectedIndex === 0 ? i18n.tr("No more episodes to listen to!") : i18n.tr("No episodes have been downloaded") : i18n.tr("No Episodes found matching the search term.")
             }
         }
 
         ListModel {
-            id: whatsNewModel
+            id: episodesModel
         }
 
         SortFilterModel {
             id: sortedEpisodeModel
-            model: whatsNewModel
+            model: episodesModel
             filter.property: "name"
-            filter.pattern: whatsNewPage.state === "search" && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
+            filter.pattern: episodesPage.state === "search" && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
                                                                                                   : RegExp("", "gi")
         }
 
@@ -152,15 +184,15 @@
                 db.transaction(function (tx) {
                     /*
                      If tempGuid is NULL, then the episode currently being downloaded is not found within
-                     this podcast. On the other hand, if it is within this podcast, then update the whatsNewModel
+                     this podcast. On the other hand, if it is within this podcast, then update the episodesModel
                      with the downloadedfile location we just received from the downloader.
                     */
                     if (tempGuid != "NULL") {
                         var rs2 = tx.executeSql("SELECT downloadedfile FROM Episode WHERE guid=?", [tempGuid]);
-                        for (var i=0; i<whatsNewModel.count; i++) {
-                            if (whatsNewModel.get(i).guid == tempGuid) {
+                        for (var i=0; i<episodesModel.count; i++) {
+                            if (episodesModel.get(i).guid == tempGuid) {
                                 console.log("[LOG]: Setting episode download URL to " + rs2.rows.item(0).downloadedfile)
-                                whatsNewModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
+                                episodesModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
                                 break
                             }
                         }
@@ -192,6 +224,7 @@
                 flickDeceleration = flickDeceleration * scaleFactor;
             }
 
+            clip: true
             anchors.fill: parent
             model: sortedEpisodeModel
 
@@ -201,7 +234,7 @@
             section.delegate: Rectangle {
                 width: parent.width
                 color: "Transparent"
-                height: header.implicitHeight + units.gu(2)
+                height: header.text !== "" ? header.implicitHeight + units.gu(2) : units.gu(0)
                 Label {
                     id: header
                     anchors {
@@ -222,6 +255,9 @@
 
                         else if (section === "Older")
                             return i18n.tr("Older")
+
+                        else
+                            return ""
                     }
                 }
             }
@@ -262,24 +298,36 @@
                                     db.transaction(function (tx) {
                                         tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [model.guid]);
                                     });
-                                    whatsNewModel.setProperty(model.index, "downloadedfile", "")
+                                    episodesModel.setProperty(model.index, "downloadedfile", "")
+                                    if (episodesPage.head.sections.selectedIndex === 1) {
+                                        episodesModel.remove(model.index, 1)
+                                    }
                                 } else {
                                     db.transaction(function (tx) {
                                         tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
                                     });
-                                    whatsNewModel.setProperty(model.index, "queued", 1)
+                                    episodesModel.setProperty(model.index, "queued", 1)
                                     downloader.addDownload(model.guid, model.audiourl);
                                 }
                             }
                         },
 
                         Action {
-                            iconName: "select"
+                            iconName: model.listened ? "view-collapse" : "select"
                             onTriggered: {
                                 var db = Podcasts.init();
                                 db.transaction(function (tx) {
-                                    tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [model.guid])
-                                    whatsNewModel.remove(model.index, 1)
+                                    if (model.listened) {
+                                        tx.executeSql("UPDATE Episode SET listened=0 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "listened", 0)
+                                    }
+                                    else {
+                                        tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "listened", 1)
+                                        if (episodesPage.head.sections.selectedIndex === 0) {
+                                            episodesModel.remove(model.index, 1)
+                                        }
+                                    }
                                 });
                             }
                         },
@@ -331,44 +379,70 @@
     }
 
     function refreshModel() {
-        var today = new Date()
-        var dayToMs = 86400000; //1 * 24 * 60 * 60 * 1000
-        var i, j, episode, diff
-        var todayCount, yesterdayCount
-
-        whatsNewModel.clear()
-        todayCount = 0
-        yesterdayCount = 0
-
+        var i, j, episode
         var db = Podcasts.init()
-        db.transaction(function (tx) {
-            var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
-            for (i=0; i < rs.rows.length; i++) {
-                var podcast = rs.rows.item(i);
-                var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
-                for (j=0; j < rs2.rows.length; j++) {
-                    episode = rs2.rows.item(j)
-                    diff = Math.floor((today - episode.published)/dayToMs)
-                    if (diff < 7 && !episode.listened) {
-                        if (diff < 1) {
-                            whatsNewModel.insert(todayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Today"})
-                            todayCount++;
-                        } else if (diff < 2) {
-                            whatsNewModel.insert(todayCount + yesterdayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Yesterday"})
-                            yesterdayCount++;
-                        } else {
-                            whatsNewModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Older"})
-                        }
-                    } else if (diff >= 7){
-                        break
-                    }
-                }
-
-                if (podcast.lastupdate === null && !episodesUpdating) {
-                    updateEpisodesDatabase();
-                }
-            }
-        });
+
+        episodesModel.clear()
+
+        // Episode Model for the what's new view
+        if (episodesPage.head.sections.selectedIndex === 0) {
+            var today = new Date()
+            var dayToMs = 86400000; //1 * 24 * 60 * 60 * 1000
+            var todayCount, yesterdayCount, diff
+
+            todayCount = 0
+            yesterdayCount = 0
+
+            db.transaction(function (tx) {
+                var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
+                for (i=0; i < rs.rows.length; i++) {
+                    var podcast = rs.rows.item(i);
+                    var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
+                    for (j=0; j < rs2.rows.length; j++) {
+                        episode = rs2.rows.item(j)
+                        diff = Math.floor((today - episode.published)/dayToMs)
+                        if (diff < 7 && !episode.listened) {
+                            if (diff < 1) {
+                                episodesModel.insert(todayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Today"})
+                                todayCount++;
+                            } else if (diff < 2) {
+                                episodesModel.insert(todayCount + yesterdayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Yesterday"})
+                                yesterdayCount++;
+                            } else {
+                                episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Older"})
+                            }
+                        } else if (diff >= 7){
+                            break
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
+
+        // Episode Model for the downloaded view
+        else if (episodesPage.head.sections.selectedIndex === 1) {
+            db.transaction(function (tx) {
+                var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
+                for (i=0; i < rs.rows.length; i++) {
+                    var podcast = rs.rows.item(i);
+                    var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
+                    for (j=0; j < rs2.rows.length; j++) {
+                        episode = rs2.rows.item(j)
+                        if (episode.downloadedfile) {
+                            episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Null"})
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
 
         episodesUpdating = false;
     }
 
=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2015-05-02 08:51:10 +0000
+++ app/ui/PodcastsTab.qml	2015-05-13 11:43:12 +0000
@@ -71,10 +71,10 @@
                 },
 
                 Action {
-                    iconName: podbird.settings.showListView ? "view-grid-symbolic" : "view-list-symbolic"
-                    text: podbird.settings.showListView ? i18n.tr("Grid View") : i18n.tr("List View")
+                    iconName: "add"
+                    text: i18n.tr("Add New Podcasts")
                     onTriggered: {
-                        podbird.settings.showListView = !podbird.settings.showListView
+                        mainStack.push(Qt.resolvedUrl("SearchPage.qml"))
                     }
                 }
             ]
 
=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml	2015-05-02 08:51:10 +0000
+++ app/ui/SearchPage.qml	2015-05-13 11:43:12 +0000
@@ -46,6 +46,8 @@
         }
     }
 
+    title: i18n.tr("Add New Podcasts")
+
     state: "default"
     states: [
         PageHeadState {
@@ -266,7 +268,7 @@
                                     }
                                 });
                             }
-                            tabs.selectedTabIndex = 1;
+                            mainStack.pop();
                         }
                     }
                 ]
@@ -393,7 +395,7 @@
                     Podcasts.subscribe(artist, name, feed, image);
                     imageDownloader.feed = feed;
                     imageDownloader.download(image);
-                    tabs.selectedTabIndex = 1;
+                    mainStack.pop()
                 } else {
                     PopupUtils.open(subscribeFailedDialog);
                     searchPage.state = "add"
 
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-05-12 21:35:11 +0000
+++ app/ui/SettingsPage.qml	2015-05-13 11:43:12 +0000
@@ -105,11 +105,31 @@
                 right: parent.right
             }
 
-//            HeaderListItem {
-//                // TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options
-//                // that doesn't fit into any other category.
-//                title: i18n.tr("General Settings")
-//            }
+            HeaderListItem {
+                // TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options
+                // that doesn't fit into any other category.
+                title: i18n.tr("General Settings")
+            }
+
+            ListItem {
+                height: control.implicitHeight + units.gu(2)
+                divider.visible: false
+
+                Label {
+                    id: contentLabel2
+                    anchors { left: parent.left; leftMargin: units.gu(2); right: control2.left; rightMargin: units.gu(1); verticalCenter: parent.verticalCenter }
+                    text: i18n.tr("Displays podcasts in a list view")
+                }
+
+                Switch {
+                    id: control2
+                    anchors { right: parent.right; rightMargin: units.gu(2); verticalCenter: parent.verticalCenter }
+                    checked: podbird.settings.showListView
+                    onClicked: podbird.settings.showListView = checked
+                }
+
+                onClicked: podbird.settings.showListView = !podbird.settings.showListView
+            }
 
 //            ListItems.SingleValue {
 //                progression: true