Merge lp:~nik90/podbird/devel-branch-sync-1 into lp:podbird

[Nekhelesh Ramananthan]

- Added new navigation structure (combined Add new podcasts tab and podcasts tab), (replaced whatsnew tab with episodes tab)
- Fixed episode description not readable in dark theme
- Added ability to favourite episodes
- Removed zebra colouring as requested by design
- Implemented part of the new design given by kevin
- Renamed "WhatsNew" to "Recent"

@Mike, From our discussion on IRC, we agreed to keep the "Add new Podcasts" as a separate tab. However I implemented that change several commits later. So while it is not part of this MP, it has been included in devel-branch-sync-3 to avoid code conflict.

[Nekhelesh Ramananthan (nik90)]

Note 1: In the code diff, it shows "SingleValueListItem.qml" file being removed and then readded. This is due to bzr merge from lp:podbird/devel. The only change is the addition of 2 lines,

+ divider.anchors.leftMargin: units.gu(2)
+ divider.anchors.rightMargin: units.gu(2)

[Nekhelesh Ramananthan (nik90)]

Note 2: Same case with TabsList.qml file. It shows it being removed and then readded. This is again due to bzr merge from lp:podbird/devel. The only change is the removal of "Add new podcasts" Tab and the replacement of "What's New" with "Episodes" tab.

As explained in the MP description, the "Add new podcasts" has been readded in a later commit in lp:podbird/devel and will be backported in the next MP.

[Michael Sheldon (michael-sheldon)]

See inline diff for fixes needed to the database upgrade cases

review: Needs Fixing

[lp:~nik90/podbird/devel-branch-sync-1]

185. By Nekhelesh Ramananthan on 2016-03-28

Fixed db upgrade issue

[Michael Sheldon (michael-sheldon)]

Looks good :)

review: Approve

=== modified file 'app/components/HeaderListItem.qml'
--- app/components/HeaderListItem.qml	2016-02-20 11:01:25 +0000
+++ app/components/HeaderListItem.qml	2016-03-28 22:37:57 +0000
@@ -25,6 +25,8 @@
     property alias title: headerText.title
 
     height: headerText.height + divider.height
+    divider.anchors.leftMargin: units.gu(2)
+    divider.anchors.rightMargin: units.gu(2)
 
     ListItemLayout {
         id: headerText

=== added file 'app/components/SingleValueListItem.qml'
--- app/components/SingleValueListItem.qml	1970-01-01 00:00:00 +0000
+++ app/components/SingleValueListItem.qml	2016-03-28 22:37:57 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015-2016 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+ListItem {
+    id: customListItem
+
+    property alias title: customItemLayout.title
+    property alias value: _value.text
+
+    divider.anchors.leftMargin: units.gu(2)
+    divider.anchors.rightMargin: units.gu(2)
+
+    ListItemLayout {
+        id: customItemLayout
+
+        title.text: " "
+        title.color: podbird.appTheme.baseText
+
+        Label {
+            id: _value
+            color: podbird.appTheme.baseText
+            SlotsLayout.position: SlotsLayout.Trailing;
+        }
+
+        ProgressionSlot {}
+    }
+}

=== removed file 'app/components/SingleValueListItem.qml'
--- app/components/SingleValueListItem.qml	2016-02-25 11:09:44 +0000
+++ app/components/SingleValueListItem.qml	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015-2016 Podbird Team
- *
- * This file is part of Podbird.
- *
- * Podbird is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * Podbird is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-ListItem {
-    id: customListItem
-
-    property alias title: customItemLayout.title
-    property alias value: _value.text
-
-    ListItemLayout {
-        id: customItemLayout
-
-        title.text: " "
-        title.color: podbird.appTheme.baseText
-
-        Label {
-            id: _value
-            color: podbird.appTheme.baseText
-            SlotsLayout.position: SlotsLayout.Trailing;
-        }
-
-        ProgressionSlot {}
-    }
-}

=== added file 'app/components/TabsList.qml'
--- app/components/TabsList.qml	1970-01-01 00:00:00 +0000
+++ app/components/TabsList.qml	2016-03-28 22:37:57 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015-2016 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+ActionList {
+    id: tabsList
+
+    property int currentTab: tabs.selectedTabIndex
+
+    children: [
+        Action {
+            text: i18n.tr("Episodes")
+            visible: currentTab !== 0
+            onTriggered: {
+                tabs.selectedTabIndex = 0
+            }
+        },
+
+        Action {
+            text: i18n.tr("Podcasts")
+            visible: currentTab !== 1
+            onTriggered: {
+                tabs.selectedTabIndex = 1
+            }
+        },
+
+        Action {
+            text: i18n.tr("Settings")
+            visible: currentTab !== 2
+            onTriggered: {
+                tabs.selectedTabIndex = 2
+            }
+        }
+    ]
+}

=== removed file 'app/components/TabsList.qml'
--- app/components/TabsList.qml	2016-02-25 23:53:44 +0000
+++ app/components/TabsList.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright 2015-2016 Podbird Team
- *
- * This file is part of Podbird.
- *
- * Podbird is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * Podbird is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-ActionList {
-    id: tabsList
-
-    property int currentTab: tabs.selectedTabIndex
-
-    children: [
-        Action {
-            text: i18n.tr("What's New")
-            visible: currentTab !== 0
-            onTriggered: {
-                tabs.selectedTabIndex = 0
-            }
-        },
-
-        Action {
-            text: i18n.tr("Podcasts")
-            visible: currentTab !== 1
-            onTriggered: {
-                tabs.selectedTabIndex = 1
-            }
-        },
-
-        Action {
-            text: i18n.tr("Add New Podcasts")
-            visible: currentTab !== 2
-            onTriggered: {
-                tabs.selectedTabIndex = 2
-            }
-        },
-
-        Action {
-            text: i18n.tr("Settings")
-            visible: currentTab !== 3
-            onTriggered: {
-                tabs.selectedTabIndex = 3
-            }
-        }
-    ]
-}

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2016-02-25 11:09:44 +0000
+++ app/podbird.qml	2016-03-28 22:37:57 +0000
@@ -56,7 +56,7 @@
     // visible on application start.
     function refreshModels() {
         if (tabs.selectedTabIndex === 0) {
-            whatsNewTab.refreshModel()
+            episodesTab.refreshModel()
         } else if (tabs.selectedTabIndex === 1) {
             podcastPage.item.refreshModel()
         }
@@ -246,9 +246,9 @@
                 }
             }
 
