Fix action naming and icon

Improve search page item accessibility
On mobile, interaction with the search page swipe list items result in a set of inconveniences: - Accidentally play a track - triggered by item click- while trying to click the swipe handler, and vice versa - Swipe list item actions do not offer a text description; you have to try them to see what they offer - The styling of the swipe list item on mobile, in many cases, makes hard to trigger the actions - When more than one pages exist in the stack, gestures for swiping an item and navigating between pages overlap An alternative pattern is offered: - The search results are presented as simple list items - When the user clicks on an item, the item is expanded; a new row is displayed, displaying the actions available for this item. - When the user clicks on an expanded item, the item's actions are hiding
2022-01-02 15:13:02 +02:00 · 2022-01-02 12:54:38 +00:00
16 changed files with 92 additions and 98 deletions
@@ -6,4 +6,3 @@
 *.kdev4
 CMakeLists.txt.user
 flatpak/flatpak-builder-tools/
-build/
@@ -2,24 +2,3 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: AudioTube
 Upstream-Contact: Jonah Brüchert <[email protected]>
 Source: https://invent.kde.org/plasma-mobile/audiotube
-
-# Sample paragraph, commented out:
-#
-# Files: ...
-# Copyright: $YEAR $NAME <$CONTACT>
-# License: ...
-# Comment: ...
-
-Files: README.md
-Copyright: 2021 Jonah Brüchert <[email protected]>
-License: CC0-1.0
-
-Files: org.kde.audiotube.desktop
-       org.kde.audiotube.json
-Copyright: 2021 Jonah Brüchert <[email protected]>
-License: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-Files: logo.png
-       org.kde.audiotube.svg
-Copyright: 2021 Mathis Brüchert <[email protected]>
-License: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
@@ -8,7 +8,7 @@ project(audiotube)

 include(FeatureSummary)

-set(PROJECT_VERSION "22.02")
+set(PROJECT_VERSION "21.12")
 set(QT5_MIN_VERSION 5.15)
 set(KF5_MIN_VERSION 5.81)

@@ -6,7 +6,7 @@ AudioTube is a client for YouTube Music.

 It depends on Qt, Kirigami, KI18n, KCoreAddons and KCrash in addition to a few python packages:
 * ytmusicapi
