Allow to show all favourites / history as a list

Display AudioTube label just on mobile, and move the search bar back to the center
app header: Move search bar to side, add app header, add search button for mobile
2022-05-25 22:34:10 +02:00 · 2022-05-25 15:33:35 +02:00 · 2022-05-25 15:33:32 +02:00 · 2022-05-25 01:52:03 +00:00 · 2022-05-24 14:52:20 +00:00 · 2022-05-24 01:50:35 +00:00
47 changed files with 2526 additions and 1116 deletions
@@ -7,13 +7,18 @@
    "sources": [
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/b4/7b/0960d02701f783bb052ec69ea32789d878d2cce05a03950adbd75f164758/websockets-10.2.tar.gz",
-            "sha256": "8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098"
+            "url": "https://files.pythonhosted.org/packages/9a/bf/1bc7e3096ddc2c398b3d04176530a9c02efe08546d9730c9eef0b07a0a43/yt_dlp-2022.5.18-py2.py3-none-any.whl",
+            "sha256": "deec1009442312c1e2ee5298966842194d0e950b433f0d4fc844ef464b9c32a7"
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0/Brotli-1.0.9.zip",
-            "sha256": "4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438"
+            "url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
+            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/f8/a3/622d9acbfb9a71144b5d7609906bc648c62e3ca5fdbb1c8cca222949d82c/websockets-10.3.tar.gz",
+            "sha256": "fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4"
        },
        {
            "type": "file",
@@ -22,8 +27,8 @@
        },
        {
            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/c0/61/3a08dc08c0c60498a0136a7eec1a098f08be79f75bf35fdd0a15a1bace70/yt_dlp-2022.3.8.2-py3-none-any.whl",
-            "sha256": "05179f0f2c34f06910003bb9f80af68ff798b072ca0f826c0e6704a3fbd5b306"
+            "url": "https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0/Brotli-1.0.9.zip",
+            "sha256": "4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438"
        },
        {
            "type": "file",
@@ -5,21 +5,16 @@
        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"ytmusicapi\" --no-build-isolation"
    ],
    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/cb/58/834a6445479c72544d9285badce0a58650520c8ba5adfae7b98e61d133bb/ytmusicapi-0.21.0-py3-none-any.whl",