-            WhatsNewTab {
-                id: whatsNewTab
-                objectName: "whatsNewTab"
+            EpisodesTab {
+                id: episodesTab
+                objectName: "episodesTab"
             }
 
             Tab {
@@ -264,19 +264,6 @@
             }
 
             Tab {
-                id: searchTab
-
-                // 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
 
                 // Dynamically load/unload the settings tab as required

=== modified file 'app/podcasts.js'
--- app/podcasts.js	2015-09-12 14:34:46 +0000
+++ app/podcasts.js	2016-03-28 22:37:57 +0000
@@ -21,18 +21,35 @@
 
     db.transaction(function(tx) {
         tx.executeSql('CREATE TABLE IF NOT EXISTS Podcast(artist TEXT, name TEXT, description TEXT, feed TEXT, image TEXT, lastupdate TIMESTAMP)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, queued BOOLEAN, listened BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, queued BOOLEAN, listened BOOLEAN, favourited BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
     });
 
-    /*
-     Schema Upgrade to v1.1 which adds a new queued boolean variable which is needed to track the queued status
-     of a episode properly.
-    */
-    if (db.version == "1.0") {
-        db.changeVersion("1.0", "1.1", function(tx) {
-            tx.executeSql('ALTER TABLE Episode ADD queued BOOLEAN');
-            tx.executeSql('UPDATE Episode SET queued=0');
-        });
+    try {
+        /*
+        Schema Upgrade to v1.1 which adds a new queued boolean variable which is needed to track the queued status
+        of a episode properly.
+        */
+        if (db.version === "1.0" || db.version === "") {
+            console.log("Upgrading database from %1 -> v1.1".arg(db.version))
+            db.changeVersion(db.version, "1.1", function(tx) {
+                tx.executeSql('ALTER TABLE Episode ADD queued BOOLEAN');
+                tx.executeSql('UPDATE Episode SET queued=0');
+            });
+        }
+
+        /*
+        Schema Upgrade to v1.2 which adds a new favourited boolean variable which is needed to track the favourite status
+        of an episode.
+        */
+        if (db.version === "1.1") {
+            console.log("Upgrading database from %1 -> v1.2".arg(db.version))
+            db.changeVersion("1.1", "1.2", function(tx) {
+                tx.executeSql('ALTER TABLE Episode ADD favourited BOOLEAN');
+                tx.executeSql('UPDATE Episode SET favourited=?', [false]);
+            });
+        }
+    } catch(ex) {
+        console.log(ex)
     }
 
     return db;
@@ -110,15 +127,16 @@
                                             db.transaction(function(tx2) {
                                                 var ers = tx2.executeSql("SELECT rowid FROM Episode WHERE guid=?", [track.guid]);
                                                 if (ers.rows.length === 0) {
-                                                    tx2.executeSql("INSERT INTO Episode(podcast, name, description, audiourl, guid, listened, queued, duration, published) VALUES(?, ?, ? , ?, ?, ?, ?, ?, ?)", [pid,
-                                                                                                                                                                                                                 track.name,
-                                                                                                                                                                                                                 track.description,
-                                                                                                                                                                                                                 track.audiourl,
-                                                                                                                                                                                                                 track.guid,
-                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                 track.duration,
-                                                                                                                                                                                                                 track.published]);
+                                                    tx2.executeSql("INSERT INTO Episode(podcast, name, description, audiourl, guid, listened, queued, favourited, duration, published) VALUES(?, ?, ? , ?, ?, ?, ?, ?, ?, ?)", [pid,
+                                                                                                                                                                                                                                track.name,
+                                                                                                                                                                                                                                track.description,
+                                                                                                                                                                                                                                track.audiourl,
+                                                                                                                                                                                                                                track.guid,
+                                                                                                                                                                                                                                false,
+                                                                                                                                                                                                                                false,
+                                                                                                                                                                                                                                false,
+                                                                                                                                                                                                                                track.duration,
+                                                                                                                                                                                                                                track.published]);
                                                 }
                                             });
                                         }

=== modified file 'app/themes/Dark.qml'
--- app/themes/Dark.qml	2016-02-19 20:10:06 +0000
+++ app/themes/Dark.qml	2016-03-28 22:37:57 +0000
@@ -33,9 +33,9 @@
     property color baseIcon: "White"
 
     // Button Colors
-    property color positiveActionButton: UbuntuColors.green
-    property color negativeActionButton: UbuntuColors.red
-    property color neutralActionButton: UbuntuColors.coolGrey
+    property color positiveActionButton: "#3EB34F" // UbuntuColors.green
+    property color negativeActionButton: "#ED3146" // UbuntuColors.red
+    property color neutralActionButton: "#5D5D5D" // UbuntuColors.coolGrey
 
     // Bottom Player Bar Colors
     property color bottomBarBackground: "#15141A"

=== modified file 'app/themes/Light.qml'
--- app/themes/Light.qml	2016-02-19 20:10:06 +0000
+++ app/themes/Light.qml	2016-03-28 22:37:57 +0000
@@ -33,9 +33,9 @@
     property color baseIcon: UbuntuColors.darkGrey
 
     // Button Colors
-    property color positiveActionButton: UbuntuColors.green
-    property color negativeActionButton: UbuntuColors.red
-    property color neutralActionButton: UbuntuColors.coolGrey
+    property color positiveActionButton: "#3EB34F" // UbuntuColors.green
+    property color negativeActionButton: "#ED3146" // UbuntuColors.red
+    property color neutralActionButton: "#5D5D5D" // UbuntuColors.coolGrey
 
     // Bottom Player Bar Colors
     property color bottomBarBackground: "#323435"

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-14 15:33:40 +0000
+++ app/ui/EpisodesPage.qml	2016-03-28 22:37:57 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.4
 import QtMultimedia 5.4
 import Ubuntu.Components 1.3
-import QtQuick.Layouts 1.1
 import QtQuick.LocalStorage 2.0
 import Ubuntu.DownloadManager 0.1
 import Ubuntu.Components.Popups 1.3
@@ -105,17 +104,14 @@
             name: "search"
             head: episodesPage.head
 
-            actions: [
-                Action {
-                    iconName: "edit-clear"
-                    text: i18n.tr("Cancel")
-                    onTriggered: {
-                        episodeList.forceActiveFocus()
-                        episodesPage.state = "default"
-                        episodeList.positionViewAtBeginning()
-                    }
+            backAction: Action {
+                iconName: "back"
+                onTriggered: {
+                    episodeList.forceActiveFocus()
+                    episodesPage.state = "default"
+                    episodeList.positionViewAtBeginning()
                 }
-            ]
+            }
 
             contents: Loader {
                 id: searchField
@@ -229,7 +225,6 @@
             Label {
                 width: parent.width
                 wrapMode: Text.WordWrap
-                color: UbuntuColors.darkGrey
                 linkColor: "Blue"
                 text: dialogInternal.description
                 onLinkActivated: Qt.openUrlExternally(link)
@@ -281,7 +276,7 @@
                                                                                               : RegExp("", "gi")
     }
 
-    UbuntuListView {
+    ListView {
         id: episodeList
 
         Component.onCompleted: {
@@ -294,76 +289,97 @@
 
         anchors.fill: parent
         model: sortedEpisodeModel
-        currentIndex: -1
         clip: true
 
         header: Column {
-            height: blurredBackground.height + modeTabs.height + units.gu(2)
-            spacing: units.gu(2)
-            BlurredBackground {
-                id: blurredBackground
+            height: coverArtContainer.height + modeTabs.height + units.gu(2)
+            Item {
+                id: coverArtContainer
 
-                art: episodeImage
-                width: parent.width
+                width: episodesPage.width
                 visible: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0
-                height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(4) : 0
-                backgroundStrength: podbird.settings.themeName === "Light.qml" ? 0.3 : 0.6
+                height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(6) : 0
 
                 Image {
                     id:cover
-                    width: units.gu(12)
+                    width: units.gu(18)
                     height: width
                     sourceSize.height: width
                     sourceSize.width: width
                     source: episodeImage
                     asynchronous: true
                     anchors {
-                        left: parent.left
+                        horizontalCenter: parent.horizontalCenter
                         top: parent.top
                         margins: units.gu(2)
                     }
                 }
 
-                Column {
-                    id: podcastTitle
-
-                    anchors {
-                        left: cover.right
-                        right: parent.right
-                        bottom: parent.bottom
-                        margins: units.gu(2)
-                    }
-
-                    Label {
-                        text: episodeName
-                        width: parent.width
-                        wrapMode: Text.WordWrap
-                        maximumLineCount: 2
-                        elide: Text.ElideRight
-                        color: podbird.appTheme.baseText
-                    }
-
-                    Label {
-                        text: i18n.tr("%1 episode", "%1 episodes", episodeList.count).arg(episodeList.count)
-                        width: parent.width
-                        elide: Text.ElideRight
-                        textSize: Label.XSmall
-                        color: podbird.appTheme.baseText
-                    }
+                Label {
+                    text: episodeName
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
+                    elide: Text.ElideRight
+                    color: podbird.appTheme.baseText
+                    anchors.top: cover.bottom
+                    anchors.topMargin: units.gu(2)
                 }
             }
 
             Item {
+                width: parent.width
+                height: units.gu(2)
+            }
+
+            Item {
                 id: modeTabs
-                height: unheardTab.implicitHeight + units.gu(2)
+                height: unheardTab.implicitHeight + units.gu(2.25)
                 width: episodesPage.width
 
+                Rectangle {
+                    id: sliderContainer
+                    anchors.top: unheardTab.bottom
+                    anchors.topMargin: units.gu(1)
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.margins: units.gu(2)
+                    height: units.gu(0.25)
+                    radius: width/3
+                    color: UbuntuColors.lightGrey
+                }
+
+                Rectangle {
+                    id: slider
+                    anchors.top: unheardTab.bottom
+                    anchors.topMargin: units.gu(1)
+                    height: units.gu(0.25)
+                    radius: width/3
+                    width: sliderContainer.width/3
+                    color: podbird.appTheme.focusText
+                    x: {
+                        if (episodesPage.mode === "unheard")
+                            return units.gu(2)
+                        else if (episodesPage.mode === "listened")
+                            return width + units.gu(2)
+                        else
+                            return 2 * width + units.gu(2)
+                    }
+
+                    Behavior on x {
+                        UbuntuNumberAnimation {}
+                    }
+                }
+
                 Label {
                     id: unheardTab
-                    textSize: Label.Large
                     text: i18n.tr("Unheard")
                     anchors.left: parent.left
                     anchors.leftMargin: units.gu(2)
+                    width: sliderContainer.width/3
+                    horizontalAlignment: Text.AlignHCenter
+                    font.weight: Font.DemiBold
                     color: episodesPage.mode == "unheard" ? podbird.appTheme.focusText : podbird.appTheme.baseText
 
                     AbstractButton {
@@ -372,23 +388,13 @@
                     }
                 }
 
-                Rectangle {
-                    anchors.top: unheardTab.bottom
-                    anchors.topMargin: units.gu(1)
-                    anchors.horizontalCenter: unheardTab.horizontalCenter
-                    height: units.gu(0.25)
-                    width: unheardTab.width
-                    radius: width/3
-                    color: podbird.appTheme.focusText
-                    visible: episodesPage.mode == "unheard"
-                }
-
                 Label {
                     id: listenedTab
                     anchors.left: unheardTab.right
-                    anchors.leftMargin: (parent.width - unheardTab.width - listenedTab.width - downloadedTab.width - unheardTab.anchors.leftMargin - downloadedTab.anchors.rightMargin) / 2.0
-                    textSize: Label.Large
                     text: i18n.tr("Listened")
+                    width: sliderContainer.width/3
+                    font.weight: Font.DemiBold
+                    horizontalAlignment: Text.AlignHCenter
                     color: episodesPage.mode == "listened" ? podbird.appTheme.focusText : podbird.appTheme.baseText
 
                     AbstractButton {
@@ -397,22 +403,13 @@
                     }
                 }
 
-                Rectangle {
-                    anchors.top: listenedTab.bottom
-                    anchors.topMargin: units.gu(1)
-                    anchors.horizontalCenter: listenedTab.horizontalCenter
-                    height: units.gu(0.25)
-                    width: listenedTab.width
-                    radius: width/3
-                    color: podbird.appTheme.focusText
-                    visible: episodesPage.mode == "listened"
-                }
-
                 Label {
                     id: downloadedTab
                     anchors.right: parent.right
                     anchors.rightMargin: units.gu(2)
-                    textSize: Label.Large
+                    width: sliderContainer.width/3
+                    font.weight: Font.DemiBold
+                    horizontalAlignment: Text.AlignHCenter
                     text: i18n.tr("Downloaded")
                     color: episodesPage.mode == "downloaded" ? podbird.appTheme.focusText : podbird.appTheme.baseText
 
@@ -421,17 +418,6 @@
                         onClicked: episodesPage.mode = "downloaded"
                     }
                 }
-
-                Rectangle {
-                    anchors.top: downloadedTab.bottom
-                    anchors.topMargin: units.gu(1)
-                    anchors.horizontalCenter: downloadedTab.horizontalCenter
-                    height: units.gu(0.25)
-                    width: downloadedTab.width
-                    radius: width/3
-                    color: podbird.appTheme.focusText
-                    visible: episodesPage.mode == "downloaded"
-                }
             }
 
         }
@@ -445,9 +431,8 @@
             id: listItem
 
             divider.visible: false
-            highlightColor: "Transparent"
+            highlightColor: podbird.appTheme.hightlightListView
             height: visible ? listItemLayout.height + progressBarLoader.height + units.gu(1) : 0
-            color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"
 
             visible: episodesPage.mode == "listened" ? model.listened
                                                      : (episodesPage.mode == "unheard" ? !model.listened
@@ -526,6 +511,20 @@
                     },
 
                     Action {
+                        iconName: model.favourited ? "unlike" : "like"
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                if (model.favourited)
+                                    tx.executeSql("UPDATE Episode SET favourited=0 WHERE guid=?", [model.guid])
+                                else
+                                    tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [model.guid])
+                                refreshModel();
+                            });
+                        }
+                    },
+
+                    Action {
                         iconName: "info"
                         onTriggered: {
                             var popup = PopupUtils.open(episodeDescriptionDialog, episodesPage);
@@ -584,10 +583,10 @@
             for(i = 0; i < rs.rows.length; i++) {
                 episode = rs.rows.item(i);
                 if (!episode.listened) {
-                    episodeModel.insert(newCount, {"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued});
+                    episodeModel.insert(newCount, {"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited});
                     newCount++;
                 } else {
-                    episodeModel.insert(i,{"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued});
+                    episodeModel.insert(i,{"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited});
                 }
             }
         });

=== added file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	1970-01-01 00:00:00 +0000
+++ app/ui/EpisodesTab.qml	2016-03-28 22:37:57 +0000
@@ -0,0 +1,625 @@
+/*
+ * Copyright 2015-2016 Michael Sheldon <[e-mail]>
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtMultimedia 5.4
+import Ubuntu.Components 1.3
+import QtQuick.LocalStorage 2.0
+import Ubuntu.DownloadManager 0.1
+import Ubuntu.Components.Popups 1.3
+import "../podcasts.js" as Podcasts
+import "../components"
+
+Tab {
+    id: episodesTab
+
+    property var today: new Date()
+    property int dayToMs: 86400000
+    property string tempGuid: "NULL"
+    property bool episodesUpdating: false
+
+    TabsList {
+        id: tabsList
+    }
+
+    page: Page {
+        id: episodesPage
+
+        header: standardHeader
+
+        PageHeader {
+            id: standardHeader
+            visible: episodesPage.header === standardHeader
+            title: i18n.tr("Episodes")
+
+            StyleHints {
+                backgroundColor: podbird.appTheme.background
+            }
+
+            leadingActionBar {
+                numberOfSlots: 0
+                actions: tabsList.actions
+            }
+
+            trailingActionBar.actions: [
+                Action {
+                    iconName: "search"
+                    text: i18n.tr("Search Episode")
+                    onTriggered: {
+                        episodesPage.header = searchHeader
+                        searchField.item.forceActiveFocus()
+                    }
+                },
+
+                Action {
+                    iconName: "select"
+                    visible: episodesPageHeaderSections.selectedIndex === 0
+                    text: i18n.tr("Mark all listened")
+                    onTriggered: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            for (var i=0; i<episodesModel.count; i++) {
+                                tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [episodesModel.get(i).guid]);
+                            }
+                            episodesModel.clear()
+                        });
+                    }
+                },
+
+                Action {
+                    iconName: "save"
+                    visible: episodesPageHeaderSections.selectedIndex === 0
+                    text: i18n.tr("Download all")
+                    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: episodesPageHeaderSections.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();
+                    }
+                }
+            ]
+
+            extension: Sections {
+                id: episodesPageHeaderSections
+
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    bottom: parent.bottom
+                }
+
+                StyleHints {
+                    selectedSectionColor: podbird.appTheme.focusText
+                }
+
+                model: [i18n.tr("Recent"), i18n.tr("Downloaded"), i18n.tr("Favourites")]
+                onSelectedIndexChanged: {
+                    refreshModel();
+                }
+            }
+        }
+
+        PageHeader {
+            id: searchHeader
+            visible: episodesPage.header === searchHeader
+
+            StyleHints {
+                backgroundColor: podbird.appTheme.background
+            }
+
+            contents: Loader {
+                id: searchField
+                sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
+                anchors.left: parent ? parent.left : undefined
+                anchors.right: parent ? parent.right : undefined
+                anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+            }
+
+            leadingActionBar.actions: [
+                Action {
+                    iconName: "back"
+                    onTriggered: {
+                        episodeList.forceActiveFocus()
+                        episodesPage.header = standardHeader
+                    }
+                }
+            ]
+        }
+
+        Component {
+            id: searchFieldComponent
+            TextField {
+                inputMethodHints: Qt.ImhNoPredictiveText
+                placeholderText: i18n.tr("Search episode")
+            }
+        }
+
+        Loader {
+            id: emptyState
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(2)
+                verticalCenter: parent.verticalCenter
+                verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
+            }
+
+            sourceComponent: episodesModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
+        }
+
+        Component {
+            id: emptyStateComponent
+            EmptyState {
+                icon.source: episodesModel.count === 0 ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
+                title: {
+                    if (episodesModel.count === 0 && episodesPage.header === standardHeader) {
+                        if (episodesPageHeaderSections.selectedIndex === 0)
+                            return i18n.tr("No New Episodes")
+                        else if (episodesPageHeaderSections.selectedIndex === 1)
+                            return i18n.tr("No Downloaded Episodes")
+                        else if (episodesPageHeaderSections.selectedIndex === 2)
+                            return i18n.tr("No Favourited Episodes")
+                    } else {
+                        return i18n.tr("No Episodes Found")
+                    }
+                }
+                subTitle: {
+                    if (episodesModel.count === 0 && episodesPage.header === standardHeader) {
+                        if (episodesPageHeaderSections.selectedIndex === 0)
+                            return i18n.tr("No more episodes to listen to!")
+                        else if (episodesPageHeaderSections.selectedIndex === 1)
+                            return i18n.tr("No episodes have been downloaded for offline listening")
+                        else if (episodesPageHeaderSections.selectedIndex === 2)
+                            return i18n.tr("No episodes have been favourited.")
+                    } else {
+                        return i18n.tr("No Episodes found matching the search term.")
+                    }
+                }
+            }
+        }
+
+        ListModel {
+            id: episodesModel
+        }
+
+        SortFilterModel {
+            id: sortedEpisodeModel
+            model: episodesModel
+            filter.property: "name"
+            filter.pattern: episodesPage.header === searchHeader && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
+                                                                                                       : RegExp("", "gi")
+        }
+
+        onVisibleChanged: {
+            if (visible) {
+                refreshModel()
+                if (downloader.downloadingGuid != "")
+                    tempGuid = downloader.downloadingGuid
+            } else {
+                episodesPage.header = standardHeader
+            }
+        }
+
+        Connections {
+            target: downloader
+            onDownloadingGuidChanged: {
+                var db = Podcasts.init();
+                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 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<episodesModel.count; i++) {
+                            if (episodesModel.get(i).guid == tempGuid) {
+                                console.log("[LOG]: Setting episode download URL to " + rs2.rows.item(0).downloadedfile)
+                                episodesModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
+                                episodesModel.setProperty(i, "queued", 0)
+                                break
+                            }
+                        }
+                        tempGuid = "NULL"
+                    }
+
+                    /*
+                     Here it is checked if the currently downloaded episode belongs to the podcast
+                     page being currently displayed. If it is, then the downloaded episode guid is
+                     stored in the tempGuid variable to track it.
+                    */
+                    var rs = tx.executeSql("SELECT podcast FROM Episode WHERE guid=?", [downloader.downloadingGuid]);
+
+                    if (downloader.downloadingGuid != "" && tempGuid == "NULL") {
+                        tempGuid = downloader.downloadingGuid
+                    }
+                });
+                refreshModel();
+            }
+        }
+
+        /*
+         Note (nik90): After the upgrade to Ubuntu.Components 1.2, it seems the new listitems don't have their trailing
+         action width clamped. As a result when the list item expands and the user swipes left, it leads to a rather huge
+         trailing edge action. This has been reported upstream at http://pad.lv/1465582. Until this is fixed, the
+         episode description is shown in a dialog.
+        */
+        Component {
+            id: episodeDescriptionDialog
+            Dialog {
+                id: dialogInternal
+
+                property string description
+
+                title: "<b>%1</b>".arg(i18n.tr("Episode Description"))
+
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    linkColor: "Blue"
+                    text: dialogInternal.description
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
+
+                Button {
+                    text: i18n.tr("Close")
+                    color: podbird.appTheme.positiveActionButton
+                    onClicked: {
+                        PopupUtils.close(dialogInternal)
+                    }
+                }
+            }
+        }
+
+        ListView {
+            id: episodeList
+
+            Component.onCompleted: {
+                // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+                // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+                var scaleFactor = units.gridUnit / 8;
+                maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+                flickDeceleration = flickDeceleration * scaleFactor;
+            }
+
+            anchors {
+                top: episodesPage.header.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+
+            clip: true
+            model: sortedEpisodeModel
+            section.property: "diff"
+            section.labelPositioning: ViewSection.InlineLabels
+
+            section.delegate: ListItem {
+                height: headerText.title.text !== "" ? headerText.height + divider.height : units.gu(0)
+                divider.anchors.leftMargin: units.gu(2)
+                divider.anchors.rightMargin: units.gu(2)
+
+                ListItemLayout {
+                    id: headerText
+                    title.text: {
+                        if (section === "Today") {
+                            return i18n.tr("Today")
+                        }
+
+                        else if (section === "Yesterday") {
+                            return i18n.tr("Yesterday")
+                        }
+
+                        else if (section === "Older") {
+                            return i18n.tr("Older")
+                        }
+
+                        else {
+                            return ""
+                        }
+                    }
+                    title.color: podbird.appTheme.baseText
+                    title.font.weight: Font.DemiBold
+                }
+            }
+
+            footer: Item {
+                width: parent.width
+                height: units.gu(8)
+            }
+
+            delegate: ListItem {
+                id: listItem
+
+                divider.visible: false
+                highlightColor: podbird.appTheme.hightlightListView
+                height: downloader.downloadingGuid === model.guid ? listItemLayout.height + progressBarLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)
+
+                ListItemLayout {
+                    id: listItemLayout
+
+                    title.text: model.name !== undefined ? model.name.trim() : "Undefined"
+                    title.color: currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
+                                                                                                         : podbird.appTheme.baseText
+                    // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
+                    title.maximumLineCount: 1
+
+                    subtitle.text: model.duration === 0 || model.duration === undefined ? model.downloadedfile ? "📎 " + model.artist
+                                                                                                               : model.artist
+                                                                                        : model.downloadedfile ? "📎 " + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
+                                                                                                               : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
+                    subtitle.color: podbird.appTheme.baseSubText
+
+                    Image {
+                        height: width
+                        width: units.gu(6)
+                        source: model.image !== undefined ? model.image : Qt.resolvedUrl("../graphics/podbird.png")
+                        SlotsLayout.position: SlotsLayout.Leading
+                        sourceSize { width: width; height: height }
+                    }
+
+                    padding.top: units.gu(1)
+                    padding.bottom: units.gu(0.5)
+                }
+
+                Loader {
+                    id: progressBarLoader
+                    anchors { top: listItemLayout.bottom; left: parent.left; right: parent.right; leftMargin: units.gu(2); rightMargin: units.gu(2) }
+                    height: sourceComponent !== undefined ? units.dp(5) : 0
+                    visible: sourceComponent !== undefined
+                    sourceComponent: downloader.downloadingGuid === model.guid ? progressBar : undefined
+                }
+
+                Component {
+                    id: progressBar
+                    CustomProgressBar {
+                        indeterminateProgress: downloader.progress < 0 || downloader.progress > 100 && downloader.downloadingGuid === model.guid
+                        progress: downloader.progress
+                    }
+                }
+
+                trailingActions: ListItemActions {
+                    actions: [
+                        Action {
+                            iconName: model.downloadedfile ? "delete" : (model.queued && downloader.downloadingGuid !== model.guid ? "history" : "save")
+                            onTriggered: {
+                                var db = Podcasts.init();
+                                if (model.downloadedfile) {
+                                    fileManager.deleteFile(model.downloadedfile);
+                                    db.transaction(function (tx) {
+                                        tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [model.guid]);
+                                    });
+                                    episodesModel.setProperty(model.index, "downloadedfile", "")
+                                    if (episodesPageHeaderSections.selectedIndex === 1) {
+                                        episodesModel.remove(model.index, 1)
+                                    }
+                                } else {
+                                    db.transaction(function (tx) {
+                                        tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
+                                    });
+                                    episodesModel.setProperty(model.index, "queued", 1)
+                                    downloader.addDownload(model.guid, model.audiourl);
+                                }
+                            }
+                        },
+
+                        Action {
+                            iconName: model.listened ? "view-collapse" : "select"
+                            onTriggered: {
+                                var db = Podcasts.init();
+                                db.transaction(function (tx) {
+                                    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 (episodesPageHeaderSections.selectedIndex === 0) {
+                                            episodesModel.remove(model.index, 1)
+                                        }
+                                    }
+                                });
+                            }
+                        },
+
+                        Action {
+                            iconName: model.favourited ? "unlike" : "like"
+                            onTriggered: {
+                                var db = Podcasts.init();
+                                db.transaction(function (tx) {
+                                    if (model.favourited) {
+                                        tx.executeSql("UPDATE Episode SET favourited=0 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "favourited", 0)
+                                        if (episodesPageHeaderSections.selectedIndex === 2) {
+                                            episodesModel.remove(model.index, 1)
+                                        }
+                                    }
+                                    else {
+                                        tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "favourited", 1)
+                                    }
+                                });
+                            }
+                        },
+
+                        Action {
+                            iconName: "info"
+                            onTriggered: {
+                                var popup = PopupUtils.open(episodeDescriptionDialog, episodesTab);
+                                popup.description = model.description
+                            }
+                        }
+                    ]
+                }
+
+                onClicked: {
+                    Haptics.play()
+                    var db = Podcasts.init();
+                    db.transaction(function (tx) {
+                        if (currentGuid !== model.guid) {
+                            currentGuid = "";
+                            currentUrl = model.downloadedfile ? model.downloadedfile : model.audiourl;
+                            var rs = tx.executeSql("SELECT position FROM Episode WHERE guid=?", [model.guid]);
+                            playerLoader.item.play();
+                            playerLoader.item.seek(rs.rows.item(0).position);
+                            currentName = model.name;
+                            currentArtist = model.artist;
+                            currentImage = model.image;
+                            currentGuid = model.guid;
+                        }
+                    });
+                }
+            }
+
+            Scrollbar {
+                flickableItem: episodeList
+                align: Qt.AlignTrailing
+                StyleHints { sliderColor: podbird.appTheme.focusText }
+            }
+
+            PullToRefresh {
+                refreshing: episodesUpdating
+                onRefresh: updateEpisodesDatabase();
+            }
+        }
+    }
+
+    function refreshModel() {
+        var i, j, episode
+        var db = Podcasts.init()
+
+        episodesModel.clear()
+
+        // Episode Model for the what's new view
+        if (episodesPageHeaderSections.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, "favourited": episode.favourited, "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, "favourited": episode.favourited, "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, "favourited": episode.favourited, "diff": "Older"})
+                            }
+                        } else if (diff >= 7){
+                            break
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
+
+        // Episode Model for the downloaded view
+        else if (episodesPageHeaderSections.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, "favourited": episode.favourited, "diff": "Null"})
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
+
+        // Episode Model for the favourites view
+        else if (episodesPageHeaderSections.selectedIndex === 2) {
+            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.favourited) {
+                            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, "favourited": episode.favourited, "diff": "Null"})
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
+
+        episodesUpdating = false;
+    }
+
+    function updateEpisodesDatabase() {
+        console.log("[LOG]: Checking for new episodes")
+        episodesUpdating = true;
+        Podcasts.updateEpisodes(refreshModel)
+    }
+}
+

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-02-25 11:09:44 +0000
+++ app/ui/PodcastsTab.qml	2016-03-28 22:37:57 +0000
@@ -61,10 +61,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"))
                 }
             }
         ]
