Merge lp:~nik90/podbird/add-episodes-batch-actions into lp:podbird/devel

[Nekhelesh Ramananthan]

- Added "%1 items selected" title during multi-select mode to make it more clear
- Changed Podcast remove icon to unsubscribe (used by telegram)
- Added batch actions to episodes page
- Converted episodes page to use PageHeader

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-16 15:30:47 +0000
+++ app/ui/EpisodesPage.qml	2016-03-17 15:08:31 +0000
@@ -29,8 +29,6 @@
     id: episodesPage
 
     visible: false
-    title: i18n.tr("Podcast")
-    flickable: null
 
     property string episodeName
     property string episodeId
@@ -47,81 +45,205 @@
             tempGuid = downloader.downloadingGuid
     }
 
-    head.contents: Label {
-        text: title
-        anchors.fill: parent
-        anchors.margins: units.gu(0.5)
-        verticalAlignment: Text.AlignVCenter
-
-        textSize: Label.XLarge
-        fontSizeMode: Text.Fit
-
-        maximumLineCount: 3
-        minimumPointSize: 8
-        elide: Text.Right
-        wrapMode: Text.WordWrap
-    }
-
-    state: "default"
-    states: [
-        PageHeadState {
-            name: "default"
-            head: episodesPage.head
+    header: standardHeader
+
+    PageHeader {
+        id: standardHeader
+        title: i18n.tr("Podcast")
+        flickable: null
+
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+
+        trailingActionBar.actions: [
+            Action {
+                iconName: "search"
+                text: i18n.tr("Search Episode")
+                onTriggered: {
+                    episodesPage.header = searchHeader
+                    searchField.item.forceActiveFocus()
+                }
+            },
+
+            Action {
+                text: i18n.tr("Unsubscribe")
+                iconName: "system-log-out"
+                onTriggered: {
+                    PopupUtils.open(confirmDeleteDialog, episodesPage);
+                }
+            }
+        ]
+    }
+
+    PageHeader {
+        id: searchHeader
+        visible: episodesPage.header === searchHeader
+        flickable: null
+
+        leadingActionBar.actions: Action {
+            iconName: "back"
+            onTriggered: {
+                episodeList.forceActiveFocus()
+                episodesPage.header = standardHeader
+                episodeList.positionViewAtBeginning()
+            }
+        }
+
+        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
+        }
+    }
+
+    PageHeader {
+        id: selectionHeader
+        visible: episodeList.ViewItems.selectMode
+        // TRANSLATORS: This is the page title. Keep it short. Otherwise it will just be elided.
+        title: i18n.tr("%1 item selected", "%1 items selected", episodeList.ViewItems.selectedIndices.length).arg(episodeList.ViewItems.selectedIndices.length)
+
+        onVisibleChanged: {
+            if (visible) {
+                episodesPage.header = selectionHeader
+            }
+        }
+
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+
+        leadingActionBar.actions: [
+            Action {
+                iconName: "back"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    episodeList.closeSelection()
+                }
+            }
+        ]
+
+        trailingActionBar {
+            numberOfSlots: 6
             actions: [
                 Action {
-                    iconName: "search"
-                    text: i18n.tr("Search Episode")
-                    onTriggered: {
-                        episodesPage.state = "search"
-                        searchField.item.forceActiveFocus()
-                    }
-                },
-
-                Action {
                     iconName: "select"
-                    text: i18n.tr("Mark all listened")
-                    onTriggered: {
-                        var db = Podcasts.init();
-                        db.transaction(function (tx) {
-                            tx.executeSql("UPDATE Episode SET listened=1 WHERE podcast=?", [episodeId]);
-                            refreshModel();
-                        });
-                    }
-                },
-
-                Action {
-                    text: i18n.tr("Unsubscribe")
+                    text: i18n.tr("Mark Listened")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+                    visible: episodesPage.mode !== "listened"
+                    onTriggered: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                var index = episodeList.ViewItems.selectedIndices[i]
+                                tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [episodeModel.get(index).guid]);
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
+                    iconName: "save"
+                    text: i18n.tr("Download episode(s)")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+                    visible: episodesPage.mode !== "downloaded"
+
+                    onTriggered: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                var index = episodeList.ViewItems.selectedIndices[i]
+                                if (!episodeModel.get(index).downloadedfile) {
+                                    episodeModel.setProperty(index, "queued", 1)
+                                    tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodeModel.get(index).guid]);
+                                    if (episodeModel.get(index).audiourl) {
+                                        podbird.downloadEpisode(episodeModel.get(index).image, episodeModel.get(index).name, episodeModel.get(index).guid, episodeModel.get(index).audiourl)
+                                    } else {
+                                        console.log("[ERROR]: Invalid download url: " + episodeModel.get(index).audiourl)
+                                    }
+                                }
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
                     iconName: "delete"
-                    onTriggered: {
-                        PopupUtils.open(confirmDeleteDialog, episodesPage);
+                    text: i18n.tr("Delete episode(s)")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                    onTriggered: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                var index = episodeList.ViewItems.selectedIndices[i]
+                                if (episodeModel.get(index).downloadedfile) {
+                                    fileManager.deleteFile(episodeModel.get(index).downloadedfile);
+                                    tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [episodeModel.get(index).guid]);
+                                    episodeModel.setProperty(index, "downloadedfile", "")
+                                }
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
+                    iconName: "like"
+                    text: i18n.tr("Favourite episode(s)")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                    onTriggered: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                var index = episodeList.ViewItems.selectedIndices[i]
+                                if (!episodeModel.get(index).favourited) {
+                                    tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [episodeModel.get(index).guid])
+                                    episodeModel.setProperty(index, "favourited", 1)
+                                }
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
+                    iconName: "add-to-playlist"
+                    text: i18n.tr("Add to queue")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                    onTriggered: {
+                        for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                            var index = episodeList.ViewItems.selectedIndices[i]
+                            if (episodeModel.get(index).audiourl) {
+                                var url = episodeModel.get(index).downloadedfile ? "file://" + episodeModel.get(index).downloadedfile : episodeModel.get(index).audiourl
+                                player.addEpisodeToQueue(episodeModel.get(index).guid, episodeModel.get(index).image, episodeModel.get(index).name, episodeModel.get(index).artist, url)
+                            }
+                        }
+
+                        episodeList.closeSelection()
                     }
                 }