- * yt_dlp
+ * youtube_dl

 YouTube uses webp images for the cover art, so you will need to install qtimageformats.

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
+
+SPDX-License-Identifier: CC0-1.0
@@ -7,8 +7,8 @@
    "sources": [
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/8e/10/7b43c0a779d4c6331088d64af7e4a2da27b47817f558e97ebbadfc41869f/yt_dlp-2022.1.21-py2.py3-none-any.whl",
-            "sha256": "182903b78a4645edd504dcd9f2603f76f9fdaf8bd279fd45d01992f7637b6d8a"
+            "url": "https://files.pythonhosted.org/packages/27/7e/5bf52a334a0638639b57b7699e6a3adaaaa8e7bd6f7ad33e62a9e2be7bb7/yt_dlp-2021.12.27-py2.py3-none-any.whl",
+            "sha256": "bb46898a175d149c9c6bb2846056590d297aa4eafad8487c3e1315d2c6090896"
        },
        {
            "type": "file",
@@ -7,8 +7,13 @@
    "sources": [
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/33/d9/d18f3827dfd54acc48f29337059197514ad656ffc88e02a51e0457c5117a/ytmusicapi-0.20.0-py3-none-any.whl",
-            "sha256": "abdb90426baa14a7929ec810d65c1df228661b61d580678fc48c087909a9aea2"
+            "url": "https://files.pythonhosted.org/packages/87/5a/ef90afb6dbef7a2cf8418c050f2e9e32be449f97ddad085e41e568bf4a15/ytmusicapi-0.19.5-py3-none-any.whl",
+            "sha256": "23ed35df2b7977e3e7662c0ac478864fb23d025ba5de8f2c269cabf2903b8d25"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/92/96/144f70b972a9c0eabbd4391ef93ccd49d0f2747f4f6a2a2738e99e5adc65/requests-2.26.0-py2.py3-none-any.whl",
+            "sha256": "6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"
        },
        {
            "type": "file",
@@ -17,13 +22,8 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/84/3e/1037abe6498e65d645ce7a22d3402605d49a3b2c7f20c3abb027760da4f0/charset_normalizer-2.0.10-py3-none-any.whl",
-            "sha256": "cb957888737fc0bbcd78e3df769addb41fd1ff8cf950dc9e7ad7793f1bf44455"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl",
-            "sha256": "f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"
+            "url": "https://files.pythonhosted.org/packages/47/84/b06f6729fac8108c5fa3e13cde19b0b3de66ba5538c325496dbe39f5ff8e/charset_normalizer-2.0.9-py3-none-any.whl",
+            "sha256": "1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"
        },
        {
            "type": "file",
@@ -32,8 +32,8 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/4e/b8/f5a25b22e803f0578e668daa33ba3701bb37858ec80e08a150bd7d2cf1b1/urllib3-1.26.8-py2.py3-none-any.whl",
-            "sha256": "000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"
+            "url": "https://files.pythonhosted.org/packages/af/f4/524415c0744552cce7d8bf3669af78e8a069514405ea4fcbd0cc44733744/urllib3-1.26.7-py2.py3-none-any.whl",
+            "sha256": "c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
        }
    ]
 }
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Mathis Brüchert <[email protected]>
+
+SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
@@ -7,7 +7,6 @@ SPDX-License-Identifier: CC0-1.0
 <component type="desktop-application">
  <id>org.kde.audiotube</id>
  <name>AudioTube</name>
-  <name xml:lang="ar">تيوب الصوتي</name>
  <name xml:lang="ca">AudioTube</name>
  <name xml:lang="ca-valencia">AudioTube</name>
  <name xml:lang="cs">AudioTube</name>
@@ -25,14 +24,12 @@ SPDX-License-Identifier: CC0-1.0
  <name xml:lang="pl">AudioTube</name>
  <name xml:lang="pt">AudioTube</name>
  <name xml:lang="pt-BR">AudioTube</name>
-  <name xml:lang="ro">AudioTube</name>
  <name xml:lang="sk">AudioTube</name>
  <name xml:lang="sl">AudioTube</name>
  <name xml:lang="sv">AudioTube</name>
  <name xml:lang="uk">AudioTube</name>
  <name xml:lang="x-test">xxAudioTubexx</name>
  <summary>Convergent YouTube Music client</summary>
-  <summary xml:lang="ar">عميل موسيقى يوتيوب متعدد المنصات</summary>
  <summary xml:lang="ca">Client convergent de música de YouTube</summary>
  <summary xml:lang="ca-valencia">Client convergent de música de YouTube</summary>
  <summary xml:lang="de">Konvergentes YouTube-Musikprogramm</summary>
@@ -48,7 +45,6 @@ SPDX-License-Identifier: CC0-1.0
  <summary xml:lang="pl">Adaptacyjny program do YouTube Music</summary>
  <summary xml:lang="pt">Cliente de música do YouTube convergente</summary>
  <summary xml:lang="pt-BR">Um cliente convergente para o YouTube Music</summary>
-  <summary xml:lang="ro">Client convergent de muzică pentru YouTube</summary>
  <summary xml:lang="sl">Konvergentni odjemalec glasbe YouTube</summary>
  <summary xml:lang="sv">Konvergent YouTube-musikprogram</summary>
  <summary xml:lang="uk">Зручний музичний клієнт YouTube</summary>
@@ -56,7 +52,6 @@ SPDX-License-Identifier: CC0-1.0
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <developer_name>KDE Community</developer_name>
-  <developer_name xml:lang="ar">مجتمع كدي</developer_name>
  <developer_name xml:lang="ca">La comunitat KDE</developer_name>
  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
  <developer_name xml:lang="cs">Komunita KDE</developer_name>