@@ -86,21 +86,13 @@
             anchors.verticalCenter: parent.verticalCenter
         }
 
-        trailingActionBar.actions: [
+        leadingActionBar.actions: [
             Action {
-                iconName: "edit-clear"
-                text: i18n.tr("Cancel")
+                iconName: "back"
                 onTriggered: {
                     viewLoader.item.forceActiveFocus()
                     podcastPage.header = standardHeader
                 }
-            },
-            Action {
-                iconName: podbird.settings.showListView ? "view-grid-symbolic" : "view-list-symbolic"
-                text: podbird.settings.showListView ? i18n.tr("Grid View") : i18n.tr("List View")
-                onTriggered: {
-                    podbird.settings.showListView = !podbird.settings.showListView
-                }
             }
         ]
     }
@@ -221,8 +213,7 @@
 
                 height: listItemLayout.height
                 divider.visible: false
-                color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"
-                highlightColor: index % 2 === 0 ? "Transparent" : podbird.appTheme.hightlightListView
+                highlightColor: podbird.appTheme.hightlightListView
 
                 ListItemLayout {
                     id: listItemLayout

=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml	2016-02-25 11:09:44 +0000
+++ app/ui/SearchPage.qml	2016-03-28 22:37:57 +0000
@@ -28,10 +28,6 @@
 
     property var xhr: new XMLHttpRequest;
 
-    TabsList {
-        id: tabsList
-    }
-
     header: standardHeader
 
     PageHeader {
@@ -44,11 +40,6 @@
             backgroundColor: podbird.appTheme.background
         }
 
-        leadingActionBar {
-            numberOfSlots: 0
-            actions: tabsList.actions
-        }
-
         trailingActionBar.actions: [
             Action {
                 iconName: "search"
@@ -87,10 +78,9 @@
             anchors.verticalCenter: parent.verticalCenter
         }
 
-        trailingActionBar.actions: [
+        leadingActionBar.actions: [
             Action {
-                iconName: "edit-clear"
-                text: i18n.tr("Cancel")
+                iconName: "back"
                 onTriggered: {
                     resultsView.forceActiveFocus()
                     searchResults.clear()
@@ -294,7 +284,7 @@
                                 }
                             });
                         }
-                        tabs.selectedTabIndex = 1;
+                        mainStack.pop();
                     }
                 }
             }