-
             ]
-        },
-
-        PageHeadState {
-            name: "search"
-            head: episodesPage.head
-
-            backAction: Action {
-                iconName: "back"
-                onTriggered: {
-                    episodeList.forceActiveFocus()
-                    episodesPage.state = "default"
-                    episodeList.positionViewAtBeginning()
-                }
-            }
-
-            contents: Loader {
-                id: searchField
-                sourceComponent: episodesPage.state === "search" ? searchFieldComponent : undefined
-                anchors.left: parent ? parent.left : undefined
-                anchors.right: parent ? parent.right : undefined
-                anchors.rightMargin: units.gu(2)
-            }
         }
-    ]
+    }
 
     onVisibleChanged: {
         if (!visible) {
@@ -252,8 +374,8 @@
             verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
         }
 
-        sourceComponent: (episodesPage.state === "search" && sortedEpisodeModel.count === 0) ? emptyStateComponent
-                                                                                             : undefined
+        sourceComponent: (episodesPage.header === searchHeader && sortedEpisodeModel.count === 0) ? emptyStateComponent
+                                                                                                  : undefined
     }
 
     Component {
@@ -273,13 +395,16 @@
         id: sortedEpisodeModel
         model: episodeModel
         filter.property: "name"
-        filter.pattern: episodesPage.state === "search" && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
-                                                                                              : RegExp("", "gi")
+        filter.pattern: episodesPage.header === searchHeader && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
+                                                                                                   : RegExp("", "gi")
     }
 
     ListView {
         id: episodeList
 
+        signal clearSelection()
+        signal closeSelection()
+
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
             // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
@@ -288,7 +413,7 @@
             flickDeceleration = flickDeceleration * scaleFactor;
         }
 