@@ -74,7 +69,6 @@ SPDX-License-Identifier: CC0-1.0
  <developer_name xml:lang="pl">Społeczność KDE</developer_name>
  <developer_name xml:lang="pt">Comunidade do KDE</developer_name>
  <developer_name xml:lang="pt-BR">A Comunidade KDE</developer_name>
-  <developer_name xml:lang="ro">Comunitatea KDE</developer_name>
  <developer_name xml:lang="sk">KDE komunita</developer_name>
  <developer_name xml:lang="sl">Skupnost KDE</developer_name>
  <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
@@ -83,14 +77,6 @@ SPDX-License-Identifier: CC0-1.0
  <content_rating type="oars-1.0"/>
  <url type="homepage">https://apps.kde.org/en/audiotube</url>
  <releases>
-    <release version="22.02" date="2022-02-09">
-      <url>https://www.plasma-mobile.org/2022/02/09/plasma-mobile-gear-22-02/</url>
-      <description>
-        <ul>
-          <li>Update the version of ytmusicapi</li>
-        </ul>
-      </description>
-    </release>
    <release version="21.12" date="2021-12-07">
      <url>https://www.plasma-mobile.org/2021/12/07/plasma-mobile-gear-21-12/</url>
    </release>
@@ -114,7 +100,6 @@ SPDX-License-Identifier: CC0-1.0
  </recommends>
  <description>
    <p>AudioTube can search YouTube Music, list albums and artists, play automatically generated playlists, albums and allows to put your own playlist together.</p>
-    <p xml:lang="ar">يمكن لتيوب الصوتي البحث في موسيقى يوتيوب، وعرض الألبومات والفنانين، وتشغيل القوائم والألبومات المولدة تلقائيًا، ويسمح لك بوضع قائمة التشغيل الخاصة بك معًا.</p>
    <p xml:lang="ca">L'AudioTube pot cercar música a YouTube, llistar àlbums i artistes, reproduir llistes de reproducció generades automàticament, àlbums i permet crear la vostra pròpia llista de reproducció.</p>
    <p xml:lang="ca-valencia">L'AudioTube pot cercar música a YouTube, llistar àlbums i artistes, reproduir llistes de reproducció generades automàticament, àlbums i permet crear la vostra pròpia llista de reproducció.</p>
    <p xml:lang="de">AudioTube kann Musik auf YouTube durchsuchen, Alben und Interpreten auflisten, automatisch generierte Wiedergabelisten und Alben abspielen und erlaubt es, eine eigene Wiedergabeliste zusammenzustellen.</p>
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=AudioTube
-Name[ar]=تيوب الصوتي
 Name[ca]=AudioTube
 Name[ca@valencia]=AudioTube
 Name[cs]=AudioTube
@@ -25,7 +24,6 @@ Name[sv]=AudioTube
 Name[uk]=AudioTube
 Name[x-test]=xxAudioTubexx
 Comment=YouTube Music client
-Comment[ar]=عميل يوتيوب ميوزيك
 Comment[ca]=Client de música de YouTube
 Comment[ca@valencia]=Client de música de YouTube
 Comment[cs]=Hudební klient YouTube
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
+
+SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
+
+SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Mathis Brüchert <[email protected]>
+
+SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
@@ -3,5 +3,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

-ytmusicapi==0.20.0
+ytmusicapi==0.19.5
 yt-dlp
@@ -75,8 +75,9 @@ Kirigami.ScrollablePage {
                }
            }
        }