@@ -443,7 +433,7 @@
                     Podcasts.subscribe(artist, name, feed, image);
                     imageDownloader.feed = feed;
                     imageDownloader.download(image);
-                    tabs.selectedTabIndex = 1;
+                    mainStack.pop();
                 } else {
                     PopupUtils.open(subscribeFailedDialog);
                     searchPage.header = addHeader

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2016-02-25 11:09:44 +0000
+++ app/ui/SettingsPage.qml	2016-03-28 22:37:57 +0000
@@ -146,6 +146,20 @@
                 onClicked: mainStack.push(Qt.resolvedUrl("../settings/ThemeSetting.qml"))
             }
 
+            ListItem {
+                ListItemLayout {
+                    id: gridViewLayout
+                    title.text: i18n.tr("Displays podcasts in a list view")
+                    Switch {
+                        SlotsLayout.position: SlotsLayout.Last
+                        checked: podbird.settings.showListView
+                        onClicked: podbird.settings.showListView = checked
+                    }
+                }
+                divider.visible: false
+                height: gridViewLayout.height
+            }
+
             HeaderListItem {
                 title.text: i18n.tr("Playback Settings")
             }

=== removed file 'app/ui/WhatsNewTab.qml'
--- app/ui/WhatsNewTab.qml	2016-02-25 11:09:44 +0000
+++ app/ui/WhatsNewTab.qml	1970-01-01 00:00:00 +0000
@@ -1,488 +0,0 @@
-/*
- * Copyright 2015-2016 Michael Sheldon <[e-mail]>
- *
- * This file is part of Podbird.
- *
- * Podbird is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * Podbird is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtMultimedia 5.4
-import Ubuntu.Components 1.3
-import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
-import Ubuntu.Components.Popups 1.3
-import "../podcasts.js" as Podcasts
-import "../components"
-
-Tab {
-    id: whatsNewTab
-
-    property var today: new Date()
-    property int dayToMs: 86400000
-    property string tempGuid: "NULL"
-    property bool episodesUpdating: false
-
-    TabsList {
-        id: tabsList
-    }
-
-    page: Page {
-        id: whatsNewPage
-
-        header: standardHeader
-
-        PageHeader {
-            id: standardHeader
-            visible: whatsNewPage.header === standardHeader
-            title: i18n.tr("What's New")
-
-            StyleHints {
-                backgroundColor: podbird.appTheme.background
-            }
-
-            leadingActionBar {
-                numberOfSlots: 0
-                actions: tabsList.actions
-            }
-
-            trailingActionBar.actions: [
-                Action {
-                    iconName: "search"
-                    text: i18n.tr("Search Episode")
-                    onTriggered: {
-                        whatsNewPage.header = searchHeader
-                        searchField.item.forceActiveFocus()
-                    }
-                },
-
-                Action {
-                    iconName: "select"
-                    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]);
-                            }
-                            whatsNewModel.clear()
-                        });
-                    }
-                },
-
-                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);
-                                }
-                            }
-                        });
-                    }
-                }
-            ]
-        }
-
-        PageHeader {
-            id: searchHeader
-            visible: whatsNewPage.header === searchHeader
-
-            StyleHints {
-                backgroundColor: podbird.appTheme.background
-            }
-
-            contents: Loader {
-                id: searchField
-                sourceComponent: whatsNewPage.header === searchHeader ? searchFieldComponent : undefined
-                anchors.left: parent ? parent.left : undefined
-                anchors.right: parent ? parent.right : undefined
-                anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-            }
-
-            trailingActionBar.actions: [
-                Action {
-                    iconName: "edit-clear"
-                    text: i18n.tr("Cancel")
-                    onTriggered: {
-                        episodeList.forceActiveFocus()
-                        whatsNewPage.header = standardHeader
-                    }
-                }
-            ]
-        }
-
-        Component {
-            id: searchFieldComponent
-            TextField {
-                inputMethodHints: Qt.ImhNoPredictiveText
-                placeholderText: i18n.tr("Search episode")
-            }
-        }
-
-        Loader {
-            id: emptyState
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                margins: units.gu(2)
-                verticalCenter: parent.verticalCenter
-                verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
-            }
-
-            sourceComponent: whatsNewModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
-        }
-
-        Component {
-            id: emptyStateComponent
-            EmptyState {
-                icon.source: 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.")
-            }
-        }
-
-        ListModel {
-            id: whatsNewModel
-        }
-
-        SortFilterModel {
-            id: sortedEpisodeModel
-            model: whatsNewModel
-            filter.property: "name"
-            filter.pattern: whatsNewPage.state === "search" && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
-                                                                                                  : RegExp("", "gi")
-        }
-
-        onVisibleChanged: {
-            if (visible) {
-                refreshModel()
-                if (downloader.downloadingGuid != "")
-                    tempGuid = downloader.downloadingGuid
-            } else {
-                whatsNewPage.header = standardHeader
-            }
-        }
-
-        Connections {
-            target: downloader
-            onDownloadingGuidChanged: {
-                var db = Podcasts.init();
-                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
-                     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) {
-                                console.log("[LOG]: Setting episode download URL to " + rs2.rows.item(0).downloadedfile)
-                                whatsNewModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
-                                whatsNewModel.setProperty(i, "queued", 0)
-                                break
-                            }
-                        }
-                        tempGuid = "NULL"
-                    }
-
-                    /*
-                     Here it is checked if the currently downloaded episode belongs to the podcast
-                     page being currently displayed. If it is, then the downloaded episode guid is
-                     stored in the tempGuid variable to track it.
-                    */
-                    var rs = tx.executeSql("SELECT podcast FROM Episode WHERE guid=?", [downloader.downloadingGuid]);
-
-                    if (downloader.downloadingGuid != "" && tempGuid == "NULL") {
-                        tempGuid = downloader.downloadingGuid
-                    }
-                });
-                refreshModel();
-            }
-        }
-
-        /*
-         Note (nik90): After the upgrade to Ubuntu.Components 1.2, it seems the new listitems don't have their trailing
-         action width clamped. As a result when the list item expands and the user swipes left, it leads to a rather huge
-         trailing edge action. This has been reported upstream at http://pad.lv/1465582. Until this is fixed, the
-         episode description is shown in a dialog.
-        */
-        Component {
-            id: episodeDescriptionDialog
-            Dialog {
-                id: dialogInternal
-
-                property string description
-
-                title: "<b>%1</b>".arg(i18n.tr("Episode Description"))
-
-                Label {
-                    width: parent.width
-                    wrapMode: Text.WordWrap
-                    color: UbuntuColors.darkGrey
-                    linkColor: "Blue"
-                    text: dialogInternal.description
-                    onLinkActivated: Qt.openUrlExternally(link)
-                }
-
-                Button {
-                    text: i18n.tr("Close")
-                    color: podbird.appTheme.positiveActionButton
-                    onClicked: {
-                        PopupUtils.close(dialogInternal)
-                    }
-                }
-            }
-        }
-
-        UbuntuListView {
-            id: episodeList
-
-            Component.onCompleted: {
-                // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
-                // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
-                var scaleFactor = units.gridUnit / 8;
-                maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
-                flickDeceleration = flickDeceleration * scaleFactor;
-            }
-
-            anchors {
-                top: whatsNewPage.header.bottom
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom
-            }
-
-            clip: true
-
-            model: sortedEpisodeModel
-            currentIndex: -1
-            section.property: "diff"
-            section.labelPositioning: ViewSection.InlineLabels
-
-            section.delegate: Rectangle {
-                width: parent.width
-                color: "Transparent"
-                height: header.implicitHeight + units.gu(2)
-                Label {
-                    id: header
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                        margins: units.gu(2)
-                        verticalCenter: parent.verticalCenter
-                    }
-                    textSize: Label.XLarge
-                    text:  {
-                        if (section === "Today") {
-                            return i18n.tr("Today")
-                        }
-
-                        else if (section === "Yesterday") {
-                            return i18n.tr("Yesterday")
-                        }
-
-                        else if (section === "Older")
-                            return i18n.tr("Older")
-                    }
-                }
-            }
-
-            footer: Item {
-                width: parent.width
-                height: units.gu(8)
-            }
-
-            delegate: ListItem {
-                id: listItem
-
-                divider.visible: false
-                highlightColor: "Transparent"
-                height: downloader.downloadingGuid === model.guid ? listItemLayout.height + progressBarLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)
-                color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"
-
-                ListItemLayout {
-                    id: listItemLayout
-
-                    title.text: model.name !== undefined ? model.name.trim() : "Undefined"
-                    title.color: currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
-                                                                                                         : podbird.appTheme.baseText
-                    // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
-                    title.maximumLineCount: 1
-
-                    subtitle.text: model.duration === 0 || model.duration === undefined ? model.downloadedfile ? "📎 " + model.artist
-                                                                                                               : model.artist
-                                                                                        : model.downloadedfile ? "📎 " + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
-                                                                                                               : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
-                    subtitle.color: podbird.appTheme.baseSubText
-
-                    Image {
-                        height: width
-                        width: units.gu(6)
-                        source: model.image !== undefined ? model.image : Qt.resolvedUrl("../graphics/podbird.png")
-                        SlotsLayout.position: SlotsLayout.Leading
-                        sourceSize { width: width; height: height }
-                    }
-
-                    padding.top: units.gu(1)
-                    padding.bottom: units.gu(0.5)
-                }
-
-                Loader {
-                    id: progressBarLoader
-                    anchors { top: listItemLayout.bottom; left: parent.left; right: parent.right; leftMargin: units.gu(2); rightMargin: units.gu(2) }
-                    height: sourceComponent !== undefined ? units.dp(5) : 0
-                    visible: sourceComponent !== undefined
-                    sourceComponent: downloader.downloadingGuid === model.guid ? progressBar : undefined
-                }
-
-                Component {
-                    id: progressBar
-                    CustomProgressBar {
-                        indeterminateProgress: downloader.progress < 0 || downloader.progress > 100 && downloader.downloadingGuid === model.guid
-                        progress: downloader.progress
-                    }
-                }
-
-                trailingActions: ListItemActions {
-                    actions: [
-                        Action {
-                            iconName: model.downloadedfile ? "delete" : (model.queued && downloader.downloadingGuid !== model.guid ? "history" : "save")
-                            onTriggered: {
-                                var db = Podcasts.init();
-                                if (model.downloadedfile) {
-                                    fileManager.deleteFile(model.downloadedfile);
-                                    db.transaction(function (tx) {
-                                        tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [model.guid]);
-                                    });
-                                    whatsNewModel.setProperty(model.index, "downloadedfile", "")
-                                } else {
-                                    db.transaction(function (tx) {
-                                        tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
-                                    });
-                                    whatsNewModel.setProperty(model.index, "queued", 1)
-                                    downloader.addDownload(model.guid, model.audiourl);
-                                }
-                            }
-                        },
-
-                        Action {
-                            iconName: "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)
-                                });
-                            }
-                        },
-
-                        Action {
-                            iconName: "info"
-                            onTriggered: {
-                                var popup = PopupUtils.open(episodeDescriptionDialog, whatsNewTab);
-                                popup.description = model.description
-                            }
-                        }
-                    ]
-                }
-
-                onClicked: {
-                    Haptics.play()
-                    var db = Podcasts.init();
-                    db.transaction(function (tx) {
-                        if (currentGuid !== model.guid) {
-                            currentGuid = "";
-                            currentUrl = model.downloadedfile ? model.downloadedfile : model.audiourl;
-                            var rs = tx.executeSql("SELECT position FROM Episode WHERE guid=?", [model.guid]);
-                            playerLoader.item.play();
-                            playerLoader.item.seek(rs.rows.item(0).position);
-                            currentName = model.name;
-                            currentArtist = model.artist;
-                            currentImage = model.image;
-                            currentGuid = model.guid;
-                        }
-                    });
-                }
-            }
-
-            Scrollbar {
-                flickableItem: episodeList
-                align: Qt.AlignTrailing
-                StyleHints { sliderColor: podbird.appTheme.focusText }
-            }
-
-            PullToRefresh {
-                refreshing: episodesUpdating
-                onRefresh: updateEpisodesDatabase();
-            }
-        }
-    }
-
-    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 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();
-                }
-            }
-        });
-
-        episodesUpdating = false;
-    }
-
-    function updateEpisodesDatabase() {
-        console.log("[LOG]: Checking for new episodes")
-        episodesUpdating = true;
-        Podcasts.updateEpisodes(refreshModel)
-    }
-}
-

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2016-02-25 10:59:57 +0000
+++ po/com.mikeasoft.podbird.pot	2016-03-28 22:37:57 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 16:28+0530\n"
+"POT-Creation-Date: 2016-03-19 07:47+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,19 +18,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/components/TabsList.qml:11 ../app/ui/WhatsNewTab.qml:30
-msgid "What's New"
+#: ../app/components/TabsList.qml:29 ../app/ui/EpisodesTab.qml:48
+msgid "Episodes"
 msgstr ""
 