-            "sha256": "29d8d44e1911458041882a453b05c37021ff850757c648f93a45d1775dddbae2"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/37/45/946c02767aabb873146011e665728b680884cd8fe70dde973c640e45b775/certifi-2021.10.8-py2.py3-none-any.whl",
-            "sha256": "d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
-        },
        {
            "type": "file",
            "url": "https://files.pythonhosted.org/packages/ec/03/062e6444ce4baf1eac17a6a0ebfe36bb1ad05e1df0e20b110de59c278498/urllib3-1.26.9-py2.py3-none-any.whl",
            "sha256": "44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"
        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
+            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
+        },
        {
            "type": "file",
            "url": "https://files.pythonhosted.org/packages/06/b3/24afc8868eba069a7f03650ac750a778862dc34941a4bebeb58706715726/charset_normalizer-2.0.12-py3-none-any.whl",
@@ -30,6 +25,11 @@
            "url": "https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl",
            "sha256": "f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"
        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/0e/5a/4a5316bddbb697d4b1787159291edfeffd10f73c08b59c7248b15291b601/ytmusicapi-0.22.0-py3-none-any.whl",
+            "sha256": "d042520f3f76eac2c1498130dbc4e8a4af21ca73496590a5ff054fc4da0af1d8"
+        },
        {
            "type": "file",
            "url": "https://files.pythonhosted.org/packages/04/a2/d918dcd22354d8958fe113e1a3630137e0fc8b44859ade3063982eacd2a4/idna-3.3-py3-none-any.whl",
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-01-21 22:52+0400\n"
 "Last-Translator: Zayed Al-Saidi <[email protected]>\n"
 "Language-Team: ar\n"
@@ -28,8 +28,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "شغّل"
@@ -83,40 +82,47 @@ msgstr "حسنًا"
 msgid "Cancel"
 msgstr "ألغِ"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "تيوب الصوتي"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "لا يوجد وسائط تعمل"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "أزل المسار"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "امسح"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "اخلط"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "ألبث"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "لا يوجد وسائط تعمل"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "وسع"
+msgid "Shuffle"
+msgstr "اخلط"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -152,3 +158,12 @@ msgstr "اعثر على موسيقى على موسيقى يوتيوب"
 #, kde-format
 msgid "Search"
 msgstr "ابحث"
+
+#~ msgid "Clear"
+#~ msgstr "امسح"
+
+#~ msgid "Pause"
+#~ msgstr "ألبث"
+
+#~ msgid "Expand"
+#~ msgstr "وسع"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-04-22 18:44+0400\n"
 "Last-Translator: Kheyyam Gojayev <[email protected]>\n"
 "Language-Team: Azerbaijani <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Başladın"
@@ -84,40 +83,47 @@ msgstr "OLDU"
 msgid "Cancel"
 msgstr "İmtina"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Media faylı oynadılmır"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Mahnını silin"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Təmizləyin"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Qarışıq"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Fasilə"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Media faylı oynadılmır"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Açmaq"
+msgid "Shuffle"
+msgstr "Qarışıq"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -153,3 +159,12 @@ msgstr "Musiqini YouTube Musiqi-də tapın"
 #, kde-format
 msgid "Search"
 msgstr "Axtarın"
+
+#~ msgid "Clear"
+#~ msgstr "Təmizləyin"
+
+#~ msgid "Pause"
+#~ msgstr "Fasilə"
+
+#~ msgid "Expand"
+#~ msgstr "Açmaq"
@@ -1,23 +1,24 @@
 # Translation of audiotube.po to Catalan
-# Copyright (C) 2021 This_file_is_part_of_KDE
+# Copyright (C) 2021-2022 This_file_is_part_of_KDE
 # This file is distributed under the license LGPL version 2.1 or
 # version 3 or later versions approved by the membership of KDE e.V.
 #
 # Antoni Bella Pérez <[email protected]>, 2021.
+# Josep M. Ferrer <[email protected]>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-05 16:03+0100\n"
-"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-24 08:45+0200\n"
+"Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <[email protected]>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 21.11.90\n"
+"X-Generator: Lokalize 20.12.0\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -29,8 +30,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Reprodueix"
@@ -86,40 +86,46 @@ msgstr "D'acord"
 msgid "Cancel"
 msgstr "Cancel·la"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Preferides"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Les més reproduïdes"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "Ara s'està reproduint"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "Cua"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Elimina la pista"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Neteja"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Barreja"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pausa"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "No s'està reproduint cap suport"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expandeix"
+msgid "Shuffle"
+msgstr "Barreja"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -155,6 +161,3 @@ msgstr "Cerca a la Música de Youtube"
 #, kde-format
 msgid "Search"
 msgstr "Cerca"
-
-#~ msgid "Play only Audio"
-#~ msgstr "Reprodueix només l'àudio"
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-12-05 16:03+0100\n"
 "Last-Translator: Antoni Bella Pérez <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -29,8 +29,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Reprodueix"
@@ -86,40 +85,47 @@ msgstr "D'acord"
 msgid "Cancel"
 msgstr "Cancel·la"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "No s'està reproduint cap suport"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Elimina la pista"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Neteja"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Barreja"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pausa"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "No s'està reproduint cap suport"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expandeix"
+msgid "Shuffle"
+msgstr "Barreja"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -155,3 +161,12 @@ msgstr "Busca a la Música de Youtube"
 #, kde-format
 msgid "Search"
 msgstr "Busca"
+
+#~ msgid "Clear"
+#~ msgstr "Neteja"
+
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "Expand"
+#~ msgstr "Expandeix"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-01-11 17:36+0100\n"
 "Last-Translator: Vit Pelcak <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Přehrát"
@@ -84,40 +83,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Zrušit"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Nepřehrává se žádné médium"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Odstranit skladbu"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Vyprázdnit"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Zamíchat"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pozastavit"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Nepřehrává se žádné médium"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Rozvinout"
+msgid "Shuffle"
+msgstr "Zamíchat"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -153,3 +159,12 @@ msgstr "Najít hudbu na Hudba YouTube"
 #, kde-format
 msgid "Search"
 msgstr "Hledat"
+
+#~ msgid "Clear"
+#~ msgstr "Vyprázdnit"
+
+#~ msgid "Pause"
+#~ msgstr "Pozastavit"
+
+#~ msgid "Expand"
+#~ msgstr "Rozvinout"
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-02-20 10:37+0100\n"
 "Last-Translator: Frederik Schwarzer <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -28,8 +28,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Wiedergabe"
@@ -85,40 +84,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Abbrechen"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Es werden keine Medien wiedergegeben"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Stück entfernen"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Löschen"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Zufällig"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pause"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Es werden keine Medien wiedergegeben"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Erweitern"
+msgid "Shuffle"
+msgstr "Zufällig"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -155,5 +161,14 @@ msgstr "Musik auf YouTube suchen"
 msgid "Search"
 msgstr "Suchen"

+#~ msgid "Clear"
+#~ msgstr "Löschen"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Expand"
+#~ msgstr "Erweitern"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Nur Audio abspielen"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-01-01 15:21+0000\n"
 "Last-Translator: Steve Allewell <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Play"
@@ -84,40 +83,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancel"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "No media playing"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Remove Track"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Clear"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Shuffle"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pause"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "No media playing"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expand"
+msgid "Shuffle"
+msgstr "Shuffle"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -154,5 +160,14 @@ msgstr "Find music on YouTube Music"
 msgid "Search"
 msgstr "Search"

+#~ msgid "Clear"
+#~ msgstr "Clear"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Expand"
+#~ msgstr "Expand"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Play only Audio"
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the audiotube package.
 #
 # Automatically generated, 2021.
-# Eloy Cuadra <[email protected]>, 2021.
+# Eloy Cuadra <[email protected]>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-06 00:36+0100\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-25 00:18+0200\n"
 "Last-Translator: Eloy Cuadra <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
 "Language: es\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 21.11.90\n"
+"X-Generator: Lokalize 22.04.1\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -29,8 +29,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Reproducir"
@@ -86,40 +85,46 @@ msgstr "Aceptar"
 msgid "Cancel"
 msgstr "Cancelar"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Favoritos"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Más reproducidos"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "Reproduciendo"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "Cola"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Eliminar pista"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Borrar todo"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Desordenar"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pausar"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Ningún medio en reproducción"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expandir"
+msgid "Shuffle"
+msgstr "Desordenar"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -156,5 +161,14 @@ msgstr "Encuentre música en YouTube Music"
 msgid "Search"
 msgstr "Buscar"

+#~ msgid "Clear"
+#~ msgstr "Borrar todo"
+
+#~ msgid "Pause"
+#~ msgstr "Pausar"
+
+#~ msgid "Expand"
+#~ msgstr "Expandir"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Reproducir solo el sonido"
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-02-21 18:58+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n"
 "Language-Team: Basque <[email protected]>\n"
@@ -30,8 +30,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Jo"
@@ -87,40 +86,47 @@ msgstr "Ados"
 msgid "Cancel"
 msgstr "Utzi"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Ez da euskarririk jotzen ari"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Kendu pista"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Garbitu"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Nahastu"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Eten"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Ez da euskarririk jotzen ari"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Zabaldu"
+msgid "Shuffle"
+msgstr "Nahastu"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -157,5 +163,14 @@ msgstr "Aurkitu musika «Youtube Music»en"
 msgid "Search"
 msgstr "Bilatu"

+#~ msgid "Clear"
+#~ msgstr "Garbitu"
+
+#~ msgid "Pause"
+#~ msgstr "Eten"
+
+#~ msgid "Expand"
+#~ msgstr "Zabaldu"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Audio bakarrik jo"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-01-11 22:47+0200\n"
 "Last-Translator: Tommi Nieminen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Toista"
@@ -83,40 +82,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Peru"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Mitään ei toisteta"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Poista raita"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Tyhjennä"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Sekoita"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Tauko"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Mitään ei toisteta"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Laajenna"
+msgid "Shuffle"
+msgstr "Sekoita"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -153,5 +159,14 @@ msgstr "Etsi musiikkia Youtube Musicista"
 msgid "Search"
 msgstr "Etsi"

+#~ msgid "Clear"
+#~ msgstr "Tyhjennä"
+
+#~ msgid "Pause"
+#~ msgstr "Tauko"
+
+#~ msgid "Expand"
+#~ msgstr "Laajenna"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Toista vain ääni"
@@ -1,10 +1,10 @@
-# Xavier Besnard <[email protected]>, 2021.
+# Xavier Besnard <[email protected]>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-06 10:18+0100\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-23 20:05+0200\n"
 "Last-Translator: Xavier Besnard <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "Language: fr\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 21.11.90\n"
+"X-Generator: Lokalize 22.04.1\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -24,8 +24,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Lire"
@@ -81,40 +80,47 @@ msgstr "Ok"
 msgid "Cancel"
 msgstr "Annuler"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Favoris"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Les plus lus"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Aucun média en lecture"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Supprimer une piste"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Effacer"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Mélanger"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pause"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Aucun média en lecture"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Développer"
+msgid "Shuffle"
+msgstr "Mélanger"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -151,5 +157,14 @@ msgstr "Rechercher de la musique sur « YouTube Music »"
 msgid "Search"
 msgstr "Rechercher"

+#~ msgid "Clear"
+#~ msgstr "Effacer"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Expand"
+#~ msgstr "Développer"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Ne lire que l'audio"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-09-17 20:09+0530\n"
 "Last-Translator: Raghavendra Kamath <[email protected]>\n"
 "Language-Team: kde-hindi\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "बजाएँ"
@@ -83,40 +82,47 @@ msgstr ""
 msgid "Cancel"
 msgstr ""

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "ओडियो-ट्यूब"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "कोई मीडिया नहीं बजा रहा है"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "गाना हटाएँ"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "साफ करें"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "फेंटें"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "रोकें"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "कोई मीडिया नहीं बजा रहा है"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "विस्तृत करें"
+msgid "Shuffle"
+msgstr "फेंटें"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -153,5 +159,14 @@ msgstr "यूट्यूब संगीत पर संगीत ढूं
 msgid "Search"
 msgstr "खोजें"

+#~ msgid "Clear"
+#~ msgstr "साफ करें"
+
+#~ msgid "Pause"
+#~ msgstr "रोकें"
+
+#~ msgid "Expand"
+#~ msgstr "विस्तृत करें"
+
 #~ msgid "Play only Audio"
 #~ msgstr "केवल ध्वनी चलाएँ"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-12-06 02:46+0100\n"
 "Last-Translator: Vincenzo Reale <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Riproduci"
@@ -84,40 +83,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annulla"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Nessun supporto in riproduzione"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Rimuovi traccia"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Pulisci"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Mescola"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pausa"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Nessun supporto in riproduzione"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Espandi"
+msgid "Shuffle"
+msgstr "Mescola"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -154,5 +160,14 @@ msgstr "Trova musica su Youtube Music"
 msgid "Search"
 msgstr "Cerca"

+#~ msgid "Clear"
+#~ msgstr "Pulisci"
+
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "Expand"
+#~ msgstr "Espandi"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Riproduci solo l'audio"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-12-08 00:45+0100\n"
 "Last-Translator: Shinjo Park <[email protected]>\n"
 "Language-Team: Korean <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "재생"
@@ -82,40 +81,47 @@ msgstr "확인"
 msgid "Cancel"
 msgstr "취소"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "재생 중인 미디어 없음"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "트랙 삭제"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "지우기"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "무순서 재생"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "일시 정지"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "재생 중인 미디어 없음"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "확장"
+msgid "Shuffle"
+msgstr "무순서 재생"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -152,5 +158,14 @@ msgstr "YouTube Music에서 음악 찾기"
 msgid "Search"
 msgstr "검색"

+#~ msgid "Clear"
+#~ msgstr "지우기"
+
+#~ msgid "Pause"
+#~ msgstr "일시 정지"
+
+#~ msgid "Expand"
+#~ msgstr "확장"
+
 #~ msgid "Play only Audio"
 #~ msgstr "오디오만 재생"
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
 #
-# Freek de Kruijf <[email protected]>, 2021.
+# Freek de Kruijf <[email protected]>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-05 16:48+0100\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-24 10:48+0200\n"
 "Last-Translator: Freek de Kruijf <[email protected]>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -15,20 +15,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 21.08.3\n"
+"X-Generator: Lokalize 22.04.1\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
-msgstr "Freek de Kruijf - 2021"
+msgstr "Freek de Kruijf - 2021 t/m 2022"

 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Afspelen"
@@ -84,40 +83,46 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuleren"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Favorieten"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Meest afgespeeld"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "Speelt nu"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "Wachtrij"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Track verwijderen"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Wissen"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Willekeurig afspelen"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pauzeren"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Er speelt geen medium"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Uitbreiden"
+msgid "Shuffle"
+msgstr "Willekeurig afspelen"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -154,5 +159,14 @@ msgstr "Muziek zoeken op YouTube Music"
 msgid "Search"
 msgstr "Zoeken"

+#~ msgid "Clear"
+#~ msgstr "Wissen"
+
+#~ msgid "Pause"
+#~ msgstr "Pauzeren"
+
+#~ msgid "Expand"
+#~ msgstr "Uitbreiden"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Alleen geluid afspelen"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-01-01 09:11-0800\n"
 "Last-Translator: A S Alam <[email protected]>\n"
 "Language-Team: Punjabi <[email protected]>\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "alam yellow @ gmail.com"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "ਚਲਾਓ"
@@ -82,40 +81,47 @@ msgstr "ਠੀਕ ਹੈ"
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "ਆਡੀਓ-ਟਿਊਬ"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ ਚੱਲਦਾ"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "ਟਰੈਕ ਨੂੰ ਹਟਾਓ"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "ਮਿਟਾਓ"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "ਰਲਵੇਂ"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "ਵਿਰਾਮ"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ ਚੱਲਦਾ"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "ਫੈਲਾਓ"
+msgid "Shuffle"
+msgstr "ਰਲਵੇਂ"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -152,5 +158,14 @@ msgstr "ਯੂਟਿਊਬ ਸੰਗੀਤ ਉੱਤੇ ਸੰਗੀਤ ਲੱ
 msgid "Search"
 msgstr "ਖੋਜੋ"

+#~ msgid "Clear"
+#~ msgstr "ਮਿਟਾਓ"
+
+#~ msgid "Pause"
+#~ msgstr "ਵਿਰਾਮ"
+
+#~ msgid "Expand"
+#~ msgstr "ਫੈਲਾਓ"
+
 #~ msgid "Play only Audio"
 #~ msgstr "ਸਿਰਫ਼ ਆਡੀਓ ਹੀ ਚਲਾਓ"
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-12-30 12:38+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -29,8 +29,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected], [email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Odtwórz"
@@ -86,40 +85,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Anuluj"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Nic nie jest odtwarzane"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Usuń utwór"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Wyczyść"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Wymieszaj"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Wstrzymaj"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Nic nie jest odtwarzane"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Rozwiń"
+msgid "Shuffle"
+msgstr "Wymieszaj"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -156,5 +162,14 @@ msgstr "Znajdź muzykę w serwisie YouTube Music"
 msgid "Search"
 msgstr "Szukaj"

+#~ msgid "Clear"
+#~ msgstr "Wyczyść"
+
+#~ msgid "Pause"
+#~ msgstr "Wstrzymaj"
+
+#~ msgid "Expand"
+#~ msgstr "Rozwiń"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Odtwórz tylko dźwięk"
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-09-04 18:29+0100\n"
 "Last-Translator: José Nuno Coelho Pires <[email protected]>\n"
 "Language-Team: Portuguese <[email protected]>\n"
@@ -29,8 +29,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Reproduzir"
@@ -86,40 +85,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancelar"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Nada em reprodução"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Remover a Faixa"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Limpar"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Baralhar"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pausa"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Nada em reprodução"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expandir"
+msgid "Shuffle"
+msgstr "Baralhar"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -156,5 +162,14 @@ msgstr "Procurar música no YouTube Music"
 msgid "Search"
 msgstr "Procurar"

+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "Expand"
+#~ msgstr "Expandir"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Reproduzir só o Áudio"
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2021-12-09 10:13-0300\n"
 "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n"
 "Language-Team: Portuguese <[email protected]>\n"
@@ -28,8 +28,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Reproduzir"
@@ -85,40 +84,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancelar"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Nenhuma mídia em reprodução"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Remover faixa"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Limpar"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Embaralhar"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pausar"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Nenhuma mídia em reprodução"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expandir"
+msgid "Shuffle"
+msgstr "Embaralhar"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -155,5 +161,14 @@ msgstr "Encontre músicas no YouTube Music"
 msgid "Search"
 msgstr "Pesquisar"

+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid "Pause"
+#~ msgstr "Pausar"
+
+#~ msgid "Expand"
+#~ msgstr "Expandir"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Reproduzir apenas áudio"
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-05-10 21:39+0300\n"
 "Last-Translator: Alexander Yavorsky <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -28,8 +28,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Воспроизвести"
@@ -83,40 +82,46 @@ msgstr "ОК"
 msgid "Cancel"
 msgstr "Отмена"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Удалить дорожку"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Очистить"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Перемешать"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Приостановить"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr ""

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr ""
+msgid "Shuffle"
+msgstr "Перемешать"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -152,3 +157,9 @@ msgstr ""
 #, kde-format
 msgid "Search"
 msgstr "Поиск"
+
+#~ msgid "Clear"
+#~ msgstr "Очистить"
+
+#~ msgid "Pause"
+#~ msgstr "Приостановить"
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-04-07 18:01+0200\n"
 "Last-Translator: Roman Paholik <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -25,8 +25,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Prehrať"
@@ -81,40 +80,47 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Zrušiť"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Neprehráva sa žiadne médium"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr ""

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Vyčistiť"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Zamiešať"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Pozastaviť"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Neprehráva sa žiadne médium"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Rozvinúť"
+msgid "Shuffle"
+msgstr "Zamiešať"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -150,3 +156,12 @@ msgstr ""
 #, kde-format
 msgid "Search"
 msgstr "Hľadať"
+
+#~ msgid "Clear"
+#~ msgstr "Vyčistiť"
+
+#~ msgid "Pause"
+#~ msgstr "Pozastaviť"
+
+#~ msgid "Expand"
+#~ msgstr "Rozvinúť"
@@ -1,20 +1,20 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
 #
-# Matjaž Jeran <[email protected]>, 2021.
+# Matjaž Jeran <[email protected]>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-09 13:26+0100\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-24 07:26+0200\n"
 "Last-Translator: Matjaž Jeran <[email protected]>\n"
 "Language-Team: Slovenian <[email protected]>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 21.04.3\n"
+"X-Generator: Lokalize 21.12.2\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"

@@ -28,8 +28,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Predvajaj"
@@ -83,40 +82,46 @@ msgstr "V redu"
 msgid "Cancel"
 msgstr "Prekliči"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Priljubljeni"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Največkrat predvajani"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "Pravkar predvajano"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "Čakalna vrsta"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Odstrani sled"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Očisti"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Premešaj"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Premor"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Niče se ne predvaja"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Razširi"
+msgid "Shuffle"
+msgstr "Premešaj"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -153,5 +158,14 @@ msgstr "Najdi glasbo na Youtube Music"
 msgid "Search"
 msgstr "Išči"

+#~ msgid "Clear"
+#~ msgstr "Očisti"
+
+#~ msgid "Pause"
+#~ msgstr "Premor"
+
+#~ msgid "Expand"
+#~ msgstr "Razširi"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Predvajaj samo zvok"
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the audiotube package.
 #
-# Stefan Asserhäll <[email protected]>, 2021.
+# Stefan Asserhäll <[email protected]>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-05 11:41+0100\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-23 17:51+0200\n"
 "Last-Translator: Stefan Asserhäll <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
 "Language: sv\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Spela"
@@ -82,40 +81,47 @@ msgstr "Ok"
 msgid "Cancel"
 msgstr "Avbryt"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Favoriter"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Mest spelade"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "Inga media spelar"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Ta bort spår"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Rensa"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Blanda"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Paus"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Inga media spelar"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Expandera"
+msgid "Shuffle"
+msgstr "Blanda"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -152,5 +158,14 @@ msgstr "Sök efter musik på YouTube musik"
 msgid "Search"
 msgstr "Sök"

+#~ msgid "Clear"
+#~ msgstr "Rensa"
+
+#~ msgid "Pause"
+#~ msgstr "Paus"
+
+#~ msgid "Expand"
+#~ msgstr "Expandera"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Spela bara ljud"
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2022-04-15 14:41+0300\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-24 11:59+0300\n"
 "Last-Translator: Emir SARI <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
 "Language: tr\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 21.12.3\n"
+"X-Generator: Lokalize 22.04.0\n"

 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Çal"
@@ -84,40 +83,46 @@ msgstr "Tamam"
 msgid "Cancel"
 msgstr "İptal"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Beğeniler"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "En Çok Çalınanlar"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "Şimdi Çalınıyor"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "Kuyruk"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Parçayı Kaldır"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Temizle"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Karıştır"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Duraklat"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Ortam çalmıyor"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Genişlet"
+msgid "Shuffle"
+msgstr "Karıştır"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -153,3 +158,12 @@ msgstr "YouTube Müzik'te müzik bul"
 #, kde-format
 msgid "Search"
 msgstr "Ara"
+
+#~ msgid "Clear"
+#~ msgstr "Temizle"
+
+#~ msgid "Pause"
+#~ msgstr "Duraklat"
+
+#~ msgid "Expand"
+#~ msgstr "Genişlet"
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Yuri Chornoivan <[email protected]>, 2021.
+# Yuri Chornoivan <[email protected]>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-05 08:42+0200\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-24 08:21+0300\n"
 "Last-Translator: Yuri Chornoivan <[email protected]>\n"
 "Language-Team: Ukrainian <[email protected]>\n"
 "Language: uk\n"
@@ -28,8 +28,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "Відтворити"
@@ -85,40 +84,46 @@ msgstr "Гаразд"
 msgid "Cancel"
 msgstr "Скасувати"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "Улюблені"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "Часто слухали"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "Зараз відтворюємо"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "Додати до черги"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "Вилучити композицію"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "Спорожнити"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "Перемішати"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "Призупинити"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "Відтворення не відбувається"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "Розгорнути"
+msgid "Shuffle"
+msgstr "Перемішати"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -155,5 +160,14 @@ msgstr "Шукати музику на сайті «Музика Youtube»"
 msgid "Search"
 msgstr "Пошук"

+#~ msgid "Clear"
+#~ msgstr "Спорожнити"
+
+#~ msgid "Pause"
+#~ msgstr "Призупинити"
+
+#~ msgid "Expand"
+#~ msgstr "Розгорнути"
+
 #~ msgid "Play only Audio"
 #~ msgstr "Відтворити лише звук"
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiotube\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
-"PO-Revision-Date: 2021-12-05 01:46+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
+"PO-Revision-Date: 2022-05-24 01:49+0000\n"
 "Last-Translator: transxx.py program <[email protected]>\n"
 "Language-Team: KDE Test Language <[email protected]>\n"
 "Language: x-test\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "xxYour emailsxx"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "xxPlayxx"
@@ -84,40 +83,46 @@ msgstr "xxOKxx"
 msgid "Cancel"
 msgstr "xxCancelxx"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr "xxFavouritesxx"
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr "xxMost playedxx"
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "xxAudioTubexx"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, kde-format
+msgid "Now Playing"
+msgstr "xxNow Playingxx"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr "xxQueuexx"
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "xxRemove Trackxx"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "xxClearxx"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "xxShufflexx"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "xxPausexx"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "xxNo media playingxx"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "xxExpandxx"
+msgid "Shuffle"
+msgstr "xxShufflexx"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2021-12-05 00:45+0000\n"
+"POT-Creation-Date: 2022-05-25 00:46+0000\n"
 "PO-Revision-Date: 2022-05-15 15:46\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
@@ -27,8 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "[email protected], [email protected]"

-#: contents/ui/AlbumPage.qml:19 contents/ui/PlayerFooter.qml:173
-#: contents/ui/PlaylistPage.qml:19
+#: contents/ui/AlbumPage.qml:19 contents/ui/PlaylistPage.qml:19
 #, kde-format
 msgid "Play"
 msgstr "播放"
@@ -82,40 +81,47 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"

-#: contents/ui/main.qml:51
+#: contents/ui/LibraryPage.qml:15
+#, kde-format
+msgid "Favourites"
+msgstr ""
+
+#: contents/ui/LibraryPage.qml:67
+#, kde-format
+msgid "Most played"
+msgstr ""
+
+#: contents/ui/main.qml:93
 #, kde-format
 msgid "AudioTube"
 msgstr "AudioTube"

-#: contents/ui/PlayerFooter.qml:106
+#: contents/ui/MaximizedPlayerPage.qml:86
+#, fuzzy, kde-format
+#| msgid "No media playing"
+msgid "Now Playing"
+msgstr "没有正在播放的媒体"
+
+#: contents/ui/MaximizedPlayerPage.qml:112
+#, kde-format
+msgid "Queue"
+msgstr ""
+
+#: contents/ui/MaximizedPlayerPage.qml:224
 #, kde-format
 msgid "Remove Track"
 msgstr "移除曲目"

-#: contents/ui/PlayerFooter.qml:123
-#, kde-format
-msgid "Clear"
-msgstr "清除"
-
-#: contents/ui/PlayerFooter.qml:128 contents/ui/PlaylistPage.qml:26
-#, kde-format
-msgid "Shuffle"
-msgstr "随机播放"
-
-#: contents/ui/PlayerFooter.qml:173
-#, kde-format
-msgid "Pause"
-msgstr "暂停"
-
-#: contents/ui/PlayerFooter.qml:203
+#: contents/ui/MaximizedPlayerPage.qml:244
+#: contents/ui/MinimizedPlayerControls.qml:96
 #, kde-format
 msgid "No media playing"
 msgstr "没有正在播放的媒体"

-#: contents/ui/PlayerFooter.qml:247
+#: contents/ui/PlaylistPage.qml:26
 #, kde-format
-msgid "Expand"
-msgstr "展开"
+msgid "Shuffle"
+msgstr "随机播放"

 #: contents/ui/SearchPage.qml:27
 #, kde-format
@@ -151,3 +157,12 @@ msgstr "查找 YouTube Music 中的音乐"
 #, kde-format
 msgid "Search"
 msgstr "搜索"
+
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#~ msgid "Pause"
+#~ msgstr "暂停"
+
+#~ msgid "Expand"
+#~ msgstr "展开"
@@ -3,5 +3,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

-ytmusicapi==0.21.0
+ytmusicapi==0.22.0
 yt-dlp
@@ -78,6 +78,8 @@ void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirec
            }
            qCDebug(asyncdatabase) << "Running migration" << subdir.dirName();