-        anchors.fill: parent
+        anchors { fill: parent; topMargin: episodesPage.header.height }
         model: sortedEpisodeModel
         clip: true
 
@@ -298,8 +423,8 @@
                 id: coverArtContainer
 
                 width: episodesPage.width
-                visible: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0
-                height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(6) : 0
+                visible: episodesPage.header !== searchHeader && sortedEpisodeModel.count !== 0
+                height: episodesPage.header !== searchHeader && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(6) : 0
 
                 Image {
                     id:cover
@@ -549,11 +674,29 @@
 
             onClicked: {
                 Haptics.play()
-                if (currentGuid !== model.guid) {
-                    currentUrl = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl;
-                    player.playEpisode(model.guid, model.image, model.name, model.artist, currentUrl)
+                if (selectMode) {
+                    selected = !selected
+                } else {
+                    if (currentGuid !== model.guid) {
+                        currentUrl = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl;
+                        player.playEpisode(model.guid, model.image, model.name, model.artist, currentUrl)
+                    }
                 }
             }
+
+            onPressAndHold: {
+                ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
+            }
+        }
+
+        onClearSelection: {
+            ViewItems.selectedIndices = []
+        }
+
+        onCloseSelection: {
+            clearSelection()
+            ViewItems.selectMode = false
+            episodesPage.header = standardHeader
         }
 
         PullToRefresh {
 
=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2016-03-16 15:35:38 +0000
+++ app/ui/EpisodesTab.qml	2016-03-17 15:08:31 +0000
@@ -124,6 +124,8 @@
         PageHeader {
             id: selectionHeader
             visible: episodeList.ViewItems.selectMode
+            // TRANSLATORS: This is the page title. Keep it short. Otherwise it will just be elided.
+            title: i18n.tr("%1 item selected", "%1 items selected", episodeList.ViewItems.selectedIndices.length).arg(episodeList.ViewItems.selectedIndices.length)
 
             onVisibleChanged: {
                 if (visible) {
 
=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-03-17 02:19:48 +0000
+++ app/ui/PodcastsTab.qml	2016-03-17 15:08:31 +0000
@@ -228,7 +228,7 @@
                 leadingActions: ListItemActions {
                     actions: [
                         Action {
-                            iconName: "delete"
+                            iconName: "system-log-out"
                             onTriggered: {
                                 var db = Podcasts.init();
                                 db.transaction(function (tx) {
 
=== modified file 'po/podbird.nik90.pot'
--- po/podbird.nik90.pot	2016-03-17 02:19:48 +0000
+++ po/podbird.nik90.pot	2016-03-17 15:08:31 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-17 07:43+0530\n"
+"POT-Creation-Date: 2016-03-17 20:36+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"
@@ -22,8 +22,8 @@
 msgid "Episodes"
 msgstr ""
 
-#: ../app/components/TabsList.qml:35
-msgid "Add new podcast"
+#: ../app/components/TabsList.qml:35 ../app/ui/SearchPage.qml:41
+msgid "Add New Podcasts"
 msgstr ""
 
 #: ../app/components/TabsList.qml:43 ../app/ui/PodcastsTab.qml:42
@@ -154,67 +154,96 @@
 msgid "Dark"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:32
+#: ../app/ui/EpisodesPage.qml:52
 msgid "Podcast"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:73 ../app/ui/EpisodesTab.qml:62
+#: ../app/ui/EpisodesPage.qml:62 ../app/ui/EpisodesTab.qml:62
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:82
-msgid "Mark all listened"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:93 ../app/ui/EpisodesPage.qml:184
+#: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306
 #: ../app/ui/SearchPage.qml:275
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:120
+#. TRANSLATORS: This is the page title. Keep it short. Otherwise it will just be elided.
+#: ../app/ui/EpisodesPage.qml:110 ../app/ui/EpisodesTab.qml:128
+#, qt-format
+msgid "%1 item selected"
+msgid_plural "%1 items selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/ui/EpisodesPage.qml:125 ../app/ui/EpisodesTab.qml:143
+#: ../app/ui/NowPlayingPage.qml:42
+msgid "Back"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:137 ../app/ui/EpisodesTab.qml:155
+msgid "Mark Listened"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:156 ../app/ui/EpisodesTab.qml:173
+msgid "Download episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:184 ../app/ui/EpisodesTab.qml:201
+msgid "Delete episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:207 ../app/ui/EpisodesTab.qml:224
+msgid "Favourite episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:229 ../app/ui/EpisodesTab.qml:270
+msgid "Add to queue"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:258 ../app/ui/EpisodesTab.qml:120
 msgid "Search episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:181
+#: ../app/ui/EpisodesPage.qml:303
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:182
+#: ../app/ui/EpisodesPage.qml:304
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:201 ../app/ui/SearchPage.qml:130
+#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:130
 #: ../app/ui/SettingsPage.qml:83 ../app/ui/SettingsPage.qml:118
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:405
+#: ../app/ui/EpisodesPage.qml:345 ../app/ui/EpisodesTab.qml:407
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:235 ../app/ui/EpisodesTab.qml:417
+#: ../app/ui/EpisodesPage.qml:357 ../app/ui/EpisodesTab.qml:419
 #: ../app/ui/SearchPage.qml:179
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:263
+#: ../app/ui/EpisodesPage.qml:385
 msgid "No episodes found"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:264
+#: ../app/ui/EpisodesPage.qml:386
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:378
+#: ../app/ui/EpisodesPage.qml:503
 msgid "Unheard"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:395
+#: ../app/ui/EpisodesPage.qml:520
 msgid "Listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:414
+#: ../app/ui/EpisodesPage.qml:539
 msgid "Downloaded"
 msgstr ""
 
@@ -230,83 +259,59 @@
 msgid "Favourites"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:141 ../app/ui/NowPlayingPage.qml:42
-msgid "Back"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:153
-msgid "Mark Listened"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:171
-msgid "Download episode(s)"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:199
-msgid "Delete episode(s)"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:222
-msgid "Favourite episode(s)"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:245
+#: ../app/ui/EpisodesTab.qml:247
 msgid "Unfavourite episode(s)"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:268
-msgid "Add to queue"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:308
+#: ../app/ui/EpisodesTab.qml:310
 msgid "No New Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:310
+#: ../app/ui/EpisodesTab.qml:312
 msgid "No Downloaded Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:312
+#: ../app/ui/EpisodesTab.qml:314
 msgid "No Favourited Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:314
+#: ../app/ui/EpisodesTab.qml:316
 msgid "No Episodes Found"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:320
+#: ../app/ui/EpisodesTab.qml:322
 msgid "No more episodes to listen to!"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:322
+#: ../app/ui/EpisodesTab.qml:324
 msgid "No episodes have been downloaded for offline listening"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:324
+#: ../app/ui/EpisodesTab.qml:326
 msgid "No episodes have been favourited."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:326
+#: ../app/ui/EpisodesTab.qml:328
 msgid "No Episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:456
+#: ../app/ui/EpisodesTab.qml:458
 msgid "Downloads in progress"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:496
+#: ../app/ui/EpisodesTab.qml:498
 msgid "Downloaded episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:506
+#: ../app/ui/EpisodesTab.qml:508
 msgid "Today"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:510
+#: ../app/ui/EpisodesTab.qml:512
 msgid "Yesterday"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:514
+#: ../app/ui/EpisodesTab.qml:516
 msgid "Older"
 msgstr ""
 
@@ -368,10 +373,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/SearchPage.qml:41
-msgid "Add New Podcasts"
-msgstr ""
-
 #: ../app/ui/SearchPage.qml:63
 msgid "Add Podcast"
 msgstr ""
@@ -569,10 +570,10 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/reintroduce-add-podcast-tab-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/fix-minor-episodes-page-build/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/reintroduce-add-podcast-tab-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/fix-minor-episodes-page-build/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""