-#: ../app/components/TabsList.qml:19 ../app/ui/PodcastsTab.qml:42
+#: ../app/components/TabsList.qml:37 ../app/ui/PodcastsTab.qml:42
 msgid "Podcasts"
 msgstr ""
 
-#: ../app/components/TabsList.qml:27
-msgid "Add new podcasts"
-msgstr ""
-
-#: ../app/components/TabsList.qml:35 ../app/ui/SettingsPage.qml:32
+#: ../app/components/TabsList.qml:45 ../app/ui/SettingsPage.qml:32
 msgid "Settings"
 msgstr ""
 
@@ -48,24 +44,24 @@
 msgid "No podcasts listened to today"
 msgstr ""
 
-#: ../app/podcasts.js:180
+#: ../app/podcasts.js:182
 #, no-c-format, qt-format
 msgid "%1 hr %2 min"
 msgstr ""
 
-#: ../app/podcasts.js:189
+#: ../app/podcasts.js:191
 #, no-c-format, qt-format
 msgid "%1 hr"
 msgstr ""
 
-#: ../app/podcasts.js:197
+#: ../app/podcasts.js:199
 #, no-c-format, qt-format
 msgid "%1 min"
 msgstr ""
 
 #. TRANSLATORS: About as in information about the app
 #: ../app/settings/About.qml:28 ../app/settings/About.qml:47
