Merge lp:~nik90/podbird/filter-podcasts into lp:podbird

[Nekhelesh Ramananthan]

- Ability to search user added podcasts by their name
- Ability to search for episodes in a podcast by their name
- Moved the add feed url textfield onto the header similar to the designs provided for clock, music and other core apps
- Set anchorToKeyboard to true to anchor the contents correctly when OSK is visible

This MP adds the following features,
- Ability to search user added podcasts by their name
- Ability to search for episodes in a podcast by their name
- Moved the add feed url textfield onto the header similar to the designs provided for clock, music and other core apps
- Set anchorToKeyboard to true to anchor the contents correctly when OSK is visible

As always screenshots :) http://imgur.com/a/2iK8R#0

[lp:~nik90/podbird/filter-podcasts]

22. By Nekhelesh Ramananthan on 2015-01-27

Added episode filtering with empty state

[Michael Sheldon (michael-sheldon)]

Looks good, thanks!

review: Approve

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-01-27 02:23:48 +0000
+++ app/podbird.qml	2015-01-27 02:23:48 +0000
@@ -17,6 +17,7 @@
     property string currentGuid
 
     useDeprecatedToolbar: false
+    anchorToKeyboard: true
 
     width: units.gu(50)
     height: units.gu(75)

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2015-01-27 02:23:48 +0000
+++ app/ui/EpisodesPage.qml	2015-01-27 02:23:48 +0000
@@ -25,6 +25,22 @@
         loadEpisodes(episodeId, episodeArtist, episodeImage)
     }
 
+    /*
+     #FIXME: The following lines of code is necessary due to a upstream bug
+     in the SDK http://pad.lv/1400297. This bug is still present in the rtm.
+     Once it is fixed, this following property and connection can be remvoed.
+    */
+    property Item __oldContents: null
+    Connections {
+        target: episodesPage.head
+        onContentsChanged: {
+            if (episodesPage.__oldContents) {
+                episodesPage.__oldContents.parent = null;
+            }
+            episodesPage.__oldContents = episodesPage.head.contents;
+        }
+    }
+
     head.contents: Label {
         text: title
         anchors.fill: parent
@@ -40,12 +56,51 @@
         wrapMode: Text.WordWrap
     }
 
-    head.actions: [
-        Action {
-            text: i18n.tr("Unsubscribe")
-            iconName: "delete"
-            onTriggered: {
-                PopupUtils.open(confirmDeleteDialog);
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: episodesPage.head
+            actions: [
+                Action {
+                    text: i18n.tr("Unsubscribe")
+                    iconName: "delete"
+                    onTriggered: {
+                        PopupUtils.open(confirmDeleteDialog);
+                    }
+                },
+
+                Action {
+                    iconName: "search"
+                    text: i18n.tr("Search Episode")
+                    onTriggered: {
+                        episodesPage.state = "search"
+                        searchField.forceActiveFocus()
+                    }
+                }
+            ]
+        },
+
+        PageHeadState {
+            name: "search"
+            head: episodesPage.head
+            backAction: Action {
+                iconName: "back"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    episodeList.forceActiveFocus()
+                    searchField.text = ""
+                    episodesPage.state = "default"
+                }
+            }
+
+            contents: TextField {
+                id: searchField
+                inputMethodHints: Qt.ImhNoPredictiveText
+                placeholderText: i18n.tr("Search Episode...")
+                anchors.left: parent ? parent.left : undefined
+                anchors.right: parent ? parent.right : undefined
+                anchors.rightMargin: units.gu(2)
             }
         }
     ]
@@ -83,6 +138,15 @@
         }
     }
 
+    EmptyState {
+        anchors.centerIn: parent
+        anchors.verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
+        visible: episodesPage.state === "search" && sortedEpisodeModel.count === 0
+        iconName: "music-app-symbolic"
+        title: i18n.tr("No Episodes found")
+        subTitle: i18n.tr("No episodes found matching the search term.")
+    }
+
     ListModel {
         id: episodeModel
         property string pid;
@@ -90,12 +154,19 @@
         property string image;
     }
 