+            database.transaction();
+
            // Hackish
            const auto statements = file.readAll().split(';');

@@ -99,39 +101,52 @@ void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirec
                    }
                }
            }
+
            if (migrationSuccessful) {
+                database.commit();
                markMigrationRun(database, subdir.dirName());
+            } else {
+                database.rollback();
            }
        }
    }
    qCDebug(asyncdatabase) << "Migrations finished";
 }

+struct AsyncSqlDatabasePrivate {
+    QSqlDatabase database;
+};
+
 // Internal asynchronous database class
 QFuture<void> AsyncSqlDatabase::establishConnection(const DatabaseConfiguration &configuration)
 {
    return runAsync<void>([=, this] {
-        m_database = std::make_unique<QSqlDatabase>(QSqlDatabase::addDatabase(configuration.type()));
+        d->database = QSqlDatabase::addDatabase(configuration.type());
        if (configuration.databaseName()) {
-            m_database->setDatabaseName(*configuration.databaseName());
+            d->database.setDatabaseName(*configuration.databaseName());
        }
        if (configuration.hostName()) {
-            m_database->setHostName(*configuration.hostName());
+            d->database.setHostName(*configuration.hostName());
        }
        if (configuration.userName()) {
-            m_database->setUserName(*configuration.userName());
+            d->database.setUserName(*configuration.userName());
        }
        if (configuration.password()) {
-            m_database->setPassword(*configuration.password());
+            d->database.setPassword(*configuration.password());
        }

-        m_database->open();
+        if (!d->database.open()) {
+            qCDebug(asyncdatabase) << "Failed to open database" << d->database.lastError().text();
+            if (configuration.databaseName()) {
+                qCDebug(asyncdatabase) << "Tried to use database" << *configuration.databaseName();
+            }
+        }
    });
 }

 AsyncSqlDatabase::AsyncSqlDatabase()
    : QObject()
-    , m_database(nullptr)
+    , d(std::make_unique<AsyncSqlDatabasePrivate>())
 {
 }

@@ -176,6 +191,11 @@ std::optional<Row> AsyncSqlDatabase::retrieveOptionalRow(QSqlQuery &query)
    }
 }

+QSqlDatabase &AsyncSqlDatabase::db()
+{
+    return d->database;
+}
+
 AsyncSqlDatabase::~AsyncSqlDatabase() = default;

 void printSqlError(const QSqlQuery &query)
@@ -193,6 +213,14 @@ QSqlQuery prepareQuery(const QSqlDatabase &database, const QString &sqlQuery)
    return query;
 }

+QSqlQuery runQuery(QSqlQuery &query)
+{
+    if (!query.exec()) {
+        printSqlError(query);
+    }
+    return query;
+}
+
 }

 struct DatabaseConfigurationPrivate : public QSharedData {
@@ -250,18 +278,22 @@ const std::optional<QString> &DatabaseConfiguration::password() const {
 }


+struct ThreadedDatabasePrivate {
+    asyncdatabase_private::AsyncSqlDatabase db;
+};
+
 std::unique_ptr<ThreadedDatabase> ThreadedDatabase::establishConnection(DatabaseConfiguration config) {
    auto threadedDb = std::make_unique<ThreadedDatabase>();
    threadedDb->setObjectName(QStringLiteral("database thread"));
-    threadedDb->m_db->moveToThread(&*threadedDb);
+    threadedDb->d->db.moveToThread(&*threadedDb);
    threadedDb->start();
-    threadedDb->m_db->establishConnection(config);
+    threadedDb->d->db.establishConnection(config);
    return threadedDb;
 }

 ThreadedDatabase::ThreadedDatabase()
    : QThread()
-    , m_db(std::make_unique<asyncdatabase_private::AsyncSqlDatabase>())
+    , d(std::make_unique<ThreadedDatabasePrivate>())
 {
 }

@@ -270,3 +302,8 @@ ThreadedDatabase::~ThreadedDatabase()
    quit();
    wait();
 }
+
+asyncdatabase_private::AsyncSqlDatabase &ThreadedDatabase::db()
+{
+    return d->db;
+}
@@ -10,10 +10,6 @@ class QSqlDatabase;
 #include <QString>
 #include <QObject>
 #include <QFuture>
-#include <QFutureWatcher>
-#include <QSqlQuery>
-#include <QDebug>
-#include <QThread>
 #include <QSharedDataPointer>

 #include <memory>
@@ -23,9 +19,6 @@ class QSqlDatabase;

 #include "asyncdatabase_p.h"

-using Row  = std::vector<QVariant>;
-using Rows = std::vector<Row>;
-
 struct DatabaseConfigurationPrivate;

 ///
@@ -66,36 +59,15 @@ private:
 ///
 const QString DATABASE_TYPE_SQLITE = QStringLiteral("QSQLITE");

-///
-/// Parse the row into a tuple of the given types.
-/// The types need to be deserializable from QVariant.
-///
-template <typename ...RowTypes>
-auto parseRow(const Row &row) -> std::tuple<RowTypes...>
+template <typename T>
+concept FromSql = requires(T v, typename T::ColumnTypes row)
 {
-    auto tuple = std::tuple<RowTypes...>();
-    int i = 0;
-    asyncdatabase_private::iterate_tuple(tuple, [&](auto &elem) {
-        elem = row.at(i).value<std::decay_t<decltype(elem)>>();
-        i++;
-    });
-    return tuple;
-}
+    typename T::ColumnTypes;
+    { std::tuple(row) } -> std::same_as<typename T::ColumnTypes>;
+    { T::fromSql(row) } -> std::same_as<T>;
+};