-#: ../app/ui/SettingsPage.qml:208
+#: ../app/ui/SettingsPage.qml:222
 msgid "About"
 msgstr ""
 
@@ -143,7 +139,7 @@
 #: ../app/settings/DownloadSetting.qml:34
 #: ../app/settings/DownloadSetting.qml:35
 #: ../app/settings/DownloadSetting.qml:36
-#: ../app/settings/DownloadSetting.qml:37 ../app/ui/EpisodesPage.qml:347
+#: ../app/settings/DownloadSetting.qml:37
 #, qt-format
 msgid "%1 episode"
 msgid_plural "%1 episodes"
@@ -164,72 +160,130 @@
 msgid "Dark"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:33
+#: ../app/ui/EpisodesPage.qml:32
 msgid "Podcast"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:74 ../app/ui/WhatsNewTab.qml:44
+#: ../app/ui/EpisodesPage.qml:73 ../app/ui/EpisodesTab.qml:62
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:83 ../app/ui/WhatsNewTab.qml:53
+#: ../app/ui/EpisodesPage.qml:82 ../app/ui/EpisodesTab.qml:72
 msgid "Mark all listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:94 ../app/ui/EpisodesPage.qml:188
-#: ../app/ui/SearchPage.qml:276
+#: ../app/ui/EpisodesPage.qml:93 ../app/ui/EpisodesPage.qml:184
+#: ../app/ui/SearchPage.qml:266
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:111 ../app/ui/EpisodesPage.qml:205
-#: ../app/ui/PodcastsTab.qml:92 ../app/ui/SearchPage.qml:93
-#: ../app/ui/SearchPage.qml:131 ../app/ui/SettingsPage.qml:83
-#: ../app/ui/SettingsPage.qml:118 ../app/ui/WhatsNewTab.qml:103
-msgid "Cancel"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:140 ../app/ui/WhatsNewTab.qml:116
+#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:173
 msgid "Search episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:185