+    SortFilterModel {
+        id: sortedEpisodeModel
+        model: episodeModel
+        filter.property: "name"
+        filter.pattern: RegExp(searchField.text, "gi")
+    }
+
     ListView {
         id: episodeList
 
         clip: true
         anchors.fill: parent
-        model: episodeModel
+        model: sortedEpisodeModel
 
         footer: Item {
             width: parent.width

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2015-01-27 02:23:48 +0000
+++ app/ui/PodcastsTab.qml	2015-01-27 02:23:48 +0000
@@ -32,18 +32,116 @@
     title: i18n.tr("Podcasts")
 
     property bool episodesUpdating: false;
-    property bool addPodcast: false;
 
     page: Page {
-        head.actions: [
-            Action {
-                text: i18n.tr("Add Podcast")
-                iconName: "add"
-                visible: !addPodcast
-                onTriggered: {
-                    addPodcast = true;
-                }
-            }
+        id: podcastPage
+
+        /*
+         #FIXME: The following lines of code is necessary due to a upstream bug
+         in the SDK http://pad.lv/1400297. This bug is still present in the rtm.
+         Once it is fixed, this following property and connection can be remvoed.
+        */
+        property Item __oldContents: null
+        Connections {
+            target: podcastPage.head
+            onContentsChanged: {
+                if (podcastPage.__oldContents) {
+                    podcastPage.__oldContents.parent = null;
+                }
+                podcastPage.__oldContents = podcastPage.head.contents;
+            }
+        }
+
+        state: "default"
+        states: [
+            PageHeadState {
+                name: "default"
+                head: podcastPage.head
+                actions: [
+                    Action {
+                        text: i18n.tr("Add Podcast")
+                        iconName: "add"
+                        onTriggered: {
+                            podcastPage.state = "add"
+                            feedUrlField.forceActiveFocus()
+                        }
+                    },
+
+                    Action {
+                        iconName: "search"
+                        text: i18n.tr("Search Podcast")
+                        onTriggered: {
+                            podcastPage.state = "search"
+                            searchField.forceActiveFocus()
+                        }
+                    }
+                ]
+            },
+
+            PageHeadState {
+                name: "search"
+                head: podcastPage.head
+                backAction: Action {
+                    iconName: "back"
+                    text: i18n.tr("Back")
+                    onTriggered: {
+                        view.forceActiveFocus()
+                        searchField.text = ""
+                        podcastPage.state = "default"
+                    }
+                }
+
+                contents: TextField {
+                    id: searchField
+                    inputMethodHints: Qt.ImhNoPredictiveText
+                    placeholderText: i18n.tr("Search Podcast...")
+                    anchors.left: parent ? parent.left : undefined
+                    anchors.right: parent ? parent.right : undefined
+                    anchors.rightMargin: units.gu(2)
+                }
+            },
+
+            PageHeadState {
+                name: "add"
+                head: podcastPage.head
+                backAction: Action {
+                    iconName: "back"
+                    text: i18n.tr("Back")
+                    onTriggered: {
+                        view.forceActiveFocus()
+                        feedUrlField.text = ""
+                        podcastPage.state = "default"
+                    }
+                }
+
+                actions: [
+                    Action {
+                        iconName: "ok"
+                        text: i18n.tr("Save Podcast")
+                        onTriggered: {
+                            view.forceActiveFocus()
+                            subscribeFromFeed(feedUrlField.text);
+                            feedUrlField.text = ""
+                            podcastPage.state = "default"
+                        }
+                    }
+                ]
+
+                contents: TextField {
+                    id: feedUrlField
+                    inputMethodHints: Qt.ImhUrlCharactersOnly
+                    placeholderText: i18n.tr("Feed URL...")
+                    anchors.left: parent ? parent.left : undefined
+                    anchors.right: parent ? parent.right : undefined
+                    onAccepted: {
+                        view.forceActiveFocus()
+                        subscribeFromFeed(feedUrlField.text);
+                        feedUrlField.text = ""
+                        podcastPage.state = "default"
+                    }
+                }
+            }
+
         ]
 
         onVisibleChanged: {
@@ -67,16 +165,29 @@
 
         EmptyState {
             anchors.centerIn: parent
-            visible: view.model === podcastModel && podcastModel.count === 0
+            anchors.verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
+            visible: podcastModel.count === 0 || sortedPodcastModel.count === 0
             iconName: "music-app-symbolic"
-            title: i18n.tr("No Podcast Subscriptions")
-            subTitle: i18n.tr("You haven't subscribed to any podcasts yet, visit the 'Search' page to add some.")
+            title: podcastModel.count === 0 ? i18n.tr("No Podcast Subscriptions")
+                                            : i18n.tr("No Podcasts found")
+            subTitle: podcastModel.count === 0 ? i18n.tr("You haven't subscribed to any podcasts yet, visit the 'Search' page to add some.")
+                                               : i18n.tr("No podcasts found matching the search term.")
         }
 
         ListModel {
             id: podcastModel
         }
 
+        SortFilterModel {
+            id: sortedPodcastModel
+            model: podcastModel
+            sort.property: "name"
+            sort.order: Qt.AscendingOrder
+            filter.property: "name"
+            filter.pattern: RegExp(searchField.text, "gi")
+        }
+
+
         ListModel {
             id: episodeModel
             property string pid;
@@ -88,7 +199,7 @@
             id: view
 
             clip: true
-            model: podcastModel
+            model: sortedPodcastModel
             anchors.fill: parent
 
             footer: Item {
@@ -118,6 +229,11 @@
                 }
 
                 onClicked: {
+                    if(podcastPage.state === "search") {
+                        view.forceActiveFocus()
+                        searchField.text = ""
+                        podcastPage.state = "default"
+                    }
                     mainStack.push(Qt.resolvedUrl("EpisodesPage.qml"), {"episodeName": model.name, "episodeId": model.id, "episodeArtist": model.artist, "episodeImage": model.image})
                 }
 
@@ -178,86 +294,6 @@
                 onRefresh: updateEpisodes();
             }
         }
-
-        Rectangle {
-            anchors.top: parent.top
-            anchors.topMargin: header.y + header.height
-            width: parent.width
-            height: addCol.height
-            opacity: addPodcast ? 1 : 0
-            color: Theme.palette.normal.background
-
-            onOpacityChanged: {
-                visible = opacity != 0;
-            }
-
-            onVisibleChanged: {
-                if (visible) {
-                    addText.forceActiveFocus()
-                }
-            }
-
-            Behavior on opacity {
-                UbuntuNumberAnimation {
-                    duration: UbuntuAnimation.SlowDuration
-                }
-            }
-
-            Column {
-                id: addCol
-                anchors.horizontalCenter: parent.horizontalCenter
-                spacing: units.gu(2)
-                width: parent.width - units.gu(4)
-                anchors.margins: units.gu(2)
-
-                Item {
-                    width: parent.width
-                    height: units.gu(2)
-                }
-
-                TextField {
-                    id: addText
-                    width: parent.width
-                    inputMethodHints: Qt.ImhUrlCharactersOnly
-                    placeholderText: i18n.tr("Feed URL...")
-                    onAccepted: {
-                        subscribeFromFeed(addText.text);
-                        addPodcast = false;
-                        addText.text = "";
-                    }
-                }
-
-                Row {
-                    spacing: units.gu(2)
-                    width: parent.width
-
-                    Button {
-                        width: (parent.width - parent.spacing) / 2
-                        text: i18n.tr("Cancel")
-                        onClicked: {
-                            addText.text = "";
-                            addPodcast = false;
-                        }
-                    }
-
-                    Button {
-                        width: (parent.width - parent.spacing) / 2
-                        color: UbuntuColors.orange
-                        text: i18n.tr("Add")
-                        onClicked: {
-                            subscribeFromFeed(addText.text);
-                            addPodcast = false;
-                            addText.text = "";
-                        }
-                    }
-                }
-
-                Item {
-                    width: parent.width
-                    height: units.gu(2)
-                }
-            }
-        }
     }
 
     function refreshModel() {
@@ -292,8 +328,8 @@
             if (xhr.readyState === XMLHttpRequest.DONE) {
                 if (xhr.status < 200 || xhr.status > 299 || xhr.responseXML === null) {
                     PopupUtils.open(subscribeFailedDialog);
-                    addText.text = feed;
-                    addPodcast = true;
+                    feedUrlField.text = feed
+                    podcastPage.state = "add"
                     return;
                 }
 
@@ -322,8 +358,8 @@
                     updateEpisodes();
                 } else {
                     PopupUtils.open(subscribeFailedDialog);
-                    addText.text = feed;
-                    addPodcast = true;
+                    feedUrlField.text = feed
+                    podcastPage.state = "add"
                     return;
                 }
             }

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-01-27 02:23:48 +0000
+++ po/com.mikeasoft.podbird.pot	2015-01-27 02:23:48 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-25 19:00+0100\n"
+"POT-Creation-Date: 2015-01-27 03:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,38 +17,59 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../app/ui/EpisodesPage.qml:45
+#: ../app/ui/EpisodesPage.qml:66
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:57
+#: ../app/ui/EpisodesPage.qml:75
+msgid "Search Episode"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:89 ../app/ui/PodcastsTab.qml:86
+#: ../app/ui/PodcastsTab.qml:109
+msgid "Back"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:100
+msgid "Search Episode..."
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:112
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:58
+#: ../app/ui/EpisodesPage.qml:113
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:60
+#: ../app/ui/EpisodesPage.qml:115
 msgid "Yes"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:77
+#: ../app/ui/EpisodesPage.qml:132
 msgid "No"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:196
+#: ../app/ui/EpisodesPage.qml:146
+msgid "No Episodes found"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:147
+msgid "No episodes found matching the search term."
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:267
 #, qt-format
 msgid "%1h %2m"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:202
+#: ../app/ui/EpisodesPage.qml:273
 #, qt-format
 msgid "%1h"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:207
+#: ../app/ui/EpisodesPage.qml:278
 #, c-format, qt-format
 msgid "%1m"
 msgstr ""
@@ -57,42 +78,54 @@
 msgid "Podcasts"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:40
+#: ../app/ui/PodcastsTab.qml:62
 msgid "Add Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:59
+#: ../app/ui/PodcastsTab.qml:72
+msgid "Search Podcast"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:97
+msgid "Search Podcast..."
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:120
+msgid "Save Podcast"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:133
+msgid "Feed URL..."
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:157
 msgid "Unable to subscribe"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:60
+#: ../app/ui/PodcastsTab.qml:158
 msgid "Please check the URL and try again"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:62
+#: ../app/ui/PodcastsTab.qml:160
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:72
+#: ../app/ui/PodcastsTab.qml:171
 msgid "No Podcast Subscriptions"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:73
+#: ../app/ui/PodcastsTab.qml:172
+msgid "No Podcasts found"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:173
 msgid ""
 "You haven't subscribed to any podcasts yet, visit the 'Search' page to add "
 "some."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:222
-msgid "Feed URL..."
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:236
-msgid "Cancel"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:246
-msgid "Add"
+#: ../app/ui/PodcastsTab.qml:174
+msgid "No podcasts found matching the search term."
 msgstr ""
 
 #: ../app/ui/SearchTab.qml:27
@@ -107,6 +140,6 @@
 msgid "Subscribe"
 msgstr ""
 
-#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-new-listitem-actions-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-filter-podcast-list-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
 msgid "Podbird"
 msgstr ""