-///
-/// Parse the rows into a list of tuples of the given types.
-/// The types need to be deserializable from QVariant.
-///
-template <typename ...RowTypes>
-auto parseRows(const Rows &rows) -> std::vector<std::tuple<RowTypes...>> {
-    std::vector<std::tuple<RowTypes...>> parsedRows;
-    parsedRows.reserve(rows.size());
-    for (const auto &row : rows) {
-        parsedRows.push_back(parseRow<RowTypes...>(row));
-    }
-
-    return parsedRows;
-}
+struct ThreadedDatabasePrivate;

 class ThreadedDatabase : public QThread {
 public:
@@ -113,8 +85,9 @@ public:
    /// \return
    ///
    template <typename ...Args>
+    requires std::conjunction_v<std::is_convertible<Args, QVariant>...>
    auto execute(const QString &sqlQuery, Args... args) -> QFuture<void> {
-        return m_db->execute(sqlQuery, args...);
+        return db().execute(sqlQuery, args...);
    }

    ///
@@ -127,7 +100,7 @@ public:
    /// \return
    ///
    auto runMigrations(const QString &migrationDirectory) -> QFuture<void> {
-        return m_db->runMigrations(migrationDirectory);
+        return db().runMigrations(migrationDirectory);
    }

    ///
@@ -136,22 +109,44 @@ public:
    /// \param parameters to bind to the placeholders in the SQL query.
    /// \return Future of a list of lists of variants.
    ///
-    template <typename ...Args>
-    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<Rows> {
-        return m_db->getResults(sqlQuery, args...);
+    /// T must provide a tuple of the column types as `using ColumnTypes = std::tuple<...>`
+    /// and a `static T fromSql(ColumnTypes tuple)` deserialization method.
+    ///
+    template <typename T, typename ...Args>
+    requires FromSql<T> && std::conjunction_v<std::is_convertible<Args, QVariant>...>
+    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<std::vector<T>> {
+        return db().getResults<T, Args...>(sqlQuery, args...);
    }

    ///
    /// \brief Like getResults, but for retrieving just one row.
    ///
-    template <typename ...Args>
-    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<Row>> {
-        return m_db->getResult(sqlQuery, args...);
+    template <typename T, typename ...Args>
+    requires FromSql<T> && std::conjunction_v<std::is_convertible<Args, QVariant>...>
+    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<T>> {
+        return db().getResult<T, Args...>(sqlQuery, args...);
    }

    ThreadedDatabase();
    ~ThreadedDatabase();

 private:
-    std::unique_ptr<asyncdatabase_private::AsyncSqlDatabase> m_db;
+    asyncdatabase_private::AsyncSqlDatabase &db();
+
+    std::unique_ptr<ThreadedDatabasePrivate> d;
+};
+
+///
+/// \brief Deserialize just a single value from a query result.
+///
+template <typename T>
+struct SingleValue {
+    using ColumnTypes = std::tuple<T>;
+
+    static SingleValue fromSql(ColumnTypes tuple) {
+        auto [value] = tuple;
+        return SingleValue { value };
+    }
+
+    T value;
 };
@@ -60,11 +60,35 @@ void connectFuture(const QFuture<T> &future, QObjectDerivedType *self, const Fun
 using Row  = std::vector<QVariant>;
 using Rows = std::vector<Row>;

+template <typename RowTypesTuple>
+auto parseRow(const Row &row) -> RowTypesTuple
+{
+    auto tuple = RowTypesTuple();
+    int i = 0;
+    asyncdatabase_private::iterate_tuple(tuple, [&](auto &elem) {
+        elem = row.at(i).value<std::decay_t<decltype(elem)>>();
+        i++;
+    });
+    return tuple;
+}
+
+template <typename RowTypesTuple>
+auto parseRows(const Rows &rows) -> std::vector<RowTypesTuple> {
+    std::vector<RowTypesTuple> parsedRows;
+    parsedRows.reserve(rows.size());
+    std::ranges::transform(rows, std::back_inserter(parsedRows), parseRow<RowTypesTuple>);
+    return parsedRows;
+}
+
 void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirectory);

 void printSqlError(const QSqlQuery &query);

+// non-template helper functions to allow patching a much as possible in the shared library
 QSqlQuery prepareQuery(const QSqlDatabase &database, const QString &sqlQuery);
+QSqlQuery runQuery(QSqlQuery &query);
+
+struct AsyncSqlDatabasePrivate;

 class AsyncSqlDatabase : public QObject {
    Q_OBJECT
@@ -72,19 +96,27 @@ class AsyncSqlDatabase : public QObject {
 public:
    QFuture<void> establishConnection(const DatabaseConfiguration &configuration);

-    template <typename ...Args>
-    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<Rows> {
-        return runAsync<Rows>([=, this] {
+    template <typename T, typename ...Args>
+    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<std::vector<T>> {
+        return runAsync<std::vector<T>>([=, this] {
            auto query = executeQuery(sqlQuery, args...);
-            return retrieveRows(query);
+            const auto rows = parseRows<typename T::ColumnTypes>(retrieveRows(query));
+
+            std::vector<T> deserializedRows;
+            std::ranges::transform(rows, std::back_inserter(deserializedRows), T::fromSql);
+            return deserializedRows;
        });
    }

-    template <typename ...Args>
-    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<Row>> {
-        return runAsync<std::optional<Row>>([=, this] {
+    template <typename T, typename ...Args>
+    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<T>> {
+        return runAsync<std::optional<T>>([=, this]() -> std::optional<T> {
            auto query = executeQuery(sqlQuery, args...);
-            return retrieveOptionalRow(query);
+            if (const auto row = retrieveOptionalRow(query)) {
+                return T::fromSql(parseRow<typename T::ColumnTypes>(*row));
+            }
+
+            return std::nullopt;
        });
    }

@@ -97,7 +129,7 @@ public:

    auto runMigrations(const QString &migrationDirectory) -> QFuture<void> {
        return runAsync<void>([=, this] {
-            runDatabaseMigrations(*m_database, migrationDirectory);
+            runDatabaseMigrations(db(), migrationDirectory);
        });
    }

@@ -107,19 +139,14 @@ public:
 private:
    template <typename ...Args>
    QSqlQuery executeQuery(const QString &sqlQuery, Args... args) {
-        auto query = prepareQuery(*m_database, sqlQuery);
+        auto query = prepareQuery(db(), sqlQuery);
        auto argsTuple = std::make_tuple<Args...>(std::move(args)...);
        int i = 0;
        asyncdatabase_private::iterate_tuple(argsTuple, [&](auto &arg) {
            query.bindValue(i, arg);
            i++;
        });
-
-        if (!query.exec()) {
-            printSqlError(query);
-        }
-
-        return query;
+        return runQuery(query);
    }

    template <typename T, typename Functor>
@@ -143,7 +170,9 @@ private:
    Rows retrieveRows(QSqlQuery &query);
    std::optional<Row> retrieveOptionalRow(QSqlQuery &query);

-    std::unique_ptr<QSqlDatabase> m_database;
+    QSqlDatabase &db();
+
+    std::unique_ptr<AsyncSqlDatabasePrivate> d;
 };

 }
@@ -21,6 +21,13 @@ Kirigami.ScrollablePage {
                applicationWindow().playPlaylist(albumModel.playlistId)
            }
        }
+        right: Kirigami.Action {
+            icon.name: "media-playlist-shuffle"
+            text: i18n("Shuffle")
+            onTriggered: {
+                applicationWindow().playShufflePlaylist(albumModel.playlistId)
+            }
+        }
    }

    ListView {
@@ -10,9 +10,38 @@ import org.kde.kirigami 2.14 as Kirigami
 import org.kde.ytmusic 1.0

 Kirigami.ScrollablePage {
+    
+    globalToolBarStyle: Kirigami.ApplicationHeaderStyle.None
+    
+    // so that there is still a separator, since the header style is none
+    Kirigami.Separator {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+    }
+    
    ColumnLayout {
-        Kirigami.Heading {
-            text: i18n("Favourites")
+        RowLayout {
+            Layout.fillWidth: true
+            Kirigami.Heading {
+                text: i18n("Favourites")
+                Layout.alignment: Qt.AlignLeft
+            }
+
+            // Spacer
+            Item {
+                Layout.fillWidth: true
+            }
+
+            Controls.ToolButton {
+                text: i18n("Show All")
+                Layout.alignment: Qt.AlignRight
+                icon.name: "arrow-right"
+                onClicked: pageStack.layers.push("qrc:/PlaybackHistory.qml", {
+                                                     "dataModel": Library.favourites,
+                                                     "title": i18n("Favourite Songs")
+                                                 })
+            }
        }
        Controls.ScrollView {
            Layout.fillWidth: true
@@ -23,7 +52,7 @@ Kirigami.ScrollablePage {
                    delegate: ColumnLayout {
                        id: delegateItem
                        required property string title
-                        required property string artist
+                        required property string artists
                        required property string videoId

                        Layout.fillWidth: false
@@ -63,8 +92,27 @@ Kirigami.ScrollablePage {
                }
            }
        }
-        Kirigami.Heading {
-            text: i18n("Most played")
+        RowLayout {
+            Layout.fillWidth: true
+            Kirigami.Heading {
+                text: i18n("Most played")
+                Layout.alignment: Qt.AlignLeft
+            }
+
+            // Spacer
+            Item {
+                Layout.fillWidth: true
+            }
+
+            Controls.ToolButton {
+                text: i18n("Show All")
+                Layout.alignment: Qt.AlignRight
+                icon.name: "arrow-right"
+                onClicked: pageStack.layers.push("qrc:/PlaybackHistory.qml", {
+                                                     "dataModel": Library.playbackHistory,
+                                                     "title": i18n("Played Songs")
+                                                 })
+            }
        }
        Controls.ScrollView {
            Layout.fillWidth: true
@@ -75,7 +123,7 @@ Kirigami.ScrollablePage {
                    delegate: ColumnLayout {
                        id: mpdelegateItem
                        required property string title
-                        required property string artist
+                        required property string artists
                        required property string videoId

                        Layout.fillWidth: false
@@ -97,14 +145,6 @@ Kirigami.ScrollablePage {
                                fillMode: Image.PreserveAspectCrop
                                asynchronous: true
                            }
-
-                            actions: [
-                                Kirigami.Action {
-                                    icon.name: "delete"
-                                    onTriggered: Library.removeFavourite(mpdelegateItem.videoId)
-                                }
-
-                            ]
                        }
                        Controls.Label {
                            Layout.maximumWidth: 200
@@ -0,0 +1,427 @@
+// SPDX-FileCopyrightText: 2020-2022 Devin Lin <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+
+import QtGraphicalEffects 1.0
+import QtMultimedia 5.12
+
+import org.kde.kirigami 2.19 as Kirigami
+import org.kde.ytmusic 1.0
+
+Item {
+    id: root
+    
+    required property var info // VideoInfoExtractor object
+    required property var audio // Audio object
+    
+    signal requestClose()
+    
+    // background image
+    Item {
+        anchors.fill: parent
+        
+        Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(25, 25, 30, 1)
+        }
+
+        Image {
+            anchors.fill: parent
+            asynchronous: true
+            
+            source: info.thumbnail
+            fillMode: Image.PreserveAspectCrop
+            
+            sourceSize.width: 512
+            sourceSize.height: 512
+        }
+        
+        layer.enabled: true
+        layer.effect: HueSaturation {
+            cached: true
+
+            lightness: -0.5
+            saturation: 1.9
+
+            layer.enabled: true
+            layer.effect: FastBlur {
+                cached: true
+                radius: 100
+            }
+        }
+    }
+    
+    // content
+    ColumnLayout {
+        anchors.fill: parent
+        spacing: 0
+
+        // hide arrow button
+        ToolButton {
+            id: closeButton
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+            Layout.maximumHeight: parent.height
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.maximumWidth: parent.height
+            Layout.preferredWidth: Kirigami.Units.gridUnit * 3
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            icon.name: "arrow-down"
+            icon.color: "white"
+            Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+            Kirigami.Theme.inherit: false
+            onClicked: root.requestClose()
+        }
+        
+        // top tab bar
+        RowLayout {
+            id: tabBar
+            Layout.alignment: Qt.AlignHCenter
+            
+            ToolButton {
+                id: nowPlayingTab
+                text: i18n("Now Playing")
+                padding: Kirigami.Units.largeSpacing
+                onClicked: swipeView.setCurrentIndex(0)
+                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+                Layout.preferredWidth: Kirigami.Units.gridUnit * 9
+                
+                contentItem: Label {
+                    text: nowPlayingTab.text
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    elide: Text.ElideRight
+                    color: "white" // we need to ensure the label is white
+                }
+                
+                // selection indicator
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    color: Kirigami.Theme.highlightColor
+                    height: 1
+                    visible: swipeView.currentIndex == 0
+                }
+            }
+            ToolButton {
+                id: queueTab
+                text: i18n("Queue")
+                padding: Kirigami.Units.largeSpacing
+                onClicked: swipeView.setCurrentIndex(1)
+                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+                Layout.preferredWidth: Kirigami.Units.gridUnit * 9
+                
+                contentItem: Label {
+                    text: queueTab.text
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    elide: Text.ElideRight
+                    color: "white"
+                }
+                
+                // selection indicator
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    color: Kirigami.Theme.highlightColor
+                    height: 1
+                    visible: swipeView.currentIndex == 1
+                }
+            }
+        }
+        
+        // tabs
+        SwipeView {
+            id: swipeView
+            property double specWidth: {
+                let allowedWidth = root.width - Kirigami.Units.largeSpacing * 4;
+                let allowedHeight = root.height - Kirigami.Units.largeSpacing * 8 - (closeButton.height + tabBar.height + bottomPlayerControls.height);
+                if (allowedWidth > allowedHeight) {
+                    return allowedHeight;
+                } else {
+                    return allowedWidth;
+                }
+            }
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+            Layout.fillWidth: true
+            Layout.preferredHeight: specWidth
+        
+            // music art
+            Item {
+                height: swipeView.width
+                width: swipeView.height
+
+                Image {
+                    anchors.centerIn: parent
+                    width: swipeView.specWidth
+                    height: swipeView.specWidth
+
+                    asynchronous: true
+                    mipmap: true
+
+                    source: info.thumbnail
+
+                    sourceSize {
+                        width: 512
+                        height: 512
+                    }
+
+                    fillMode: Image.PreserveAspectCrop
+                }
+            }
+            
+            // playlist
+            ListView {
+                id: playlistView
+                width: swipeView.width
+                height: swipeView.height
+                clip: true
+                
+                Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                Kirigami.Theme.inherit: false
+
+                BusyIndicator {
+                    anchors.centerIn: parent
+                    visible: UserPlaylistModel.loading || UserPlaylistModel.loading
+                }
+
+                model: UserPlaylistModel
+
+                delegate: Kirigami.SwipeListItem {
+                    id: delegateItem
+                    required property string title
+                    required property string videoId
+                    required property string artists
+                    required property bool isCurrent
+
+                    backgroundColor: 'transparent'
+                    highlighted: isCurrent
+                    onClicked: UserPlaylistModel.skipTo(videoId)
+
+                    ColumnLayout {
+                        Layout.fillWidth: true
+                        Kirigami.Heading {
+                            elide: Text.ElideRight
+                            Layout.fillWidth: true
+                            level: 2
+                            text: title
+                        }
+
+                        Label {
+                            elide: Text.ElideRight
+                            Layout.fillWidth: true
+                            text: artists
+                        }
+                    }
+
+                    actions: [
+                        Kirigami.Action {
+                            text: i18n("Remove Track")
+                            icon.name: "list-remove"
+                            icon.color: "white"
+                            onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
+                        }
+                    ]
+                }
+            }
+        }
+        
+        ColumnLayout {
+            id: bottomPlayerControls
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.leftMargin: Kirigami.Units.gridUnit * 2
+            Layout.rightMargin: Kirigami.Units.gridUnit * 2
+            Layout.bottomMargin: Kirigami.Units.gridUnit * 2
+            
+            // song name
+            Label {
+                id: mainLabel
+                text: info.title ? info.title : i18n("No media playing")
+                
+                Layout.fillWidth: true
+                
+                horizontalAlignment: Text.AlignHCenter
+                elide: Text.ElideRight
+                maximumLineCount: 1
+                // Hardcoded because the footerbar blur always makes a dark-ish
+                // background, so we don't want to use a color scheme color that
+                // might also be dark
+                color: "white"
+                font.pointSize: Kirigami.Theme.defaultFont.pointSize * 1.5
+                font.weight: Font.Bold
+                font.bold: true
+            }
+            
+            // song artist
+            Kirigami.Heading {
+                id: authorLabel
+                text: info.artist ? info.artist : info.channel
+                
+                Layout.fillWidth: true
+                
+                horizontalAlignment: Text.AlignHCenter
+                elide: Text.ElideRight
+                maximumLineCount: 1
+                // Hardcoded because the footerbar blur always makes a dark-ish
+                // background, so we don't want to use a color scheme color that
+                // might also be dark
+                color: "white"
+                opacity: 0.9
+                font.pointSize: Kirigami.Theme.defaultFont.pointSize * 1.3
+                font.weight: Font.Bold
+                font.bold: true
+            }
+            
+            // slider row
+            RowLayout {
+                Layout.topMargin: Kirigami.Units.gridUnit * 2
+                spacing: Kirigami.Units.smallSpacing
+                
+                Label {
+                    Layout.alignment: Qt.AlignVCenter
+                    color: "white"
+                    visible: info.title
+                    text: PlayerUtils.formatTimestamp(audio.position)
+                }
+
+                Slider {
+                    Layout.alignment: Qt.AlignVCenter
+                    Layout.fillWidth: true
+                    from: 0
+                    to: audio.duration
+                    value: audio.position
+                    enabled: audio.seekable
+                    onMoved: {
+                        console.log("Value:", value);
+                        audio.seek(Math.floor(value));
+                    }
+
+                    Behavior on value {
+                        NumberAnimation {
+                            duration: 1000
+                        }
+                    }
+                }
+
+                Label {
+                    Layout.alignment: Qt.AlignVCenter
+                    color: "white"
+                    visible: info.title
+                    text: PlayerUtils.formatTimestamp(audio.duration)
+                }
+            }
+            
+            RowLayout {
+                Layout.topMargin: Kirigami.Units.largeSpacing
+                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
+                spacing: Kirigami.Units.largeSpacing
+                
+                // ensure white icons
+                Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                Kirigami.Theme.inherit: false
+
+                ToolButton {
+                    id: favouriteButton
+                    readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)
+                    Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    onClicked: if (favouriteWatcher)
+                                   favouriteWatcher.isFavourite
+                                    ? Library.removeFavourite(info.videoId)
+                                    : Library.addFavourite(info.videoId, info.title)
+                    
+                    icon.name: favouriteWatcher ? (favouriteWatcher.isFavourite ? "starred-symbolic" : "non-starred-symbolic") : ""
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: skipBackwardButton
+                    Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    enabled: false
+                    
+                    icon.name: "media-skip-backward"
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: playPauseButton
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 4
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    enabled: info.audioUrl != ""
+                    onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
+                    
+                    icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+                    icon.width: Kirigami.Units.gridUnit * 3
+                    icon.height: Kirigami.Units.gridUnit * 3
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: skipForwardButton
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    enabled: UserPlaylistModel.canSkip
+                    onClicked: UserPlaylistModel.next()
+                    
+                    icon.name: "media-skip-forward"
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: shuffleButton
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    onClicked: UserPlaylistModel.shufflePlaylist()
+                    
+                    icon.name: "media-playlist-shuffle"
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,217 @@
+// SPDX-FileCopyrightText: 2020-2022 Devin Lin <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+
+import QtGraphicalEffects 1.0
+import QtMultimedia 5.12
+
+import org.kde.kirigami 2.19 as Kirigami
+import org.kde.ytmusic 1.0
+
+Item {
+    id: root
+    
+    required property int progressBarHeight
+    required property int minimizedPlayerContentHeight
+    
+    required property var info // VideoInfoExtractor object
+    required property var audio // Audio object
+    
+    readonly property bool isWidescreen: width >= Kirigami.Units.gridUnit * 40
+    
+    signal requestOpen()
+    
+    Rectangle {
+        id: miniProgressBar
+        z: 1
+        visible: !root.isWidescreen
+        anchors.top: parent.top
+        anchors.left: parent.left
+        height: root.progressBarHeight
+        color: Kirigami.Theme.highlightColor
+        width: parent.width * (audio.position / audio.duration)
+    }
+    
+    RowLayout {
+        anchors.fill: parent
+        spacing: 0
+        
+        Rectangle {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.maximumWidth: Kirigami.Units.gridUnit * 20
+            Layout.preferredWidth: Kirigami.Units.gridUnit * 20
+            color: Qt.rgba(0, 0, 0, trackClick.containsMouse ? 0.1 : trackClick.pressed ? 0.3 : 0)
+
+            RowLayout {
+                anchors.fill: parent
+                anchors.leftMargin: Kirigami.Units.largeSpacing
+                spacing: Kirigami.Units.largeSpacing
+                
+                // track image
+                Item {
+                    property double imageSize: root.height - Kirigami.Units.largeSpacing * 2
+                    
+                    Layout.alignment: Qt.AlignVCenter
+                    Layout.maximumWidth: imageSize
+                    Layout.preferredWidth: imageSize
+                    Layout.maximumHeight: imageSize
+                    Layout.minimumHeight: imageSize
+
+                    Image {
+                        id: mainIcon
+                        anchors.fill: parent
+                        
+                        visible: !loadingIndicator.visible
+                        asynchronous: true
+                        mipmap: true
+
+                        source: info.thumbnail
+
+                        sourceSize.width: 512
+                        sourceSize.height: 512
+                        fillMode: Image.PreserveAspectCrop
+                    }
+                    
+                    BusyIndicator {
+                        id: loadingIndicator
+                        anchors.centerIn: parent
+                        visible: UserPlaylistModel.loading
+                        Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                        Kirigami.Theme.inherit: false
+                    }
+                }
+                
+                // track information
+                ColumnLayout {
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    
+                    Label {
+                        id: mainLabel
+                        text: info.title ? info.title : i18n("No media playing")
+                        textFormat: Text.PlainText
+                        wrapMode: Text.Wrap
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                        Layout.fillWidth: true
+                        horizontalAlignment: Text.AlignLeft
+                        elide: Text.ElideRight
+                        maximumLineCount: 1
+                        // Hardcoded because the footerbar blur always makes a dark-ish
+                        // background, so we don't want to use a color scheme color that
+                        // might also be dark
+                        color: "white"
+                        font.weight: Font.Bold
+                    }
+                    
+                    Label {
+                        id: authorLabel
+                        text: info.artist ? info.artist : info.channel
+                        textFormat: Text.PlainText
+                        wrapMode: Text.Wrap
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                        Layout.fillWidth: true
+                        horizontalAlignment: Text.AlignLeft
+                        elide: Text.ElideRight
+                        maximumLineCount: 1
+                        // Hardcoded because the footerbar blur always makes a dark-ish
+                        // background, so we don't want to use a color scheme color that
+                        // might also be dark
+                        color: "white"
+                    }
+                }
+            }
+            
+            MouseArea {
+                id: trackClick
+                anchors.fill: parent
+                hoverEnabled: true
+                onClicked: root.requestOpen()
+            }
+        }
+        
+        RowLayout {
+            visible: root.isWidescreen
+            Layout.preferredWidth: 0
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.rightMargin: Kirigami.Units.largeSpacing
+            spacing: Kirigami.Units.smallSpacing
+            
+            Label {
+                Layout.alignment: Qt.AlignVCenter
+                color: "white"
+                visible: info.title
+                text: PlayerUtils.formatTimestamp(audio.position)
+            }
+
+            Slider {
+                Layout.alignment: Qt.AlignVCenter
+                Layout.fillWidth: true
+                from: 0
+                to: audio.duration
+                value: audio.position
+                enabled: audio.seekable
+                onMoved: {
+                    console.log("Value:", value);
+                    audio.seek(Math.floor(value));
+                }
+
+                Behavior on value {
+                    NumberAnimation {
+                        duration: 1000
+                    }
+                }
+            }
+
+            Label {
+                Layout.alignment: Qt.AlignVCenter
+                color: "white"
+                visible: info.title
+                text: PlayerUtils.formatTimestamp(audio.duration)
+            }
+        }
+        
+        ToolButton {
+            id: playPauseButton
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.maximumWidth: height
+            Layout.preferredWidth: height
+            
+            enabled: info.audioUrl != ""
+            onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
+            
+            icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+            icon.width: Kirigami.Units.gridUnit
+            icon.height: Kirigami.Units.gridUnit
+            icon.color: "white"
+            
+            Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+            Kirigami.Theme.inherit: false
+        }
+        
+        ToolButton {
+            id: skipForwardButton
+            Layout.rightMargin: Math.floor(Kirigami.Units.smallSpacing / 2)
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.maximumWidth: height
+            Layout.preferredWidth: height
+            
+            enabled: UserPlaylistModel.canSkip
+            onClicked: UserPlaylistModel.next()
+            
+            icon.name: "media-skip-forward"
+            icon.width: Kirigami.Units.gridUnit
+            icon.height: Kirigami.Units.gridUnit
+            icon.color: "white"
+            
+            Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+            Kirigami.Theme.inherit: false
+        }
+    }
+}
@@ -0,0 +1,76 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15 as Controls
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.ytmusic 1.0
+
+Kirigami.ScrollablePage {
+    id: playbackHistoryPage
+    title: i18n("Unknown list of songs")
+
+    property QtObject dataModel
+
+    ListView {
+        id: listView
+        reuseItems: true
+
+        Kirigami.PlaceholderMessage {
+            visible: listView.count < 1
+            text: i18n("No songs here yet")
+            anchors.centerIn: parent
+        }
+
+        model: playbackHistoryPage.dataModel
+
+        delegate: Kirigami.SwipeListItem {
+            id: delegateItem
+            required property string title
+            required property string videoId
+            required property string artists
+
+            RowLayout {
+                ThumbnailSource {
+                    id: thumbnailSource
+
+                    videoId: delegateItem.videoId
+                }
+
+                Item {
+                    width: Kirigami.Units.gridUnit * 3
+                    height: Kirigami.Units.gridUnit * 3
+
+                    Image {
+                        sourceSize: "200x200"
+                        source: thumbnailSource.cachedPath
+                        fillMode: Image.PreserveAspectCrop
+
+                        width: Kirigami.Units.gridUnit * 3
+                        height: Kirigami.Units.gridUnit * 3
+
+                        Layout.alignment: Qt.AlignLeft
+                    }
+                }
+
+                Controls.Label {
+                    text: delegateItem.title
+                    Layout.fillWidth: true
+                }
+            }
+
+            actions: [
+                Kirigami.Action {
+                    icon.name: "go-next"
+                    text: i18n("Play Next")
+                    onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
+                },
+                Kirigami.Action {
+                    icon.name: "media-playlist-append"
+                    text: i18n("Add to Playlist")
+                    onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
+                }
+            ]
+        }
+    }
+}
@@ -1,280 +1,422 @@
 // SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
+// SPDX-FileCopyrightText: 2021 Bart De Vries <[email protected]>
+// SPDX-FileCopyrightText: 2020-2022 Devin Lin <[email protected]>
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

 import QtQuick 2.7
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12 as Controls
+
+import QtMultimedia 5.12
+import QtGraphicalEffects 1.0
+
 import org.kde.kirigami 2.12 as Kirigami
 import org.kde.ytmusic 1.0
-import QtMultimedia 5.12

-Item {
+Flickable {
    id: footerItem
+    
    property bool maximized: false
+    
+    readonly property int progressBarHeight: Kirigami.Units.gridUnit / 6
+    readonly property int minimizedPlayerContentHeight: Math.round(Kirigami.Units.gridUnit * 3.5)
+    readonly property int minimizedPlayerHeight: minimizedPlayerContentHeight + progressBarHeight

-    anchors.left: parent.left
-    anchors.right: parent.right
-    height: maximized ? applicationWindow().height : 75
-
-    Rectangle {
-        color: Kirigami.Theme.backgroundColor
-        Kirigami.Theme.colorSet: Kirigami.Theme.Window
-        anchors.fill: footerLayout
+    boundsBehavior: Flickable.StopAtBounds
+    
+    function close() {
+        toClose.restart();
    }

+    function resetToBoundsOnFlick() {
+        if (!atYBeginning || !atYEnd) {
+            if (footerItem.verticalVelocity > 0) {
+                toOpen.restart();
+            } else if (footerItem.verticalVelocity < 0) {
+                toClose.restart();
+            } else { // i.e. when verticalVelocity === 0
+                if (contentY > contentHeight / 4) {
+                    toOpen.restart();
+                } else  {
+                    toClose.restart();
+                }
+            }
+        }
+    }

+    function resetToBoundsOnResize() {
+        if (contentY > contentHeight / 4) {
+            contentY = contentHeight / 2;
+        } else {
+            contentY = 0;
+        }
+    }
+    
+    NumberAnimation on contentY {
+        id: toOpen
+        from: contentY
+        to: contentHeight / 2
+        duration: Kirigami.Units.longDuration * 2
+        easing.type: Easing.OutCubic
+        running: false
+    }
+    
+    NumberAnimation on contentY {
+        id: toClose
+        from: contentY
+        to: 0
+        duration: Kirigami.Units.longDuration * 2
+        easing.type: Easing.OutCubic
+        running: false
+    }
+
+    // snap to end
+    MouseArea {
+        anchors.fill: footerLayout
+        propagateComposedEvents: true
+        onPressed: {
+            toOpen.stop();
+            toClose.stop();
+            propagateComposedEvents = true;
+        }
+        onReleased: footerItem.resetToBoundsOnFlick()
+    }
+
+    onMovementStarted: {
+        toOpen.stop();
+        toClose.stop();
+    }
+    onFlickStarted: resetToBoundsOnFlick()
+    onMovementEnded: resetToBoundsOnFlick()
+    onHeightChanged: resetToBoundsOnResize()
+
+    property var videoInfoExtractor: VideoInfoExtractor {
+        id: info
+
+        onSongChanged: audio.play()
+        videoId: UserPlaylistModel.currentVideoId
+        onTitleChanged: Library.addPlaybackHistoryItem(info.videoId, info.title)
+    }
+    
+    property var audioPlayer: Audio {
+        id: audio
+
+        source: info.audioUrl
+        onStatusChanged: {
+            if (status === Audio.EndOfMedia) {
+                console.log("Song ended");
+                UserPlaylistModel.next();
+            }
+        }
+    }
+    
+    contentHeight: height * 2
+    
    ColumnLayout {
        id: footerLayout
-        height: parent.height
-        anchors.fill: parent
+        
+        anchors.left: parent.left
+        anchors.right: parent.right
+        spacing: 0

-        GridLayout {
-            id: playerLayout
-
-            readonly property bool mobile: width > height
-
-            Layout.fillHeight: footerItem.maximized
+        // margin from top
+        Item {
+            Layout.minimumHeight: footerItem.height - footerItem.minimizedPlayerHeight
+        }
+        
+        Controls.Control {
            Layout.fillWidth: true
-            flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
-            visible: footerItem.maximized
-
-            ColumnLayout {
-                Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
-                Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)
-
-                Item {
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-
-                    Image {
-                        anchors.fill: parent
-                        source: info.thumbnail
-                        fillMode: Image.PreserveAspectFit
-                    }
-                }
-                Controls.RoundButton {
-                    readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)
-
-                    Layout.alignment: Qt.AlignHCenter
-                    icon.name: favouriteWatcher ? (favouriteWatcher.isFavourite ? "starred-symbolic" : "non-starred-symbolic") : ""
-                    onClicked: if (favouriteWatcher)
-                                   favouriteWatcher.isFavourite
-                                    ? Library.removeFavourite(info.videoId)
-                                    : Library.addFavourite(info.videoId, info.title)
-                }
-            }
-
-            Item {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
-                Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)
-
-                Controls.ScrollView {
+            padding: 0
+            implicitHeight: footerItem.minimizedPlayerHeight
+            
+            // minimized player background
+            background: Item {
+                Rectangle {
                    anchors.fill: parent
+                    color: Qt.rgba(25, 25, 30, 1)
+                }
+                
+                Image {
+                    opacity: 0.2
+                    source: info.thumbnail
+                    asynchronous: true
+                    
+                    anchors.fill: parent
+                    fillMode: Image.PreserveAspectCrop
+                }
+                
+                layer.enabled: true
+                layer.effect: HueSaturation {
+                    cached: true

-                    ListView {
-                        anchors.fill: parent
-                        id: playlistView
+                    lightness: -0.5
+                    saturation: 1.9

-                        clip: true
-
-                        Controls.BusyIndicator {
-                            anchors.centerIn: parent
-                            visible: UserPlaylistModel.loading || UserPlaylistModel.loading
-                        }
-
-                        onCountChanged: {
-                            if (count < 1) {
-                                footerItem.maximized = false
-                            }
-                        }
-
-                        model: UserPlaylistModel
-
-                        delegate: Kirigami.SwipeListItem {
-                            id: delegateItem
-                            required property string title
-                            required property string videoId
-                            required property string artists
-                            required property bool isCurrent
-
-                            highlighted: isCurrent
-                            onClicked: UserPlaylistModel.skipTo(videoId)
-
-                            ColumnLayout {
-                                Layout.fillWidth: true
-                                Kirigami.Heading {
-                                    elide: Text.ElideRight
-                                    Layout.fillWidth: true
-                                    level: 2
-                                    text: title
-                                }
-
-                                Controls.Label {
-                                    elide: Text.ElideRight
-                                    Layout.fillWidth: true
-                                    text: artists
-                                }
-                            }
-
-                            actions: [
-                                Kirigami.Action {
-                                    text: i18n("Remove Track")
-                                    icon.name: "list-remove"
-                                    onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
-                                }
-                            ]
-                        }
-
-                        header: Controls.ToolBar {
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            RowLayout {
-                                anchors.fill: parent
-                                Item {
-                                    Layout.fillWidth: true
-                                }
-
-                                Controls.ToolButton {
-                                    text: i18n("Clear")
-                                    icon.name: "edit-clear-all"
-                                    onClicked: UserPlaylistModel.clear()
-                                }
-                                Controls.ToolButton {
-                                    text: i18n("Shuffle")
-                                    icon.name: "media-playlist-shuffle"
-                                    onClicked: UserPlaylistModel.shufflePlaylist()
-                                }
-                            }
-                        }
+                    layer.enabled: true
+                    layer.effect: FastBlur {
+                        cached: true
+                        radius: 64
+                        transparentBorder: false
                    }
                }
            }
+            
+            MinimizedPlayerControls {
+                progressBarHeight: footerItem.progressBarHeight
+                minimizedPlayerContentHeight: footerItem.minimizedPlayerContentHeight
+                height: minimizedPlayerHeight
+                
+                focus: true
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+                
+                info: footerItem.videoInfoExtractor
+                audio: footerItem.audioPlayer
+                
+                onRequestOpen: toOpen.start();
+            }
        }
-
-        Kirigami.Separator {
+        
+        MaximizedPlayerPage {
+            id: maximizedPlayerPage
            Layout.fillWidth: true
+            Layout.fillHeight: true
+            implicitHeight: footerItem.height
+            
+            info: footerItem.videoInfoExtractor
+            audio: footerItem.audioPlayer
+                
+            onRequestClose: toClose.start();
        }
+        
+        //GridLayout {
+            //id: playerLayout

-        RowLayout {
-            id: player
+            //readonly property bool mobile: width > height

-            Layout.fillWidth: true
-            Layout.fillHeight: !footer.maximized
+            //Layout.fillHeight: footerItem.maximized
+            //Layout.fillWidth: true
+            //flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
+            //visible: footerItem.maximized

-            VideoInfoExtractor {
-                id: info
+            //ColumnLayout {
+                //Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
+                //Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)

-                onSongChanged: audio.play()
-                videoId: UserPlaylistModel.currentVideoId
-                onTitleChanged: Library.addPlaybackHistoryItem(info.videoId, info.title)
-            }
+                //Item {
+                    //Layout.fillWidth: true
+                    //Layout.fillHeight: true

-            Audio {
-                id: audio
+                    //Image {
+                        //anchors.fill: parent
+                        //source: info.thumbnail
+                        //fillMode: Image.PreserveAspectFit
+                    //}
+                //}
+                //Controls.RoundButton {
+                    //readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)

-                source: info.audioUrl
-                onStatusChanged: {
-                    if (status === Audio.EndOfMedia) {
-                        console.log("Song ended");
-                        UserPlaylistModel.next();
-                    }
-                }
-            }
+                    //Layout.alignment: Qt.AlignHCenter
+                    //icon.name: favouriteWatcher ? (favouriteWatcher.isFavourite ? "starred-symbolic" : "non-starred-symbolic") : ""
+                    //onClicked: if (favouriteWatcher)
+                                   //favouriteWatcher.isFavourite
+                                    //? Library.removeFavourite(info.videoId)
+                                    //: Library.addFavourite(info.videoId, info.title)
+                //}
+            //}

-            Controls.ToolButton {
-                display: Controls.AbstractButton.IconOnly
-                Layout.preferredWidth: parent.height
-                Layout.fillHeight: true
-                enabled: info.audioUrl != ""
-                text: audio.playbackState === Audio.PlayingState ? i18n("Pause") : i18n("Play")
-                visible: !info.loading
-                icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
-                onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
-            }
+            //Item {
+                //Layout.fillWidth: true
+                //Layout.fillHeight: true
+                //Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
+                //Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)

-            Controls.ToolButton {
-                display: Controls.AbstractButton.IconOnly
-                Layout.preferredWidth: parent.height
-                Layout.fillHeight: true
-                enabled: UserPlaylistModel.canSkip
-                visible: !info.loading
-                icon.name: "media-skip-forward"
-                onClicked: UserPlaylistModel.next()
-            }
+                //Controls.ScrollView {
+                    //anchors.fill: parent

-            Controls.BusyIndicator {
-                Layout.fillHeight: true
-                visible: info.loading
-            }
+                    //ListView {
+                        //anchors.fill: parent
+                        //id: playlistView

-            ColumnLayout {
-                Layout.fillHeight: true
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Kirigami.Units.smallSpacing
+                        //clip: true

-                Kirigami.Heading {
-                    level: 3
-                    Layout.fillWidth: true
-                    elide: Qt.ElideRight
-                    text: info.title ? info.title : i18n("No media playing")
-                }
+                        //Controls.BusyIndicator {
+                            //anchors.centerIn: parent
+                            //visible: UserPlaylistModel.loading || UserPlaylistModel.loading
+                        //}

-                RowLayout{
+                        //onCountChanged: {
+                            //if (count < 1) {
+                                //footerItem.maximized = false
+                            //}
+                        //}

-                    Controls.Label{
-                        visible: info.title
-                        text: PlayerUtils.formatTimestamp(audio.position)
-                    }
+                        //model: UserPlaylistModel

-                    Controls.Slider {
-                        Layout.fillWidth: true
-                        from: 0
-                        to: audio.duration
-                        value: audio.position
-                        enabled: audio.seekable
-                        onMoved: {
-                            console.log("Value:", value);
-                            audio.seek(Math.floor(value));
-                        }
+                        //delegate: Kirigami.SwipeListItem {
+                            //id: delegateItem
+                            //required property string title
+                            //required property string videoId
+                            //required property string artists
+                            //required property bool isCurrent

-                        Behavior on value {
-                            NumberAnimation {
-                                duration: 1000
-                            }
+                            //highlighted: isCurrent
+                            //onClicked: UserPlaylistModel.skipTo(videoId)

-                        }
+                            //ColumnLayout {
+                                //Layout.fillWidth: true
+                                //Kirigami.Heading {
+                                    //elide: Text.ElideRight
+                                    //Layout.fillWidth: true
+                                    //level: 2
+                                    //text: title
+                                //}

-                    }
+                                //Controls.Label {
+                                    //elide: Text.ElideRight
+                                    //Layout.fillWidth: true
+                                    //text: artists
+                                //}
+                            //}

-                    Controls.Label{
-                        visible: info.title
-                        text: PlayerUtils.formatTimestamp(audio.duration)
-                    }
+                            //actions: [
+                                //Kirigami.Action {
+                                    //text: i18n("Remove Track")
+                                    //icon.name: "list-remove"
+                                    //onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
+                                //}
+                            //]
+                        //}

-                }
+                        //header: Controls.ToolBar {
+                            //anchors.left: parent.left
+                            //anchors.right: parent.right
+                            //RowLayout {
+                                //anchors.fill: parent
+                                //Item {
+                                    //Layout.fillWidth: true
+                                //}
+
+                                //Controls.ToolButton {
+                                    //text: i18n("Clear")
+                                    //icon.name: "edit-clear-all"
+                                    //onClicked: UserPlaylistModel.clear()
+                                //}
+                                //Controls.ToolButton {
+                                    //text: i18n("Shuffle")
+                                    //icon.name: "media-playlist-shuffle"
+                                    //onClicked: UserPlaylistModel.shufflePlaylist()
+                                //}
+                            //}
+                        //}
+                    //}
+                //}
+            //}
+        //}
+
+        //Kirigami.Separator {
+            //Layout.fillWidth: true
+        //}
+
+        //RowLayout {
+            //id: player
+
+            //Layout.fillWidth: true
+            //Layout.fillHeight: !footer.maximized
+
+            //Controls.ToolButton {
+                //display: Controls.AbstractButton.IconOnly
+                //Layout.preferredWidth: parent.height
+                //Layout.fillHeight: true
+                //enabled: info.audioUrl != ""
+                //text: audio.playbackState === Audio.PlayingState ? i18n("Pause") : i18n("Play")
+                //visible: !info.loading
+                //icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+                //onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
+            //}
+
+            //Controls.ToolButton {
+                //display: Controls.AbstractButton.IconOnly
+                //Layout.preferredWidth: parent.height
+                //Layout.fillHeight: true
+                //enabled: UserPlaylistModel.canSkip
+                //visible: !info.loading
+                //icon.name: "media-skip-forward"
+                //onClicked: UserPlaylistModel.next()
+            //}
+
+            //Controls.BusyIndicator {
+                //Layout.fillHeight: true
+                //visible: info.loading
+            //}
+
+            //ColumnLayout {
+                //Layout.fillHeight: true
+                //Layout.topMargin: Kirigami.Units.smallSpacing
+                //Layout.bottomMargin: Kirigami.Units.smallSpacing
+
+                //Kirigami.Heading {
+                    //level: 3
+                    //Layout.fillWidth: true
+                    //elide: Qt.ElideRight
+                    //text: info.title ? info.title : i18n("No media playing")
+                //}
+
+                //RowLayout{
+
+                    //Controls.Label{
+                        //visible: info.title
+                        //text: PlayerUtils.formatTimestamp(audio.position)
+                    //}
+
+                    //Controls.Slider {
+                        //Layout.fillWidth: true
+                        //from: 0
+                        //to: audio.duration
+                        //value: audio.position
+                        //enabled: audio.seekable
+                        //onMoved: {
+                            //console.log("Value:", value);
+                            //audio.seek(Math.floor(value));
+                        //}
+
+                        //Behavior on value {
+                            //NumberAnimation {
+                                //duration: 1000
+                            //}
+
+                        //}
+
+                    //}
+
+                    //Controls.Label{
+                        //visible: info.title
+                        //text: PlayerUtils.formatTimestamp(audio.duration)
+                    //}
+
+                //}



-            }
+            //}

-            Controls.ToolButton {
-                display: Controls.AbstractButton.IconOnly
-                Layout.preferredWidth: parent.height
-                text: i18n("Expand")
-                enabled: playlistView.count > 0
-                Layout.fillHeight: true
-                icon.name: footerItem.maximized ? "arrow-down" : "arrow-up"
-                onClicked: footerItem.maximized = !footerItem.maximized
-            }
+            //Controls.ToolButton {
+                //display: Controls.AbstractButton.IconOnly
+                //Layout.preferredWidth: parent.height
+                //text: i18n("Expand")
+                //enabled: playlistView.count > 0
+                //Layout.fillHeight: true
+                //icon.name: footerItem.maximized ? "arrow-down" : "arrow-up"
+                //onClicked: footerItem.maximized = !footerItem.maximized
+            //}

-        }
+        //}
    }

-    Behavior on height {
-        NumberAnimation {
-        }
-    }
+    //Behavior on height {
+        //NumberAnimation {
+        //}
+    //}
 }
@@ -12,10 +12,12 @@ import org.kde.ytmusic 1.0
 Kirigami.ApplicationWindow {
    id: root

-    property alias searchField: searchField
+    property alias searchField: searchLoader.item // TODO
+
+    property bool wideScreen: width >= 600
+    property bool showSearch: false // only applicable if not widescreen

    header: Controls.Control {
-        visible: !footer.maximized
        padding: Kirigami.Units.largeSpacing

        background: Rectangle {
@@ -26,73 +28,62 @@ Kirigami.ApplicationWindow {
             Kirigami.Theme.colorSet: Kirigami.Theme.Header
             color:  Kirigami.Theme.backgroundColor
         }
-        contentItem: RowLayout{
-            Item {
-                Layout.fillWidth: true
+
+        contentItem: RowLayout {
+            Controls.ToolButton {
+                id: searchBack
+                Layout.alignment: Qt.AlignLeft
+                visible:
+                    (!root.wideScreen && root.showSearch && root.searchField.text === "")
+                    || pageStack.layers.depth > 1
+                text: i18n("Back")
+                icon.name: "go-previous-view"
+                display: Controls.ToolButton.IconOnly
+                onClicked: if (root.showSearch)
+                               root.showSearch = false
+                           else
+                               pageStack.layers.pop()
            }
-            Kirigami.SearchField {
-                id: searchField
-                delaySearch: true
-                selectByMouse: true
+
+            Kirigami.Heading {
+                Layout.alignment: Qt.AlignLeft
+                Layout.leftMargin: Kirigami.Units.largeSpacing
+                level: 1
+                text: "AudioTube"
+                visible: !root.wideScreen && !root.showSearch
+            }
+
+            // spacer
+            Item {
+                Layout.fillWidth: !root.wideScreen
+            }
+
+            Loader {
+                id: searchLoader
+                visible: root.wideScreen || root.showSearch
+                Layout.alignment: Qt.AlignHCenter
                Layout.fillWidth: true
                Layout.maximumWidth: 400
-                onPressed: {
-                    popup.open()
-                }
-
-                Controls.Popup {
-                    id: popup
-                    x: searchField.y
-                    y: searchField.y + searchField.height
-                    visible: true
-                    width: searchField.width
-                    height: completionList
-                            ? Math.min(completionList.count * Kirigami.Units.gridUnit * 2 + Kirigami.Units.gridUnit * 2, Kirigami.Units.gridUnit * 20)
-                            : Kirigami.Units.gridUnit * 20
-
-                    contentItem: Controls.ScrollView {
-                        Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
-                        ListView {
-                            id: completionList
-                            model: Library.searches
-                            delegate: Controls.ItemDelegate {
-                                id: completionDelegate
-                                width: parent.width
-                                height: Kirigami.Units.gridUnit * 2
-                                text: model.display
-                                onClicked: {
-                                    searchField.text = model.display
-                                    searchField.accepted()
-                                }
-                            }
-                        }
-                    }
-                }
-
-                onAccepted: {
-                    pageStack.clear()
-
-                    if (text) {
-                        Library.addSearch(text)
-                        pageStack.push("qrc:/SearchPage.qml", {
-                                   "searchQuery": text})
-                    } else {
-                        pageStack.replace("qrc:/LibraryPage.qml")
-                    }
-
-                    popup.close()
-                }
+                sourceComponent: searchFieldComponent
            }
-            Item {
-                Layout.fillWidth: true
+
+            Controls.ToolButton {
+                Layout.alignment: Qt.AlignRight
+                visible: !root.wideScreen && !root.showSearch
+                text: i18n("Search")
+                icon.name: "search"
+                display: Controls.ToolButton.TextBesideIcon
+                onClicked: {
+                    root.showSearch = true
+                    root.searchField.forceActiveFocus();
+                    root.searchField.popup.open();
+                }
            }
        }
    }

    title: i18n("AudioTube")

-    controlsVisible: !footer.maximized
-
    contextDrawer: Kirigami.ContextDrawer {
        id: contextDrawer
    }
@@ -120,6 +111,76 @@ Kirigami.ApplicationWindow {
            showPassiveNotification(error)
        }
    }
+    
+    Component {
+        id: searchFieldComponent
+        
+        Kirigami.SearchField {
+            id: searchField
+            delaySearch: true
+            selectByMouse: true
+            onPressed: {
+                popup.open()
+            }
+            
+            property alias popup: popup

-    footer: PlayerFooter {}
+            Controls.Popup {
+                id: popup
+                x: searchField.y
+                y: searchField.y + searchField.height
+                width: searchField.width
+                height: completionList
+                        ? Math.min(completionList.count * Kirigami.Units.gridUnit * 2 + Kirigami.Units.gridUnit * 2, Kirigami.Units.gridUnit * 20)
+                        : Kirigami.Units.gridUnit * 20
+
+                contentItem: Controls.ScrollView {
+                    Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
+                    ListView {
+                        id: completionList
+                        model: Library.searches
+                        delegate: Controls.ItemDelegate {
+                            Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                            Kirigami.Theme.inherit: false
+                            id: completionDelegate
+                            width: parent.width
+                            height: Kirigami.Units.gridUnit * 2
+                            text: model.display
+                            onClicked: {
+                                searchField.text = model.display
+                                searchField.accepted()
+                            }
+                        }
+                    }
+                }
+            }
+
+            onAccepted: {
+                pageStack.clear()
+                pageStack.layers.clear()
+
+                if (text) {
+                    Library.addSearch(text)
+                    pageStack.push("qrc:/SearchPage.qml", {
+                                "searchQuery": text})
+                } else {
+                    pageStack.replace("qrc:/LibraryPage.qml")
+                }
+
+                popup.close()
+            }
+        }
+    }
+    
+    pageStack.anchors.bottomMargin: playerFooter.minimizedPlayerHeight + 1
+
+    // media player
+    PlayerFooter {
+        id: playerFooter
+        anchors.topMargin: -root.header.height
+        anchors.fill: parent
+        
+        // only expand flicking area to full screen when it is open
+        z: (contentY === 0) ? -1 : 999
+    }
 }
@@ -17,8 +17,12 @@ namespace ranges = std::ranges;
 Library::Library(QObject *parent)
    : QObject{parent}
    , m_database(ThreadedDatabase::establishConnection([]() -> DatabaseConfiguration {
+        const auto databaseDirectory = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+        // Make sure the database directory exists
+        QDir(databaseDirectory).mkpath(QStringLiteral("."));
+
        DatabaseConfiguration config;
-        config.setDatabaseName(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) % QDir::separator() % "library.sqlite");
+        config.setDatabaseName(databaseDirectory % QDir::separator() % "library.sqlite");
        config.setType(DATABASE_TYPE_SQLITE);
        return config;
    }()))
@@ -36,16 +40,7 @@ Library &Library::instance()

 FavouritesModel *Library::favourites()
 {
-    auto future = mapFuture<Rows, std::vector<Song>>(
-        m_database->getResults("select * from favourites natural join songs"),
-        [](auto rows)
-    {
-        std::vector<Song> songs;
-        ranges::transform(parseRows<QString, QString, QString, QString>(rows),
-                          std::back_inserter(songs),
-                          Song::fromSql);
-        return songs;
-    });
+    auto future = m_database->getResults<Song>("select * from favourites natural join songs");
    return new FavouritesModel(std::move(future), this);
 }

@@ -71,16 +66,7 @@ FavouriteWatcher *Library::favouriteWatcher(const QString &videoId)

 SearchHistoryModel *Library::searches()
 {
-    return new SearchHistoryModel(mapFuture<Rows, std::vector<QString>>(
-        m_database->getResults("select (search_query) from searches order by search_id desc"),
-        [](const auto &rows)
-    {
-        std::vector<QString> out;
-        ranges::transform(rows, std::back_inserter(out), [](auto row) {
-            return row[0].toString();
-        });
-        return out;
-    }), this);
+    return new SearchHistoryModel(m_database->getResults<SingleValue<QString>>("select (search_query) from searches order by search_id desc"), this);
 }

 void Library::addSearch(const QString &text)
@@ -90,16 +76,7 @@ void Library::addSearch(const QString &text)

 PlaybackHistoryModel *Library::playbackHistory()
 {
-    auto future = mapFuture<Rows, std::vector<PlayedSong>>(
-        m_database->getResults("select * from played_songs natural join songs"),
-        [](auto rows)
-    {
-        std::vector<PlayedSong> playedSongs;
-        ranges::transform(parseRows<QString, int, QString, QString, QString>(rows),
-                          std::back_inserter(playedSongs),
-                          PlayedSong::fromSql);
-        return playedSongs;
-    });
+    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs");
    return new PlaybackHistoryModel(std::move(future), this);
 }

@@ -114,16 +91,7 @@ void Library::addPlaybackHistoryItem(const QString &videoId, const QString &titl

 PlaybackHistoryModel *Library::mostPlayed()
 {
-    auto future = mapFuture<Rows, std::vector<PlayedSong>>(
-        m_database->getResults("select * from played_songs natural join songs order by plays desc limit 10"),
-        [](auto rows)
-    {
-        std::vector<PlayedSong> playedSongs;
-        ranges::transform(parseRows<QString, int, QString, QString, QString>(rows),
-                          std::back_inserter(playedSongs),
-                          PlayedSong::fromSql);
-        return playedSongs;
-    });
+    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs order by plays desc limit 10");
    return new PlaybackHistoryModel(std::move(future), this);
 }

@@ -180,7 +148,7 @@ QHash<int, QByteArray> PlaybackHistoryModel::roleNames() const {
    return {
        {Roles::VideoId, "videoId"},
        {Roles::Title, "title"},
-        {Roles::Artist, "artist"},
+        {Roles::Artist, "artists"},
        {Roles::Plays, "plays"}
    };
 }
@@ -218,7 +186,7 @@ QHash<int, QByteArray> FavouritesModel::roleNames() const {
    return {
        {Roles::VideoId, "videoId"},
        {Roles::Title, "title"},
-        {Roles::Artist, "artist"}
+        {Roles::Artist, "artists"}
    };
 }

@@ -243,10 +211,9 @@ FavouriteWatcher::FavouriteWatcher(Library *library, const QString &videoId)
    : QObject(library), m_videoId(videoId), m_library(library)
 {
    auto update = [this] {
-        connectFuture(m_library->database().getResult("select count(*) from favourites where video_id = ?", m_videoId), this, [this](auto row) {
-            if (row) {
-                auto [favCount] = parseRow<int>(*row);
-                m_isFavourite = favCount > 0;
+        connectFuture(m_library->database().getResult<SingleValue<int>>("select count(*) from favourites where video_id = ?", m_videoId), this, [this](auto count) {
+            if (count) {
+                m_isFavourite = count->value > 0;
                Q_EMIT isFavouriteChanged();
            }
        });
@@ -259,7 +226,7 @@ bool FavouriteWatcher::isFavourite() const {
    return m_isFavourite;
 }

-SearchHistoryModel::SearchHistoryModel(QFuture<std::vector<QString>> &&historyFuture, QObject *parent)
+SearchHistoryModel::SearchHistoryModel(QFuture<std::vector<SingleValue<QString>>> &&historyFuture, QObject *parent)
    : QAbstractListModel(parent)
 {
    connectFuture(historyFuture, this, [this](const auto history) {
@@ -276,7 +243,7 @@ int SearchHistoryModel::rowCount(const QModelIndex &parent) const {
 QVariant SearchHistoryModel::data(const QModelIndex &index, int role) const {
    switch (role) {
    case Qt::DisplayRole:
-        return m_history[index.row()];
+        return m_history[index.row()].value;
    }

    Q_UNREACHABLE();
@@ -17,7 +17,9 @@
 class FavouriteWatcher;

 struct Song {
-    static Song fromSql(std::tuple<QString, QString, QString, QString> tuple) {
+    using ColumnTypes = std::tuple<QString, QString, QString, QString>;
+
+    static Song fromSql(ColumnTypes tuple) {
        auto [videoId, title, artist, album] = tuple;
        return Song {videoId, title, artist, album};
    }
@@ -49,7 +51,9 @@ private:
 };

 struct PlayedSong {
-    static PlayedSong fromSql(std::tuple<QString, int, QString, QString, QString> tuple) {
+    using ColumnTypes = std::tuple<QString, int, QString, QString, QString>;
+
+    static PlayedSong fromSql(ColumnTypes tuple) {
        auto [videoId, plays, title, artist, album] = tuple;
        return PlayedSong {videoId, title, artist, album, plays};
    }
@@ -86,12 +90,12 @@ class SearchHistoryModel : public QAbstractListModel {
    Q_OBJECT

 public:
-    SearchHistoryModel(QFuture<std::vector<QString> > &&historyFuture, QObject *parent = nullptr);
+    SearchHistoryModel(QFuture<std::vector<SingleValue<QString>>> &&historyFuture, QObject *parent = nullptr);
    int rowCount(const QModelIndex &parent) const override;
    QVariant data(const QModelIndex &index, int role) const override;

 private:
-    std::vector<QString> m_history;
+    std::vector<SingleValue<QString>> m_history;
 };

 class Library : public QObject
@@ -14,7 +14,10 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
        <file alias="PlaylistPage.qml">contents/ui/PlaylistPage.qml</file>
        <file alias="ConfirmationMessage.qml">contents/ui/ConfirmationMessage.qml</file>
        <file alias="LibraryPage.qml">contents/ui/LibraryPage.qml</file>
+        <file alias="MinimizedPlayerControls.qml">contents/ui/MinimizedPlayerControls.qml</file>
+        <file alias="MaximizedPlayerPage.qml">contents/ui/MaximizedPlayerPage.qml</file>
        <file>migrations/2022-05-20-194850_init/down.sql</file>
        <file>migrations/2022-05-20-194850_init/up.sql</file>
+        <file alias="PlaybackHistory.qml">contents/ui/PlaybackHistory.qml</file>
    </qresource>
 </RCC>
@@ -17,6 +17,8 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
            m_videoInfo = {};
            Q_EMIT audioUrlChanged();
            Q_EMIT titleChanged();
+            Q_EMIT artistChanged();
+            Q_EMIT channelChanged();
            Q_EMIT songChanged();
            Q_EMIT thumbnailChanged();
            return;
@@ -30,6 +32,8 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
            setLoading(false);
            Q_EMIT audioUrlChanged();
            Q_EMIT titleChanged();
+            Q_EMIT artistChanged();
+            Q_EMIT channelChanged();
            Q_EMIT songChanged();
            Q_EMIT thumbnailChanged();
        });
@@ -81,6 +85,16 @@ QString VideoInfoExtractor::title() const
    return QString::fromStdString(m_videoInfo.title);
 }

+QString VideoInfoExtractor::artist() const
+{
+    return QString::fromStdString(m_videoInfo.artist);
+}
+
+QString VideoInfoExtractor::channel() const
+{
+    return QString::fromStdString(m_videoInfo.channel);
+}
+
 QString VideoInfoExtractor::thumbnail() const
 {
    return QString::fromStdString(m_videoInfo.thumbnail);
@@ -17,6 +17,8 @@ class VideoInfoExtractor : public QObject

    Q_PROPERTY(QUrl audioUrl READ audioUrl NOTIFY audioUrlChanged)
    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+    Q_PROPERTY(QString artist READ artist NOTIFY artistChanged) // may be empty if it is a video
+    Q_PROPERTY(QString channel READ channel NOTIFY channelChanged)
    Q_PROPERTY(QString thumbnail READ thumbnail NOTIFY thumbnailChanged)
    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)

@@ -32,6 +34,12 @@ public:

    QString title() const;
    Q_SIGNAL void titleChanged();
+    
+    QString artist() const;
+    Q_SIGNAL void artistChanged();
+    
+    QString channel() const;
+    Q_SIGNAL void channelChanged();

    QString thumbnail() const;
    Q_SIGNAL void thumbnailChanged();
@@ -21,7 +21,7 @@ void pyPrintPretty(py::handle obj) {

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

-constexpr auto TESTED_YTMUSICAPI_VERSION = "0.21.0";
+constexpr auto TESTED_YTMUSICAPI_VERSION = "0.22.0";

 struct UNEXPORT YTMusicPrivate {
    py::scoped_interpreter guard {};
@@ -460,10 +460,12 @@ video_info::VideoInfo YTMusic::extract_video_info(const std::string &video_id) c
    using namespace pybind11::literals;

    const auto info = d->get_ytdl().attr("extract_info")(video_id, "download"_a=py::bool_(false));
-
+    
    return {
        info["id"].cast<std::string>(),
        info["title"].cast<std::string>(),
+        info.contains("artist") ? info["artist"].cast<std::string>() : "",
+        info.contains("channel") ? info["channel"].cast<std::string>() : "",
        extract_py_list<video_info::Format>(info["formats"]),
        info["thumbnail"].cast<std::string>()
    };
@@ -241,6 +241,8 @@ struct Format {
 struct VideoInfo {
    std::string id;
    std::string title;
+    std::string artist;
+    std::string channel;
    std::vector<Format> formats;
    std::string thumbnail;
Author	SHA1	Message	Date
Jonah Brüchert	d499c02089	Allow to show all favourites / history as a list	2022-05-25 22:34:10 +02:00
Jonah Brüchert	4b1cbf11ad	Display AudioTube label just on mobile, and move the search bar back to the center	2022-05-25 15:33:35 +02:00
Devin Lin	1037ac8c02	app header: Move search bar to side, add app header, add search button for mobile	2022-05-25 15:33:32 +02:00
l10n daemon script	572f3c4c94	GIT_SILENT Sync po/docbooks with svn	2022-05-25 01:52:03 +00:00
Devin Lin	e48d6c8bb6	Add loading indicator to minimized bar when loading track	2022-05-24 14:52:20 +00:00
l10n daemon script	d717e7dff9	GIT_SILENT Sync po/docbooks with svn	2022-05-24 01:50:35 +00:00
Jonah Brüchert	cb16ebb812	Crop album art to square	2022-05-23 21:42:23 +02:00
Jonah Brüchert	2c1df5e9e4	asyncdatabase: Remove unused includes	2022-05-23 21:16:43 +02:00
Jonah Brüchert	c3873d05ac	asyncdatabase: Move parseRows into private API It is no longer useful externally, as the database API doesn't return unparsed QVariants any more.	2022-05-23 21:16:43 +02:00
Jonah Brüchert	4fca0ca0c5	Show mini progress bar when there is no space for the full one	2022-05-23 16:06:00 +00:00
Jonah Brüchert	c02f369a0f	asyncdatabase: Fix mistake in concept checks	2022-05-23 18:04:28 +02:00
Jonah Brüchert	2e68ec0880	Remove remove action from most viewed	2022-05-23 17:31:21 +02:00
Jonah Brüchert	c7b22b348e	asyncdatabase: Use concepts to define the interface of types that can be deserialized from SQL	2022-05-23 16:12:25 +02:00
Devin Lin	f4c8172201	Revamp media player UI Reworks the media player UI for mobile devices. Adds a swipe gesture to open the media player, and reworks the UI to be more... hip? TODO: haven't implemented a "previous song" feature, is that possible? ![image](/uploads/d329da0ea548eed466227ef39f25301f/image.png) ![image](/uploads/7b3cf83204a1df13b5b166d24d0c2a91/image.png) ![image](/uploads/74c641c544a130eb5e692fb1ae733e37/image.png)	2022-05-23 12:36:35 +00:00
Jonah Brüchert	9fa7757efd	Make database query result deserialization more automatic	2022-05-23 13:24:07 +02:00
l10n daemon script	fc2c359bd7	GIT_SILENT Sync po/docbooks with svn	2022-05-23 01:49:32 +00:00
Jonah Brüchert	f17987b3e7	Update ytmusicapi to 0.22.0	2022-05-23 01:11:37 +02:00
Jonah Brüchert	7c2bbf3a98	library: Create database directory before opening database	2022-05-23 01:11:10 +02:00
Jonah Brüchert	4320921a96	asyncdatabase: Log error if database could not be opened	2022-05-23 01:10:45 +02:00
Jonah Brüchert	306a4c866c	Fix background color of the search popup	2022-05-23 00:41:46 +02:00
Jonah Brüchert	2bfd142300	asyncdatabase: Move as much as possible out of the header In preparation for making it a shared library in the future.	2022-05-23 00:41:06 +02:00
Jonah Brüchert	bec70c37db	Run migrations in a transaction This should be slightly faster (although not a problem right now) and more importantly allow to rollback if transactions go wrong. Then at least the issues can be fixed in a later release, so that the migration can run successful later.	2022-05-22 16:16:12 +02:00
Jonah Brüchert	a7e9588a90	Improve layout of the search popup	2022-05-22 14:23:51 +02:00
Jonah Brüchert	463bdde0a0	Add library feature The library page currently shows favourites and most played songs.	2022-05-22 11:16:38 +00:00