+#: ../app/ui/EpisodesPage.qml:181
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:186
+#: ../app/ui/EpisodesPage.qml:182
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:227 ../app/ui/WhatsNewTab.qml:216
+#: ../app/ui/EpisodesPage.qml:201 ../app/ui/SearchPage.qml:121
+#: ../app/ui/SettingsPage.qml:83 ../app/ui/SettingsPage.qml:118
+msgid "Cancel"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:295
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:239 ../app/ui/SearchPage.qml:180
-#: ../app/ui/WhatsNewTab.qml:228
+#: ../app/ui/EpisodesPage.qml:234 ../app/ui/EpisodesTab.qml:306
+#: ../app/ui/SearchPage.qml:170
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:267
+#: ../app/ui/EpisodesPage.qml:262
 msgid "No episodes found"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:268
+#: ../app/ui/EpisodesPage.qml:263
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:364
+#: ../app/ui/EpisodesPage.qml:377
 msgid "Unheard"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:391
+#: ../app/ui/EpisodesPage.qml:394
 msgid "Listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:416
+#: ../app/ui/EpisodesPage.qml:413 ../app/ui/EpisodesTab.qml:135
 msgid "Downloaded"
 msgstr ""
 
+#: ../app/ui/EpisodesTab.qml:87
+msgid "Download all"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:104
+msgid "Delete all"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:135
+msgid "Recent"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:135
+msgid "Favourites"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:198
+msgid "No New Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:200
+msgid "No Downloaded Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:202
+msgid "No Favourited Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:204
+msgid "No Episodes Found"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:210
+msgid "No more episodes to listen to!"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:212
+msgid "No episodes have been downloaded for offline listening"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:214
+msgid "No episodes have been favourited."
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:216
+msgid "No Episodes found matching the search term."
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:347
+msgid "Today"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:351
+msgid "Yesterday"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:355
+msgid "Older"
+msgstr ""
+
 #: ../app/ui/NowPlayingPage.qml:29
 msgid "Now Playing"
 msgstr ""