-        delegate: Kirigami.SwipeListItem {
+        delegate: Kirigami.AbstractListItem {
            id: delegateItem
+            property bool showActionButtons: false
            required property int index
            required property string title
            required property int type
@@ -84,55 +85,72 @@ Kirigami.ScrollablePage {
            required property var artists
            required property string radioPlaylistId

-            RowLayout {
-                Layout.fillHeight: true
-                Kirigami.Icon {
-                    Layout.fillHeight: true
-                    source: {
-                        switch (type) {
-                        case SearchModel.Artist:
-                            return "view-media-artist"
-                        case SearchModel.Album:
-                            return "media-album-cover"
-                        case SearchModel.Playlist:
-                            return "view-media-playlist"
-                        case SearchModel.Song:
-                            return "emblem-music-symbolic"
-                        case SearchModel.Video:
-                            return "emblem-videos-symbolic"
+            ColumnLayout {
+                RowLayout {
+                    Layout.fillWidth: true
+                    Kirigami.Icon {
+                        Layout.fillHeight: true
+                        source: {
+                            switch (type) {
+                            case SearchModel.Artist:
+                                return "view-media-artist"
+                            case SearchModel.Album:
+                                return "media-album-cover"
+                            case SearchModel.Playlist:
+                                return "view-media-playlist"
+                            case SearchModel.Song:
+                                return "emblem-music-symbolic"
+                            case SearchModel.Video:
+                                return "emblem-videos-symbolic"
+                            }
                        }
                    }
+
+                    Controls.Label {
+                        Layout.fillWidth: true
+                        text: title
+                        elide: Qt.ElideRight
+                    }
                }

-                Controls.Label {
+                Kirigami.Separator {
+                    visible: showActionButtons
                    Layout.fillWidth: true
-                    text: title
-                    elide: Qt.ElideRight
+                }
+
+                Kirigami.ActionToolBar {
+                    Layout.fillWidth: true
+                    alignment: Qt.AlignLeft
+                    visible: showActionButtons
+                    actions: [
+                        Kirigami.Action {
+                            icon.name: (delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video) ? "media-playback-start" : "project-open"
+                            text: (delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video) ? i18n("Play") : i18n("Open")
+                            onTriggered: searchModel.triggerItem(index)
+                        } ,
+                        Kirigami.Action {
+                            icon.name: "go-next"
+                            text: i18n("Play next")
+                            visible: delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video
+                            onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
+                        },
+                        Kirigami.Action {
+                            icon.name: "media-playlist-append"
+                            text: i18n("Add to Playlist")
+                            visible: delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video
+                            onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
+                        },
+                        Kirigami.Action {
+                            icon.name: "radio"
+                            text: i18n("Radio")
+                            visible: delegateItem.type === SearchModel.Artist && delegateItem.radioPlaylistId
+                            onTriggered: playPlaylist(delegateItem.radioPlaylistId)
+                        }
+                    ]
                }
            }

-            actions: [
-                Kirigami.Action {
-                    icon.name: "go-next"
-                    text: i18n("Play next")
-                    visible: delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video
-                    onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
-                },
-                Kirigami.Action {
-                    icon.name: "media-playlist-append"
-                    text: i18n("Add to Playlist")
-                    visible: delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video
-                    onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
-                },
-                Kirigami.Action {
-                    icon.name: "radio"
-                    text: i18n("Radio")
-                    visible: delegateItem.type === SearchModel.Artist && delegateItem.radioPlaylistId
-                    onTriggered: playPlaylist(delegateItem.radioPlaylistId)
-                }
-            ]
-
-            onClicked: searchModel.triggerItem(index)
+            onClicked: showActionButtons = !showActionButtons
        }
        Controls.BusyIndicator {
            anchors.centerIn: parent
@@ -21,7 +21,7 @@ void pyPrintPretty(py::handle obj) {

 #define UNEXPORT __attribute__ ((visibility("hidden")))

-constexpr auto TESTED_YTMUSICAPI_VERSION = "0.20.0";
+constexpr auto TESTED_YTMUSICAPI_VERSION = "0.19.5";

 struct UNEXPORT YTMusicPrivate {
    py::scoped_interpreter guard {};