@@ -246,110 +300,102 @@
 msgid "+%1s"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:55
-#: ../app/ui/SearchPage.qml:162
+#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:46
+#: ../app/ui/SearchPage.qml:152
 msgid "Search Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:65 ../app/ui/PodcastsTab.qml:100
-msgid "Grid View"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:65 ../app/ui/PodcastsTab.qml:100
-msgid "List View"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:112
+#: ../app/ui/PodcastsTab.qml:65 ../app/ui/SearchPage.qml:37
+msgid "Add New Podcasts"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:104
 msgid "Search podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:142
+#: ../app/ui/PodcastsTab.qml:134
 msgid "No Podcast Subscriptions"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:142
+#: ../app/ui/PodcastsTab.qml:134
 msgid "No Podcasts Found"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:143
+#: ../app/ui/PodcastsTab.qml:135
 msgid ""
 "You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' "
 "page to add some."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:144 ../app/ui/SearchPage.qml:210
+#: ../app/ui/PodcastsTab.qml:136 ../app/ui/SearchPage.qml:200
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:182 ../app/ui/PodcastsTab.qml:230
+#: ../app/ui/PodcastsTab.qml:174 ../app/ui/PodcastsTab.qml:221
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/SearchPage.qml:41
-msgid "Add New Podcasts"
-msgstr ""
-
-#: ../app/ui/SearchPage.qml:63
+#: ../app/ui/SearchPage.qml:54
 msgid "Add Podcast"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:123
+#: ../app/ui/SearchPage.qml:113
 msgid "Save Podcast"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:150
+#: ../app/ui/SearchPage.qml:140
 msgid "Feed URL"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:177
+#: ../app/ui/SearchPage.qml:167
 msgid "Unable to subscribe"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:178
+#: ../app/ui/SearchPage.qml:168
 msgid "Please check the URL and try again"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:208
+#: ../app/ui/SearchPage.qml:198
 msgid "Looking to add a new Podcast?"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:208
+#: ../app/ui/SearchPage.qml:198
 msgid "No Podcasts found"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:209
+#: ../app/ui/SearchPage.qml:199
 msgid ""
 "Click the 'magnifier' at the top to search or the 'plus' button to add by URL"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:276
+#: ../app/ui/SearchPage.qml:266
 msgid "Subscribe"
 msgstr ""
 
 #. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by
 #. the podcast description.
-#: ../app/ui/SearchPage.qml:315
+#: ../app/ui/SearchPage.qml:305
 #, qt-format
 msgid ""
 "Last Updated: %1\n"
 "%2"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:372
+#: ../app/ui/SearchPage.qml:362
 msgid "Not Available"
 msgstr ""
 
 #. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
 #. want to seek forward when pressing on this button.
-#: ../app/ui/SettingsPage.qml:63 ../app/ui/SettingsPage.qml:155
+#: ../app/ui/SettingsPage.qml:63 ../app/ui/SettingsPage.qml:169
 msgid "Skip forward"
 msgstr ""
 
 #: ../app/ui/SettingsPage.qml:70 ../app/ui/SettingsPage.qml:105
-#: ../app/ui/SettingsPage.qml:156 ../app/ui/SettingsPage.qml:163
+#: ../app/ui/SettingsPage.qml:170 ../app/ui/SettingsPage.qml:177
 #, qt-format
 msgid "%1 seconds"
 msgstr ""
@@ -360,7 +406,7 @@
 
 #. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
 #. want to seek backward when pressing on this button.
-#: ../app/ui/SettingsPage.qml:98 ../app/ui/SettingsPage.qml:162
+#: ../app/ui/SettingsPage.qml:98 ../app/ui/SettingsPage.qml:176
 msgid "Skip back"
 msgstr ""
 
@@ -370,73 +416,45 @@
 msgid "General Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:150
+#: ../app/ui/SettingsPage.qml:152
+msgid "Displays podcasts in a list view"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:164
 msgid "Playback Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:168
+#: ../app/ui/SettingsPage.qml:182
 msgid "Podcast Episode Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:174
+#: ../app/ui/SettingsPage.qml:188
 msgid "Automatically delete old episodes"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:176
+#: ../app/ui/SettingsPage.qml:190
 msgid ""
 "Delete episodes that are older than a given number of days for each podcast"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:188
+#: ../app/ui/SettingsPage.qml:202
 msgid "Automatically download new episodes"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:190
+#: ../app/ui/SettingsPage.qml:204
 msgid "Default number of new episodes to download for each podcast"
 msgstr ""
 
 #. TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options
 #. that doesn't fit into any other category.
-#: ../app/ui/SettingsPage.qml:202
+#: ../app/ui/SettingsPage.qml:216
 msgid "Misc."
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:218
+#: ../app/ui/SettingsPage.qml:232
 msgid "Report Bug"
 msgstr ""
 
-#: ../app/ui/WhatsNewTab.qml:67
-msgid "Download all"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:138
-msgid "No New Episodes"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:138
-msgid "No Episodes Found"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:139
-msgid "No more episodes to listen to!"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:139
-msgid "No Episodes found matching the search term."
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:277
-msgid "Today"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:281
-msgid "Yesterday"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:285
-msgid "Older"
-msgstr ""
-
 #: ../app/welcomewizard/Slide1.qml:42
 msgid "Welcome to Podbird"
 msgstr ""
@@ -511,10 +529,10 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/uc-1.3-migrate-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/devel-branch-sync-1-build/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/uc-1.3-migrate-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/devel-branch-sync-1-build/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""