chore: bumping version, fastlane and changelog

* feat: increase items per row on landscape view

This covers the catalogues: artist, album and genre; also the list of albums on artist view.
This was implemented by adierebel/tempo fork, I only cherry-picked some commits.

Co-authored-by: adierebel <adie.rebel@gmail.com>

* feat: add landscape layout to song listing views

This includes the playlist page and the album page.

* fix: bad scaling on small screens

This rollbacks to the original code by adierebel/tempo fork

* fix: remove hardcoded height blocking scroll

This was addressed in 989ca35, forgot to fix it here as well

* fix: wrap content height rather than inheriting it from parent

* feat: add ui of choice selector in setting for items per row

* feat: link getter to landscapes items per row setting an implement it

* fix: wrong default value

Co-authored-by: eddyizm <wtfisup@hotmail.com>

* feat: add default value on setting string

To introduce the new feature of landscape layouts.

Co-authored-by: eddyizm <wtfisup@hotmail.com>

---------

Co-authored-by: adierebel <adie.rebel@gmail.com>
Co-authored-by: eddyizm <wtfisup@hotmail.com>
Co-authored-by: eddyizm <eddyizm@gmail.com>

CHANGELOG.md

@@ -1,6 +1,131 @@
 # Changelog
 
-## Pending release...
+## Pending release
+
+## What's Changed
+* fix: Addressing some UI/UX quirks by @tiltshiftfocus in https://github.com/eddyizm/tempus/pull/413
+* fix: keep observer until data is received on continuousPlay bug by @eddyizm in https://github.com/eddyizm/tempus/pull/421
+* fix: album art now displays on android auto by @trobinson in https://github.com/eddyizm/tempus/pull/414
+* feat: improve landscape view and increase items per row on landscape view by @tvillega in https://github.com/eddyizm/tempus/pull/411
+
+## New Contributors
+* @tiltshiftfocus made their first contribution in https://github.com/eddyizm/tempus/pull/413
+* @trobinson made their first contribution in https://github.com/eddyizm/tempus/pull/414
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.9.8...v4.10.0
+
+## What's Changed
+## [4.9.8](https://github.com/eddyizm/tempo/releases/tag/v4.9.8) (2026-02-02)
+* fix: missing Replay Gain metadata from .m4a files by @pgrit in https://github.com/eddyizm/tempus/pull/396
+* fix: Improve Synced Lyrics by @pgrit in https://github.com/eddyizm/tempus/pull/384
+* fix: Add selector for playlist visibility by @tvillega in https://github.com/eddyizm/tempus/pull/394
+* chore(i18n): set links as untranslatable by @tvillega in https://github.com/eddyizm/tempus/pull/400
+
+## New Contributors
+* @tvillega made their first contribution in https://github.com/eddyizm/tempus/pull/394
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.9.5...v4.5.8
+
+## What's Changed
+## [4.9.5](https://github.com/eddyizm/tempo/releases/tag/v4.9.5) (2026-01-26)
+* fix: Avoid crash when server has no songs by @jaime-grj in https://github.com/eddyizm/tempus/pull/389
+* fix: updated dialog import to address crashing on android 15 by @eddyizm in https://github.com/eddyizm/tempus/pull/392
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.9.3...v4.9.5
+
+## What's Changed
+## [4.9.3](https://github.com/eddyizm/tempo/releases/tag/v4.9.3) (2026-01-25)
+* fix: Proper raw stream detection by @jaime-grj in https://github.com/eddyizm/tempus/pull/382
+* chore(i18n): Update Spanish translation by @jaime-grj in https://github.com/eddyizm/tempus/pull/381
+* feat: add configurable timeout by @eddyizm in https://github.com/eddyizm/tempus/pull/386
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.9.1...v4.9.3
+
+## What's Changed
+## [4.9.1](https://github.com/eddyizm/tempo/releases/tag/v4.9.1) (2026-01-24)
+* chore: i18n: Add Romanian translation (including locale_config this time!) by @DevMatei in https://github.com/eddyizm/tempus/pull/357
+* French localization update by @benoit-smith in https://github.com/eddyizm/tempus/pull/356
+* chore(i18n): Update Spanish translation by @jaime-grj in https://github.com/eddyizm/tempus/pull/364
+* docs: updated readme and added known issues for airsonic work around by @eddyizm in https://github.com/eddyizm/tempus/pull/366
+* fix: toast for made for you click indication by @eddyizm in https://github.com/eddyizm/tempus/pull/365
+* fix: sort playlist view  by @eddyizm in https://github.com/eddyizm/tempus/pull/368
+* feat: sort preference for playlists by @eddyizm in https://github.com/eddyizm/tempus/pull/370
+* fix: use existing future when adding tracks, dialed random album tracks off in instant mix by @eddyizm in https://github.com/eddyizm/tempus/pull/373
+* chore(i18n): Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/374
+* fix: Check for OpenSubsonic extensions also with password authentication by @pgrit in https://github.com/eddyizm/tempus/pull/375
+* feat: Implement duration and seeking for transcodes by @drakeerv in https://github.com/eddyizm/tempus/pull/358
+* feat: Playback speed controls for music by @pgrit in https://github.com/eddyizm/tempus/pull/376
+
+## New Contributors
+* @pgrit made their first contribution in https://github.com/eddyizm/tempus/pull/375
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.6.4...v4.9.1
+
+## What's Changed
+## [4.6.4](https://github.com/eddyizm/tempo/releases/tag/v4.6.4) (2026-01-13)
+* fix: instant mix random songs and broken continuous play by @eddyizm in https://github.com/eddyizm/tempus/pull/354
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.6.3...v4.6.4
+
+## What's Changed
+## [4.6.3](https://github.com/eddyizm/tempo/releases/tag/v4.6.3) (2026-01-10)
+* fix: give user feedback when trying to add podcast/radio on unsupport… by @eddyizm in https://github.com/eddyizm/tempus/pull/328
+* docs: Clarify Android Auto enablement by @Forage in https://github.com/eddyizm/tempus/pull/336
+* fix: instant mix gets a big refactor, with cascading fallbacks to produce a larger queue by @eddyizm in https://github.com/eddyizm/tempus/pull/330
+* chore(i18n): add missing keys, update Chinese translation and alphabetize by @hongwei1203 in https://github.com/eddyizm/tempus/pull/332
+* chore(i18n): Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/339
+* feat: Ability to toggle visibility of artist biography by @kmarius in https://github.com/eddyizm/tempus/pull/338
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.6.0...v4.6.3
+
+## [4.6.0](https://github.com/eddyizm/tempo/releases/tag/v4.6.0) (2025-12-22)
+## What's Changed
+* chore: Update description_empty_title in English and Polish by @tyren234 in https://github.com/eddyizm/tempus/pull/307
+* chore(i18n): Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/310
+* fix: checks preference and writes files externally, updates the ui by @eddyizm in https://github.com/eddyizm/tempus/pull/312
+* chore: Update description_empty_title in Italian by @pochopsp in https://github.com/eddyizm/tempus/pull/314
+* chore: Update description_empty_title in French and Spanish by @pochopsp in https://github.com/eddyizm/tempus/pull/315
+* feat: added regular playlist to home view by @eddyizm in https://github.com/eddyizm/tempus/pull/322
+
+## New Contributors
+* @tyren234 made their first contribution in https://github.com/eddyizm/tempus/pull/307
+* @pochopsp made their first contribution in https://github.com/eddyizm/tempus/pull/314
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.5.0...v4.6.0
+
+## [4.5.0](https://github.com/eddyizm/tempo/releases/tag/v4.5.0) (2025-12-12)
+## What's Changed
+* fix: updates starred syncing downloads to user defined directory by @eddyizm in https://github.com/eddyizm/tempus/pull/298
+* fix: handle empty albums and null mappings by @eddyizm in https://github.com/eddyizm/tempus/pull/301
+* feat: integrate sort recent searches chronologically by @J4mm3ris in https://github.com/eddyizm/tempus/pull/300
+* feat: add heart to artist/album pages, fixed artist cover art failing by @eddyizm in https://github.com/eddyizm/tempus/pull/303
+
+## New Contributors
+* @J4mm3ris made their first contribution in https://github.com/eddyizm/tempus/pull/300
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.4.0...v4.5.0
+
+## [4.4.0](https://github.com/eddyizm/tempo/releases/tag/v4.4.0) (2025-11-29)
+## What's Changed
+* chore: bringing in media service refactor previously reverted after more testing  by @eddyizm in https://github.com/eddyizm/tempus/pull/286
+* fix: refactor start queue to put the db writing in the background to address instant mix bug by @eddyizm in https://github.com/eddyizm/tempus/pull/287
+* Feat: playerqueue fab allows playqueue actions -> saving to playlist, download all, load queue, shuffle, clean queue  by @eddyizm in https://github.com/eddyizm/tempus/pull/288
+* chore(i18n): Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/291
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.3.0...v4.4.0
+
+## [4.3.0](https://github.com/eddyizm/tempo/releases/tag/v4.3.0) (2025-11-23)
+## What's Changed
+* chore: Add Obtainium badge to README by @mikaeldui in https://github.com/eddyizm/tempus/pull/280
+* fix: Revert "refactor MediaService" by @eddyizm in https://github.com/eddyizm/tempus/pull/282
+* feat: add play functionality to library folder/index items by @antebudimir in https://github.com/eddyizm/tempus/pull/276
+* fix: start queue blocking UI by @eddyizm in https://github.com/eddyizm/tempus/pull/283
+
+## New Contributors
+* @mikaeldui made their first contribution in https://github.com/eddyizm/tempus/pull/280
+* @antebudimir made their first contribution in https://github.com/eddyizm/tempus/pull/276
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.2.6...v4.3.0
 
 ## [4.2.6](https://github.com/eddyizm/tempo/releases/tag/v4.2.6) (2025-11-22)
 ## What's Changed

README.md

@@ -10,14 +10,21 @@
 
 <div align="center">
 
-  <!-- Reproducible build  -->  
-[<img src="https://shields.rbtlog.dev/simple/com.eddyizm.degoogled.tempus" alt="RB Status">](https://shields.rbtlog.dev/com.eddyizm.degoogled.tempus) 
-
+<a href="https://github.com/eddyizm/tempus/releases/">
+    <img alt="Releases" src="https://img.shields.io/github/downloads/eddyizm/tempus/total.svg?color=4B95DE&style=flat">
+</a>
+  <!-- Reproducible build  -->
+<a href="https://shields.rbtlog.dev/com.eddyizm.degoogled.tempus"><img src="https://shields.rbtlog.dev/simple/com.eddyizm.degoogled.tempus" alt="RB Status"></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0">
+    <img src="https://img.shields.io/badge/license-GPL%20v3-2B6DBE.svg?style=flat">
+</a>
 </div>
 
 <p align="center">
     <a href="https://github.com/eddyizm/tempus/releases"><img src="https://i.ibb.co/q0mdc4Z/get-it-on-github.png" width="200"></a>
     <a href="https://apt.izzysoft.de/fdroid/index/apk/com.eddyizm.degoogled.tempus"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" width="200"></a>
+    <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.eddyizm.tempus%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Feddyizm%2Ftempus%22%2C%22author%22%3A%22eddyizm%22%2C%22name%22%3A%22Tempus%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22tempus%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%2C%5C%22includeZips%5C%22%3Afalse%2C%5C%22zippedApkFilterRegEx%5C%22%3A%5C%22%5C%22%7D%22%2C%22overrideSource%22%3A%22GitHub%22%7D"><img width="200" src="https://github.com/user-attachments/assets/119e7ff4-2636-43cb-ab7f-1b6a58ac3570" /></a>
+    <a href="https://www.openapk.net/tempus/com.eddyizm.degoogled.tempus/"><img src="https://camo.githubusercontent.com/cd56895b28a73ebd781a65b4f567add5419e45797a5cf1485ce408e851c2318e/68747470733a2f2f7777772e6f70656e61706b2e6e65742f696d616765732f6f70656e61706b2d62616467652e706e67" width="200"></a>
 </p>
 <!-- 
     <a href="https://f-droid.org/packages/com.cappielloantonio.notquitemy.tempo"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="200"></a>
@@ -26,10 +33,14 @@
 
 **Tempus** is an open-source and lightweight music client for Subsonic, designed and built natively for Android. It provides a seamless and intuitive music streaming experience, allowing you to access and play your Subsonic music library directly from your Android device. 
 
-Tempus does not rely on magic algorithms to decide what you should listen to. Instead, the interface is built around your listening history, randomness, and optionally integrates with services like Last.fm to personalize your music experience.
+Tempus does not rely on magic algorithms to decide what you should listen to. Instead, the interface is built around your listening history, randomness, and optionally integrates with services like Listenbrainz.org and Last.fm to personalize your music experience (These must be supported by your backend). 
 
 The project is a fork of [Tempo](#credits).
 
+[Changelog](CHANGELOG.md)  
+[Wiki](USAGE.md)  
+[Donate](https://github.com/eddyizm/tempus#donate)
+
 **If you find Tempus useful, please consider starring the project on GitHub. It would mean a lot to me and help promote the app to a wider audience.**
 
 **Use the Github version of the app for full Android Auto and Chromecast support.**
@@ -45,11 +56,6 @@ Please note the two variants in the release assets include release/debug and 32/
 
 `app-degoogled*` <- The izzyOnDroid release that goes without any of the google stuff. It is now available on izzyOnDroid (64bit) I am releasing the both 32/64bit apk's here on github for those who need a 32bit version.
 
-[CHANGELOG.md](CHANGELOG.md)
-
-## Usage
-
-[Documentation](USAGE.md) (work in progress)
 
 ## Features
 - **Subsonic Integration**: Tempus seamlessly integrates with your Subsonic server, providing you with easy access to your entire music collection on the go.
@@ -58,16 +64,19 @@ Please note the two variants in the release assets include release/debug and 32/
 - **Streaming and Offline Mode**: Stream music directly from your Subsonic server. Offline mode is currently under active development and may have limitations when using multiple servers.
 - **Playlist Management**: Create, edit, and manage playlists to curate your perfect music collection.
 - **Gapless Playback**: Experience uninterrupted playback with gapless listening mode.
-- **Chromecast Support**: Stream your music to Chromecast devices. The support is currently in a rudimentary state.
+- **Chromecast Support**: Stream your music to Chromecast devices. The support is currently in a rudimentary state.*
 - **Scrobbling Integration**: Optionally integrate Tempus with Last.fm or Listenbrainz.org to scrobble your played tracks, gather music insights, and further personalize your music recommendations, if supported by your Subsonic server.
 - **Podcasts and Radio**: If your Subsonic server supports it, listen to podcasts and radio shows directly within Tempus, expanding your audio entertainment options.
+- **Instant Mix**: Full refactor of instant mix function which leverages subsonics similarSongs2 by artist/album and similarSongs endpoints to server a larger play queue more reliably.
 - **Transcoding Support**: Activate transcoding of tracks on your Subsonic server, allowing you to set a transcoding profile for optimized streaming directly from the app. This feature requires support from your Subsonic server.
-- **Android Auto Support**: Enjoy your favorite music on the go with full Android Auto integration, allowing you to seamlessly control and listen to your tracks directly from your mobile device while driving.
+- **Android Auto Support**: Enjoy your favorite music on the go with full Android Auto integration, allowing you to seamlessly control and listen to your tracks directly from your mobile device while driving.* 
 - **Multiple Libraries**: Tempus handles multi-library setups gracefully. They are displayed as Library folders.
 - **Equalizer**: Option to use in app equalizer.
 - **Widget**: New widget to keeping the basic controls on your screen at all times.
 - **Available in 11 languages**: Currently in Chinese, French, German, Italian, Korean, Polish, Portuguese, Russion, Spanish and Turkish
 
+ **Github version only*
+ 
 ## Screenshot
 
 <p align="center">
@@ -111,7 +120,10 @@ Currently there are no tests but I would love to start on some unit tests.
 
 Not a hard requirement but any new feature/change should ideally include an update to the nacent documention. 
 
-## Support
+*Special Thanks*  
+All the amazing [contributors](https://github.com/eddyizm/tempus/graphs/contributors)❤️
+
+## Donate
 
 [**Buy me a coffee**](https://ko-fi.com/eddyizm)  
 bitcoin: `3QVHSSCJvn6yXEcJ3A3cxYLMmbvFsrnUs5`  
@@ -120,7 +132,8 @@ bitcoin: `3QVHSSCJvn6yXEcJ3A3cxYLMmbvFsrnUs5`
 
 Tempus is released under the [GNU General Public License v3.0](LICENSE). Feel free to modify, distribute, and use the app in accordance with the terms of the license. Contributions to the project are also welcome. 
 
+
 ## Credits
 Thanks to the original repo/creator [CappielloAntonio](https://github.com/CappielloAntonio) (forked from v3.9.0)
 
-[Opensvg.org](https://opensvg.org) for the new turntable logo. 
+[Opensvg.org](https://opensvg.org) for the new turntable logo. 

USAGE.md

@@ -6,14 +6,13 @@
 - [Getting Started](#getting-started)
 - [Server Configuration](#server-configuration)
 - [Main Features](#main-features)
-
 - [Navigation](#navigation)
 - [Playback Controls](#playback-controls)
 - [Favorites](#favorites)
 - [Playlist Management](#playlist-management)
 - [Android Auto](#android-auto)
 - [Settings](#settings)
-- [Troubleshooting](#troubleshooting)
+- [Known Issues](#known-issues)
 
 ## Prerequisites
 
@@ -30,7 +29,7 @@ This app works with any service that implements the Subsonic API, including:
 - [Gonic](https://github.com/sentriz/gonic)
 - [Ampache](https://github.com/ampache/ampache)
 - [NextCloud Music](https://apps.nextcloud.com/apps/music)
-
+- [Airsonic Advanced](https://github.com/kagemomiji/airsonic-advanced)
 
 
 
@@ -69,6 +68,21 @@ However, if you want to limit or change libraries you could use a workaround, if
 
 You can create multiple users , one for each library, and save each of them in Tempus app.
 
+### Folder or index playback
+
+If your Subsonic-compatible server exposes the folder tree **or** provides an artist index (for example Gonic, Navidrome, or any backend with folder browsing enabled), Tempus lets you play an entire folder from anywhere in the library hierarchy:
+
+<p align="left">
+    <img src="mockup/usage/music_folders_root.png" width=317 style="margin-right:16px;">
+    <img src="mockup/usage/music_folders_playback.png" width=317>
+</p>
+
+- The **Library ▸ Music folders** screen shows each top-level folder with a play icon only after you drill into it. The root entry remains a simple navigator.
+- When viewing **inner folders** **or artist index entries**, tap the new play button to immediately enqueue every audio track inside that folder/index and all nested subfolders.
+- Video files are excluded automatically, so only playable audio ends up in the queue.
+
+No extra config is needed—Tempus adjusts based on the connected backend.
+
 ### Now Playing Screen
 
 On the main player control screen, tapping on the artwork will reveal a small collection of 4 buttons/icons. 
@@ -145,7 +159,23 @@ If your server supports it - add a internet radio station feed
 ## Android Auto
 
 ### Enabling on your head unit
-- You have to enable Android Auto developer options, which are different from actual Android dev options. Then you have to enable "Unknown sources" in Android Auto, otherwise the app won't appear as it isn't downloaded from Play Store. (screenshots needed)
+To allow the Tempus app on your car's head unit, "Unknown sources" needs to be enabled in the Android Auto "Developer settings". This is because Tempus isn't installed through Play Store. Note that the Android Auto developer settings are different from the global Android "Developer options".
+1. Switch to developer mode in the Android Auto settings by tapping ten times on the "Version" item at the bottom, followed by giving your permission.
+<p align="left">
+   <img width="270" height="600" alt="1a" src="https://github.com/user-attachments/assets/f09f6999-9761-4b05-8ec7-bf221a15dda3" />
+   <img width="270" height="600" alt="1b" src="https://github.com/user-attachments/assets/0795e508-ba01-41c5-96a7-7c03b0156591" />
+   <img width="270" height="600" alt="1c" src="https://github.com/user-attachments/assets/51c15f67-fddb-452e-b5d3-5092edeab390" />
+</p>
+   
+2. Go to the "Developer settings" by the menu at the top right.
+<p align="left">
+   <img width="270" height="600" alt="2" src="https://github.com/user-attachments/assets/1ecd1f3e-026d-4d25-87f2-be7f12efbac6" />
+</p>
+
+3. Scroll down to the bottom and check "Unknown sources".
+<p align="left">
+   <img width="270" height="600" alt="3" src="https://github.com/user-attachments/assets/37db88e9-1b76-417f-9c47-da9f3a750fff" />
+</p>
 
 
 ### Server Settings
@@ -162,15 +192,12 @@ If your server supports it - add a internet radio station feed
 ### Appearance
 **TODO**
 
-## Troubleshooting
+## Known Issues
 
-### Connection Issues
+### Airsonic Distorted Playback
 
-**TODO**
-
-### Common Issues
-
-**TODO**
+First reported in issue [#226](https://github.com/eddyizm/tempus/issues/226)  
+The work around is to disable the cache in the settings, (set to 0), and if needed, cleaning the (Android) cache fixes the problem.
 
 ### Support
 For additional help:

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 24
         targetSdk 35
 
-        versionCode 7
-        versionName '4.2.6'
+        versionCode 18
+        versionName '4.10.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         javaCompileOptions {

app/src/main/AndroidManifest.xml

@@ -96,7 +96,12 @@
                 android:resource="@xml/widget_info"/>
         </receiver>
 
-
+        <provider
+            android:name=".provider.AlbumArtContentProvider"
+            android:authorities="com.cappielloantonio.tempo.provider"
+            android:enabled="true"
+            android:exported="true"
+        />
 
     </application>
 </manifest>

app/src/main/java/com/cappielloantonio/tempo/database/AppDatabase.java

@@ -30,7 +30,7 @@ import com.cappielloantonio.tempo.subsonic.models.Playlist;
 
 @UnstableApi
 @Database(
-        version = 12,
+        version = 13,
         entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Chronology.class, Favorite.class, SessionMediaItem.class, Playlist.class, LyricsCache.class},
         autoMigrations = {@AutoMigration(from = 10, to = 11), @AutoMigration(from = 11, to = 12)}
 )

app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java

@@ -12,9 +12,12 @@ import java.util.List;
 
 @Dao
 public interface RecentSearchDao {
-    @Query("SELECT * FROM recent_search ORDER BY search DESC")
+    @Query("SELECT search FROM recent_search ORDER BY timestamp DESC")
     List<String> getRecent();
 
+    @Query("SELECT search FROM recent_search ORDER BY search DESC")
+    List<String> getAlpha();
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insert(RecentSearch search);
 

app/src/main/java/com/cappielloantonio/tempo/interfaces/ClickCallback.java

@@ -27,8 +27,11 @@ public interface ClickCallback {
     default void onInternetRadioStationClick(Bundle bundle) {}
     default void onInternetRadioStationLongClick(Bundle bundle) {}
     default void onMusicFolderClick(Bundle bundle) {}
+    default void onMusicFolderPlay(Bundle bundle) {}
     default void onMusicDirectoryClick(Bundle bundle) {}
+    default void onMusicDirectoryPlay(Bundle bundle) {}
     default void onMusicIndexClick(Bundle bundle) {}
+    default void onMusicIndexPlay(Bundle bundle) {}
     default void onDownloadGroupLongClick(Bundle bundle) {}
     default void onShareClick(Bundle bundle) {}
     default void onShareLongClick(Bundle bundle) {}

app/src/main/java/com/cappielloantonio/tempo/model/RecentSearch.kt

@@ -13,5 +13,8 @@ import kotlinx.parcelize.Parcelize
 data class RecentSearch(
     @PrimaryKey
     @ColumnInfo(name = "search")
-    var search: String
+    var search: String,
+
+    @ColumnInfo(name = "timestamp", defaultValue = "0")
+    var timestamp: Long
 ) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/model/SessionMediaItem.kt

@@ -1,5 +1,6 @@
 package com.cappielloantonio.tempo.model
 
+import android.content.ContentResolver
 import android.net.Uri
 import android.os.Bundle
 import androidx.annotation.Keep
@@ -13,6 +14,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.cappielloantonio.tempo.glide.CustomGlideRequest
+import com.cappielloantonio.tempo.provider.AlbumArtContentProvider
 import com.cappielloantonio.tempo.subsonic.models.Child
 import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation
 import com.cappielloantonio.tempo.subsonic.models.PodcastEpisode
@@ -197,7 +199,7 @@ class SessionMediaItem() {
 
     fun getMediaItem(): MediaItem {
         val uri: Uri = getStreamUri()
-        val artworkUri = Uri.parse(CustomGlideRequest.createUrl(coverArtId, getImageSize()))
+        val artworkUri = AlbumArtContentProvider.contentUri(coverArtId)
 
         val bundle = Bundle()
         bundle.putString("id", id)

app/src/main/java/com/cappielloantonio/tempo/provider/AlbumArtContentProvider.java

@@ -0,0 +1,149 @@
+package com.cappielloantonio.tempo.provider;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.cappielloantonio.tempo.glide.CustomGlideRequest;
+import com.cappielloantonio.tempo.util.Preferences;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class AlbumArtContentProvider extends ContentProvider {
+    public static final String AUTHORITY = "com.cappielloantonio.tempo.provider";
+    public static final String ALBUM_ART = "albumArt";
+    private ExecutorService executor;
+
+    private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+
+    static {
+        uriMatcher.addURI(AUTHORITY, "albumArt/*", 1);
+    }
+
+    public static Uri contentUri(String artworkId) {
+        return new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(AUTHORITY)
+                .appendPath(ALBUM_ART)
+                .appendPath(artworkId)
+                .build();
+    }
+
+    @Nullable
+    @Override
+    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
+        Context context = getContext();
+        String albumId = uri.getLastPathSegment();
+        Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(albumId, Preferences.getImageSize()));
+
+        try {
+            // use pipe to communicate between background thread and caller of openFile()
+            ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
+            ParcelFileDescriptor readSide = pipe[0];
+            ParcelFileDescriptor writeSide = pipe[1];
+
+            // perform loading in background thread to avoid blocking UI
+            executor.execute(() -> {
+                try (OutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream(writeSide)) {
+
+                    // request artwork from API using Glide
+                    File file = Glide.with(context)
+                            .asFile()
+                            .load(artworkUri)
+                            .diskCacheStrategy(DiskCacheStrategy.DATA)
+                            .submit()
+                            .get();
+
+                    // copy artwork down pipe returned by ContentProvider
+                    try (InputStream in = new FileInputStream(file)) {
+                        byte[] buffer = new byte[8192];
+                        int bytesRead;
+                        while ((bytesRead = in.read(buffer)) != -1) {
+                            out.write(buffer, 0, bytesRead);
+                        }
+                    } catch (Exception e) {
+                        writeSide.closeWithError("Failed to load image: " + e.getMessage());
+                    }
+
+                } catch (Exception e) {
+                    try {
+                        writeSide.closeWithError("Failed to load image: " + e.getMessage());
+                    } catch (IOException ignored) {}
+                }
+            });
+
+            return readSide;
+
+        } catch (IOException e) {
+            throw new FileNotFoundException("Could not create pipe: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean onCreate() {
+        executor = Executors.newFixedThreadPool(
+                Math.max(2, Runtime.getRuntime().availableProcessors() / 2)
+        );
+        return true;
+    }
+
+    @Override
+    public void shutdown() {
+        if (executor != null) {
+            executor.shutdown();
+            try {
+                if (!executor.awaitTermination(5, TimeUnit.SECONDS)) {
+                    executor.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                executor.shutdownNow();
+            }
+        }
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] strings, @Nullable String s, @Nullable String[] strings1, @Nullable String s1) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return "";
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+}

app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java

@@ -2,15 +2,16 @@ package com.cappielloantonio.tempo.repository;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
+
 import android.util.Log;
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.interfaces.DecadesCallback;
-import com.cappielloantonio.tempo.interfaces.MediaCallback;
 import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.AlbumInfo;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -204,29 +205,12 @@ public class AlbumRepository {
         return albumInfo;
     }
 
-    public void getInstantMix(AlbumID3 album, int count, MediaCallback callback) {
-        App.getSubsonicClientInstance(false)
-                .getBrowsingClient()
-                .getSimilarSongs2(album.getId(), count)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        List<Child> songs = new ArrayList<>();
-
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSimilarSongs2() != null) {
-                            songs.addAll(response.body().getSubsonicResponse().getSimilarSongs2().getSongs());
-                        }
-
-                        callback.onLoadMedia(songs);
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-                        callback.onLoadMedia(new ArrayList<>());
-                    }
-                });
+    public MutableLiveData<List<Child>> getInstantMix(AlbumID3 album, int count) {
+        // Delegate to the centralized SongRepository
+        return new SongRepository().getInstantMix(album.getId(), SeedType.ALBUM, count);
     }
 
+
     public MutableLiveData<List<Integer>> getDecades() {
         MutableLiveData<List<Integer>> decades = new MutableLiveData<>();
 
@@ -237,7 +221,7 @@ public class AlbumRepository {
                     @Override
                     public void onLoadYear(int last) {
                         if (first != -1 && last != -1) {
-                            List<Integer> decadeList = new ArrayList();
+                            List<Integer> decadeList = new ArrayList<>();
 
                             int startDecade = first - (first % 10);
                             int lastDecade = last - (last % 10);
@@ -298,4 +282,4 @@ public class AlbumRepository {
                     }
                 });
     }
-}
+}

app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java

@@ -5,12 +5,14 @@ import androidx.lifecycle.MutableLiveData;
 import android.util.Log;
 
 import com.cappielloantonio.tempo.App;
+import com.cappielloantonio.tempo.interfaces.MediaCallback;
 import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistInfo2;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.IndexID3;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -149,7 +151,7 @@ public class ArtistRepository {
 
                             if(response.body().getSubsonicResponse().getArtists() != null && response.body().getSubsonicResponse().getArtists().getIndices() != null) {
                                 for (IndexID3 index : response.body().getSubsonicResponse().getArtists().getIndices()) {
-                                    if(index != null && index.getArtists() != null) {
+                                    if(index.getArtists() != null) {
                                         artists.addAll(index.getArtists());
                                     }
                                 }
@@ -287,26 +289,8 @@ public class ArtistRepository {
     }
 
     public MutableLiveData<List<Child>> getInstantMix(ArtistID3 artist, int count) {
-        MutableLiveData<List<Child>> instantMix = new MutableLiveData<>();
-
-        App.getSubsonicClientInstance(false)
-                .getBrowsingClient()
-                .getSimilarSongs2(artist.getId(), count)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSimilarSongs2() != null) {
-                            instantMix.setValue(response.body().getSubsonicResponse().getSimilarSongs2().getSongs());
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
-        return instantMix;
+        // Delegate to the centralized SongRepository
+        return new SongRepository().getInstantMix(artist.getId(), SeedType.ARTIST, count);
     }
 
     public MutableLiveData<List<Child>> getRandomSong(ArtistID3 artist, int count) {

app/src/main/java/com/cappielloantonio/tempo/repository/AutomotiveRepository.java

@@ -1,6 +1,7 @@
 package com.cappielloantonio.tempo.repository;
 
 
+import android.content.ContentResolver;
 import android.net.Uri;
 import android.view.View;
 
@@ -22,6 +23,7 @@ import com.cappielloantonio.tempo.glide.CustomGlideRequest;
 import com.cappielloantonio.tempo.model.Chronology;
 import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.model.SessionMediaItem;
+import com.cappielloantonio.tempo.provider.AlbumArtContentProvider;
 import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
@@ -70,7 +72,7 @@ public class AutomotiveRepository {
                             List<MediaItem> mediaItems = new ArrayList<>();
 
                             for (AlbumID3 album : albums) {
-                                Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(album.getCoverArtId(), Preferences.getImageSize()));
+                                Uri artworkUri = AlbumArtContentProvider.contentUri(album.getCoverArtId());
 
                                 MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                         .setTitle(album.getName())
@@ -217,7 +219,7 @@ public class AutomotiveRepository {
                             List<MediaItem> mediaItems = new ArrayList<>();
 
                             for (AlbumID3 album : albums) {
-                                Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(album.getCoverArtId(), Preferences.getImageSize()));
+                                Uri artworkUri = AlbumArtContentProvider.contentUri(album.getCoverArtId());
 
                                 MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                         .setTitle(album.getName())
@@ -272,7 +274,7 @@ public class AutomotiveRepository {
                             List<MediaItem> mediaItems = new ArrayList<>();
 
                             for (ArtistID3 artist : artists) {
-                                Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(artist.getCoverArtId(), Preferences.getImageSize()));
+                                Uri artworkUri = AlbumArtContentProvider.contentUri(artist.getCoverArtId());
 
                                 MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                         .setTitle(artist.getName())
@@ -397,7 +399,7 @@ public class AutomotiveRepository {
                                 List<Child> children = response.body().getSubsonicResponse().getIndexes().getChildren();
 
                                 for (Child song : children) {
-                                    Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(song.getCoverArtId(), Preferences.getImageSize()));
+                                    Uri artworkUri = AlbumArtContentProvider.contentUri(song.getCoverArtId());
 
                                     MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                             .setTitle(song.getTitle())
@@ -451,7 +453,7 @@ public class AutomotiveRepository {
                             List<MediaItem> mediaItems = new ArrayList<>();
 
                             for (Child child : directory.getChildren()) {
-                                Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(child.getCoverArtId(), Preferences.getImageSize()));
+                                Uri artworkUri = AlbumArtContentProvider.contentUri(child.getCoverArtId());
 
                                 MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                         .setTitle(child.getTitle())
@@ -550,7 +552,7 @@ public class AutomotiveRepository {
                             List<MediaItem> mediaItems = new ArrayList<>();
 
                             for (PodcastEpisode episode : episodes) {
-                                Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(episode.getCoverArtId(), Preferences.getImageSize()));
+                                Uri artworkUri = AlbumArtContentProvider.contentUri(episode.getCoverArtId());
 
                                 MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                         .setTitle(episode.getTitle())
@@ -687,7 +689,7 @@ public class AutomotiveRepository {
                             List<MediaItem> mediaItems = new ArrayList<>();
 
                             for (AlbumID3 album : albums) {
-                                Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(album.getCoverArtId(), Preferences.getImageSize()));
+                                Uri artworkUri = AlbumArtContentProvider.contentUri(album.getCoverArtId());
 
                                 MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                         .setTitle(album.getName())
@@ -800,7 +802,7 @@ public class AutomotiveRepository {
 
                             if (response.body().getSubsonicResponse().getSearchResult3().getArtists() != null) {
                                 for (ArtistID3 artist : response.body().getSubsonicResponse().getSearchResult3().getArtists()) {
-                                    Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(artist.getCoverArtId(), Preferences.getImageSize()));
+                                    Uri artworkUri = AlbumArtContentProvider.contentUri(artist.getCoverArtId());
 
                                     MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                             .setTitle(artist.getName())
@@ -822,7 +824,7 @@ public class AutomotiveRepository {
 
                             if (response.body().getSubsonicResponse().getSearchResult3().getAlbums() != null) {
                                 for (AlbumID3 album : response.body().getSubsonicResponse().getSearchResult3().getAlbums()) {
-                                    Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(album.getCoverArtId(), Preferences.getImageSize()));
+                                    Uri artworkUri = AlbumArtContentProvider.contentUri(album.getCoverArtId());
 
                                     MediaMetadata mediaMetadata = new MediaMetadata.Builder()
                                             .setTitle(album.getName())

app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java

@@ -1,8 +1,5 @@
 package com.cappielloantonio.tempo.repository;
 
-import static android.provider.Settings.System.getString;
-
-import android.provider.Settings;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -107,13 +104,13 @@ public class PlaylistRepository {
         return playlistLiveData;
     }
 
-    public void addSongToPlaylist(String playlistId, ArrayList<String> songsId) {
+    public void addSongToPlaylist(String playlistId, ArrayList<String> songsId, Boolean playlistVisibilityIsPublic) {
         if (songsId.isEmpty()) {
             Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_all_skipped), Toast.LENGTH_SHORT).show();
         } else{
             App.getSubsonicClientInstance(false)
                     .getPlaylistClient()
-                    .updatePlaylist(playlistId, null, true, songsId, null)
+                    .updatePlaylist(playlistId, null, playlistVisibilityIsPublic, songsId, null)
                     .enqueue(new Callback<ApiResponse>() {
                         @Override
                         public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {

app/src/main/java/com/cappielloantonio/tempo/repository/PodcastRepository.java

@@ -66,88 +66,33 @@ public class PodcastRepository {
         return liveNewestPodcastEpisodes;
     }
 
-    public void refreshPodcasts() {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> refreshPodcasts() {
+        return App.getSubsonicClientInstance(false)
                 .getPodcastClient()
-                .refreshPodcasts()
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .refreshPodcasts();
     }
 
-    public void createPodcastChannel(String url) {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> createPodcastChannel(String url) {
+        return App.getSubsonicClientInstance(false)
                 .getPodcastClient()
-                .createPodcastChannel(url)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .createPodcastChannel(url);
     }
 
-    public void deletePodcastChannel(String channelId) {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> deletePodcastChannel(String channelId) {
+        return App.getSubsonicClientInstance(false)
                 .getPodcastClient()
-                .deletePodcastChannel(channelId)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .deletePodcastChannel(channelId);
     }
 
-    public void deletePodcastEpisode(String episodeId) {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> deletePodcastEpisode(String episodeId) {
+        return App.getSubsonicClientInstance(false)
                 .getPodcastClient()
-                .deletePodcastEpisode(episodeId)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .deletePodcastEpisode(episodeId);
     }
 
-    public void downloadPodcastEpisode(String episodeId) {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> downloadPodcastEpisode(String episodeId) {
+        return App.getSubsonicClientInstance(false)
                 .getPodcastClient()
-                .downloadPodcastEpisode(episodeId)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .downloadPodcastEpisode(episodeId);
     }
 }

app/src/main/java/com/cappielloantonio/tempo/repository/QueueRepository.java

@@ -1,8 +1,11 @@
 package com.cappielloantonio.tempo.repository;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.database.AppDatabase;
@@ -52,6 +55,8 @@ public class QueueRepository {
     public MutableLiveData<PlayQueue> getPlayQueue() {
         MutableLiveData<PlayQueue> playQueue = new MutableLiveData<>();
 
+        Log.d(TAG, "Getting play queue from server...");
+
         App.getSubsonicClientInstance(false)
                 .getBookmarksClient()
                 .getPlayQueue()
@@ -59,12 +64,19 @@ public class QueueRepository {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getPlayQueue() != null) {
-                            playQueue.setValue(response.body().getSubsonicResponse().getPlayQueue());
+                            PlayQueue serverQueue = response.body().getSubsonicResponse().getPlayQueue();
+                            Log.d(TAG, "Server returned play queue with " +
+                                    (serverQueue.getEntries() != null ? serverQueue.getEntries().size() : 0) + " items");
+                            playQueue.setValue(serverQueue);
+                        } else {
+                            Log.d(TAG, "Server returned no play queue");
+                            playQueue.setValue(null);
                         }
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        Log.e(TAG, "Failed to get play queue", t);
                         playQueue.setValue(null);
                     }
                 });
@@ -73,18 +85,24 @@ public class QueueRepository {
     }
 
     public void savePlayQueue(List<String> ids, String current, long position) {
+        Log.d(TAG, "Saving play queue to server - Items: " + ids.size() + ", Current: " + current);
+
         App.getSubsonicClientInstance(false)
                 .getBookmarksClient()
                 .savePlayQueue(ids, current, position)
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
+                        if (response.isSuccessful()) {
+                            Log.d(TAG, "Play queue saved successfully");
+                        } else {
+                            Log.d(TAG, "Play queue save failed with code: " + response.code());
+                        }
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
+                        Log.e(TAG, "Play queue save failed", t);
                     }
                 });
     }
@@ -123,10 +141,9 @@ public class QueueRepository {
 
     private boolean isMediaInQueue(List<Queue> queue, Child media) {
         if (queue == null || media == null) return false;
-        
-        return queue.stream().anyMatch(queueItem -> 
-            queueItem != null && media.getId() != null && 
-            queueItem.getId().equals(media.getId())
+        return queue.stream().anyMatch(queueItem ->
+                queueItem != null && media.getId() != null &&
+                        queueItem.getId().equals(media.getId())
         );
     }
 
@@ -146,8 +163,8 @@ public class QueueRepository {
             List<Child> filteredToAdd = toAdd;
             final List<Queue> finalMedia = media;
             filteredToAdd = toAdd.stream()
-                .filter(child -> !isMediaInQueue(finalMedia, child))
-                .collect(Collectors.toList());
+                    .filter(child -> !isMediaInQueue(finalMedia, child))
+                    .collect(Collectors.toList());
 
             for (int i = 0; i < filteredToAdd.size(); i++) {
                 Queue queueItem = new Queue(filteredToAdd.get(i));

app/src/main/java/com/cappielloantonio/tempo/repository/RadioRepository.java

@@ -38,54 +38,22 @@ public class RadioRepository {
         return radioStation;
     }
 
-    public void createInternetRadioStation(String name, String streamURL, String homepageURL) {
-        App.getSubsonicClientInstance(false)
+        public Call<ApiResponse> createInternetRadioStation(String name, String streamURL, String homepageURL) {
+        return App.getSubsonicClientInstance(false)
                 .getInternetRadioClient()
-                .createInternetRadioStation(streamURL, name, homepageURL)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .createInternetRadioStation(streamURL, name, homepageURL);
     }
 
-    public void updateInternetRadioStation(String id, String name, String streamURL, String homepageURL) {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> updateInternetRadioStation(String id, String name, String streamURL, String homepageURL) {
+        return App.getSubsonicClientInstance(false)
                 .getInternetRadioClient()
-                .updateInternetRadioStation(id, streamURL, name, homepageURL)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .updateInternetRadioStation(id, streamURL, name, homepageURL);
     }
 
-    public void deleteInternetRadioStation(String id) {
-        App.getSubsonicClientInstance(false)
+    public Call<ApiResponse> deleteInternetRadioStation(String id) {
+        return App.getSubsonicClientInstance(false)
                 .getInternetRadioClient()
-                .deleteInternetRadioStation(id)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+                .deleteInternetRadioStation(id);
     }
+
 }

app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java

@@ -13,6 +13,7 @@ import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.SearchResult2;
 import com.cappielloantonio.tempo.subsonic.models.SearchResult3;
+import com.cappielloantonio.tempo.util.Preferences;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -186,7 +187,12 @@ public class SearchingRepository {
 
         @Override
         public void run() {
-            recent = recentSearchDao.getRecent();
+            if(Preferences.isSearchSortingChronologicallyEnabled()){
+                recent = recentSearchDao.getRecent();
+            }
+            else {
+                recent = recentSearchDao.getAlpha();
+            }
         }
 
         public List<String> getRecent() {

app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java

@@ -1,23 +1,35 @@
 package com.cappielloantonio.tempo.repository;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.subsonic.models.SubsonicResponse;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
 public class SongRepository {
+
     private static final String TAG = "SongRepository";
 
+    public interface MediaCallbackInternal {
+        void onSongsAvailable(List<Child> songs);
+    }
+
     public MutableLiveData<List<Child>> getStarredSongs(boolean random, int size) {
         MutableLiveData<List<Child>> starredSongs = new MutableLiveData<>(Collections.emptyList());
 
@@ -42,25 +54,202 @@ public class SongRepository {
                     }
 
                     @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
                 });
 
         return starredSongs;
     }
 
-    public MutableLiveData<List<Child>> getInstantMix(String id, int count) {
+    /**
+     * Used by ViewModels. Updates the LiveData list incrementally as songs are found.
+     */
+    public MutableLiveData<List<Child>> getInstantMix(String id, SeedType type, int count) {
+        MutableLiveData<List<Child>> instantMix = new MutableLiveData<>(new ArrayList<>());
+        Set<String> trackIds = new HashSet<>();
+
+        performSmartMix(id, type, count, songs -> {
+            List<Child> current = instantMix.getValue();
+            if (current != null) {
+                for (Child s : songs) {
+                    if (!trackIds.contains(s.getId())) {
+                        current.add(s);
+                        trackIds.add(s.getId());
+                    }
+                }
+
+                if (current.size() < count / 2) {
+                    fetchSimilarOnly(id, count, remainder -> {
+                        for (Child r : remainder) {
+                            if (!trackIds.contains(r.getId())) {
+                                current.add(r);
+                                trackIds.add(r.getId());
+                            }
+                        }
+                        instantMix.postValue(current);
+                    });
+                } else {
+                    instantMix.postValue(current);
+                }
+            }
+        });
+
+        return instantMix;
+    }
+
+    /**
+     * Overloaded method used by other Repositories
+     */
+    public void getInstantMix(String id, SeedType type, int count, MediaCallbackInternal callback) {
+        new MediaCallbackAccumulator(callback, count).start(id, type);
+    }
+
+    private class MediaCallbackAccumulator {
+        private final MediaCallbackInternal originalCallback;
+        private final int targetCount;
+        private final List<Child> accumulatedSongs = new ArrayList<>();
+        private final Set<String> trackIds = new HashSet<>();
+        private boolean isComplete = false;
+        
+        MediaCallbackAccumulator(MediaCallbackInternal callback, int count) {
+            this.originalCallback = callback;
+            this.targetCount = count;
+        }
+        
+        void start(String id, SeedType type) {
+            performSmartMix(id, type, targetCount, this::onBatchReceived);
+        }
+        
+        private void onBatchReceived(List<Child> batch) {
+            if (isComplete || batch == null || batch.isEmpty()) {
+                return;
+            }
+
+            int added = 0;
+            for (Child song : batch) {
+                if (!trackIds.contains(song.getId()) && accumulatedSongs.size() < targetCount) {
+                    trackIds.add(song.getId());
+                    accumulatedSongs.add(song);
+                    added++;
+                }
+            }
+            
+            if (accumulatedSongs.size() >= targetCount) {
+                originalCallback.onSongsAvailable(new ArrayList<>(accumulatedSongs));
+                isComplete = true;
+            }
+        }
+
+    }
+
+    private void performSmartMix(final String id, final SeedType type, final int count, final MediaCallbackInternal callback) {
+        switch (type) {
+            case ARTIST:
+                fetchSimilarByArtist(id, count, callback);
+                break;
+            case ALBUM:
+                fetchAlbumSongs(id, count, callback);
+                break;
+            case TRACK:
+                fetchSingleTrackThenSimilar(id, count, callback);
+                break;
+        }
+    }
+
+    private void fetchAlbumSongs(String albumId, int count, MediaCallbackInternal callback) {
+        App.getSubsonicClientInstance(false).getBrowsingClient().getAlbum(albumId).enqueue(new Callback<ApiResponse>() {
+            @Override
+            public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                if (response.isSuccessful() && response.body() != null && 
+                    response.body().getSubsonicResponse().getAlbum() != null) {
+                    List<Child> albumSongs = response.body().getSubsonicResponse().getAlbum().getSongs();
+                    if (albumSongs != null && !albumSongs.isEmpty()) {
+                        int fromAlbum = Math.min(count, albumSongs.size());
+                        List<Child> limitedAlbumSongs = albumSongs.subList(0, fromAlbum);
+                        callback.onSongsAvailable(new ArrayList<>(limitedAlbumSongs));
+
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                Log.e(TAG, "fetchAlbumSongsThenSimilar.onFailure()", t);
+            }
+        });
+    }
+
+    private void fetchSimilarByArtist(String artistId, final int count, final MediaCallbackInternal callback) {
+        App.getSubsonicClientInstance(false)
+                .getBrowsingClient()
+                .getSimilarSongs2(artistId, count)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        List<Child> similar = extractSongs(response, "similarSongs2");
+                        Log.d(TAG, "fetchSimilarByArtist.onResponse() - similar songs: " + similar.size());
+
+                        if (!similar.isEmpty()) {
+                            List<Child> limitedSimilar = similar.subList(0, Math.min(count, similar.size()));
+                            callback.onSongsAvailable(limitedSimilar);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        Log.e(TAG, "fetchSimilarByArtist.onFailure()", t);
+                    }
+                });
+    }
+
+    private void fetchSingleTrackThenSimilar(String trackId, int count, MediaCallbackInternal callback) {
+        App.getSubsonicClientInstance(false).getBrowsingClient().getSong(trackId).enqueue(new Callback<ApiResponse>() {
+            @Override
+            public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                if (response.isSuccessful() && response.body() != null) {
+                    Child song = response.body().getSubsonicResponse().getSong();
+                    if (song != null) {
+                        callback.onSongsAvailable(Collections.singletonList(song));
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                Log.e(TAG, "fetchSingleTrackThenSimilar.onFailure()", t);
+            }
+        });
+    }
+
+    private void fetchSimilarOnly(String id, int count, MediaCallbackInternal callback) {
+        App.getSubsonicClientInstance(false).getBrowsingClient().getSimilarSongs(id, count).enqueue(new Callback<ApiResponse>() {
+            @Override
+            public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                List<Child> songs = extractSongs(response, "similarSongs");
+                if (!songs.isEmpty()) {
+                    int limit = Math.min(count, songs.size());
+                    callback.onSongsAvailable(songs.subList(0, limit));
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                Log.e(TAG, "fetchSimilarOnly.onFailure()", t);
+            }
+        });
+    }
+
+
+    public MutableLiveData<List<Child>> getContinuousMix(String id, int count) {
         MutableLiveData<List<Child>> instantMix = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(false)
                 .getBrowsingClient()
-                .getSimilarSongs2(id, count)
+                .getSimilarSongs(id, count)
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSimilarSongs2() != null) {
-                            instantMix.setValue(response.body().getSubsonicResponse().getSimilarSongs2().getSongs());
+                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSimilarSongs() != null) {
+                            instantMix.setValue(response.body().getSubsonicResponse().getSimilarSongs().getSongs());
                         }
                     }
 
@@ -73,188 +262,128 @@ public class SongRepository {
         return instantMix;
     }
 
+    private List<Child> extractSongs(Response<ApiResponse> response, String type) {
+        if (response.isSuccessful() && response.body() != null) {
+            SubsonicResponse res = response.body().getSubsonicResponse();
+            List<Child> list = null;
+            if (type.equals("similarSongs") && res.getSimilarSongs() != null) {
+                list = res.getSimilarSongs().getSongs();
+            } else if (type.equals("similarSongs2") && res.getSimilarSongs2() != null) {
+                list = res.getSimilarSongs2().getSongs();
+            }
+            return (list != null) ? list : new ArrayList<>();
+        }
+
+        return new ArrayList<>();
+    }
+
     public MutableLiveData<List<Child>> getRandomSample(int number, Integer fromYear, Integer toYear) {
         MutableLiveData<List<Child>> randomSongsSample = new MutableLiveData<>();
-
-        App.getSubsonicClientInstance(false)
-                .getAlbumSongListClient()
-                .getRandomSongs(number, fromYear, toYear)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        List<Child> songs = new ArrayList<>();
-
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getRandomSongs() != null && response.body().getSubsonicResponse().getRandomSongs().getSongs() != null) {
-                            songs.addAll(response.body().getSubsonicResponse().getRandomSongs().getSongs());
-                        }
-
-                        randomSongsSample.setValue(songs);
+        App.getSubsonicClientInstance(false).getAlbumSongListClient().getRandomSongs(number, fromYear, toYear).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                List<Child> songs = new ArrayList<>();
+                if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getRandomSongs() != null) {
+                    List<Child> returned = response.body().getSubsonicResponse().getRandomSongs().getSongs();
+                    if (returned != null) {
+                        songs.addAll(returned);
                     }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
+                }
+                randomSongsSample.setValue(songs);
+            }
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
         return randomSongsSample;
     }
 
     public MutableLiveData<List<Child>> getRandomSampleWithGenre(int number, Integer fromYear, Integer toYear, String genre) {
         MutableLiveData<List<Child>> randomSongsSample = new MutableLiveData<>();
 
-        App.getSubsonicClientInstance(false)
-                .getAlbumSongListClient()
-                .getRandomSongs(number, fromYear, toYear, genre)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        List<Child> songs = new ArrayList<>();
-
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getRandomSongs() != null && response.body().getSubsonicResponse().getRandomSongs().getSongs() != null) {
-                            songs.addAll(response.body().getSubsonicResponse().getRandomSongs().getSongs());
-                        }
-
-                        randomSongsSample.setValue(songs);
+        App.getSubsonicClientInstance(false).getAlbumSongListClient().getRandomSongs(number, fromYear, toYear, genre).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                List<Child> songs = new ArrayList<>();
+                if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getRandomSongs() != null) {
+                    List<Child> returned = response.body().getSubsonicResponse().getRandomSongs().getSongs();
+                    if (returned != null) {
+                        songs.addAll(returned);
                     }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
+                }
+                randomSongsSample.setValue(songs);
+            }
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
         return randomSongsSample;
     }
 
     public void scrobble(String id, boolean submission) {
-        App.getSubsonicClientInstance(false)
-                .getMediaAnnotationClient()
-                .scrobble(id, submission)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+        App.getSubsonicClientInstance(false).getMediaAnnotationClient().scrobble(id, submission).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {}
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
     }
 
     public void setRating(String id, int rating) {
-        App.getSubsonicClientInstance(false)
-                .getMediaAnnotationClient()
-                .setRating(id, rating)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
+        App.getSubsonicClientInstance(false).getMediaAnnotationClient().setRating(id, rating).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {}
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
     }
 
     public MutableLiveData<List<Child>> getSongsByGenre(String id, int page) {
         MutableLiveData<List<Child>> songsByGenre = new MutableLiveData<>();
-
-        App.getSubsonicClientInstance(false)
-                .getAlbumSongListClient()
-                .getSongsByGenre(id, 100, 100 * page)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSongsByGenre() != null) {
-                            songsByGenre.setValue(response.body().getSubsonicResponse().getSongsByGenre().getSongs());
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
+        App.getSubsonicClientInstance(false).getAlbumSongListClient().getSongsByGenre(id, 100, 100 * page).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSongsByGenre() != null) {
+                    songsByGenre.setValue(response.body().getSubsonicResponse().getSongsByGenre().getSongs());
+                }
+            }
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
         return songsByGenre;
     }
 
     public MutableLiveData<List<Child>> getSongsByGenres(ArrayList<String> genresId) {
         MutableLiveData<List<Child>> songsByGenre = new MutableLiveData<>();
-
-        for (String id : genresId)
-            App.getSubsonicClientInstance(false)
-                    .getAlbumSongListClient()
-                    .getSongsByGenre(id, 500, 0)
-                    .enqueue(new Callback<ApiResponse>() {
-                        @Override
-                        public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                            List<Child> songs = new ArrayList<>();
-
-                            if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSongsByGenre() != null) {
-                                songs.addAll(response.body().getSubsonicResponse().getSongsByGenre().getSongs());
-                            }
-
-                            songsByGenre.setValue(songs);
+        for (String id : genresId) {
+            App.getSubsonicClientInstance(false).getAlbumSongListClient().getSongsByGenre(id, 500, 0).enqueue(new Callback<ApiResponse>() {
+                @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                    List<Child> songs = new ArrayList<>();
+                    if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSongsByGenre() != null) {
+                        List<Child> returned = response.body().getSubsonicResponse().getSongsByGenre().getSongs();
+                        if (returned != null) {
+                            songs.addAll(returned);
                         }
-
-                        @Override
-                        public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                        }
-                    });
-
+                    }
+                    songsByGenre.setValue(songs);
+                }
+                @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+            });
+        }
         return songsByGenre;
     }
 
     public MutableLiveData<Child> getSong(String id) {
         MutableLiveData<Child> song = new MutableLiveData<>();
-
-        App.getSubsonicClientInstance(false)
-                .getBrowsingClient()
-                .getSong(id)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null) {
-                            song.setValue(response.body().getSubsonicResponse().getSong());
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
+        App.getSubsonicClientInstance(false).getBrowsingClient().getSong(id).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                if (response.isSuccessful() && response.body() != null) {
+                    song.setValue(response.body().getSubsonicResponse().getSong());
+                }
+            }
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
         return song;
     }
 
     public MutableLiveData<String> getSongLyrics(Child song) {
         MutableLiveData<String> lyrics = new MutableLiveData<>(null);
-
-        App.getSubsonicClientInstance(false)
-                .getMediaRetrievalClient()
-                .getLyrics(song.getArtist(), song.getTitle())
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getLyrics() != null) {
-                            lyrics.setValue(response.body().getSubsonicResponse().getLyrics().getValue());
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
+        App.getSubsonicClientInstance(false).getMediaRetrievalClient().getLyrics(song.getArtist(), song.getTitle()).enqueue(new Callback<ApiResponse>() {
+            @Override public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getLyrics() != null) {
+                    lyrics.setValue(response.body().getSubsonicResponse().getLyrics().getValue());
+                }
+            }
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
+        });
         return lyrics;
     }
-}
+}

app/src/main/java/com/cappielloantonio/tempo/service/BaseMediaService.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.TaskStackBuilder
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
@@ -32,6 +33,8 @@ import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 
+private const val TAG = "BaseMediaService"
+
 @UnstableApi
 open class BaseMediaService : MediaLibraryService() {
     companion object {
@@ -81,7 +84,7 @@ open class BaseMediaService : MediaLibraryService() {
     }
 
     fun updateMediaItems(player: Player) {
-        Log.d(javaClass.toString(), "update items")
+        Log.d(TAG, "update items")
         val n = player.mediaItemCount
         val k = player.currentMediaItemIndex
         val current = player.currentPosition
@@ -120,7 +123,7 @@ open class BaseMediaService : MediaLibraryService() {
     fun initializePlayerListener(player: Player) {
         player.addListener(object : Player.Listener {
             override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
-                Log.d(javaClass.toString(), "onMediaItemTransition" + player.currentMediaItemIndex)
+                Log.d(TAG, "onMediaItemTransition" + player.currentMediaItemIndex)
                 if (mediaItem == null) return
 
                 if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK || reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO) {
@@ -130,7 +133,7 @@ open class BaseMediaService : MediaLibraryService() {
             }
 
             override fun onTracksChanged(tracks: Tracks) {
-                Log.d(javaClass.toString(), "onTracksChanged " + player.currentMediaItemIndex)
+                Log.d(TAG, "onTracksChanged " + player.currentMediaItemIndex)
                 ReplayGainUtil.setReplayGain(player, tracks)
                 val currentMediaItem = player.currentMediaItem
                 if (currentMediaItem != null) {
@@ -138,14 +141,19 @@ open class BaseMediaService : MediaLibraryService() {
                     if (item.mediaMetadata.extras != null)
                         MediaManager.scrobble(item, false)
 
-                    if (player.nextMediaItemIndex == C.INDEX_UNSET)
-                        MediaManager.continuousPlay(player.currentMediaItem)
+                    if (player.nextMediaItemIndex == C.INDEX_UNSET) {
+                        val browserFuture = MediaBrowser.Builder(
+                            this@BaseMediaService,
+                            SessionToken(this@BaseMediaService, ComponentName(this@BaseMediaService, this@BaseMediaService::class.java))
+                        ).buildAsync()
+                        MediaManager.continuousPlay(player.currentMediaItem, browserFuture)
+                    }
                 }
 
                 if (player is ExoPlayer) {
                     // https://stackoverflow.com/questions/56937283/exoplayer-shuffle-doesnt-reproduce-all-the-songs
                     if (MediaManager.justStarted.get()) {
-                        Log.d(javaClass.toString(), "update shuffle order")
+                        Log.d(TAG, "update shuffle order")
                         MediaManager.justStarted.set(false)
                         val shuffledList = IntArray(player.mediaItemCount) { i -> i }
                         shuffledList.shuffle()
@@ -163,7 +171,7 @@ open class BaseMediaService : MediaLibraryService() {
             }
 
             override fun onIsPlayingChanged(isPlaying: Boolean) {
-                Log.d(javaClass.toString(), "onIsPlayingChanged " + player.currentMediaItemIndex)
+                Log.d(TAG, "onIsPlayingChanged " + player.currentMediaItemIndex)
                 if (!isPlaying) {
                     MediaManager.setPlayingPausedTimestamp(
                         player.currentMediaItem,
@@ -181,7 +189,7 @@ open class BaseMediaService : MediaLibraryService() {
             }
 
             override fun onPlaybackStateChanged(playbackState: Int) {
-                Log.d(javaClass.toString(), "onPlaybackStateChanged")
+                Log.d(TAG, "onPlaybackStateChanged")
                 super.onPlaybackStateChanged(playbackState)
                 if (!player.hasNextMediaItem() &&
                     playbackState == Player.STATE_ENDED &&
@@ -198,7 +206,7 @@ open class BaseMediaService : MediaLibraryService() {
                 newPosition: Player.PositionInfo,
                 reason: Int
             ) {
-                Log.d(javaClass.toString(), "onPositionDiscontinuity")
+                Log.d(TAG, "onPositionDiscontinuity")
                 super.onPositionDiscontinuity(oldPosition, newPosition, reason)
 
                 if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) {
@@ -222,7 +230,7 @@ open class BaseMediaService : MediaLibraryService() {
             }
 
             override fun onAudioSessionIdChanged(audioSessionId: Int) {
-                Log.d(javaClass.toString(), "onAudioSessionIdChanged")
+                Log.d(TAG, "onAudioSessionIdChanged")
                 attachEqualizerIfPossible(audioSessionId)
             }
         })
@@ -314,7 +322,7 @@ open class BaseMediaService : MediaLibraryService() {
     }
 
     private fun initializeMediaLibrarySession(player: Player) {
-        Log.d(javaClass.toString(), "initializeMediaLibrarySession")
+        Log.d(TAG, "initializeMediaLibrarySession")
         val sessionActivityPendingIntent =
             TaskStackBuilder.create(this).run {
                 addNextIntent(Intent(baseContext, MainActivity::class.java))
@@ -461,7 +469,7 @@ open class BaseMediaService : MediaLibraryService() {
             customCommand: SessionCommand,
             args: Bundle
         ): ListenableFuture<SessionResult> {
-            Log.d(javaClass.toString(), "onCustomCommand")
+            Log.d(TAG, "onCustomCommand")
             when (customCommand.customAction) {
                 CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON -> session.player.shuffleModeEnabled = true
                 CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF -> session.player.shuffleModeEnabled = false
@@ -486,7 +494,7 @@ open class BaseMediaService : MediaLibraryService() {
             controller: ControllerInfo,
             mediaItems: List<MediaItem>
         ): ListenableFuture<List<MediaItem>> {
-            Log.d(javaClass.toString(), "onAddMediaItems")
+            Log.d(TAG, "onAddMediaItems")
             val updatedMediaItems = mediaItems.map { mediaItem ->
                 val mediaMetadata = mediaItem.mediaMetadata
                 val newMetadata = mediaMetadata.buildUpon()

app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java

@@ -1,12 +1,13 @@
 package com.cappielloantonio.tempo.service;
 
 import android.content.ComponentName;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
-import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.media3.common.MediaItem;
@@ -25,6 +26,7 @@ import com.cappielloantonio.tempo.repository.SongRepository;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation;
 import com.cappielloantonio.tempo.subsonic.models.PodcastEpisode;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 import com.cappielloantonio.tempo.util.MappingUtil;
 import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.PlaybackViewModel;
@@ -36,6 +38,8 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class MediaManager {
@@ -43,6 +47,8 @@ public class MediaManager {
     private static WeakReference<MediaBrowser> attachedBrowserRef = new WeakReference<>(null);
     public static AtomicBoolean justStarted = new AtomicBoolean(false);
 
+    private static final ExecutorService backgroundExecutor = Executors.newSingleThreadExecutor();
+
     public static void registerPlaybackObserver(
             ListenableFuture<MediaBrowser> browserFuture,
             PlaybackViewModel playbackViewModel
@@ -175,33 +181,46 @@ public class MediaManager {
         }
     }
 
+    @OptIn(markerClass = UnstableApi.class)
     public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media, int startIndex) {
         if (mediaBrowserListenableFuture != null) {
+
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
                     if (mediaBrowserListenableFuture.isDone()) {
-                        MediaBrowser browser = mediaBrowserListenableFuture.get();
-                        justStarted.set(true);
-                        browser.setMediaItems(MappingUtil.mapMediaItems(media), startIndex, 0);
-                        browser.prepare();
+                        final MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        final List<MediaItem> items = MappingUtil.mapMediaItems(media);
+                        
+                        new Handler(Looper.getMainLooper()).post(() -> {
+                            justStarted.set(true);
+                            browser.setMediaItems(items, startIndex, 0);
+                            browser.prepare();
 
-                        Player.Listener timelineListener = new Player.Listener() {
-                            @Override
-                            public void onTimelineChanged(Timeline timeline, int reason) {
-                                int itemCount = browser.getMediaItemCount();
-                                if (itemCount > 0 && startIndex >= 0 && startIndex < itemCount) {
-                                    browser.seekTo(startIndex, 0);
-                                    browser.play();
-                                    browser.removeListener(this);
+                            Player.Listener timelineListener = new Player.Listener() {
+                                @Override
+                                public void onTimelineChanged(Timeline timeline, int reason) {
+                                    
+                                    int itemCount = browser.getMediaItemCount();
+                                    if (itemCount > 0 && startIndex >= 0 && startIndex < itemCount) {
+                                        browser.seekTo(startIndex, 0);
+                                        browser.play();
+                                        browser.removeListener(this);
+                                    } else {
+                                        Log.d(TAG, "Cannot start playback: itemCount=" + itemCount + ", startIndex=" + startIndex);
+                                    }
                                 }
-                            }
-                        };
-                        browser.addListener(timelineListener);
+                            };
+                            
+                            browser.addListener(timelineListener);
+                        });
 
-                        enqueueDatabase(media, true, 0);
+                        backgroundExecutor.execute(() -> {
+                            Log.d(TAG, "Background: enqueuing to database");
+                            enqueueDatabase(media, true, 0);
+                        });
                     }
                 } catch (ExecutionException | InterruptedException e) {
-                    e.printStackTrace();
+                    Log.e(TAG, "Error in startQueue: " + e.getMessage(), e);
                 }
             }, MoreExecutors.directExecutor());
         }
@@ -425,28 +444,33 @@ public class MediaManager {
     }
 
     @OptIn(markerClass = UnstableApi.class)
-    public static void continuousPlay(MediaItem mediaItem) {
-        if (mediaItem != null && Preferences.isContinuousPlayEnabled() && Preferences.isInstantMixUsable()) {
-            Preferences.setLastInstantMix();
-
-            LiveData<List<Child>> instantMix = getSongRepository().getInstantMix(mediaItem.mediaId, 10);
-            instantMix.observeForever(new Observer<List<Child>>() {
-                @Override
-                public void onChanged(List<Child> media) {
-                    if (media != null) {
-                        Log.e(TAG, "continuous play");
-                        ListenableFuture<MediaBrowser> mediaBrowserListenableFuture = new MediaBrowser.Builder(
-                                App.getContext(),
-                                new SessionToken(App.getContext(), new ComponentName(App.getContext(), MediaService.class))
-                        ).buildAsync();
-
-                        enqueue(mediaBrowserListenableFuture, media, true);
-                    }
-
-                    instantMix.removeObserver(this);
-                }
-            });
+    public static void continuousPlay(MediaItem mediaItem,
+                                    ListenableFuture<MediaBrowser> existingBrowserFuture) {
+        if (mediaItem == null
+                || !Preferences.isContinuousPlayEnabled()
+                || !Preferences.isInstantMixUsable()) {
+            return;
         }
+
+        Preferences.setLastInstantMix();
+
+        LiveData<List<Child>> instantMix =
+                getSongRepository().getContinuousMix(mediaItem.mediaId, 25);
+
+        instantMix.observeForever(new Observer<List<Child>>() {
+            @Override
+            public void onChanged(List<Child> media) {
+                if (media == null || media.isEmpty()) {
+                    return;
+                }
+
+                if (existingBrowserFuture != null) {
+                    Log.d(TAG, "Continuous play: adding " + media.size() + " tracks");
+                    enqueue(existingBrowserFuture, media, true);
+                }
+                instantMix.removeObserver(this);
+            }
+        });
     }
 
     public static void saveChronology(MediaItem mediaItem) {

app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java

@@ -24,13 +24,15 @@ public class SystemClient {
 
     public Call<ApiResponse> ping() {
         Log.d(TAG, "ping()");
+        int timeoutSeconds = Preferences.getNetworkPingTimeout();
         Call<ApiResponse> pingCall = systemService.ping(subsonic.getParams());
         if (Preferences.isInUseServerAddressLocal()) {
             pingCall.timeout()
-                    .timeout(1, TimeUnit.SECONDS);
+                    .timeout(timeoutSeconds, TimeUnit.SECONDS);
         } else {
+            int finalTimeout = Math.min(timeoutSeconds * 2, 10);
             pingCall.timeout()
-                    .timeout(3, TimeUnit.SECONDS);
+                    .timeout(finalTimeout, TimeUnit.SECONDS);
         }
         return pingCall;
     }

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/Playlist.kt

@@ -22,6 +22,7 @@ open class Playlist(
     var name: String? = null,
     @ColumnInfo(name = "duration")
     var duration: Long = 0,
+    @SerializedName("coverArt")
     @ColumnInfo(name = "coverArt")
     var coverArtId: String? = null,
 ) : Parcelable {

app/src/main/java/com/cappielloantonio/tempo/subsonic/models/SimilarSongs.kt

@@ -1,8 +1,10 @@
 package com.cappielloantonio.tempo.subsonic.models
 
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 @Keep
 class SimilarSongs {
+    @SerializedName("song")
     var songs: List<Child>? = null
 }

app/src/main/java/com/cappielloantonio/tempo/ui/activity/MainActivity.java

@@ -2,6 +2,8 @@ package com.cappielloantonio.tempo.ui.activity;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Rect;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -11,6 +13,7 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.core.splashscreen.SplashScreen;
@@ -62,6 +65,7 @@ public class MainActivity extends BaseActivity {
     private BottomNavigationView bottomNavigationView;
     public NavController navController;
     private BottomSheetBehavior bottomSheetBehavior;
+    private boolean isLandscape = false;
     private AssetLinkNavigator assetLinkNavigator;
     private AssetLinkUtil.AssetLink pendingAssetLink;
 
@@ -85,6 +89,8 @@ public class MainActivity extends BaseActivity {
         connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this);
         connectivityStatusReceiverManager(true);
 
+        isLandscape = (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
+
         init();
         checkConnectionType();
         getOpenSubsonicExtensions();
@@ -141,6 +147,15 @@ public class MainActivity extends BaseActivity {
         } else {
             goToLogin();
         }
+
+        // Set bottom navigation height
+        if (isLandscape) {
+            ViewGroup.LayoutParams layoutParams = bottomNavigationView.getLayoutParams();
+            Rect windowRect = new Rect();
+            bottomNavigationView.getWindowVisibleDisplayFrame(windowRect);
+            layoutParams.width = windowRect.height();
+            bottomNavigationView.setLayoutParams(layoutParams);
+        }
     }
 
     // BOTTOM SHEET/NAVIGATION
@@ -215,7 +230,9 @@ public class MainActivity extends BaseActivity {
                 @Override
                 public void onSlide(@NonNull View view, float slideOffset) {
                     animateBottomSheet(slideOffset);
-                    animateBottomNavigation(slideOffset, navigationHeight);
+                    if (!isLandscape) {
+                         animateBottomNavigation(slideOffset, navigationHeight);
+                    }
                 }
             };
 
@@ -354,7 +371,7 @@ public class MainActivity extends BaseActivity {
 
         // TODO Enter all settings to be reset
         Preferences.setOpenSubsonic(false);
-        Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_100);
+        Preferences.setPlaybackSpeed(1.0f);
         Preferences.setSkipSilenceMode(false);
         Preferences.setDataSavingMode(false);
         Preferences.setStarredSyncEnabled(false);
@@ -384,7 +401,7 @@ public class MainActivity extends BaseActivity {
     }
 
     private void pingServer() {
-        if (Preferences.getToken() == null) return;
+        if (Preferences.getToken() == null && Preferences.getPassword() == null) return;
 
         if (Preferences.isInUseServerAddressLocal()) {
             mainViewModel.ping().observe(this, subsonicResponse -> {
@@ -428,7 +445,7 @@ public class MainActivity extends BaseActivity {
     }
 
     private void getOpenSubsonicExtensions() {
-        if (Preferences.getToken() != null) {
+        if (Preferences.getToken() != null || Preferences.getPassword() != null) {
             mainViewModel.getOpenSubsonicExtensions().observe(this, openSubsonicExtensions -> {
                 if (openSubsonicExtensions != null) {
                     Preferences.setOpenSubsonicExtensions(openSubsonicExtensions);

app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicDirectoryAdapter.java

@@ -53,7 +53,7 @@ public class MusicDirectoryAdapter extends RecyclerView.Adapter<MusicDirectoryAd
                 .into(holder.item.musicDirectoryCoverImageView);
 
         holder.item.musicDirectoryMoreButton.setVisibility(child.isDir() ? View.VISIBLE : View.INVISIBLE);
-        holder.item.musicDirectoryPlayButton.setVisibility(child.isDir() ? View.INVISIBLE : View.VISIBLE);
+        holder.item.musicDirectoryPlayButton.setVisibility(child.isDir() ? View.VISIBLE : View.INVISIBLE);
     }
 
     @Override
@@ -80,6 +80,7 @@ public class MusicDirectoryAdapter extends RecyclerView.Adapter<MusicDirectoryAd
             itemView.setOnLongClickListener(v -> onLongClick());
 
             item.musicDirectoryMoreButton.setOnClickListener(v -> onClick());
+            item.musicDirectoryPlayButton.setOnClickListener(v -> onPlayClick());
         }
 
         public void onClick() {
@@ -107,5 +108,13 @@ public class MusicDirectoryAdapter extends RecyclerView.Adapter<MusicDirectoryAd
                 return false;
             }
         }
+
+        public void onPlayClick() {
+            if (children.get(getBindingAdapterPosition()).isDir()) {
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.MUSIC_DIRECTORY_ID, children.get(getBindingAdapterPosition()).getId());
+                click.onMusicDirectoryPlay(bundle);
+            }
+        }
     }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicIndexAdapter.java

@@ -76,6 +76,7 @@ public class MusicIndexAdapter extends RecyclerView.Adapter<MusicIndexAdapter.Vi
 
             itemView.setOnClickListener(v -> onClick());
             item.musicIndexMoreButton.setOnClickListener(v -> onClick());
+            item.musicIndexPlayButton.setOnClickListener(v -> onPlayClick());
         }
 
         public void onClick() {
@@ -83,5 +84,11 @@ public class MusicIndexAdapter extends RecyclerView.Adapter<MusicIndexAdapter.Vi
             bundle.putString(Constants.MUSIC_DIRECTORY_ID, artists.get(getBindingAdapterPosition()).getId());
             click.onMusicIndexClick(bundle);
         }
+
+        public void onPlayClick() {
+            Bundle bundle = new Bundle();
+            bundle.putString(Constants.MUSIC_DIRECTORY_ID, artists.get(getBindingAdapterPosition()).getId());
+            click.onMusicIndexPlay(bundle);
+        }
     }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java

@@ -18,9 +18,12 @@ import com.cappielloantonio.tempo.databinding.ItemPlayerQueueSongBinding;
 import com.cappielloantonio.tempo.glide.CustomGlideRequest;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.interfaces.MediaIndexCallback;
+import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.DownloadUtil;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.ExternalAudioReader;
 import com.cappielloantonio.tempo.util.MusicUtil;
 import com.cappielloantonio.tempo.util.Preferences;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -29,7 +32,9 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueueAdapter.ViewHolder> {
     private static final String TAG = "PlayerSongQueueAdapter";
@@ -37,7 +42,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
     private List<Child> songs;
-
+    private final Map<String, Boolean> downloadStatusCache = new ConcurrentHashMap<>();
     private String currentPlayingId;
     private boolean isPlaying;
     private List<Integer> currentPlayingPositions = Collections.emptyList();
@@ -78,7 +83,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
                 .build()
                 .thumbnail(thumbnail)
                 .into(holder.item.queueSongCoverImageView);
-
         MediaManager.getCurrentIndex(mediaBrowserListenableFuture, new MediaIndexCallback() {
             @Override
             public void onRecovery(int index) {
@@ -94,6 +98,23 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
             }
         });
 
+        boolean isDownloaded = false;
+
+        if (Preferences.getDownloadDirectoryUri() == null) {
+            DownloaderManager downloaderManager = DownloadUtil.getDownloadTracker(holder.itemView.getContext());
+            if (downloaderManager != null) {
+                isDownloaded = downloaderManager.isDownloaded(song.getId());
+            }
+        } else {
+            isDownloaded = ExternalAudioReader.getUri(song) != null;
+        }
+
+        if (isDownloaded) {
+            holder.item.downloadIndicatorIcon.setVisibility(View.VISIBLE);
+        } else {
+            holder.item.downloadIndicatorIcon.setVisibility(View.GONE);
+        }
+
         if (Preferences.showItemRating()) {
             if (song.getStarred() == null && song.getUserRating() == null) {
                 holder.item.ratingIndicatorImageView.setVisibility(View.GONE);
@@ -153,7 +174,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
             holder.item.coverArtOverlay.setVisibility(View.INVISIBLE);
         }
     }
-
+    
     public List<Child> getItems() {
         return this.songs;
     }

app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java

@@ -173,10 +173,12 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
                         )
                 )
         ) {
-            holder.item.differentDiskDividerSector.setVisibility(View.VISIBLE);
 
             if (songs.get(position).getDiscNumber() != null && !Objects.requireNonNull(songs.get(position).getDiscNumber()).toString().isBlank()) {
                 holder.item.discTitleTextView.setText(holder.itemView.getContext().getString(R.string.disc_titleless, songs.get(position).getDiscNumber().toString()));
+                holder.item.differentDiskDividerSector.setVisibility(View.VISIBLE);
+            } else {
+                holder.item.differentDiskDividerSector.setVisibility(View.GONE);
             }
 
             if (album.getDiscTitles() != null) {

app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaybackSpeedDialog.java

@@ -0,0 +1,57 @@
+package com.cappielloantonio.tempo.ui.dialog;
+
+import android.app.Dialog;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+import com.cappielloantonio.tempo.R;
+import com.cappielloantonio.tempo.util.Preferences;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+public class PlaybackSpeedDialog extends DialogFragment {
+    private static final String TAG = "PlaybackSpeedDialog";
+
+    public interface PlaybackSpeedListener {
+        void onSpeedSelected(float speed);
+    }
+
+    private PlaybackSpeedListener listener;
+
+    private static final float[] SPEED_VALUES = {0.5f, 0.75f, 1.0f, 1.25f, 1.5f, 1.75f, 2.0f};
+    private static final String[] SPEED_LABELS = {"0.5x", "0.75x", "1.0x", "1.25x", "1.5x", "1.75x", "2.0x"};
+
+    public void setPlaybackSpeedListener(PlaybackSpeedListener listener) {
+        this.listener = listener;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        float currentSpeed = Preferences.getPlaybackSpeed();
+        int selectedIndex = getSelectedIndex(currentSpeed);
+
+        return new MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(R.string.playback_speed_dialog_title)
+                .setSingleChoiceItems(SPEED_LABELS, selectedIndex, (dialog, which) -> {
+                    float selectedSpeed = SPEED_VALUES[which];
+                    Preferences.setPlaybackSpeed(selectedSpeed);
+                    if (listener != null) {
+                        listener.onSpeedSelected(selectedSpeed);
+                    }
+                    dialog.dismiss();
+                })
+                .setNegativeButton(R.string.playback_speed_dialog_negative_button, (dialog, id) -> dialog.cancel())
+                .create();
+    }
+
+    private int getSelectedIndex(float currentSpeed) {
+        for (int i = 0; i < SPEED_VALUES.length; i++) {
+            if (Math.abs(SPEED_VALUES[i] - currentSpeed) < 0.01f) {
+                return i;
+            }
+        }
+        return 2; // Default to 1.0x
+    }
+}

app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -20,6 +21,7 @@ import com.cappielloantonio.tempo.viewmodel.PlaylistChooserViewModel;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class PlaylistChooserDialog extends DialogFragment implements ClickCallback {
     private DialogPlaylistChooserBinding bind;
@@ -35,9 +37,21 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba
 
         playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class);
 
+        String[] playlistVisibilityChoice = {
+                getString(R.string.playlist_chooser_dialog_visibility_public),
+                getString(R.string.playlist_chooser_dialog_visibility_private)
+        };
+
         return new MaterialAlertDialogBuilder(getActivity())
                 .setView(bind.getRoot())
                 .setTitle(R.string.playlist_chooser_dialog_title)
+                .setSingleChoiceItems(
+                        playlistVisibilityChoice,
+                        0,
+                        (dialog, which) -> {
+                                boolean isPublic = (which == 0);
+                                playlistChooserViewModel.setIsPlaylistPublic(isPublic);
+                        })
                 .setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { })
                 .setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel())
                 .create();

app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java

@@ -3,11 +3,13 @@ package com.cappielloantonio.tempo.ui.dialog;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.databinding.DialogRadioEditorBinding;
 import com.cappielloantonio.tempo.interfaces.RadioCallback;
@@ -21,7 +23,6 @@ import java.util.Objects;
 public class RadioEditorDialog extends DialogFragment {
     private DialogRadioEditorBinding bind;
     private RadioEditorViewModel radioEditorViewModel;
-
     private final RadioCallback radioCallback;
 
     private String radioName;
@@ -36,25 +37,26 @@ public class RadioEditorDialog extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         bind = DialogRadioEditorBinding.inflate(getLayoutInflater());
-
         radioEditorViewModel = new ViewModelProvider(requireActivity()).get(RadioEditorViewModel.class);
 
+        setupObservers();
+
         return new MaterialAlertDialogBuilder(requireContext())
                 .setView(bind.getRoot())
                 .setTitle(R.string.radio_editor_dialog_title)
                 .setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> {
                     if (validateInput()) {
                         if (radioEditorViewModel.getRadioToEdit() == null) {
-                            radioEditorViewModel.createRadio(radioName, radioStreamURL, radioHomepageURL.isEmpty() ? null : radioHomepageURL);
+                            radioEditorViewModel.createRadio(radioName, radioStreamURL, 
+                                radioHomepageURL.isEmpty() ? null : radioHomepageURL);
                         } else {
-                            radioEditorViewModel.updateRadio(radioName, radioStreamURL, radioHomepageURL.isEmpty() ? null : radioHomepageURL);
+                            radioEditorViewModel.updateRadio(radioName, radioStreamURL, 
+                                radioHomepageURL.isEmpty() ? null : radioHomepageURL);
                         }
-                        dismissDialog();
                     }
                 })
                 .setNeutralButton(R.string.radio_editor_dialog_neutral_button, (dialog, id) -> {
                     radioEditorViewModel.deleteRadio();
-                    dismissDialog();
                 })
                 .setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> {
                     dialog.cancel();
@@ -62,6 +64,24 @@ public class RadioEditorDialog extends DialogFragment {
                 .create();
     }
 
+    private void setupObservers() {
+        radioEditorViewModel.getIsSuccess().observe(this, isSuccess -> {
+            if (isSuccess != null && isSuccess) {
+                Toast.makeText(requireContext(),
+                    radioEditorViewModel.getRadioToEdit() == null ?
+                            App.getContext().getString(R.string.radio_editor_dialog_added) : App.getContext().getString(R.string.radio_editor_dialog_updated),
+                    Toast.LENGTH_SHORT).show();
+                dismissDialog();
+            }
+        });
+        radioEditorViewModel.getErrorMessage().observe(this, error -> {
+            if (error != null && !error.isEmpty()) {
+                Toast.makeText(requireContext(), error, Toast.LENGTH_LONG).show();
+                radioEditorViewModel.clearError();
+            }
+        });
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -77,7 +97,6 @@ public class RadioEditorDialog extends DialogFragment {
     private void setParameterInfo() {
         if (getArguments() != null && getArguments().getParcelable(Constants.INTERNET_RADIO_STATION_OBJECT) != null) {
             InternetRadioStation toEdit = requireArguments().getParcelable(Constants.INTERNET_RADIO_STATION_OBJECT);
-
             radioEditorViewModel.setRadioToEdit(toEdit);
 
             bind.internetRadioStationNameTextView.setText(toEdit.getName());
@@ -90,22 +109,21 @@ public class RadioEditorDialog extends DialogFragment {
         radioName = Objects.requireNonNull(bind.internetRadioStationNameTextView.getText()).toString().trim();
         radioStreamURL = Objects.requireNonNull(bind.internetRadioStationStreamUrlTextView.getText()).toString().trim();
         radioHomepageURL = Objects.requireNonNull(bind.internetRadioStationHomepageUrlTextView.getText()).toString().trim();
-
         if (TextUtils.isEmpty(radioName)) {
             bind.internetRadioStationNameTextView.setError(getString(R.string.error_required));
             return false;
         }
-
         if (TextUtils.isEmpty(radioStreamURL)) {
             bind.internetRadioStationStreamUrlTextView.setError(getString(R.string.error_required));
             return false;
         }
-
         return true;
     }
 
     private void dismissDialog() {
-        radioCallback.onDismiss();
+        if (radioCallback != null) {
+            radioCallback.onDismiss();
+        }
         Objects.requireNonNull(getDialog()).dismiss();
     }
-}
+}

app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ShareUpdateDialog.java

@@ -1,6 +1,6 @@
 package com.cappielloantonio.tempo.ui.dialog;
 
-import android.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.text.TextUtils;

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java

@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -49,6 +50,7 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
     private AlbumCatalogueViewModel albumCatalogueViewModel;
 
     private AlbumCatalogueAdapter albumAdapter;
+    private int spanCount = 2;
     private String currentSortOrder;
     private List<com.cappielloantonio.tempo.subsonic.models.AlbumID3> originalAlbums;
 
@@ -90,6 +92,10 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         bind = FragmentAlbumCatalogueBinding.inflate(inflater, container, false);
         View view = bind.getRoot();
 
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            spanCount = Preferences.getLandscapeItemsPerRow();
+        }
+
         initAppBar();
         initAlbumCatalogueView();
         initProgressLoader();
@@ -133,8 +139,8 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initAlbumCatalogueView() {
-        bind.albumCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
-        bind.albumCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(2, 20, false));
+        bind.albumCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), spanCount));
+        bind.albumCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(spanCount, 20, false));
         bind.albumCatalogueRecyclerView.setHasFixedSize(true);
 
         albumAdapter = new AlbumCatalogueAdapter(this, true);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java

@@ -4,7 +4,7 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Parcelable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -12,6 +12,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
+import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -60,12 +61,14 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
     private SongHorizontalAdapter songHorizontalAdapter;
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
+    /** @noinspection deprecation*/
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
     }
 
+    /** @noinspection deprecation*/
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
@@ -81,7 +84,7 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         albumPageViewModel = new ViewModelProvider(requireActivity()).get(AlbumPageViewModel.class);
         playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);
 
-        init();
+        init(view);
         initAppBar();
         initAlbumInfoTextButton();
         initAlbumNotes();
@@ -119,12 +122,13 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         bind = null;
     }
 
+    /** @noinspection deprecation*/
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == R.id.action_rate_album) {
             Bundle bundle = new Bundle();
             AlbumID3 album = albumPageViewModel.getAlbum().getValue();
-            bundle.putParcelable(Constants.ALBUM_OBJECT, (Parcelable) album);
+            bundle.putParcelable(Constants.ALBUM_OBJECT, album);
             RatingDialog dialog = new RatingDialog();
             dialog.setArguments(bundle);
             dialog.show(requireActivity().getSupportFragmentManager(), null);
@@ -159,8 +163,21 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
         return false;
     }
 
-    private void init() {
-        albumPageViewModel.setAlbum(getViewLifecycleOwner(), requireArguments().getParcelable(Constants.ALBUM_OBJECT));
+    private void init(View view) {
+        AlbumID3 albumArg = requireArguments().getParcelable(Constants.ALBUM_OBJECT);
+        assert albumArg != null;
+        albumPageViewModel.setAlbum(getViewLifecycleOwner(), albumArg);
+        ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
+        favoriteToggle.setChecked(albumArg.getStarred() != null);
+
+        favoriteToggle.setOnClickListener(v -> {
+            albumPageViewModel.setFavorite();
+        });
+        albumPageViewModel.getAlbum().observe(getViewLifecycleOwner(), album -> {
+            if (album != null) {
+                favoriteToggle.setChecked(album.getStarred() != null);
+            }
+        });
     }
 
     private void initAppBar() {

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistCatalogueFragment.java

@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -50,6 +51,7 @@ public class ArtistCatalogueFragment extends Fragment implements ClickCallback {
     private ArtistCatalogueViewModel artistCatalogueViewModel;
 
     private ArtistCatalogueAdapter artistAdapter;
+    private int spanCount = 2;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -66,6 +68,10 @@ public class ArtistCatalogueFragment extends Fragment implements ClickCallback {
         bind = FragmentArtistCatalogueBinding.inflate(inflater, container, false);
         View view = bind.getRoot();
 
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            spanCount = Preferences.getLandscapeItemsPerRow();
+        }
+
         initAppBar();
         initArtistCatalogueView();
 
@@ -108,8 +114,8 @@ public class ArtistCatalogueFragment extends Fragment implements ClickCallback {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initArtistCatalogueView() {
-        bind.artistCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
-        bind.artistCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(2, 20, false));
+        bind.artistCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), spanCount));
+        bind.artistCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(spanCount, 20, false));
         bind.artistCatalogueRecyclerView.setHasFixedSize(true);
 
         artistAdapter = new ArtistCatalogueAdapter(this);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistPageFragment.java

@@ -2,15 +2,22 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.Toast;
+import android.widget.ToggleButton;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.session.MediaBrowser;
@@ -28,18 +35,21 @@ import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
+import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.AlbumCatalogueAdapter;
 import com.cappielloantonio.tempo.ui.adapter.ArtistCatalogueAdapter;
 import com.cappielloantonio.tempo.ui.adapter.SongHorizontalAdapter;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.MusicUtil;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.ArtistPageViewModel;
 import com.cappielloantonio.tempo.viewmodel.PlaybackViewModel;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @UnstableApi
 public class ArtistPageFragment extends Fragment implements ClickCallback {
@@ -54,6 +64,8 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
+    private int spanCount = 2;
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         activity = (MainActivity) getActivity();
@@ -63,7 +75,11 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
         artistPageViewModel = new ViewModelProvider(requireActivity()).get(ArtistPageViewModel.class);
         playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);
 
-        init();
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            spanCount = Preferences.getLandscapeItemsPerRow();
+        }
+
+        init(view);
         initAppBar();
         initArtistInfo();
         initPlayButtons();
@@ -100,7 +116,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
         bind = null;
     }
 
-    private void init() {
+    private void init(View view) {
         artistPageViewModel.setArtist(requireArguments().getParcelable(Constants.ARTIST_OBJECT));
 
         bind.mostStreamedSongTextViewClickable.setOnClickListener(v -> {
@@ -109,6 +125,14 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
             bundle.putParcelable(Constants.ARTIST_OBJECT, artistPageViewModel.getArtist());
             activity.navController.navigate(R.id.action_artistPageFragment_to_songListPageFragment, bundle);
         });
+
+        ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
+        favoriteToggle.setChecked(artistPageViewModel.getArtist().getStarred() != null);
+        favoriteToggle.setOnClickListener(v -> artistPageViewModel.setFavorite(requireContext()));
+
+        Button bioToggle = view.findViewById(R.id.button_toggle_bio);
+        bioToggle.setOnClickListener(v ->
+                Toast.makeText(getActivity(), R.string.artist_no_artist_info_toast, Toast.LENGTH_SHORT).show());
     }
 
     private void initAppBar() {
@@ -126,53 +150,118 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
             if (artistInfo == null) {
                 if (bind != null) bind.artistPageBioSector.setVisibility(View.GONE);
             } else {
-                String normalizedBio = MusicUtil.forceReadableString(artistInfo.getBiography());
+                if (getContext() != null && bind != null) {
+                    ArtistID3 currentArtist = artistPageViewModel.getArtist();
+                        String primaryId = currentArtist.getCoverArtId() != null && !currentArtist.getCoverArtId().trim().isEmpty()
+                            ? currentArtist.getCoverArtId()
+                            : currentArtist.getId();
+                    
+                    final String fallbackId = (Objects.requireNonNull(primaryId).equals(currentArtist.getCoverArtId()) &&
+                                            currentArtist.getId() != null && 
+                                            !currentArtist.getId().equals(primaryId))
+                            ? currentArtist.getId()
+                            : null;
+                    
+                    CustomGlideRequest.Builder
+                            .from(requireContext(), primaryId, CustomGlideRequest.ResourceType.Artist)
+                            .build()
+                            .listener(new com.bumptech.glide.request.RequestListener<Drawable>() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable com.bumptech.glide.load.engine.GlideException e,
+                                                            Object model,
+                                                            @NonNull com.bumptech.glide.request.target.Target<Drawable> target,
+                                                            boolean isFirstResource) {
+                                    if (e != null) {
+                                        e.getMessage();
+                                        if (e.getMessage().contains("400") && fallbackId != null) {
 
-                if (bind != null)
-                    bind.artistPageBioSector.setVisibility(!normalizedBio.trim().isEmpty() ? View.VISIBLE : View.GONE);
-                if (bind != null)
-                    bind.bioMoreTextViewClickable.setVisibility(artistInfo.getLastFmUrl() != null ? View.VISIBLE : View.GONE);
+                                            Log.d("ArtistCover", "Primary ID failed (400), trying fallback: " + fallbackId);
 
-                if (getContext() != null && bind != null) CustomGlideRequest.Builder
-                        .from(requireContext(), artistPageViewModel.getArtist().getId(), CustomGlideRequest.ResourceType.Artist)
-                        .build()
-                        .into(bind.artistBackdropImageView);
+                                            CustomGlideRequest.Builder
+                                                    .from(requireContext(), fallbackId, CustomGlideRequest.ResourceType.Artist)
+                                                    .build()
+                                                    .into(bind.artistBackdropImageView);
+                                            return true;
+                                        }
+                                    }
+                                    return false;
+                                }
 
-                if (bind != null) bind.bioTextView.setText(normalizedBio);
+                                @Override
+                                public boolean onResourceReady(@NonNull Drawable resource,
+                                                               @NonNull Object model,
+                                                               com.bumptech.glide.request.target.Target<Drawable> target,
+                                                               @NonNull com.bumptech.glide.load.DataSource dataSource,
+                                                               boolean isFirstResource) {
+                                    return false;
+                                }
+                            })
+                            .into(bind.artistBackdropImageView);
+                }
 
-                if (bind != null) bind.bioMoreTextViewClickable.setOnClickListener(v -> {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setData(Uri.parse(artistInfo.getLastFmUrl()));
-                    startActivity(intent);
-                });
+                if (bind != null) {
+                    String normalizedBio = MusicUtil.forceReadableString(artistInfo.getBiography()).trim();
+                    String lastFmUrl = artistInfo.getLastFmUrl();
 
-                if (bind != null) bind.artistPageBioSector.setVisibility(View.VISIBLE);
+                    if (normalizedBio.isEmpty()) {
+                        bind.bioTextView.setVisibility(View.GONE);
+                    } else {
+                        bind.bioTextView.setText(normalizedBio);
+                    }
+
+                    if (lastFmUrl == null) {
+                        bind.bioMoreTextViewClickable.setVisibility(View.GONE);
+                    } else {
+                        bind.bioMoreTextViewClickable.setOnClickListener(v -> {
+                            Intent intent = new Intent(Intent.ACTION_VIEW);
+                            intent.setData(Uri.parse(artistInfo.getLastFmUrl()));
+                            startActivity(intent);
+                        });
+                        bind.bioMoreTextViewClickable.setVisibility(View.VISIBLE);
+                    }
+
+                    if (!normalizedBio.isEmpty() || lastFmUrl != null) {
+                        View view = bind.getRoot();
+
+                        Button bioToggle = view.findViewById(R.id.button_toggle_bio);
+                        bioToggle.setOnClickListener(v -> {
+                            if (bind != null) {
+                                boolean displayBio = Preferences.getArtistDisplayBiography();
+                                Preferences.setArtistDisplayBiography(!displayBio);
+                                bind.artistPageBioSector.setVisibility(displayBio ? View.GONE : View.VISIBLE);
+                            }
+                        });
+
+                        boolean displayBio = Preferences.getArtistDisplayBiography();
+                        bind.artistPageBioSector.setVisibility(displayBio ? View.VISIBLE : View.GONE);
+                    }
+                }
             }
         });
     }
 
     private void initPlayButtons() {
-        bind.artistPageShuffleButton.setOnClickListener(v -> {
-            artistPageViewModel.getArtistShuffleList().observe(getViewLifecycleOwner(), songs -> {
-                if (!songs.isEmpty()) {
-                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
-                    activity.setBottomSheetInPeek(true);
-                } else {
-                    Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
-                }
-            });
-        });
-
-        bind.artistPageRadioButton.setOnClickListener(v -> {
-            artistPageViewModel.getArtistInstantMix().observe(getViewLifecycleOwner(), songs -> {
+        bind.artistPageShuffleButton.setOnClickListener(v -> artistPageViewModel.getArtistShuffleList().observe(getViewLifecycleOwner(), new Observer<List<Child>>() {
+            @Override
+            public void onChanged(List<Child> songs) {
                 if (songs != null && !songs.isEmpty()) {
                     MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
                     activity.setBottomSheetInPeek(true);
-                } else {
-                    Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_radio), Toast.LENGTH_SHORT).show();
+                    artistPageViewModel.getArtistShuffleList().removeObserver(this);
                 }
-            });
-        });
+            }
+        }));
+
+        bind.artistPageRadioButton.setOnClickListener(v -> artistPageViewModel.getArtistInstantMix().observe(getViewLifecycleOwner(), new Observer<List<Child>>() {
+            @Override
+            public void onChanged(List<Child> songs) {
+                if (songs != null && !songs.isEmpty()) {
+                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
+                    activity.setBottomSheetInPeek(true);
+                    artistPageViewModel.getArtistInstantMix().removeObserver(this);
+                }
+            }
+        }));
     }
 
     private void initTopSongsView() {
@@ -195,8 +284,8 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
     }
 
     private void initAlbumsView() {
-        bind.albumsRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
-        bind.albumsRecyclerView.addItemDecoration(new GridItemDecoration(2, 20, false));
+        bind.albumsRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), spanCount));
+        bind.albumsRecyclerView.addItemDecoration(new GridItemDecoration(spanCount, 20, false));
         bind.albumsRecyclerView.setHasFixedSize(true);
 
         albumCatalogueAdapter = new AlbumCatalogueAdapter(this, false);
@@ -214,8 +303,8 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
     }
 
     private void initSimilarArtistsView() {
-        bind.similarArtistsRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
-        bind.similarArtistsRecyclerView.addItemDecoration(new GridItemDecoration(2, 20, false));
+        bind.similarArtistsRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), spanCount));
+        bind.similarArtistsRecyclerView.addItemDecoration(new GridItemDecoration(spanCount, 20, false));
         bind.similarArtistsRecyclerView.setHasFixedSize(true);
 
         artistCatalogueAdapter = new ArtistCatalogueAdapter(this);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/DirectoryFragment.java

@@ -27,7 +27,13 @@ import com.cappielloantonio.tempo.interfaces.DialogClickCallback;
 import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
+import com.cappielloantonio.tempo.repository.DirectoryRepository;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.subsonic.models.Directory;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.MusicDirectoryAdapter;
 import com.cappielloantonio.tempo.ui.dialog.DownloadDirectoryDialog;
@@ -53,6 +59,7 @@ public class DirectoryFragment extends Fragment implements ClickCallback {
     private MusicDirectoryAdapter musicDirectoryAdapter;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
+    private DirectoryRepository directoryRepository;
 
     private MenuItem menuItem;
 
@@ -77,6 +84,7 @@ public class DirectoryFragment extends Fragment implements ClickCallback {
         bind = FragmentDirectoryBinding.inflate(inflater, container, false);
         View view = bind.getRoot();
         directoryViewModel = new ViewModelProvider(requireActivity()).get(DirectoryViewModel.class);
+        directoryRepository = new DirectoryRepository();
 
         initAppBar();
         initDirectoryListView();
@@ -197,4 +205,57 @@ public class DirectoryFragment extends Fragment implements ClickCallback {
     public void onMusicDirectoryClick(Bundle bundle) {
         Navigation.findNavController(requireView()).navigate(R.id.directoryFragment, bundle);
     }
+
+    @Override
+    public void onMusicDirectoryPlay(Bundle bundle) {
+        String directoryId = bundle.getString(Constants.MUSIC_DIRECTORY_ID);
+        if (directoryId != null) {
+            Toast.makeText(requireContext(), getString(R.string.folder_play_collecting), Toast.LENGTH_SHORT).show();
+            collectAndPlayDirectorySongs(directoryId);
+        }
+    }
+
+    private void collectAndPlayDirectorySongs(String directoryId) {
+        List<Child> allSongs = new ArrayList<>();
+        AtomicInteger pendingRequests = new AtomicInteger(0);
+
+        collectSongsFromDirectory(directoryId, allSongs, pendingRequests, () -> {
+            if (!allSongs.isEmpty()) {
+                activity.runOnUiThread(() -> {
+                    MediaManager.startQueue(mediaBrowserListenableFuture, allSongs, 0);
+                    activity.setBottomSheetInPeek(true);
+                    Toast.makeText(requireContext(), getString(R.string.folder_play_playing, allSongs.size()), Toast.LENGTH_SHORT).show();
+                });
+            } else {
+                activity.runOnUiThread(() -> {
+                    Toast.makeText(requireContext(), getString(R.string.folder_play_no_songs), Toast.LENGTH_SHORT).show();
+                });
+            }
+        });
+    }
+
+    private void collectSongsFromDirectory(String directoryId, List<Child> allSongs, AtomicInteger pendingRequests, Runnable onComplete) {
+        pendingRequests.incrementAndGet();
+
+        directoryRepository.getMusicDirectory(directoryId).observe(getViewLifecycleOwner(), directory -> {
+            if (directory != null && directory.getChildren() != null) {
+                for (Child child : directory.getChildren()) {
+                    if (child.isDir()) {
+                        // It's a subdirectory, recurse into it
+                        collectSongsFromDirectory(child.getId(), allSongs, pendingRequests, onComplete);
+                    } else if (!child.isVideo()) {
+                        // It's a song, add it to the list
+                        synchronized (allSongs) {
+                            allSongs.add(child);
+                        }
+                    }
+                }
+            }
+
+            // Decrement pending requests and check if we're done
+            if (pendingRequests.decrementAndGet() == 0) {
+                onComplete.run();
+            }
+        });
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/GenreCatalogueFragment.java

@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,6 +33,7 @@ import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.GenreCatalogueAdapter;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.GenreCatalogueViewModel;
 
 @OptIn(markerClass = UnstableApi.class)
@@ -41,6 +43,7 @@ public class GenreCatalogueFragment extends Fragment implements ClickCallback {
     private GenreCatalogueViewModel genreCatalogueViewModel;
 
     private GenreCatalogueAdapter genreCatalogueAdapter;
+    private int spanCount = 2;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -56,6 +59,10 @@ public class GenreCatalogueFragment extends Fragment implements ClickCallback {
         View view = bind.getRoot();
         genreCatalogueViewModel = new ViewModelProvider(requireActivity()).get(GenreCatalogueViewModel.class);
 
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            spanCount = Preferences.getLandscapeItemsPerRow();
+        }
+
         init();
         initAppBar();
         initGenreCatalogueView();
@@ -97,8 +104,8 @@ public class GenreCatalogueFragment extends Fragment implements ClickCallback {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initGenreCatalogueView() {
-        bind.genreCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
-        bind.genreCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(2, 16, false));
+        bind.genreCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), spanCount));
+        bind.genreCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(spanCount, 16, false));
         bind.genreCatalogueRecyclerView.setHasFixedSize(true);
 
         genreCatalogueAdapter = new GenreCatalogueAdapter(this);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,10 +40,10 @@ import com.cappielloantonio.tempo.model.HomeSector;
 import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
-import com.cappielloantonio.tempo.subsonic.models.Child;
-import com.cappielloantonio.tempo.subsonic.models.Share;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
+import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.subsonic.models.Share;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.AlbumAdapter;
 import com.cappielloantonio.tempo.ui.adapter.AlbumHorizontalAdapter;
@@ -57,6 +59,8 @@ import com.cappielloantonio.tempo.ui.dialog.HomeRearrangementDialog;
 import com.cappielloantonio.tempo.ui.dialog.PlaylistEditorDialog;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.DownloadUtil;
+import com.cappielloantonio.tempo.util.ExternalAudioReader;
+import com.cappielloantonio.tempo.util.ExternalAudioWriter;
 import com.cappielloantonio.tempo.util.MappingUtil;
 import com.cappielloantonio.tempo.util.MusicUtil;
 import com.cappielloantonio.tempo.util.Preferences;
@@ -66,8 +70,6 @@ import com.cappielloantonio.tempo.viewmodel.PlaybackViewModel;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import androidx.media3.common.MediaItem;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -228,6 +230,12 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             activity.navController.navigate(R.id.action_homeFragment_to_albumListPageFragment, bundle);
         });
 
+        bind.playlistCatalogueTextViewClickable.setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putString(Constants.PLAYLIST_ALL, Constants.PLAYLIST_ALL);
+            activity.navController.navigate(R.id.action_homeFragment_to_playlistCatalogueFragment, bundle);
+        });
+
         bind.recentlyPlayedAlbumsTextViewClickable.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             bundle.putString(Constants.ALBUM_RECENTLY_PLAYED, Constants.ALBUM_RECENTLY_PLAYED);
@@ -279,51 +287,113 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
     }
 
     private void initSyncStarredView() {
-        if (Preferences.isStarredSyncEnabled() && Preferences.getDownloadDirectoryUri() == null) {
-            homeViewModel.getAllStarredTracks().observeForever(new Observer<List<Child>>() {
+        if (Preferences.isStarredSyncEnabled()) {
+            homeViewModel.getAllStarredTracks().observe(getViewLifecycleOwner(), new Observer<List<Child>>() {
                 @Override
                 public void onChanged(List<Child> songs) {
-                    if (songs != null) {
-                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
-                        List<String> toSync = new ArrayList<>();
+                    if (songs != null && !songs.isEmpty()) {
+                        int songsToSyncCount = 0;
+                        List<String> toSyncSample = new ArrayList<>();
 
-                        for (Child song : songs) {
-                            if (!manager.isDownloaded(song.getId())) {
-                                toSync.add(song.getTitle());
-                            }
-                        }
-
-                        if (!toSync.isEmpty()) {
-                            bind.homeSyncStarredCard.setVisibility(View.VISIBLE);
-                            bind.homeSyncStarredTracksToSync.setText(String.join(", ", toSync));
-                        }
-                    }
-
-                    homeViewModel.getAllStarredTracks().removeObserver(this);
-                }
-            });
-        }
-
-        bind.homeSyncStarredCancel.setOnClickListener(v -> bind.homeSyncStarredCard.setVisibility(View.GONE));
-
-        bind.homeSyncStarredDownload.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                homeViewModel.getAllStarredTracks().observeForever(new Observer<List<Child>>() {
-                    @Override
-                    public void onChanged(List<Child> songs) {
-                        if (songs != null) {
+                        if (Preferences.getDownloadDirectoryUri() == null) {
                             DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
-
                             for (Child song : songs) {
                                 if (!manager.isDownloaded(song.getId())) {
-                                    manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                    songsToSyncCount++;
+                                    if (toSyncSample.size() < 3) {
+                                        toSyncSample.add(song.getTitle());
+                                    }
+                                }
+                            }
+                        } else {
+                            for (Child song : songs) {
+                                if (ExternalAudioReader.getUri(song) == null) {
+                                    songsToSyncCount++;
+                                    if (toSyncSample.size() < 3) {
+                                        toSyncSample.add(song.getTitle());
+                                    }
                                 }
                             }
                         }
 
-                        homeViewModel.getAllStarredTracks().removeObserver(this);
+                        if (songsToSyncCount > 0) {
+                            bind.homeSyncStarredCard.setVisibility(View.VISIBLE);
+
+                            StringBuilder displayText = new StringBuilder();
+                            if (!toSyncSample.isEmpty()) {
+                                displayText.append(String.join(", ", toSyncSample));
+                                if (songsToSyncCount > 3) {
+                                    displayText.append("...");
+                                }
+                            }
+
+                            String countText = getResources().getQuantityString(
+                                    R.plurals.home_sync_starred_songs_count,
+                                    songsToSyncCount,
+                                    songsToSyncCount
+                            );
+
+                            if (displayText.length() > 0) {
+                                bind.homeSyncStarredTracksToSync.setText(displayText.toString() + "\n" + countText);
+                            } else {
+                                bind.homeSyncStarredTracksToSync.setText(countText);
+                            }
+
+                            if (getActivity() != null) {
+                                getActivity().runOnUiThread(() -> reorder());
+                            }
+                        } else {
+                            bind.homeSyncStarredCard.setVisibility(View.GONE);
+                        }
+                    }
+                }
+            });
+        }
+
+        bind.homeSyncStarredCancel.setOnClickListener(v -> {
+            bind.homeSyncStarredCard.setVisibility(View.GONE);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(() -> reorder());
+            }
+        });
+
+        bind.homeSyncStarredDownload.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                homeViewModel.getAllStarredTracks().observe(getViewLifecycleOwner(), new Observer<List<Child>>() {
+                    @Override
+                    public void onChanged(List<Child> songs) {
+                        if (songs != null && !songs.isEmpty()) {
+                            int downloadedCount = 0;
+
+                            if (Preferences.getDownloadDirectoryUri() == null) {
+                                DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                                for (Child song : songs) {
+                                    if (!manager.isDownloaded(song.getId())) {
+                                        manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                        downloadedCount++;
+                                    }
+                                }
+                            } else {
+                                for (Child song : songs) {
+                                    if (ExternalAudioReader.getUri(song) == null) {
+                                        ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                                        downloadedCount++;
+                                    }
+                                }
+                            }
+
+                            if (downloadedCount > 0) {
+                                Toast.makeText(requireContext(),
+                                        getResources().getQuantityString(R.plurals.songs_download_started, downloadedCount, downloadedCount),
+                                        Toast.LENGTH_SHORT).show();
+                            }
+                        }
+
                         bind.homeSyncStarredCard.setVisibility(View.GONE);
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(() -> reorder());
+                        }
                     }
                 });
             }
@@ -331,6 +401,7 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
     }
 
     private void initSyncStarredAlbumsView() {
+
         if (Preferences.isStarredAlbumsSyncEnabled()) {
             homeViewModel.getStarredAlbums(getViewLifecycleOwner()).observe(getViewLifecycleOwner(), new Observer<List<AlbumID3>>() {
                 @Override
@@ -344,6 +415,9 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
 
         bind.homeSyncStarredAlbumsCancel.setOnClickListener(v -> {
             bind.homeSyncStarredAlbumsCard.setVisibility(View.GONE);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(() -> reorder());
+            }
         });
 
         bind.homeSyncStarredAlbumsDownload.setOnClickListener(v -> {
@@ -351,24 +425,36 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
                 @Override
                 public void onChanged(List<Child> allSongs) {
                     if (allSongs != null && !allSongs.isEmpty()) {
-                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                         int songsToDownload = 0;
 
-                        for (Child song : allSongs) {
-                            if (!manager.isDownloaded(song.getId())) {
-                                manager.download(MappingUtil.mapDownload(song), new Download(song));
-                                songsToDownload++;
+                        if (Preferences.getDownloadDirectoryUri() == null) {
+                            DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                            for (Child song : allSongs) {
+                                if (!manager.isDownloaded(song.getId())) {
+                                    manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                    songsToDownload++;
+                                }
+                            }
+                        } else {
+                            for (Child song : allSongs) {
+                                if (ExternalAudioReader.getUri(song) == null) {
+                                    ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                                    songsToDownload++;
+                                }
                             }
                         }
 
                         if (songsToDownload > 0) {
-                            Toast.makeText(requireContext(), 
-                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload), 
+                            Toast.makeText(requireContext(),
+                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload),
                                 Toast.LENGTH_SHORT).show();
                         }
                     }
-                    
+
                     bind.homeSyncStarredAlbumsCard.setVisibility(View.GONE);
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(() -> reorder());
+                    }
                 }
             });
         });
@@ -379,33 +465,73 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             @Override
             public void onChanged(List<Child> allSongs) {
                 if (allSongs != null) {
-                    DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                     int songsToDownload = 0;
                     List<String> albumsNeedingSync = new ArrayList<>();
 
-                    for (AlbumID3 album : albums) {
-                        boolean albumNeedsSync = false;
-                        // Check if any songs from this album need downloading
-                        for (Child song : allSongs) {
-                            if (song.getAlbumId() != null && song.getAlbumId().equals(album.getId()) && 
-                                !manager.isDownloaded(song.getId())) {
-                                songsToDownload++;
-                                albumNeedsSync = true;
+                    if (Preferences.getDownloadDirectoryUri() == null) {
+                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                        
+                        for (AlbumID3 album : albums) {
+                            boolean albumNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getAlbumId() != null && song.getAlbumId().equals(album.getId()) &&
+                                        !manager.isDownloaded(song.getId())) {
+                                    songsToDownload++;
+                                    albumNeedsSync = true;
+                                }
+                            }
+                            if (albumNeedsSync) {
+                                albumsNeedingSync.add(album.getName());
                             }
                         }
-                        if (albumNeedsSync) {
-                            albumsNeedingSync.add(album.getName());
+                    } else {
+                        for (AlbumID3 album : albums) {
+                            boolean albumNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getAlbumId() != null && song.getAlbumId().equals(album.getId()) &&
+                                        ExternalAudioReader.getUri(song) == null) {
+                                    songsToDownload++;
+                                    albumNeedsSync = true;
+                                }
+                            }
+                            if (albumNeedsSync) {
+                                albumsNeedingSync.add(album.getName());
+                            }
                         }
                     }
 
                     if (songsToDownload > 0) {
                         bind.homeSyncStarredAlbumsCard.setVisibility(View.VISIBLE);
-                        String message = getResources().getQuantityString(
-                            R.plurals.home_sync_starred_albums_count, 
-                            albumsNeedingSync.size(), 
+                        
+                        StringBuilder displayText = new StringBuilder();
+                        List<String> sampleAlbums = new ArrayList<>();
+                        
+                        for (int i = 0; i < Math.min(albumsNeedingSync.size(), 3); i++) {
+                            sampleAlbums.add(albumsNeedingSync.get(i));
+                        }
+                        
+                        if (!sampleAlbums.isEmpty()) {
+                            displayText.append(String.join(", ", sampleAlbums));
+                            if (albumsNeedingSync.size() > 3) {
+                                displayText.append("...");
+                            }
+                        }
+                        
+                        String countText = getResources().getQuantityString(
+                            R.plurals.home_sync_starred_albums_count,
+                            albumsNeedingSync.size(),
                             albumsNeedingSync.size()
                         );
-                        bind.homeSyncStarredAlbumsToSync.setText(message);
+                        
+                        if (displayText.length() > 0) {
+                            bind.homeSyncStarredAlbumsToSync.setText(displayText.toString() + "\n" + countText);
+                        } else {
+                            bind.homeSyncStarredAlbumsToSync.setText(countText);
+                        }
+                        
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(() -> reorder());
+                        }
                     } else {
                         bind.homeSyncStarredAlbumsCard.setVisibility(View.GONE);
                     }
@@ -428,6 +554,9 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
 
         bind.homeSyncStarredArtistsCancel.setOnClickListener(v -> {
             bind.homeSyncStarredArtistsCard.setVisibility(View.GONE);
+            if (getActivity() != null) {
+                getActivity().runOnUiThread(() -> reorder());
+            }
         });
 
         bind.homeSyncStarredArtistsDownload.setOnClickListener(v -> {
@@ -435,24 +564,36 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
                 @Override
                 public void onChanged(List<Child> allSongs) {
                     if (allSongs != null && !allSongs.isEmpty()) {
-                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                         int songsToDownload = 0;
 
-                        for (Child song : allSongs) {
-                            if (!manager.isDownloaded(song.getId())) {
-                                manager.download(MappingUtil.mapDownload(song), new Download(song));
-                                songsToDownload++;
+                        if (Preferences.getDownloadDirectoryUri() == null) {
+                            DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                            for (Child song : allSongs) {
+                                if (!manager.isDownloaded(song.getId())) {
+                                    manager.download(MappingUtil.mapDownload(song), new Download(song));
+                                    songsToDownload++;
+                                }
+                            }
+                        } else {
+                            for (Child song : allSongs) {
+                                if (ExternalAudioReader.getUri(song) == null) {
+                                    ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                                    songsToDownload++;
+                                }
                             }
                         }
 
                         if (songsToDownload > 0) {
-                            Toast.makeText(requireContext(), 
-                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload), 
+                            Toast.makeText(requireContext(),
+                                getResources().getQuantityString(R.plurals.songs_download_started, songsToDownload, songsToDownload),
                                 Toast.LENGTH_SHORT).show();
                         }
                     }
-                    
+
                     bind.homeSyncStarredArtistsCard.setVisibility(View.GONE);
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(() -> reorder());
+                    }
                 }
             });
         });
@@ -463,33 +604,73 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             @Override
             public void onChanged(List<Child> allSongs) {
                 if (allSongs != null) {
-                    DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
                     int songsToDownload = 0;
                     List<String> artistsNeedingSync = new ArrayList<>();
 
-                    for (ArtistID3 artist : artists) {
-                        boolean artistNeedsSync = false;
-                        // Check if any songs from this artist need downloading
-                        for (Child song : allSongs) {
-                            if (song.getArtistId() != null && song.getArtistId().equals(artist.getId()) && 
-                                !manager.isDownloaded(song.getId())) {
-                                songsToDownload++;
-                                artistNeedsSync = true;
+                    if (Preferences.getDownloadDirectoryUri() == null) {
+                        DownloaderManager manager = DownloadUtil.getDownloadTracker(requireContext());
+                        
+                        for (ArtistID3 artist : artists) {
+                            boolean artistNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getArtistId() != null && song.getArtistId().equals(artist.getId()) &&
+                                        !manager.isDownloaded(song.getId())) {
+                                    songsToDownload++;
+                                    artistNeedsSync = true;
+                                }
+                            }
+                            if (artistNeedsSync) {
+                                artistsNeedingSync.add(artist.getName());
                             }
                         }
-                        if (artistNeedsSync) {
-                            artistsNeedingSync.add(artist.getName());
+                    } else {
+                        for (ArtistID3 artist : artists) {
+                            boolean artistNeedsSync = false;
+                            for (Child song : allSongs) {
+                                if (song.getArtistId() != null && song.getArtistId().equals(artist.getId()) &&
+                                        ExternalAudioReader.getUri(song) == null) {
+                                    songsToDownload++;
+                                    artistNeedsSync = true;
+                                }
+                            }
+                            if (artistNeedsSync) {
+                                artistsNeedingSync.add(artist.getName());
+                            }
                         }
                     }
 
                     if (songsToDownload > 0) {
                         bind.homeSyncStarredArtistsCard.setVisibility(View.VISIBLE);
-                        String message = getResources().getQuantityString(
-                            R.plurals.home_sync_starred_artists_count, 
-                            artistsNeedingSync.size(), 
+                        
+                        StringBuilder displayText = new StringBuilder();
+                        List<String> sampleArtists = new ArrayList<>();
+                        
+                        for (int i = 0; i < Math.min(artistsNeedingSync.size(), 3); i++) {
+                            sampleArtists.add(artistsNeedingSync.get(i));
+                        }
+                        
+                        if (!sampleArtists.isEmpty()) {
+                            displayText.append(String.join(", ", sampleArtists));
+                            if (artistsNeedingSync.size() > 3) {
+                                displayText.append("...");
+                            }
+                        }
+                        
+                        String countText = getResources().getQuantityString(
+                            R.plurals.home_sync_starred_artists_count,
+                            artistsNeedingSync.size(),
                             artistsNeedingSync.size()
                         );
-                        bind.homeSyncStarredArtistsToSync.setText(message);
+                        
+                        if (displayText.length() > 0) {
+                            bind.homeSyncStarredArtistsToSync.setText(displayText.toString() + "\n" + countText);
+                        } else {
+                            bind.homeSyncStarredArtistsToSync.setText(countText);
+                        }
+                        
+                        if (getActivity() != null) {
+                            getActivity().runOnUiThread(() -> reorder());
+                        }
                     } else {
                         bind.homeSyncStarredArtistsCard.setVisibility(View.GONE);
                     }
@@ -497,7 +678,7 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
             }
         });
     }
-    
+
     private void initDiscoverSongSlideView() {
         if (homeViewModel.checkHomeSectorVisibility(Constants.HOME_SECTOR_DISCOVERY)) return;
 
@@ -962,6 +1143,18 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
         if (bind != null && homeViewModel.getHomeSectorList() != null) {
             bind.homeLinearLayoutContainer.removeAllViews();
 
+            if (bind.homeSyncStarredCard.getVisibility() == View.VISIBLE) {
+                bind.homeLinearLayoutContainer.addView(bind.homeSyncStarredCard);
+            }
+
+            if (bind.homeSyncStarredAlbumsCard.getVisibility() == View.VISIBLE) {
+                bind.homeLinearLayoutContainer.addView(bind.homeSyncStarredAlbumsCard);
+            }
+
+            if (bind.homeSyncStarredArtistsCard.getVisibility() == View.VISIBLE) {
+                bind.homeLinearLayoutContainer.addView(bind.homeSyncStarredArtistsCard);
+            }
+
             for (HomeSector sector : homeViewModel.getHomeSectorList()) {
                 if (!sector.isVisible()) continue;
 
@@ -1062,20 +1255,25 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
         MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
     }
 
-    @Override
     public void onMediaClick(Bundle bundle) {
         if (bundle.containsKey(Constants.MEDIA_MIX)) {
-            MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelable(Constants.TRACK_OBJECT));
+            Child track = bundle.getParcelable(Constants.TRACK_OBJECT);
             activity.setBottomSheetInPeek(true);
 
             if (mediaBrowserListenableFuture != null) {
-                homeViewModel.getMediaInstantMix(getViewLifecycleOwner(), bundle.getParcelable(Constants.TRACK_OBJECT)).observe(getViewLifecycleOwner(), songs -> {
-                    MusicUtil.ratingFilter(songs);
+                final boolean[] playbackStarted = {false};
+                Toast.makeText(requireContext(), R.string.bottom_sheet_generating_instant_mix, Toast.LENGTH_SHORT).show();
+                homeViewModel.getMediaInstantMix(getViewLifecycleOwner(), track)
+                        .observe(getViewLifecycleOwner(), songs -> {
+                            if (playbackStarted[0] || songs == null || songs.isEmpty()) return;
 
-                    if (songs != null && !songs.isEmpty()) {
-                        MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
-                    }
-                });
+                            new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                                if (playbackStarted[0]) return;
+
+                                MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
+                                playbackStarted[0] = true;
+                            }, 300);
+                        });
             }
         } else if (bundle.containsKey(Constants.MEDIA_CHRONOLOGY)) {
             List<Child> media = bundle.getParcelableArrayList(Constants.TRACKS_OBJECT);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/IndexFragment.java

@@ -1,27 +1,40 @@
 package com.cappielloantonio.tempo.ui.fragment;
 
+import android.content.ComponentName;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.session.MediaBrowser;
+import androidx.media3.session.SessionToken;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.databinding.FragmentIndexBinding;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
+import com.cappielloantonio.tempo.repository.DirectoryRepository;
+import com.cappielloantonio.tempo.service.MediaManager;
+import com.cappielloantonio.tempo.service.MediaService;
+import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.MusicFolder;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.MusicIndexAdapter;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.IndexUtil;
 import com.cappielloantonio.tempo.viewmodel.IndexViewModel;
+import com.google.common.util.concurrent.ListenableFuture;
 
 @UnstableApi
 public class IndexFragment extends Fragment implements ClickCallback {
@@ -32,6 +45,8 @@ public class IndexFragment extends Fragment implements ClickCallback {
     private IndexViewModel indexViewModel;
 
     private MusicIndexAdapter musicIndexAdapter;
+    private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
+    private DirectoryRepository directoryRepository;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -40,6 +55,7 @@ public class IndexFragment extends Fragment implements ClickCallback {
         bind = FragmentIndexBinding.inflate(inflater, container, false);
         View view = bind.getRoot();
         indexViewModel = new ViewModelProvider(requireActivity()).get(IndexViewModel.class);
+        directoryRepository = new DirectoryRepository();
 
         initAppBar();
         initDirectoryListView();
@@ -48,6 +64,18 @@ public class IndexFragment extends Fragment implements ClickCallback {
         return view;
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        initializeMediaBrowser();
+    }
+
+    @Override
+    public void onStop() {
+        releaseMediaBrowser();
+        super.onStop();
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -107,4 +135,65 @@ public class IndexFragment extends Fragment implements ClickCallback {
     public void onMusicIndexClick(Bundle bundle) {
         Navigation.findNavController(requireView()).navigate(R.id.directoryFragment, bundle);
     }
+
+    @Override
+    public void onMusicIndexPlay(Bundle bundle) {
+        String directoryId = bundle.getString(Constants.MUSIC_DIRECTORY_ID);
+        if (directoryId != null) {
+            Toast.makeText(requireContext(), getString(R.string.folder_play_collecting), Toast.LENGTH_SHORT).show();
+            collectAndPlayDirectorySongs(directoryId);
+        }
+    }
+
+    private void initializeMediaBrowser() {
+        mediaBrowserListenableFuture = new MediaBrowser.Builder(requireContext(), new SessionToken(requireContext(), new ComponentName(requireContext(), MediaService.class))).buildAsync();
+    }
+
+    private void releaseMediaBrowser() {
+        MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
+    }
+
+    private void collectAndPlayDirectorySongs(String directoryId) {
+        List<Child> allSongs = new ArrayList<>();
+        AtomicInteger pendingRequests = new AtomicInteger(0);
+
+        collectSongsFromDirectory(directoryId, allSongs, pendingRequests, () -> {
+            if (!allSongs.isEmpty()) {
+                activity.runOnUiThread(() -> {
+                    MediaManager.startQueue(mediaBrowserListenableFuture, allSongs, 0);
+                    activity.setBottomSheetInPeek(true);
+                    Toast.makeText(requireContext(), getString(R.string.folder_play_playing, allSongs.size()), Toast.LENGTH_SHORT).show();
+                });
+            } else {
+                activity.runOnUiThread(() -> {
+                    Toast.makeText(requireContext(), getString(R.string.folder_play_no_songs), Toast.LENGTH_SHORT).show();
+                });
+            }
+        });
+    }
+
+    private void collectSongsFromDirectory(String directoryId, List<Child> allSongs, AtomicInteger pendingRequests, Runnable onComplete) {
+        pendingRequests.incrementAndGet();
+
+        directoryRepository.getMusicDirectory(directoryId).observe(getViewLifecycleOwner(), directory -> {
+            if (directory != null && directory.getChildren() != null) {
+                for (Child child : directory.getChildren()) {
+                    if (child.isDir()) {
+                        // It's a subdirectory, recurse into it
+                        collectSongsFromDirectory(child.getId(), allSongs, pendingRequests, onComplete);
+                    } else if (!child.isVideo()) {
+                        // It's a song, add it to the list
+                        synchronized (allSongs) {
+                            allSongs.add(child);
+                        }
+                    }
+                }
+            }
+
+            // Decrement pending requests and check if we're done
+            if (pendingRequests.decrementAndGet() == 0) {
+                onComplete.run();
+            }
+        });
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java

@@ -11,7 +11,11 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.session.MediaBrowser;
+import androidx.media3.session.SessionToken;
 import androidx.navigation.Navigation;
+
+import android.content.ComponentName;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -31,6 +35,8 @@ import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.LibraryViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
+import com.cappielloantonio.tempo.service.MediaService;
+import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.Objects;
 
@@ -49,6 +55,7 @@ public class LibraryFragment extends Fragment implements ClickCallback {
     private PlaylistHorizontalAdapter playlistHorizontalAdapter;
 
     private MaterialToolbar materialToolbar;
+    private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
     @Nullable
     @Override
@@ -79,6 +86,7 @@ public class LibraryFragment extends Fragment implements ClickCallback {
     @Override
     public void onStart() {
         super.onStart();
+        initializeMediaBrowser();
         activity.setBottomNavigationBarVisibility(true);
     }
 
@@ -292,4 +300,8 @@ public class LibraryFragment extends Fragment implements ClickCallback {
     public void onMusicFolderClick(Bundle bundle) {
         Navigation.findNavController(requireView()).navigate(R.id.indexFragment, bundle);
     }
+
+    private void initializeMediaBrowser() {
+        mediaBrowserListenableFuture = new MediaBrowser.Builder(requireContext(), new SessionToken(requireContext(), new ComponentName(requireContext(), MediaService.class))).buildAsync();
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java

@@ -39,6 +39,7 @@ import com.cappielloantonio.tempo.databinding.InnerFragmentPlayerControllerBindi
 import com.cappielloantonio.tempo.service.EqualizerManager;
 import com.cappielloantonio.tempo.service.MediaService;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
+import com.cappielloantonio.tempo.ui.dialog.PlaybackSpeedDialog;
 import com.cappielloantonio.tempo.ui.dialog.RatingDialog;
 import com.cappielloantonio.tempo.ui.dialog.TrackInfoDialog;
 import com.cappielloantonio.tempo.ui.fragment.pager.PlayerControllerHorizontalPager;
@@ -413,10 +414,10 @@ public class PlayerControllerFragment extends Fragment {
                     bind.getRoot().setShowNextButton(true);
                     bind.getRoot().setShowFastForwardButton(false);
                     bind.getRoot().setRepeatToggleModes(RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL | RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE);
-                    bind.getRoot().findViewById(R.id.player_playback_speed_button).setVisibility(View.GONE);
+                    bind.getRoot().findViewById(R.id.player_playback_speed_button).setVisibility(View.VISIBLE);
                     bind.getRoot().findViewById(R.id.player_skip_silence_toggle_button).setVisibility(View.GONE);
                     bind.getRoot().findViewById(R.id.button_favorite).setVisibility(View.VISIBLE);
-                    resetPlaybackParameters(mediaBrowser);
+                    setPlaybackParameters(mediaBrowser);
                     break;
             }
         }
@@ -522,33 +523,12 @@ public class PlayerControllerFragment extends Fragment {
 
     private void initPlaybackSpeedButton(MediaBrowser mediaBrowser) {
         playbackSpeedButton.setOnClickListener(view -> {
-            float currentSpeed = Preferences.getPlaybackSpeed();
-
-            if (currentSpeed == Constants.MEDIA_PLAYBACK_SPEED_080) {
-                mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_100));
-                playbackSpeedButton.setText(getString(R.string.player_playback_speed, Constants.MEDIA_PLAYBACK_SPEED_100));
-                Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_100);
-            } else if (currentSpeed == Constants.MEDIA_PLAYBACK_SPEED_100) {
-                mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_125));
-                playbackSpeedButton.setText(getString(R.string.player_playback_speed, Constants.MEDIA_PLAYBACK_SPEED_125));
-                Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_125);
-            } else if (currentSpeed == Constants.MEDIA_PLAYBACK_SPEED_125) {
-                mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_150));
-                playbackSpeedButton.setText(getString(R.string.player_playback_speed, Constants.MEDIA_PLAYBACK_SPEED_150));
-                Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_150);
-            } else if (currentSpeed == Constants.MEDIA_PLAYBACK_SPEED_150) {
-                mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_175));
-                playbackSpeedButton.setText(getString(R.string.player_playback_speed, Constants.MEDIA_PLAYBACK_SPEED_175));
-                Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_175);
-            } else if (currentSpeed == Constants.MEDIA_PLAYBACK_SPEED_175) {
-                mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_200));
-                playbackSpeedButton.setText(getString(R.string.player_playback_speed, Constants.MEDIA_PLAYBACK_SPEED_200));
-                Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_200);
-            } else if (currentSpeed == Constants.MEDIA_PLAYBACK_SPEED_200) {
-                mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_080));
-                playbackSpeedButton.setText(getString(R.string.player_playback_speed, Constants.MEDIA_PLAYBACK_SPEED_080));
-                Preferences.setPlaybackSpeed(Constants.MEDIA_PLAYBACK_SPEED_080);
-            }
+            PlaybackSpeedDialog dialog = new PlaybackSpeedDialog();
+            dialog.setPlaybackSpeedListener(speed -> {
+                mediaBrowser.setPlaybackParameters(new PlaybackParameters(speed));
+                playbackSpeedButton.setText(getString(R.string.player_playback_speed, speed));
+            });
+            dialog.show(requireActivity().getSupportFragmentManager(), null);
         });
 
         skipSilenceToggleButton.setOnClickListener(view -> {
@@ -600,7 +580,7 @@ public class PlayerControllerFragment extends Fragment {
     }
 
     private void resetPlaybackParameters(MediaBrowser mediaBrowser) {
-        mediaBrowser.setPlaybackParameters(new PlaybackParameters(Constants.MEDIA_PLAYBACK_SPEED_100));
+        mediaBrowser.setPlaybackParameters(new PlaybackParameters(1.0f));
         // TODO Resettare lo skip del silenzio
     }
 

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerLyricsFragment.java

@@ -7,7 +7,9 @@ import android.os.Handler;
 import android.text.Layout;
 import android.text.Spannable;
 import android.text.SpannableString;
-import android.text.TextUtils;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -51,6 +53,7 @@ public class PlayerLyricsFragment extends Fragment {
     private Runnable syncLyricsRunnable;
     private String currentLyrics;
     private LyricsList currentLyricsList;
+    private Integer lastLineIdx;
     private String currentDescription;
 
     @Override
@@ -109,6 +112,7 @@ public class PlayerLyricsFragment extends Fragment {
         currentLyrics = null;
         currentLyricsList = null;
         currentDescription = null;
+        lastLineIdx = null;
     }
 
     private void initOverlay() {
@@ -162,6 +166,7 @@ public class PlayerLyricsFragment extends Fragment {
 
         playerBottomSheetViewModel.getLiveLyricsList().observe(getViewLifecycleOwner(), lyricsList -> {
             currentLyricsList = lyricsList;
+            lastLineIdx = null;
             updatePanelContent();
         });
 
@@ -194,7 +199,7 @@ public class PlayerLyricsFragment extends Fragment {
         bind.nowPlayingSongLyricsSrollView.smoothScrollTo(0, 0);
 
         if (hasStructuredLyrics(currentLyricsList)) {
-            setSyncLirics(currentLyricsList);
+            setSyncLyrics(currentLyricsList);
             bind.nowPlayingSongLyricsTextView.setVisibility(View.VISIBLE);
             bind.emptyDescriptionImageView.setVisibility(View.GONE);
             bind.titleEmptyDescriptionLabel.setVisibility(View.GONE);
@@ -241,14 +246,14 @@ public class PlayerLyricsFragment extends Fragment {
     }
 
     @SuppressLint("DefaultLocale")
-    private void setSyncLirics(LyricsList lyricsList) {
+    private void setSyncLyrics(LyricsList lyricsList) {
         if (lyricsList.getStructuredLyrics() != null && !lyricsList.getStructuredLyrics().isEmpty() && lyricsList.getStructuredLyrics().get(0).getLine() != null) {
             StringBuilder lyricsBuilder = new StringBuilder();
             List<Line> lines = lyricsList.getStructuredLyrics().get(0).getLine();
 
             if (lines != null) {
                 for (Line line : lines) {
-                    lyricsBuilder.append(line.getValue().trim()).append("\n");
+                    lyricsBuilder.append(line.getValue().trim()).append("\n\n");
                 }
             }
 
@@ -288,67 +293,75 @@ public class PlayerLyricsFragment extends Fragment {
         int timestamp = (int) (mediaBrowser.getCurrentPosition());
 
         if (hasStructuredLyrics(lyricsList)) {
-            StringBuilder lyricsBuilder = new StringBuilder();
             List<Line> lines = lyricsList.getStructuredLyrics().get(0).getLine();
-
-            if (lines == null || lines.isEmpty()) return;
-
-            for (Line line : lines) {
-                lyricsBuilder.append(line.getValue().trim()).append("\n");
+            if (lines == null || lines.isEmpty()) {
+                return;
             }
 
-            Line toHighlight = lines.stream().filter(line -> line != null && line.getStart() != null && line.getStart() < timestamp).reduce((first, second) -> second).orElse(null);
-
-            if (toHighlight != null) {
-                String lyrics = lyricsBuilder.toString();
-                Spannable spannableString = new SpannableString(lyrics);
-
-                int startingPosition = getStartPosition(lines, toHighlight);
-                int endingPosition = startingPosition + toHighlight.getValue().length();
-
-                spannableString.setSpan(new ForegroundColorSpan(requireContext().getResources().getColor(R.color.shadowsLyricsTextColor, null)), 0, lyrics.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                spannableString.setSpan(new ForegroundColorSpan(requireContext().getResources().getColor(R.color.lyricsTextColor, null)), startingPosition, endingPosition, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-                bind.nowPlayingSongLyricsTextView.setText(spannableString);
-
-                if (playerBottomSheetViewModel.getSyncLyricsState()) {
-                    bind.nowPlayingSongLyricsSrollView.smoothScrollTo(0, getScroll(lines, toHighlight));
+            // Find the index of the currently playing line
+            int curIdx = 0;
+            for (; curIdx < lines.size(); ++curIdx) {
+                Integer start = lines.get(curIdx).getStart();
+                if (start != null && start > timestamp) {
+                    curIdx--; // Found the first line that starts after the current timestamp
+                    break;
                 }
             }
-        }
-    }
 
-    private int getStartPosition(List<Line> lines, Line toHighlight) {
-        int start = 0;
+            // Only update if the highlighted line has changed
+            if (lastLineIdx != null && curIdx == lastLineIdx) {
+                return;
+            }
+            lastLineIdx = curIdx;
 
-        for (Line line : lines) {
-            if (line != toHighlight) {
-                start = start + line.getValue().length() + 1;
-            } else {
-                break;
+            StringBuilder lyricsBuilder = new StringBuilder();
+            for (Line line : lines) {
+                lyricsBuilder.append(line.getValue().trim()).append("\n\n");
+            }
+            String lyrics = lyricsBuilder.toString();
+            Spannable spannableString = new SpannableString(lyrics);
+
+            // Make each line clickable for navigation and highlight the current one
+            int offset = 0;
+            int highlightStart = -1;
+            for (int i = 0; i < lines.size(); ++i) {
+                boolean highlight = i == curIdx;
+                if (highlight) highlightStart = offset;
+
+                int len = lines.get(i).getValue().length() + 2;
+                final int lineStart = lines.get(i).getStart();
+                spannableString.setSpan(new ClickableSpan() {
+                    @Override
+                    public void onClick(@NonNull View view) {
+                        // Seeking to 1ms after the actual start prevents scrolling / highlighting artifacts
+                        mediaBrowser.seekTo(lineStart + 1);
+                    }
+
+                    @Override
+                    public void updateDrawState(@NonNull TextPaint ds) {
+                        super.updateDrawState(ds);
+                        ds.setUnderlineText(false);
+                        if (highlight) {
+                            ds.setColor(requireContext().getResources().getColor(R.color.lyricsTextColor, null));
+                        } else {
+                            ds.setColor(requireContext().getResources().getColor(R.color.shadowsLyricsTextColor, null));
+                        }
+                    }
+                }, offset, offset + len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                offset += len;
+            }
+
+            bind.nowPlayingSongLyricsTextView.setMovementMethod(LinkMovementMethod.getInstance());
+            bind.nowPlayingSongLyricsTextView.setText(spannableString);
+
+            // Scroll to the highlighted line, but only if there is one
+            if (highlightStart >= 0 && playerBottomSheetViewModel.getSyncLyricsState()) {
+                bind.nowPlayingSongLyricsSrollView.smoothScrollTo(0, getScroll(highlightStart));
             }
         }
-
-        return start;
     }
 
-    private int getLineCount(List<Line> lines, Line toHighlight) {
-        int start = 0;
-
-        for (Line line : lines) {
-            if (line != toHighlight) {
-                bind.tempLyricsLineTextView.setText(line.getValue());
-                start = start + bind.tempLyricsLineTextView.getLineCount();
-            } else {
-                break;
-            }
-        }
-
-        return start;
-    }
-
-    private int getScroll(List<Line> lines, Line toHighlight) {
-        int startIndex = getStartPosition(lines, toHighlight);
+    private int getScroll(int startIndex) {
         Layout layout = bind.nowPlayingSongLyricsTextView.getLayout();
         if (layout == null) return 0;
 

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java

@@ -2,28 +2,41 @@ package com.cappielloantonio.tempo.ui.fragment;
 
 import android.content.ComponentName;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.Observer;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.session.MediaBrowser;
+import androidx.media3.common.MediaItem;
 import androidx.media3.session.SessionToken;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.databinding.InnerFragmentPlayerQueueBinding;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
+import com.cappielloantonio.tempo.service.DownloaderManager;
 import com.cappielloantonio.tempo.service.MediaManager;
 import com.cappielloantonio.tempo.service.MediaService;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.subsonic.models.PlayQueue;
 import com.cappielloantonio.tempo.ui.adapter.PlayerSongQueueAdapter;
+import com.cappielloantonio.tempo.ui.dialog.PlaylistChooserDialog;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.DownloadUtil;
+import com.cappielloantonio.tempo.util.ExternalAudioReader;
+import com.cappielloantonio.tempo.util.ExternalAudioWriter;
+import com.cappielloantonio.tempo.util.MappingUtil;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.PlaybackViewModel;
 import com.cappielloantonio.tempo.viewmodel.PlayerBottomSheetViewModel;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -31,6 +44,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @UnstableApi
@@ -39,6 +53,18 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
 
     private InnerFragmentPlayerQueueBinding bind;
 
+    private com.google.android.material.floatingactionbutton.FloatingActionButton fabMenuToggle;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabClearQueue;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabShuffleQueue;
+
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabSaveToPlaylist;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabDownloadAll;
+    private com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton fabLoadQueue;
+
+    private boolean isMenuOpen = false;
+    private final int ANIMATION_DURATION = 250; 
+    private final float FAB_VERTICAL_SPACING_DP = 70f;
+
     private PlayerBottomSheetViewModel playerBottomSheetViewModel;
     private PlaybackViewModel playbackViewModel;
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
@@ -53,6 +79,27 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
         playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);
 
+        fabMenuToggle = bind.fabMenuToggle;
+        fabClearQueue = bind.fabClearQueue;
+        fabShuffleQueue = bind.fabShuffleQueue;
+
+        fabSaveToPlaylist = bind.fabSaveToPlaylist;
+        fabDownloadAll = bind.fabDownloadAll;
+        fabLoadQueue = bind.fabLoadQueue;
+
+        fabMenuToggle.setOnClickListener(v -> toggleFabMenu());
+        fabClearQueue.setOnClickListener(v -> handleClearQueueClick());
+        fabShuffleQueue.setOnClickListener(v -> handleShuffleQueueClick());
+
+        fabSaveToPlaylist.setOnClickListener(v -> handleSaveToPlaylistClick());
+        fabDownloadAll.setOnClickListener(v -> handleDownloadAllClick());
+        fabLoadQueue.setOnClickListener(v -> handleLoadQueueClick());
+
+        // Hide Load Queue FAB if sync is disabled
+        if (!Preferences.isSyncronizationEnabled()) {
+            fabLoadQueue.setVisibility(View.GONE);
+        }
+
         initQueueRecyclerView();
 
         return view;
@@ -62,8 +109,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
     public void onStart() {
         super.onStart();
         initializeBrowser();
-        bindMediaController();
-
         MediaManager.registerPlaybackObserver(mediaBrowserListenableFuture, playbackViewModel);
         observePlayback();
     }
@@ -105,18 +150,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
     }
 
-    private void bindMediaController() {
-        mediaBrowserListenableFuture.addListener(() -> {
-            try {
-                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
-                initShuffleButton(mediaBrowser);
-                initCleanButton(mediaBrowser);
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-        }, MoreExecutors.directExecutor());
-    }
-
     private void setMediaBrowserListenableFuture() {
         playerSongQueueAdapter.setMediaBrowserListenableFuture(mediaBrowserListenableFuture);
     }
@@ -149,18 +182,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
 
                 fromPosition = viewHolder.getBindingAdapterPosition();
                 toPosition = target.getBindingAdapterPosition();
-
-                /*
-                 * Per spostare un elemento nella coda devo:
-                 *    - Spostare graficamente la traccia da una posizione all'altra con Collections.swap()
-                 *    - Spostare nel db la traccia, tramite QueueRepository
-                 *    - Notificare il Service dell'avvenuto spostamento con MusicPlayerRemote.moveSong()
-                 *
-                 * In onMove prendo la posizione di inizio e fine, ma solo al rilascio dell'elemento procedo allo spostamento
-                 * In questo modo evito che ad ogni cambio di posizione vada a riscrivere nel db
-                 * Al rilascio dell'elemento chiamo il metodo clearView()
-                 */
-
                 Collections.swap(playerSongQueueAdapter.getItems(), fromPosition, toPosition);
                 recyclerView.getAdapter().notifyItemMoved(fromPosition, toPosition);
 
@@ -188,46 +209,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         }).attachToRecyclerView(bind.playerQueueRecyclerView);
     }
 
-    private void initShuffleButton(MediaBrowser mediaBrowser) {
-        bind.playerShuffleQueueFab.setOnClickListener(view -> {
-            int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
-            int endPosition = playerSongQueueAdapter.getItems().size() - 1;
-
-            if (startPosition < endPosition) {
-                ArrayList<Integer> pool = new ArrayList<>();
-
-                for (int i = startPosition; i <= endPosition; i++) {
-                    pool.add(i);
-                }
-
-                while (pool.size() >= 2) {
-                    int fromPosition = (int) (Math.random() * (pool.size()));
-                    int positionA = pool.get(fromPosition);
-                    pool.remove(fromPosition);
-
-                    int toPosition = (int) (Math.random() * (pool.size()));
-                    int positionB = pool.get(toPosition);
-                    pool.remove(toPosition);
-
-                    Collections.swap(playerSongQueueAdapter.getItems(), positionA, positionB);
-                    bind.playerQueueRecyclerView.getAdapter().notifyItemMoved(positionA, positionB);
-                }
-
-                MediaManager.shuffle(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
-            }
-        });
-    }
-
-    private void initCleanButton(MediaBrowser mediaBrowser) {
-        bind.playerCleanQueueButton.setOnClickListener(view -> {
-            int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
-            int endPosition = playerSongQueueAdapter.getItems().size();
-
-            MediaManager.removeRange(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
-            bind.playerQueueRecyclerView.getAdapter().notifyItemRangeRemoved(startPosition, endPosition);
-        });
-    }
-
     private void updateNowPlayingItem() {
         playerSongQueueAdapter.notifyDataSetChanged();
     }
@@ -259,4 +240,250 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
             playerSongQueueAdapter.setPlaybackState(id, playing != null && playing);
         }
     }
+
+    /**
+     * Toggles the visibility and animates all six secondary FABs.
+     */
+    private void toggleFabMenu() {
+        if (isMenuOpen) {
+            // CLOSE MENU (Reverse order for visual effect)
+            if (Preferences.isSyncronizationEnabled()) {
+                closeFab(fabLoadQueue, 4);
+            }
+            closeFab(fabSaveToPlaylist, 3); 
+            closeFab(fabClearQueue, 2);
+            closeFab(fabDownloadAll, 1);
+            closeFab(fabShuffleQueue, 0);
+            
+            fabMenuToggle.animate().rotation(0f).setDuration(ANIMATION_DURATION).start();
+        } else {
+            // OPEN MENU (lowest index at bottom)
+            openFab(fabShuffleQueue, 0);
+            openFab(fabDownloadAll, 1);
+            openFab(fabClearQueue, 2);
+            openFab(fabSaveToPlaylist, 3);
+            if (Preferences.isSyncronizationEnabled()) {
+                openFab(fabLoadQueue, 4);
+            }
+            fabMenuToggle.animate().rotation(45f).setDuration(ANIMATION_DURATION).start();
+        }
+        isMenuOpen = !isMenuOpen;
+    }
+
+    private void openFab(View fab, int index) {
+        final float displacement = getResources().getDisplayMetrics().density * (FAB_VERTICAL_SPACING_DP * (index + 1));
+        
+        fab.setVisibility(View.VISIBLE);
+        fab.setAlpha(0f);
+        fab.setTranslationY(displacement); // Start at the hidden (closed) position
+        
+        fab.animate()
+        .translationY(0f)
+        .alpha(1f)
+        .setDuration(ANIMATION_DURATION)
+        .start();
+    }
+
+    private void closeFab(View fab, int index) {
+        final float displacement = getResources().getDisplayMetrics().density * (FAB_VERTICAL_SPACING_DP * (index + 1));
+
+        fab.animate()
+        .translationY(displacement)
+        .alpha(0f)
+        .setDuration(ANIMATION_DURATION)
+        .withEndAction(() -> fab.setVisibility(View.GONE))
+        .start();
+    }
+
+    private void handleShuffleQueueClick() {
+        Log.d(TAG, "Shuffle Queue Clicked!");
+
+        mediaBrowserListenableFuture.addListener(() -> {
+            try {
+                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
+                int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
+                int endPosition = playerSongQueueAdapter.getItems().size() - 1;
+
+                if (startPosition < endPosition) {
+                    ArrayList<Integer> pool = new ArrayList<>();
+
+                    for (int i = startPosition; i <= endPosition; i++) {
+                        pool.add(i);
+                    }
+
+                    while (pool.size() >= 2) {
+                        int fromPosition = (int) (Math.random() * (pool.size()));
+                        int positionA = pool.get(fromPosition);
+                        pool.remove(fromPosition);
+
+                        int toPosition = (int) (Math.random() * (pool.size()));
+                        int positionB = pool.get(toPosition);
+                        pool.remove(toPosition);
+
+                        Collections.swap(playerSongQueueAdapter.getItems(), positionA, positionB);
+                        bind.playerQueueRecyclerView.getAdapter().notifyItemMoved(positionA, positionB);
+                    }
+
+                    MediaManager.shuffle(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
+                }
+
+            } catch (Exception e) {
+                Log.e(TAG, "Error shuffling queue", e);
+            }
+
+            toggleFabMenu();
+        }, MoreExecutors.directExecutor());
+    }
+
+    private void handleClearQueueClick() {
+        Log.d(TAG, "Clear Queue Clicked!");
+
+        mediaBrowserListenableFuture.addListener(() -> {
+            try {
+                MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
+                int startPosition = mediaBrowser.getCurrentMediaItemIndex() + 1;
+                int endPosition = playerSongQueueAdapter.getItems().size();
+
+                MediaManager.removeRange(mediaBrowserListenableFuture, playerSongQueueAdapter.getItems(), startPosition, endPosition);
+                bind.playerQueueRecyclerView.getAdapter().notifyItemRangeRemoved(startPosition, endPosition - startPosition);
+
+            } catch (Exception e) {
+                Log.e(TAG, "Error clearing queue", e);
+            }
+
+            toggleFabMenu();
+        }, MoreExecutors.directExecutor());
+    }
+
+    private void handleSaveToPlaylistClick() {
+        Log.d(TAG, "Save to Playlist Clicked!");
+
+        List<Child> queueSongs = playerSongQueueAdapter.getItems();
+
+        if (queueSongs == null || queueSongs.isEmpty()) {
+            Toast.makeText(requireContext(), "Queue is empty", Toast.LENGTH_SHORT).show();
+            toggleFabMenu();
+            return;
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putParcelableArrayList(Constants.TRACKS_OBJECT, new ArrayList<>(queueSongs));
+
+        PlaylistChooserDialog dialog = new PlaylistChooserDialog();
+        dialog.setArguments(bundle);
+        dialog.show(requireActivity().getSupportFragmentManager(), null);
+
+        toggleFabMenu();
+    }
+
+    private void handleDownloadAllClick() {
+        Log.d(TAG, "Download All Clicked!");
+
+        List<Child> queueSongs = playerSongQueueAdapter.getItems();
+
+        if (queueSongs == null || queueSongs.isEmpty()) {
+            Toast.makeText(requireContext(), "Queue is empty", Toast.LENGTH_SHORT).show();
+            toggleFabMenu();
+            return;
+        }
+
+        int downloadCount = 0;
+        
+        if (Preferences.getDownloadDirectoryUri() == null) {
+            List<MediaItem> mediaItemsToDownload = MappingUtil.mapMediaItems(queueSongs);
+            List<com.cappielloantonio.tempo.model.Download> downloadModels = new ArrayList<>();
+
+            for (Child child : queueSongs) {
+                com.cappielloantonio.tempo.model.Download downloadModel =
+                        new com.cappielloantonio.tempo.model.Download(child);
+                downloadModel.setArtist(child.getArtist());
+                downloadModel.setAlbum(child.getAlbum());
+                downloadModel.setCoverArtId(child.getCoverArtId());
+                downloadModels.add(downloadModel);
+            }
+
+            DownloaderManager downloaderManager = DownloadUtil.getDownloadTracker(requireContext());
+
+            if (downloaderManager != null) {
+                downloaderManager.download(mediaItemsToDownload, downloadModels);
+                downloadCount = queueSongs.size();
+                Toast.makeText(requireContext(), 
+                    getResources().getQuantityString(R.plurals.songs_download_started, downloadCount, downloadCount), 
+                    Toast.LENGTH_SHORT).show();
+                    
+                new Handler().postDelayed(() -> {
+                    if (playerSongQueueAdapter != null) {
+                        playerSongQueueAdapter.notifyDataSetChanged();
+                    }
+                }, 1000);
+            } else {
+                Log.e(TAG, "DownloaderManager not initialized. Check DownloadUtil.");
+                Toast.makeText(requireContext(), "Download service unavailable.", Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            for (Child song : queueSongs) {
+                if (ExternalAudioReader.getUri(song) == null) {
+                    ExternalAudioWriter.downloadToUserDirectory(requireContext(), song);
+                    downloadCount++;
+                }
+            }
+            
+            if (downloadCount > 0) {
+                Toast.makeText(requireContext(),
+                    getResources().getQuantityString(R.plurals.songs_download_started, downloadCount, downloadCount),
+                    Toast.LENGTH_SHORT).show();
+                    
+                new Handler().postDelayed(() -> {
+                    if (playerSongQueueAdapter != null) {
+                        playerSongQueueAdapter.notifyDataSetChanged();
+                    }
+                }, 2000);
+            } else {
+                Toast.makeText(requireContext(), "All songs already downloaded", Toast.LENGTH_SHORT).show();
+            }
+        }
+        
+        toggleFabMenu();
+    }
+
+    private void handleLoadQueueClick() {
+        Log.d(TAG, "Load Queue Clicked!");
+        if (!Preferences.isSyncronizationEnabled()) {
+            toggleFabMenu();
+            return;
+        }
+
+        PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
+        
+        playerBottomSheetViewModel.getPlayQueue().observe(getViewLifecycleOwner(), new Observer<PlayQueue>() {
+            @Override
+            public void onChanged(PlayQueue playQueue) {
+                playerBottomSheetViewModel.getPlayQueue().removeObserver(this);
+                
+                if (playQueue != null && playQueue.getEntries() != null && !playQueue.getEntries().isEmpty()) {
+                    int currentIndex = 0;
+                    for (int i = 0; i < playQueue.getEntries().size(); i++) {
+                        if (playQueue.getEntries().get(i).getId().equals(playQueue.getCurrent())) {
+                            currentIndex = i;
+                            break;
+                        }
+                    }
+                    
+                    MediaManager.startQueue(mediaBrowserListenableFuture, playQueue.getEntries(), currentIndex);
+                    
+                    Toast.makeText(requireContext(), "Queue loaded", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(requireContext(), "No saved queue found", Toast.LENGTH_SHORT).show();
+                }
+                
+                toggleFabMenu();
+            }
+        });
+
+        new Handler().postDelayed(() -> {
+            if (isMenuOpen) {
+                toggleFabMenu();
+            }
+        }, 1000);
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistCatalogueFragment.java

@@ -156,10 +156,10 @@ public class PlaylistCatalogueFragment extends Fragment implements ClickCallback
 
         popup.setOnMenuItemClickListener(menuItem -> {
             if (menuItem.getItemId() == R.id.menu_playlist_sort_name) {
-                playlistHorizontalAdapter.sort(Constants.GENRE_ORDER_BY_NAME);
+                playlistHorizontalAdapter.sort(Constants.PLAYLIST_ORDER_BY_NAME);
                 return true;
             } else if (menuItem.getItemId() == R.id.menu_playlist_sort_random) {
-                playlistHorizontalAdapter.sort(Constants.GENRE_ORDER_BY_RANDOM);
+                playlistHorizontalAdapter.sort(Constants.PLAYLIST_ORDER_BY_RANDOM);
                 return true;
             }
 

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java

@@ -9,6 +9,8 @@ import android.media.audiofx.AudioEffect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.text.InputFilter;
+import android.text.InputType;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +29,7 @@ import androidx.media3.common.util.UnstableApi;
 import androidx.navigation.NavController;
 import androidx.navigation.NavOptions;
 import androidx.navigation.fragment.NavHostFragment;
+import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -141,6 +144,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         setStreamingCacheSize();
         setAppLanguage();
         setVersion();
+        setNetorkPingTimeoutBase();
 
         actionLogout();
         actionScan();
@@ -261,6 +265,30 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         }
     }
 
+    private void setNetorkPingTimeoutBase() {
+        EditTextPreference networkPingTimeoutBase = findPreference("network_ping_timeout_base");
+
+        if (networkPingTimeoutBase != null) {
+            networkPingTimeoutBase.setSummaryProvider(EditTextPreference.SimpleSummaryProvider.getInstance());
+            networkPingTimeoutBase.setOnBindEditTextListener(editText -> {
+                editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+                editText.setFilters(new InputFilter[]{ (source, start, end, dest, dstart, dend) -> {
+                    for (int i = start; i < end; i++) {
+                        if (!Character.isDigit(source.charAt(i))) {
+                            return "";
+                        }
+                    }
+                    return null;
+            }});
+        });
+
+        networkPingTimeoutBase.setOnPreferenceChangeListener((preference, newValue) -> {
+            String input = (String) newValue;
+            return input != null && !input.isEmpty();
+        });
+        }
+    }
+
     private void setStreamingCacheSize() {
         ListPreference streamingCachePreference = findPreference("streaming_cache_size");
 

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java

@@ -24,7 +24,6 @@ import androidx.navigation.fragment.NavHostFragment;
 
 import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.glide.CustomGlideRequest;
-import com.cappielloantonio.tempo.interfaces.MediaCallback;
 import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
 import com.cappielloantonio.tempo.service.MediaManager;
@@ -43,7 +42,6 @@ import com.cappielloantonio.tempo.util.ExternalAudioReader;
 import com.cappielloantonio.tempo.viewmodel.AlbumBottomSheetViewModel;
 import com.cappielloantonio.tempo.viewmodel.HomeViewModel;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.android.material.snackbar.Snackbar;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.ArrayList;
@@ -61,7 +59,10 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
     private List<Child> currentAlbumTracks = Collections.emptyList();
     private List<MediaItem> currentAlbumMediaItems = Collections.emptyList();
 
+    private boolean isFirstBatch = true;
+
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
+    private static final String TAG = "AlbumBottomSheetDialog";
 
     @Nullable
     @Override
@@ -114,33 +115,41 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
 
         ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
         favoriteToggle.setChecked(albumBottomSheetViewModel.getAlbum().getStarred() != null);
-        favoriteToggle.setOnClickListener(v -> {
-            albumBottomSheetViewModel.setFavorite(requireContext());
-        });
+        favoriteToggle.setOnClickListener(v -> albumBottomSheetViewModel.setFavorite(requireContext()));
 
         TextView playRadio = view.findViewById(R.id.play_radio_text_view);
         playRadio.setOnClickListener(v -> {
-            AlbumRepository albumRepository = new AlbumRepository();
-            albumRepository.getInstantMix(album, 20, new MediaCallback() {
-                @Override
-                public void onError(Exception exception) {
-                    exception.printStackTrace();
-                }
+            MainActivity activity = (MainActivity) getActivity();
+            if (activity == null) return;
 
-                @Override
-                public void onLoadMedia(List<?> media) {
-                    MusicUtil.ratingFilter((ArrayList<Child>) media);
+            ListenableFuture<MediaBrowser> activityBrowserFuture = activity.getMediaBrowserListenableFuture();
+            if (activityBrowserFuture == null) return;
 
-                    if (!media.isEmpty()) {
-                        MediaManager.startQueue(mediaBrowserListenableFuture, (ArrayList<Child>) media, 0);
-                        ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
+            isFirstBatch = true;
+            Toast.makeText(requireContext(), R.string.bottom_sheet_generating_instant_mix, Toast.LENGTH_SHORT).show();
+
+            albumBottomSheetViewModel.getAlbumInstantMix(activity, album).observe(activity, media -> {
+                if (media == null || media.isEmpty()) return;
+                if (getActivity() == null) return;
+
+                MusicUtil.ratingFilter(media);
+
+                if (isFirstBatch) {
+                    isFirstBatch = false;
+                    
+                    MediaManager.startQueue(activityBrowserFuture, media, 0);
+                    activity.setBottomSheetInPeek(true);
+                    
+                    if (isAdded()) {
+                        dismissBottomSheet();
                     }
-
-                    dismissBottomSheet();
+                } else {
+                    MediaManager.enqueue(activityBrowserFuture, media, true);
                 }
             });
         });
 
+
         TextView playRandom = view.findViewById(R.id.play_random_text_view);
         playRandom.setOnClickListener(v -> {
             AlbumRepository albumRepository = new AlbumRepository();
@@ -186,18 +195,16 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
         });
 
         TextView addToPlaylist = view.findViewById(R.id.add_to_playlist_text_view);
-        addToPlaylist.setOnClickListener(v -> {
-            albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> {
-                Bundle bundle = new Bundle();
-                bundle.putParcelableArrayList(Constants.TRACKS_OBJECT, new ArrayList<>(songs));
+        addToPlaylist.setOnClickListener(v -> albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> {
+            Bundle bundle = new Bundle();
+            bundle.putParcelableArrayList(Constants.TRACKS_OBJECT, new ArrayList<>(songs));
 
-                PlaylistChooserDialog dialog = new PlaylistChooserDialog();
-                dialog.setArguments(bundle);
-                dialog.show(requireActivity().getSupportFragmentManager(), null);
+            PlaylistChooserDialog dialog = new PlaylistChooserDialog();
+            dialog.setArguments(bundle);
+            dialog.show(requireActivity().getSupportFragmentManager(), null);
 
-                dismissBottomSheet();
-            });
-        });
+            dismissBottomSheet();
+        }));
 
         removeAllTextView = view.findViewById(R.id.remove_all_text_view);
         albumBottomSheetViewModel.getAlbumTracks().observe(getViewLifecycleOwner(), songs -> {
@@ -291,4 +298,5 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
     private void refreshShares() {
         homeViewModel.refreshShares(requireActivity());
     }
+
 }

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java

@@ -29,6 +29,7 @@ import com.cappielloantonio.tempo.viewmodel.ArtistBottomSheetViewModel;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.common.util.concurrent.ListenableFuture;
 
+
 @UnstableApi
 public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener {
     private static final String TAG = "AlbumBottomSheetDialog";
@@ -38,6 +39,8 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
+    private boolean isFirstBatch = true;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -86,20 +89,31 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
 
         TextView playRadio = view.findViewById(R.id.play_radio_text_view);
         playRadio.setOnClickListener(v -> {
-            ArtistRepository artistRepository = new ArtistRepository();
+            MainActivity activity = (MainActivity) getActivity();
+            if (activity == null) return;
 
-            artistRepository.getInstantMix(artist, 20).observe(getViewLifecycleOwner(), songs -> {
-                // navidrome may return null for this
-                if (songs == null)
-                    return;
-                MusicUtil.ratingFilter(songs);
+            ListenableFuture<MediaBrowser> activityBrowserFuture = activity.getMediaBrowserListenableFuture();
+            if (activityBrowserFuture == null) return;
 
-                if (!songs.isEmpty()) {
-                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
-                    ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
+            isFirstBatch = true;
+            Toast.makeText(requireContext(), R.string.bottom_sheet_generating_instant_mix, Toast.LENGTH_SHORT).show();
+
+            artistBottomSheetViewModel.getArtistInstantMix(activity, artist).observe(activity, media -> {
+                if (media == null || media.isEmpty()) return;
+                if (getActivity() == null) return;
+
+                MusicUtil.ratingFilter(media);
+
+                if (isFirstBatch) {
+                    isFirstBatch = false;
+                    MediaManager.startQueue(activityBrowserFuture, media, 0);
+                    activity.setBottomSheetInPeek(true);
+                    if (isAdded()) {
+                        dismissBottomSheet();
+                    }
+                } else {
+                    MediaManager.enqueue(activityBrowserFuture, media, true);
                 }
-
-                dismissBottomSheet();
             });
         });
 
@@ -108,16 +122,10 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
             ArtistRepository artistRepository = new ArtistRepository();
             artistRepository.getRandomSong(artist, 50).observe(getViewLifecycleOwner(), songs -> {
                 MusicUtil.ratingFilter(songs);
-
                 if (!songs.isEmpty()) {
                     MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
                     ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
-
-                    dismissBottomSheet();
-                } else {
-                    Toast.makeText(requireContext(), getString(R.string.artist_error_retrieving_tracks), Toast.LENGTH_SHORT).show();
                 }
-
                 dismissBottomSheet();
             });
         });
@@ -139,4 +147,5 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
     private void releaseMediaBrowser() {
         MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
     }
-}
+
+}

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java

@@ -5,6 +5,7 @@ import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,8 +45,6 @@ import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import android.content.Intent;
-import androidx.media3.common.MediaItem;
 import com.cappielloantonio.tempo.util.ExternalAudioWriter;
 
 import java.util.ArrayList;
@@ -67,7 +66,9 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
     private AssetLinkUtil.AssetLink currentAlbumLink;
     private AssetLinkUtil.AssetLink currentArtistLink;
 
+    private boolean isFirstBatch = true;
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
+    private static final String TAG = "SongBottomSheetDialog";
 
     @Nullable
     @Override
@@ -143,20 +144,34 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
 
         TextView playRadio = view.findViewById(R.id.play_radio_text_view);
         playRadio.setOnClickListener(v -> {
-            MediaManager.startQueue(mediaBrowserListenableFuture, song);
-            ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
+            MainActivity activity = (MainActivity) getActivity();
+            if (activity == null) return;
 
-            songBottomSheetViewModel.getInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), songs -> {
-                MusicUtil.ratingFilter(songs);
+            ListenableFuture<MediaBrowser> activityBrowserFuture = activity.getMediaBrowserListenableFuture();
+            if (activityBrowserFuture == null) {
+                Log.e(TAG, "MediaBrowser Future is null in MainActivity");
+                return;
+            }
 
-                if (songs == null) {
-                    dismissBottomSheet();
-                    return;
-                }
+            isFirstBatch = true;
+            Toast.makeText(requireContext(), R.string.bottom_sheet_generating_instant_mix, Toast.LENGTH_SHORT).show();
 
-                if (!songs.isEmpty()) {
-                    MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
-                    dismissBottomSheet();
+            songBottomSheetViewModel.getInstantMix(activity, song).observe(activity, media -> {
+
+                if (media == null || media.isEmpty()) return;
+                if (getActivity() == null) return;
+
+                MusicUtil.ratingFilter(media);
+
+                if (isFirstBatch) {
+                    isFirstBatch = false;
+                    MediaManager.startQueue(activityBrowserFuture, media, 0);
+                    activity.setBottomSheetInPeek(true);
+                    if (isAdded()) {
+                        dismissBottomSheet();
+                    }
+                } else {
+                    MediaManager.enqueue(activityBrowserFuture, media, true);
                 }
             });
         });
@@ -327,16 +342,12 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
         chip.setVisibility(View.VISIBLE);
 
         chip.setOnClickListener(v -> {
-            if (assetLink != null) {
-                ((MainActivity) requireActivity()).openAssetLink(assetLink);
-            }
+            ((MainActivity) requireActivity()).openAssetLink(assetLink);
         });
 
         chip.setOnLongClickListener(v -> {
-            if (assetLink != null) {
-                AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
-                Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, id), Toast.LENGTH_SHORT).show();
-            }
+            AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
+            Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, id), Toast.LENGTH_SHORT).show();
             return true;
         });
 
@@ -397,4 +408,5 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
     private void refreshShares() {
         homeViewModel.refreshShares(requireActivity());
     }
+
 }

app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt

@@ -61,13 +61,6 @@ object Constants {
     const val MEDIA_TYPE_VIDEO = "video"
     const val MEDIA_TYPE_RADIO = "radio"
 
-    const val MEDIA_PLAYBACK_SPEED_080 = 0.8f
-    const val MEDIA_PLAYBACK_SPEED_100 = 1.0f
-    const val MEDIA_PLAYBACK_SPEED_125 = 1.25f
-    const val MEDIA_PLAYBACK_SPEED_150 = 1.50f
-    const val MEDIA_PLAYBACK_SPEED_175 = 1.75f
-    const val MEDIA_PLAYBACK_SPEED_200 = 2.0f
-
     const val MEDIA_RECENTLY_PLAYED = "MEDIA_RECENTLY_PLAYED"
     const val MEDIA_MOST_PLAYED = "MEDIA_MOST_PLAYED"
     const val MEDIA_RECENTLY_ADDED = "MEDIA_RECENTLY_ADDED"
@@ -133,4 +126,7 @@ object Constants {
     const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF = "android.media3.session.demo.REPEAT_OFF"
     const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE = "android.media3.session.demo.REPEAT_ONE"
     const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL = "android.media3.session.demo.REPEAT_ALL"
+    enum class SeedType {
+        ARTIST, ALBUM, TRACK
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/util/DynamicMediaSourceFactory.kt

@@ -46,8 +46,16 @@ class DynamicMediaSourceFactory(
 
             else -> {
                 val extractorsFactory: ExtractorsFactory = DefaultExtractorsFactory()
-                ProgressiveMediaSource.Factory(dataSourceFactory, extractorsFactory)
-                    .createMediaSource(mediaItem)
+                val progressiveFactory = ProgressiveMediaSource.Factory(dataSourceFactory, extractorsFactory)
+
+                val uri = mediaItem.localConfiguration?.uri
+                val isTranscoding = uri?.getQueryParameter("format") != null && uri.getQueryParameter("format") != "raw"
+                
+                if (isTranscoding && OpenSubsonicExtensionsUtil.isTranscodeOffsetExtensionAvailable()) {
+                     TranscodingMediaSource(mediaItem, dataSourceFactory, progressiveFactory)
+                } else {
+                     progressiveFactory.createMediaSource(mediaItem)
+                }
             }
         }
     }

app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java

@@ -1,7 +1,9 @@
 package com.cappielloantonio.tempo.util;
 
+import android.content.ContentResolver;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.annotation.OptIn;
 import androidx.lifecycle.LifecycleOwner;
@@ -14,6 +16,7 @@ import androidx.media3.common.HeartRating;
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.glide.CustomGlideRequest;
 import com.cappielloantonio.tempo.model.Download;
+import com.cappielloantonio.tempo.provider.AlbumArtContentProvider;
 import com.cappielloantonio.tempo.repository.DownloadRepository;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation;
@@ -35,84 +38,106 @@ public class MappingUtil {
         return mediaItems;
     }
 
+    private static final String TAG = "MappingUtil";
+
     public static MediaItem mapMediaItem(Child media) {
-        Uri uri = getUri(media);
-        Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(media.getCoverArtId(), Preferences.getImageSize()));
+        try {
+            Uri uri = getUri(media);
+            String coverArtId = media.getCoverArtId();
+            Uri artworkUri = null;
 
-        Bundle bundle = new Bundle();
-        bundle.putString("id", media.getId());
-        bundle.putString("parentId", media.getParentId());
-        bundle.putBoolean("isDir", media.isDir());
-        bundle.putString("title", media.getTitle());
-        bundle.putString("album", media.getAlbum());
-        bundle.putString("artist", media.getArtist());
-        bundle.putInt("track", media.getTrack() != null ? media.getTrack() : 0);
-        bundle.putInt("year", media.getYear() != null ? media.getYear() : 0);
-        bundle.putString("genre", media.getGenre());
-        bundle.putString("coverArtId", media.getCoverArtId());
-        bundle.putLong("size", media.getSize() != null ? media.getSize() : 0);
-        bundle.putString("contentType", media.getContentType());
-        bundle.putString("suffix", media.getSuffix());
-        bundle.putString("transcodedContentType", media.getTranscodedContentType());
-        bundle.putString("transcodedSuffix", media.getTranscodedSuffix());
-        bundle.putInt("duration", media.getDuration() != null ? media.getDuration() : 0);
-        bundle.putInt("bitrate", media.getBitrate() != null ? media.getBitrate() : 0);
-        bundle.putInt("samplingRate", media.getSamplingRate() != null ? media.getSamplingRate() : 0);
-        bundle.putInt("bitDepth", media.getBitDepth() != null ? media.getBitDepth() : 0);
-        bundle.putString("path", media.getPath());
-        bundle.putBoolean("isVideo", media.isVideo());
-        bundle.putInt("userRating", media.getUserRating() != null ? media.getUserRating() : 0);
-        bundle.putDouble("averageRating", media.getAverageRating() != null ? media.getAverageRating() : 0);
-        bundle.putLong("playCount", media.getPlayCount() != null ? media.getPlayCount() : 0);
-        bundle.putInt("discNumber", media.getDiscNumber() != null ? media.getDiscNumber() : 0);
-        bundle.putLong("created", media.getCreated() != null ? media.getCreated().getTime() : 0);
-        bundle.putLong("starred", media.getStarred() != null ? media.getStarred().getTime() : 0);
-        bundle.putString("albumId", media.getAlbumId());
-        bundle.putString("artistId", media.getArtistId());
-        bundle.putString("type", Constants.MEDIA_TYPE_MUSIC);
-        bundle.putLong("bookmarkPosition", media.getBookmarkPosition() != null ? media.getBookmarkPosition() : 0);
-        bundle.putInt("originalWidth", media.getOriginalWidth() != null ? media.getOriginalWidth() : 0);
-        bundle.putInt("originalHeight", media.getOriginalHeight() != null ? media.getOriginalHeight() : 0);
-        bundle.putString("uri", uri.toString());
-        bundle.putString("assetLinkSong", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, media.getId()));
-        bundle.putString("assetLinkAlbum", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, media.getAlbumId()));
-        bundle.putString("assetLinkArtist", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, media.getArtistId()));
-        bundle.putString("assetLinkGenre", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_GENRE, media.getGenre()));
-        Integer year = media.getYear();
-        bundle.putString("assetLinkYear", year != null && year != 0 ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_YEAR, String.valueOf(year)) : null);
+            if (coverArtId != null) {
+                artworkUri = AlbumArtContentProvider.contentUri(coverArtId);
+            }
 
-        return new MediaItem.Builder()
-                .setMediaId(media.getId())
-                .setMediaMetadata(
-                        new MediaMetadata.Builder()
-                                .setTitle(media.getTitle())
-                                .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0)
-                                .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0)
-                                .setReleaseYear(media.getYear() != null ? media.getYear() : 0)
-                                .setAlbumTitle(media.getAlbum())
-                                .setArtist(media.getArtist())
-                                .setArtworkUri(artworkUri)
-                                .setUserRating(new HeartRating(media.getStarred() != null))
-                                .setSupportedCommands(
+            Bundle bundle = new Bundle();
+            bundle.putString("id", media.getId());
+            bundle.putString("parentId", media.getParentId());
+            bundle.putBoolean("isDir", media.isDir());
+            
+            bundle.putString("title", media.getTitle());
+            bundle.putString("album", media.getAlbum());
+            bundle.putString("artist", media.getArtist());
+
+            bundle.putInt("track", media.getTrack() != null ? media.getTrack() : 0);
+            bundle.putInt("year", media.getYear() != null ? media.getYear() : 0);
+            bundle.putString("genre", media.getGenre());
+            bundle.putString("coverArtId", coverArtId);
+            bundle.putLong("size", media.getSize() != null ? media.getSize() : 0);
+            bundle.putString("contentType", media.getContentType());
+            bundle.putString("suffix", media.getSuffix());
+            bundle.putString("transcodedContentType", media.getTranscodedContentType());
+            bundle.putString("transcodedSuffix", media.getTranscodedSuffix());
+            bundle.putInt("duration", media.getDuration() != null ? media.getDuration() : 0);
+            bundle.putInt("bitrate", media.getBitrate() != null ? media.getBitrate() : 0);
+            bundle.putInt("samplingRate", media.getSamplingRate() != null ? media.getSamplingRate() : 0);
+            bundle.putInt("bitDepth", media.getBitDepth() != null ? media.getBitDepth() : 0);
+            bundle.putString("path", media.getPath());
+            bundle.putBoolean("isVideo", media.isVideo());
+            bundle.putInt("userRating", media.getUserRating() != null ? media.getUserRating() : 0);
+            bundle.putDouble("averageRating", media.getAverageRating() != null ? media.getAverageRating() : 0);
+            bundle.putLong("playCount", media.getPlayCount() != null ? media.getPlayCount() : 0);
+            bundle.putInt("discNumber", media.getDiscNumber() != null ? media.getDiscNumber() : 0);
+            bundle.putLong("created", media.getCreated() != null ? media.getCreated().getTime() : 0);
+            bundle.putLong("starred", media.getStarred() != null ? media.getStarred().getTime() : 0);
+            bundle.putString("albumId", media.getAlbumId());
+            bundle.putString("artistId", media.getArtistId());
+            bundle.putString("type", Constants.MEDIA_TYPE_MUSIC);
+            bundle.putLong("bookmarkPosition", media.getBookmarkPosition() != null ? media.getBookmarkPosition() : 0);
+            bundle.putInt("originalWidth", media.getOriginalWidth() != null ? media.getOriginalWidth() : 0);
+            bundle.putInt("originalHeight", media.getOriginalHeight() != null ? media.getOriginalHeight() : 0);
+            bundle.putString("uri", uri.toString());
+            
+            bundle.putString("assetLinkSong", media.getId() != null ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_SONG, media.getId()) : null);
+            bundle.putString("assetLinkAlbum", media.getAlbumId() != null ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ALBUM, media.getAlbumId()) : null);
+            bundle.putString("assetLinkArtist", media.getArtistId() != null ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_ARTIST, media.getArtistId()) : null);
+            bundle.putString("assetLinkGenre", AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_GENRE, media.getGenre()));
+            Integer year = media.getYear();
+            bundle.putString("assetLinkYear", year != null && year != 0 ? AssetLinkUtil.buildLink(AssetLinkUtil.TYPE_YEAR, String.valueOf(year)) : null);
+
+            return new MediaItem.Builder()
+                    .setMediaId(media.getId())
+                    .setMediaMetadata(
+                            new MediaMetadata.Builder()
+                                    .setTitle(media.getTitle())
+                                    .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0)
+                                    .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0)
+                                    .setReleaseYear(media.getYear() != null ? media.getYear() : 0)
+                                    .setAlbumTitle(media.getAlbum())
+                                    .setArtist(media.getArtist())
+                                    .setArtworkUri(artworkUri)
+                                    .setUserRating(new HeartRating(media.getStarred() != null))
+                                    .setSupportedCommands(
                                         ImmutableList.of(
                                                 Constants.CUSTOM_COMMAND_TOGGLE_HEART_ON,
                                                 Constants.CUSTOM_COMMAND_TOGGLE_HEART_OFF
                                         )
-                                )
-                                .setExtras(bundle)
-                                .setIsBrowsable(false)
-                                .setIsPlayable(true)
-                                .build()
-                )
-                .setRequestMetadata(
-                        new MediaItem.RequestMetadata.Builder()
-                                .setMediaUri(uri)
-                                .setExtras(bundle)
-                                .build()
-                )
-                .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
-                .setUri(uri)
-                .build();
+                                    )
+                                    .setExtras(bundle)
+                                    .setIsBrowsable(false)
+                                    .setIsPlayable(true)
+                                    .build()
+                    )
+                    .setRequestMetadata(
+                            new MediaItem.RequestMetadata.Builder()
+                                    .setMediaUri(uri)
+                                    .setExtras(bundle)
+                                    .build()
+                    )
+                    .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
+                    .setUri(uri)
+                    .build();
+
+        } catch (Exception e) {
+            String id = media != null ? media.getId() : "NULL_MEDIA_OBJECT";
+            String title = media != null ? media.getTitle() : "N/A";
+            
+            Log.e(TAG, "Instant Mix CRASH! Failed to map song to MediaItem. " +
+                       "Problematic Song ID: " + id + 
+                       ", Title: " + title + 
+                       ". Inspect this song's Subsonic data for missing fields.", e);
+            throw new RuntimeException("Mapping failed for song ID: " + id, e);
+        }
     }
 
     public static MediaItem mapMediaItem(MediaItem old) {
@@ -212,7 +237,7 @@ public class MappingUtil {
 
     public static MediaItem mapMediaItem(PodcastEpisode podcastEpisode) {
         Uri uri = getUri(podcastEpisode);
-        Uri artworkUri = Uri.parse(CustomGlideRequest.createUrl(podcastEpisode.getCoverArtId(), Preferences.getImageSize()));
+        Uri artworkUri = AlbumArtContentProvider.contentUri(podcastEpisode.getCoverArtId());
 
         Bundle bundle = new Bundle();
         bundle.putString("id", podcastEpisode.getId());

app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java

@@ -31,7 +31,7 @@ public class MusicUtil {
     private static final Pattern BITRATE_PATTERN = Pattern.compile("&maxBitRate=\\d+");
     private static final Pattern FORMAT_PATTERN = Pattern.compile("&format=\\w+");
 
-    public static Uri getStreamUri(String id) {
+    public static Uri getStreamUri(String id, int timeOffset) {
         Map<String, String> params = App.getSubsonicClientInstance(false).getParams();
 
         StringBuilder uri = new StringBuilder();
@@ -58,6 +58,8 @@ public class MusicUtil {
             uri.append("&format=").append(getTranscodingFormatPreference());
         if (Preferences.askForEstimateContentLength())
             uri.append("&estimateContentLength=true");
+        if (timeOffset > 0)
+            uri.append("&timeOffset=").append(timeOffset);
 
         uri.append("&id=").append(id);
 
@@ -66,6 +68,10 @@ public class MusicUtil {
         return Uri.parse(uri.toString());
     }
 
+    public static Uri getStreamUri(String id) {
+        return getStreamUri(id, 0);
+    }
+
     public static Uri updateStreamUri(Uri uri) {
         String s = uri.toString();
         Matcher m1 = BITRATE_PATTERN.matcher(s);

app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt

@@ -29,6 +29,7 @@ object Preferences {
     private const val REPEAT_MODE = "repeat_mode"
     private const val IMAGE_CACHE_SIZE = "image_cache_size"
     private const val STREAMING_CACHE_SIZE = "streaming_cache_size"
+    private const val LANDSCAPE_ITEMS_PER_ROW = "landscape_items_per_row"
     private const val IMAGE_SIZE = "image_size"
     private const val MAX_BITRATE_WIFI = "max_bitrate_wifi"
     private const val MAX_BITRATE_MOBILE = "max_bitrate_mobile"
@@ -74,6 +75,8 @@ object Preferences {
     private const val CONTINUOUS_PLAY = "continuous_play"
     private const val LAST_INSTANT_MIX = "last_instant_mix"
     private const val ALLOW_PLAYLIST_DUPLICATES = "allow_playlist_duplicates"
+    private const val HOME_SORT_PLAYLISTS = "home_sort_playlists"
+    private const val DEFAULT_HOME_SORT_PLAYLISTS_SORT_ORDER = Constants.PLAYLIST_ORDER_BY_RANDOM
     private const val EQUALIZER_ENABLED = "equalizer_enabled"
     private const val EQUALIZER_BAND_LEVELS = "equalizer_band_levels"
     private const val MINI_SHUFFLE_BUTTON_VISIBILITY = "mini_shuffle_button_visibility"
@@ -81,6 +84,10 @@ object Preferences {
     private const val ALBUM_SORT_ORDER = "album_sort_order"
     private const val DEFAULT_ALBUM_SORT_ORDER = Constants.ALBUM_ORDER_BY_NAME
     private const val ARTIST_SORT_BY_ALBUM_COUNT= "artist_sort_by_album_count"
+    private const val SORT_SEARCH_CHRONOLOGICALLY= "sort_search_chronologically"
+    private const val ARTIST_DISPLAY_BIOGRAPHY= "artist_display_biography"
+    private const val NETWORK_PING_TIMEOUT = "network_ping_timeout_base"
+    
 
     @JvmStatic
     fun getServer(): String? {
@@ -92,6 +99,19 @@ object Preferences {
         App.getInstance().preferences.edit().putString(SERVER, server).apply()
     }
 
+    @JvmStatic
+    fun getNetworkPingTimeout(): Int {
+        val timeoutString = App.getInstance().preferences.getString(NETWORK_PING_TIMEOUT, "2") ?: "2"
+        return (timeoutString.toIntOrNull() ?: 2).coerceAtLeast(1)
+    }
+
+    @JvmStatic
+    fun setNetworkPingTimeout(pingTimeout: String?) {
+        App.getInstance().preferences.edit().putString(NETWORK_PING_TIMEOUT, pingTimeout).apply()
+    }
+
+    
+
     @JvmStatic
     fun getUser(): String? {
         return App.getInstance().preferences.getString(USER, null)
@@ -285,6 +305,11 @@ object Preferences {
         return App.getInstance().preferences.getString(IMAGE_CACHE_SIZE, "500")!!.toInt()
     }
 
+    @JvmStatic
+    fun getLandscapeItemsPerRow(): Int {
+        return App.getInstance().preferences.getString(LANDSCAPE_ITEMS_PER_ROW, "4")!!.toInt()
+    }
+
     @JvmStatic
     fun getImageSize(): Int {
         return App.getInstance().preferences.getString(IMAGE_SIZE, "-1")!!.toInt()
@@ -623,6 +648,16 @@ object Preferences {
         return App.getInstance().preferences.getBoolean(ALLOW_PLAYLIST_DUPLICATES, false)
     }
 
+    @JvmStatic
+    fun getHomeSortPlaylists(): String {
+        return App.getInstance().preferences.getString(HOME_SORT_PLAYLISTS, DEFAULT_HOME_SORT_PLAYLISTS_SORT_ORDER) ?: DEFAULT_HOME_SORT_PLAYLISTS_SORT_ORDER
+    }
+
+        @JvmStatic
+    fun getHomeSortPlaylists(sortOrder: String) {
+        App.getInstance().preferences.edit().putString(HOME_SORT_PLAYLISTS, sortOrder).apply()
+    }
+
     @JvmStatic
     fun setEqualizerEnabled(enabled: Boolean) {
         App.getInstance().preferences.edit().putBoolean(EQUALIZER_ENABLED, enabled).apply()
@@ -674,4 +709,19 @@ object Preferences {
         else
             return Constants.ARTIST_ORDER_BY_NAME
     }
+
+    @JvmStatic
+    fun isSearchSortingChronologicallyEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(SORT_SEARCH_CHRONOLOGICALLY, false)
+    }
+
+    @JvmStatic
+    fun getArtistDisplayBiography(): Boolean {
+        return App.getInstance().preferences.getBoolean(ARTIST_DISPLAY_BIOGRAPHY, true)
+    }
+
+    @JvmStatic
+    fun setArtistDisplayBiography(displayBiographyEnabled: Boolean) {
+        App.getInstance().preferences.edit().putBoolean(ARTIST_DISPLAY_BIOGRAPHY, displayBiographyEnabled).apply()
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/util/ReplayGainUtil.java

@@ -7,6 +7,7 @@ import androidx.media3.common.Metadata;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.Player;
+import androidx.media3.extractor.metadata.id3.InternalFrame;
 
 import com.cappielloantonio.tempo.model.ReplayGain;
 
@@ -82,26 +83,32 @@ public class ReplayGainUtil {
     private static ReplayGain setReplayGains(Metadata.Entry entry) {
         ReplayGain replayGain = new ReplayGain();
 
-        if (entry.toString().contains(tags[0])) {
-            replayGain.setTrackGain(parseReplayGainTag(entry));
+        // The logic below assumes .toString() contains the dB value. That's not the case for InternalFrame
+        String str = entry.toString();
+        if (entry instanceof InternalFrame) {
+            str = ((InternalFrame) entry).description + ((InternalFrame) entry).text;
         }
 
-        if (entry.toString().contains(tags[1])) {
-            replayGain.setAlbumGain(parseReplayGainTag(entry));
+        if (str.contains(tags[0])) {
+            replayGain.setTrackGain(parseReplayGainTag(str));
         }
 
-        if (entry.toString().contains(tags[2])) {
-            replayGain.setTrackGain(parseReplayGainTag(entry) / 256f);
+        if (str.contains(tags[1])) {
+            replayGain.setAlbumGain(parseReplayGainTag(str));
         }
 
-        if (entry.toString().contains(tags[3])) {
-            replayGain.setAlbumGain(parseReplayGainTag(entry) / 256f);
+        if (str.contains(tags[2])) {
+            replayGain.setTrackGain(parseReplayGainTag(str) / 256f);
+        }
+
+        if (str.contains(tags[3])) {
+            replayGain.setAlbumGain(parseReplayGainTag(str) / 256f);
         }
 
         return replayGain;
     }
 
-    private static Float parseReplayGainTag(Metadata.Entry entry) {
+    private static Float parseReplayGainTag(String entry) {
         try {
             return Float.parseFloat(entry.toString().replaceAll("[^\\d.-]", ""));
         } catch (NumberFormatException exception) {

app/src/main/java/com/cappielloantonio/tempo/util/TranscodingMediaSource.kt

@@ -0,0 +1,322 @@
+package com.cappielloantonio.tempo.util
+
+import androidx.annotation.OptIn
+import androidx.media3.common.C
+import androidx.media3.common.MediaItem
+import androidx.media3.common.Timeline
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.common.util.Util
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.TransferListener
+import androidx.media3.decoder.DecoderInputBuffer
+import androidx.media3.exoplayer.FormatHolder
+import androidx.media3.exoplayer.LoadingInfo
+import androidx.media3.exoplayer.SeekParameters
+import androidx.media3.exoplayer.source.CompositeMediaSource
+import androidx.media3.exoplayer.source.ForwardingTimeline
+import androidx.media3.exoplayer.source.MediaPeriod
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.exoplayer.source.SampleStream
+import androidx.media3.exoplayer.trackselection.ExoTrackSelection
+import androidx.media3.exoplayer.upstream.Allocator
+
+@OptIn(UnstableApi::class)
+class TranscodingMediaSource(
+        private val mediaItem: MediaItem,
+        private val dataSourceFactory: DataSource.Factory,
+        private val progressiveMediaSourceFactory: ProgressiveMediaSource.Factory
+) : CompositeMediaSource<Void>() {
+
+    private var durationUs: Long = C.TIME_UNSET
+    private var currentSource: MediaSource? = null
+
+    init {
+        val extras = mediaItem.mediaMetadata.extras
+        if (extras != null && extras.containsKey("duration")) {
+            val seconds = extras.getInt("duration")
+            if (seconds > 0) {
+                durationUs = Util.msToUs(seconds * 1000L)
+            }
+        }
+    }
+
+    override fun getMediaItem() = mediaItem
+
+    override fun prepareSourceInternal(mediaTransferListener: TransferListener?) {
+        super.prepareSourceInternal(mediaTransferListener)
+        val initialSource = progressiveMediaSourceFactory.createMediaSource(mediaItem)
+        currentSource = initialSource
+        prepareChildSource(null, initialSource)
+    }
+
+    override fun onChildSourceInfoRefreshed(
+            childSourceId: Void?,
+            mediaSource: MediaSource,
+            newTimeline: Timeline
+    ) {
+        val timeline =
+                if (durationUs != C.TIME_UNSET) {
+                    DurationOverridingTimeline(newTimeline, durationUs)
+                } else {
+                    newTimeline
+                }
+        refreshSourceInfo(timeline)
+    }
+
+    override fun createPeriod(
+            id: MediaSource.MediaPeriodId,
+            allocator: Allocator,
+            startPositionUs: Long
+    ): MediaPeriod {
+        val source = currentSource ?: throw IllegalStateException("Source not ready")
+        val childPeriod = source.createPeriod(id, allocator, startPositionUs)
+        return TranscodingMediaPeriod(childPeriod, source, id, allocator)
+    }
+
+    override fun releasePeriod(mediaPeriod: MediaPeriod) {
+        val transcodingPeriod = mediaPeriod as TranscodingMediaPeriod
+        transcodingPeriod.release()
+        
+        if (transcodingPeriod.currentOffsetUs > 0) {
+            releaseChildSource(null)
+            val initialSource = progressiveMediaSourceFactory.createMediaSource(mediaItem)
+            currentSource = initialSource
+            prepareChildSource(null, initialSource)
+        }
+    }
+
+    override fun getMediaPeriodIdForChildMediaPeriodId(
+            childSourceId: Void?,
+            mediaPeriodId: MediaSource.MediaPeriodId
+    ) = mediaPeriodId
+
+    private inner class TranscodingMediaPeriod(
+            private var currentPeriod: MediaPeriod,
+            private var source: MediaSource,
+            private val id: MediaSource.MediaPeriodId,
+            private val allocator: Allocator
+    ) : MediaPeriod, MediaPeriod.Callback {
+
+        private var localCallback: MediaPeriod.Callback? = null
+        internal var currentOffsetUs: Long = 0
+        private var isReloading = false
+
+        private var lastSelections: Array<out ExoTrackSelection?>? = null
+        private var lastMayRetainStreamFlags: BooleanArray? = null
+        private var activeWrappers: Array<OffsetSampleStream?> = emptyArray()
+
+        fun release() {
+            source.releasePeriod(currentPeriod)
+        }
+
+        override fun prepare(callback: MediaPeriod.Callback, positionUs: Long) {
+            localCallback = callback
+            currentPeriod.prepare(this, positionUs)
+        }
+
+        override fun maybeThrowPrepareError() {
+            if (!isReloading) currentPeriod.maybeThrowPrepareError()
+        }
+
+        override fun getTrackGroups() = currentPeriod.trackGroups
+
+        override fun getStreamKeys(trackSelections: MutableList<ExoTrackSelection>) =
+                currentPeriod.getStreamKeys(trackSelections)
+
+        override fun selectTracks(
+                selections: Array<out ExoTrackSelection?>,
+                mayRetainStreamFlags: BooleanArray,
+                streams: Array<SampleStream?>,
+                streamResetFlags: BooleanArray,
+                positionUs: Long
+        ): Long {
+            lastSelections = selections
+            lastMayRetainStreamFlags = mayRetainStreamFlags
+
+            val childStreams = arrayOfNulls<SampleStream>(streams.size)
+            streams.forEachIndexed { i, stream ->
+                childStreams[i] = (stream as? OffsetSampleStream)?.childStream
+            }
+
+            val startPos =
+                    currentPeriod.selectTracks(
+                            selections,
+                            mayRetainStreamFlags,
+                            childStreams,
+                            streamResetFlags,
+                            positionUs - currentOffsetUs
+                    )
+
+            val newWrappers = arrayOfNulls<OffsetSampleStream>(streams.size)
+            for (i in streams.indices) {
+                val child = childStreams[i]
+                if (child == null) {
+                    streams[i] = null
+                } else {
+                    val existingWrapper = streams[i] as? OffsetSampleStream
+                    if (existingWrapper != null && existingWrapper.childStream === child) {
+                        newWrappers[i] = existingWrapper
+                    } else {
+                        val wrapper = OffsetSampleStream(child)
+                        newWrappers[i] = wrapper
+                        streams[i] = wrapper
+                    }
+                }
+            }
+            activeWrappers = newWrappers
+
+            return startPos + currentOffsetUs
+        }
+
+        override fun discardBuffer(positionUs: Long, toKeyframe: Boolean) {
+            if (!isReloading) {
+                currentPeriod.discardBuffer(positionUs - currentOffsetUs, toKeyframe)
+            }
+        }
+
+        override fun readDiscontinuity(): Long {
+            if (isReloading) return C.TIME_UNSET
+            val discontinuity = currentPeriod.readDiscontinuity()
+            return if (discontinuity == C.TIME_UNSET) C.TIME_UNSET
+            else discontinuity + currentOffsetUs
+        }
+
+        override fun seekToUs(positionUs: Long): Long {
+            if (positionUs == 0L && currentOffsetUs == 0L) {
+                return currentPeriod.seekToUs(positionUs)
+            }
+
+            reloadSource(positionUs)
+            return positionUs
+        }
+
+        override fun getAdjustedSeekPositionUs(positionUs: Long, seekParameters: SeekParameters) =
+                positionUs
+
+        override fun getBufferedPositionUs(): Long {
+            if (isReloading) return currentOffsetUs
+            val buffered = currentPeriod.bufferedPositionUs
+            if (buffered == C.TIME_END_OF_SOURCE) return C.TIME_END_OF_SOURCE
+            return if (buffered == C.TIME_UNSET) C.TIME_UNSET else buffered + currentOffsetUs
+        }
+
+        override fun getNextLoadPositionUs(): Long {
+            if (isReloading) return C.TIME_UNSET
+            val next = currentPeriod.nextLoadPositionUs
+            if (next == C.TIME_END_OF_SOURCE) return C.TIME_END_OF_SOURCE
+            return if (next == C.TIME_UNSET) C.TIME_UNSET else next + currentOffsetUs
+        }
+
+        override fun reevaluateBuffer(positionUs: Long) {
+            if (!isReloading) currentPeriod.reevaluateBuffer(positionUs - currentOffsetUs)
+        }
+
+        override fun continueLoading(isLoading: LoadingInfo): Boolean {
+            if (isReloading) return false
+            val builder = isLoading.buildUpon()
+            builder.setPlaybackPositionUs(isLoading.playbackPositionUs - currentOffsetUs)
+            return currentPeriod.continueLoading(builder.build())
+        }
+
+        override fun isLoading() = isReloading || currentPeriod.isLoading
+
+        override fun onPrepared(mediaPeriod: MediaPeriod) {
+            if (isReloading && mediaPeriod == currentPeriod) {
+                isReloading = false
+                restoreTracks()
+                localCallback?.onContinueLoadingRequested(this)
+            } else {
+                localCallback?.onPrepared(this)
+            }
+        }
+
+        override fun onContinueLoadingRequested(source: MediaPeriod) {
+            if (!isReloading) localCallback?.onContinueLoadingRequested(this)
+        }
+
+        private fun reloadSource(positionUs: Long) {
+            isReloading = true
+            currentOffsetUs = positionUs
+
+            activeWrappers.forEach { it?.childStream = null }
+
+            source.releasePeriod(currentPeriod)
+            releaseChildSource(null)
+
+            val seconds = Util.usToMs(positionUs) / 1000
+            val newUri = MusicUtil.getStreamUri(mediaItem.mediaId, seconds.toInt())
+            val newMediaItem = mediaItem.buildUpon().setUri(newUri).build()
+
+            val newSource = progressiveMediaSourceFactory.createMediaSource(newMediaItem)
+
+            source = newSource
+            currentSource = newSource
+            prepareChildSource(null, newSource)
+
+            val newPeriod = newSource.createPeriod(id, allocator, 0)
+            currentPeriod = newPeriod
+            newPeriod.prepare(this, 0)
+        }
+
+        private fun restoreTracks() {
+            val selections = lastSelections ?: return
+            val flags = lastMayRetainStreamFlags ?: return
+
+            val childStreams = arrayOfNulls<SampleStream>(activeWrappers.size)
+            val streamResetFlags = BooleanArray(activeWrappers.size)
+
+            currentPeriod.selectTracks(selections, flags, childStreams, streamResetFlags, 0)
+
+            for (i in activeWrappers.indices) {
+                activeWrappers[i]?.childStream = childStreams[i]
+            }
+        }
+
+        private inner class OffsetSampleStream(var childStream: SampleStream?) : SampleStream {
+            override fun isReady() = childStream?.isReady ?: false
+            override fun maybeThrowError() {
+                childStream?.maybeThrowError()
+            }
+
+            override fun readData(
+                    formatHolder: FormatHolder,
+                    buffer: DecoderInputBuffer,
+                    readFlags: Int
+            ): Int {
+                val stream = childStream ?: return C.RESULT_NOTHING_READ
+                val result = stream.readData(formatHolder, buffer, readFlags)
+                if (result == C.RESULT_BUFFER_READ && !buffer.isEndOfStream) {
+                    buffer.timeUs += currentOffsetUs
+                }
+                return result
+            }
+
+            override fun skipData(positionUs: Long) =
+                    childStream?.skipData(positionUs - currentOffsetUs) ?: 0
+        }
+    }
+
+    private class DurationOverridingTimeline(timeline: Timeline, private val durationUs: Long) :
+            ForwardingTimeline(timeline) {
+
+        override fun getWindow(
+                windowIndex: Int,
+                window: Window,
+                defaultPositionProjectionUs: Long
+        ): Window {
+            super.getWindow(windowIndex, window, defaultPositionProjectionUs)
+            window.durationUs = durationUs
+            window.isSeekable = true
+            window.isDynamic = false
+            window.liveConfiguration = null
+            return window
+        }
+
+        override fun getPeriod(periodIndex: Int, period: Period, setIds: Boolean): Period {
+            super.getPeriod(periodIndex, period, setIds)
+            period.durationUs = durationUs
+            return period
+        }
+    }
+}

app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumBottomSheetViewModel.java

@@ -4,10 +4,13 @@ import android.app.Application;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
+import androidx.media3.common.util.UnstableApi;
 
 import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.interfaces.StarCallback;
@@ -24,6 +27,7 @@ import com.cappielloantonio.tempo.util.MappingUtil;
 import com.cappielloantonio.tempo.util.NetworkUtil;
 import com.cappielloantonio.tempo.util.Preferences;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -33,8 +37,8 @@ public class AlbumBottomSheetViewModel extends AndroidViewModel {
     private final ArtistRepository artistRepository;
     private final FavoriteRepository favoriteRepository;
     private final SharingRepository sharingRepository;
-
     private AlbumID3 album;
+    private final MutableLiveData<List<Child>> instantMix = new MutableLiveData<>(null);
 
     public AlbumBottomSheetViewModel(@NonNull Application application) {
         super(application);
@@ -116,6 +120,7 @@ public class AlbumBottomSheetViewModel extends AndroidViewModel {
                 MutableLiveData<List<Child>> tracksLiveData = albumRepository.getAlbumTracks(album.getId());
                 
                 tracksLiveData.observeForever(new Observer<List<Child>>() {
+                    @OptIn(markerClass = UnstableApi.class)
                     @Override
                     public void onChanged(List<Child> songs) {
                         if (songs != null && !songs.isEmpty()) {
@@ -129,4 +134,12 @@ public class AlbumBottomSheetViewModel extends AndroidViewModel {
                 });
             }
     }
+
+    public LiveData<List<Child>> getAlbumInstantMix(LifecycleOwner owner, AlbumID3 album) {
+        instantMix.setValue(Collections.emptyList());
+
+        albumRepository.getInstantMix(album, 30).observe(owner, instantMix::postValue);
+
+        return instantMix;
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumListPageViewModel.java

@@ -9,7 +9,6 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.tempo.repository.AlbumRepository;
-import com.cappielloantonio.tempo.repository.DownloadRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.util.Constants;
@@ -21,7 +20,6 @@ import java.util.List;
 
 public class AlbumListPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
-    private final DownloadRepository downloadRepository;
 
     public String title;
     public ArtistID3 artist;
@@ -32,9 +30,7 @@ public class AlbumListPageViewModel extends AndroidViewModel {
 
     public AlbumListPageViewModel(@NonNull Application application) {
         super(application);
-
         albumRepository = new AlbumRepository();
-        downloadRepository = new DownloadRepository();
     }
 
     public LiveData<List<AlbumID3>> getAlbumList(LifecycleOwner owner) {

app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumPageViewModel.java

@@ -8,18 +8,23 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import com.cappielloantonio.tempo.interfaces.StarCallback;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
 import com.cappielloantonio.tempo.repository.ArtistRepository;
+import com.cappielloantonio.tempo.repository.FavoriteRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.AlbumInfo;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.NetworkUtil;
 
+import java.util.Date;
 import java.util.List;
 
 public class AlbumPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
+    private final FavoriteRepository favoriteRepository;
     private String albumId;
     private String artistId;
     private final MutableLiveData<AlbumID3> album = new MutableLiveData<>(null);
@@ -29,6 +34,7 @@ public class AlbumPageViewModel extends AndroidViewModel {
 
         albumRepository = new AlbumRepository();
         artistRepository = new ArtistRepository();
+        favoriteRepository = new FavoriteRepository();
     }
 
     public LiveData<List<Child>> getAlbumSongLiveList() {
@@ -49,6 +55,61 @@ public class AlbumPageViewModel extends AndroidViewModel {
         });
     }
 
+    public void setFavorite() {
+        AlbumID3 currentAlbum = album.getValue();
+        if (currentAlbum == null) return;
+        
+        if (currentAlbum.getStarred() != null) {
+            if (NetworkUtil.isOffline()) {
+                removeFavoriteOffline(currentAlbum);
+            } else {
+                removeFavoriteOnline(currentAlbum);
+            }
+        } else {
+            if (NetworkUtil.isOffline()) {
+                setFavoriteOffline(currentAlbum);
+            } else {
+                setFavoriteOnline(currentAlbum);
+            }
+        }
+    }
+
+    private void removeFavoriteOffline(AlbumID3 album) {
+        favoriteRepository.starLater(null, album.getId(), null, false);
+        album.setStarred(null);
+        this.album.postValue(album);
+    }
+
+    private void removeFavoriteOnline(AlbumID3 album) {
+        favoriteRepository.unstar(null, album.getId(), null, new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, album.getId(), null, false);
+            }
+        });
+
+        album.setStarred(null);
+        this.album.postValue(album);
+    }
+
+    private void setFavoriteOffline(AlbumID3 album) {
+        favoriteRepository.starLater(null, album.getId(), null, true);
+        album.setStarred(new Date());
+        this.album.postValue(album);
+    }
+
+    private void setFavoriteOnline(AlbumID3 album) {
+        favoriteRepository.star(null, album.getId(), null, new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, album.getId(), null, true);
+            }
+        });
+
+        album.setStarred(new Date());
+        this.album.postValue(album);
+    }
+
     public LiveData<ArtistID3> getArtist() {
         return artistRepository.getArtistInfo(artistId);
     }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/ArtistBottomSheetViewModel.java

@@ -4,7 +4,12 @@ import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.media3.common.util.UnstableApi;
 
 import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.interfaces.StarCallback;
@@ -17,6 +22,7 @@ import com.cappielloantonio.tempo.util.DownloadUtil;
 import com.cappielloantonio.tempo.util.MappingUtil;
 import com.cappielloantonio.tempo.util.Preferences;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.stream.Collectors;
 import java.util.List;
@@ -24,6 +30,7 @@ import java.util.List;
 public class ArtistBottomSheetViewModel extends AndroidViewModel {
     private final ArtistRepository artistRepository;
     private final FavoriteRepository favoriteRepository;
+    private final MutableLiveData<List<Child>> instantMix = new MutableLiveData<>(null);
 
     private ArtistID3 artist;
 
@@ -95,6 +102,7 @@ public class ArtistBottomSheetViewModel extends AndroidViewModel {
             Log.d("ArtistSync", "Starting artist sync for: " + artist.getName());
             
             artistRepository.getArtistAllSongs(artist.getId(), new ArtistRepository.ArtistSongsCallback() {
+                @OptIn(markerClass = UnstableApi.class)
                 @Override
                 public void onSongsCollected(List<Child> songs) {
                     Log.d("ArtistSync", "Callback triggered with songs: " + (songs != null ? songs.size() : 0));
@@ -114,5 +122,12 @@ public class ArtistBottomSheetViewModel extends AndroidViewModel {
             Log.d("ArtistSync", "Artist sync preference is disabled");
         }
     }
-    ///
+    
+    public LiveData<List<Child>> getArtistInstantMix(LifecycleOwner owner, ArtistID3 artist) {
+        instantMix.setValue(Collections.emptyList());
+
+        artistRepository.getInstantMix(artist, 30).observe(owner, instantMix::postValue);
+
+        return instantMix;
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/ArtistPageViewModel.java

@@ -1,23 +1,37 @@
 package com.cappielloantonio.tempo.viewmodel;
 
 import android.app.Application;
+import android.content.Context;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
+import androidx.media3.common.util.UnstableApi;
 
+import com.cappielloantonio.tempo.model.Download;
+import com.cappielloantonio.tempo.interfaces.StarCallback;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
 import com.cappielloantonio.tempo.repository.ArtistRepository;
+import com.cappielloantonio.tempo.repository.FavoriteRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistInfo2;
 import com.cappielloantonio.tempo.subsonic.models.Child;
+import com.cappielloantonio.tempo.util.DownloadUtil;
+import com.cappielloantonio.tempo.util.MappingUtil;
+import com.cappielloantonio.tempo.util.NetworkUtil;
+import com.cappielloantonio.tempo.util.Preferences;
 
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ArtistPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
+    private final FavoriteRepository favoriteRepository;
 
     private ArtistID3 artist;
 
@@ -26,6 +40,7 @@ public class ArtistPageViewModel extends AndroidViewModel {
 
         albumRepository = new AlbumRepository();
         artistRepository = new ArtistRepository();
+        favoriteRepository = new FavoriteRepository();
     }
 
     public LiveData<List<AlbumID3>> getAlbumList() {
@@ -45,7 +60,7 @@ public class ArtistPageViewModel extends AndroidViewModel {
     }
 
     public LiveData<List<Child>> getArtistInstantMix() {
-        return artistRepository.getInstantMix(artist, 20);
+        return artistRepository.getInstantMix(artist, 30);
     }
 
     public ArtistID3 getArtist() {
@@ -55,4 +70,70 @@ public class ArtistPageViewModel extends AndroidViewModel {
     public void setArtist(ArtistID3 artist) {
         this.artist = artist;
     }
+
+    public void setFavorite(Context context) {
+        if (artist.getStarred() != null) {
+            if (NetworkUtil.isOffline()) {
+                removeFavoriteOffline();
+            } else {
+                removeFavoriteOnline();
+            }
+        } else {
+            if (NetworkUtil.isOffline()) {
+                setFavoriteOffline();
+            } else {
+                setFavoriteOnline(context);
+            }
+        }
+    }
+
+    private void removeFavoriteOffline() {
+        favoriteRepository.starLater(null, null, artist.getId(), false);
+        artist.setStarred(null);
+    }
+
+    private void removeFavoriteOnline() {
+        favoriteRepository.unstar(null, null, artist.getId(), new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, null, artist.getId(), false);
+            }
+        });
+
+        artist.setStarred(null);
+    }
+
+        private void setFavoriteOffline() {
+        favoriteRepository.starLater(null, null, artist.getId(), true);
+        artist.setStarred(new Date());
+    }
+
+    private void setFavoriteOnline(Context context) {
+        favoriteRepository.star(null, null, artist.getId(), new StarCallback() {
+            @Override
+            public void onError() {
+                favoriteRepository.starLater(null, null, artist.getId(), true);
+            }
+        });
+
+        artist.setStarred(new Date());
+
+        if (Preferences.isStarredArtistsSyncEnabled()) {
+            artistRepository.getArtistAllSongs(artist.getId(), new ArtistRepository.ArtistSongsCallback() {
+                @OptIn(markerClass = UnstableApi.class)
+                @Override
+                public void onSongsCollected(List<Child> songs) {
+                    if (songs != null && !songs.isEmpty()) {
+                        DownloadUtil.getDownloadTracker(context).download(
+                                MappingUtil.mapDownloads(songs),
+                                songs.stream().map(Download::new).collect(Collectors.toList())
+                        );
+                    }
+                }
+            });
+        } else {
+            Log.d("ArtistSync", "Artist sync preference is disabled");
+        }
+    }
+
 }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/HomeViewModel.java

@@ -24,6 +24,8 @@ import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.Playlist;
 import com.cappielloantonio.tempo.subsonic.models.Share;
+import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 import com.cappielloantonio.tempo.util.Preferences;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
@@ -34,7 +36,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class HomeViewModel extends AndroidViewModel {
     private static final String TAG = "HomeViewModel";
@@ -100,7 +101,7 @@ public class HomeViewModel extends AndroidViewModel {
     }
 
     public LiveData<List<Child>> getRandomShuffleSample() {
-        return songRepository.getRandomSample(1000, null, null);
+        return songRepository.getRandomSample(100, null, null);
     }
 
     public LiveData<List<Chronology>> getChronologySample(LifecycleOwner owner) {
@@ -223,7 +224,7 @@ public class HomeViewModel extends AndroidViewModel {
     public LiveData<List<Child>> getMediaInstantMix(LifecycleOwner owner, Child media) {
         mediaInstantMix.setValue(Collections.emptyList());
 
-        songRepository.getInstantMix(media.getId(), 20).observe(owner, mediaInstantMix::postValue);
+        songRepository.getInstantMix(media.getId(), SeedType.TRACK, 20).observe(owner, mediaInstantMix::postValue);
 
         return mediaInstantMix;
     }
@@ -248,15 +249,22 @@ public class HomeViewModel extends AndroidViewModel {
         pinnedPlaylists.setValue(Collections.emptyList());
 
         playlistRepository.getPlaylists(false, -1).observe(owner, remotes -> {
-            playlistRepository.getPinnedPlaylists().observe(owner, locals -> {
-                if (remotes != null && locals != null) {
-                    List<Playlist> toReturn = remotes.stream()
-                            .filter(remote -> locals.stream().anyMatch(local -> local.getId().equals(remote.getId())))
-                            .collect(Collectors.toList());
-
-                    pinnedPlaylists.setValue(toReturn);
+            if (remotes != null && !remotes.isEmpty()) {
+                List<Playlist> playlists = new ArrayList<>(remotes);
+                String result = Preferences.getHomeSortPlaylists();
+                if (Preferences.getHomeSortPlaylists().equals(Constants.PLAYLIST_ORDER_BY_RANDOM))
+                {
+                    Collections.shuffle(playlists);
                 }
-            });
+                else {
+                    playlists.sort(Comparator.comparing(Playlist::getName));
+                }
+                List<Playlist> subsetPlaylists = playlists.size() > 5
+                        ? playlists.subList(0, 5)
+                        : playlists;
+
+                pinnedPlaylists.setValue(subsetPlaylists);
+            }
         });
 
         return pinnedPlaylists;

app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlayerBottomSheetViewModel.java

@@ -3,6 +3,7 @@ package com.cappielloantonio.tempo.viewmodel;
 import android.app.Application;
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
@@ -276,7 +277,7 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
     public LiveData<List<Child>> getMediaInstantMix(LifecycleOwner owner, Child media) {
         instantMix.setValue(Collections.emptyList());
 
-        songRepository.getInstantMix(media.getId(), 20).observe(owner, instantMix::postValue);
+        songRepository.getInstantMix(media.getId(), Constants.SeedType.TRACK, 20).observe(owner, instantMix::postValue);
 
         return instantMix;
     }
@@ -291,13 +292,13 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         List<String> ids = queue.stream().map(Child::getId).collect(Collectors.toList());
 
         if (media != null) {
-            queueRepository.savePlayQueue(ids, media.getId(), 0);
+            // TODO: We need to get the actual playback position here
+            Log.d(TAG, "Saving play queue - Current: " + media.getId() + ", Items: " + ids.size());
+            queueRepository.savePlayQueue(ids, media.getId(), 0); // Still hardcoded to 0 for now
             return true;
         }
-
         return false;
     }
-
     private void observeCachedLyrics(LifecycleOwner owner, String songId) {
         if (TextUtils.isEmpty(songId)) {
             return;

app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlaylistChooserViewModel.java

@@ -2,7 +2,6 @@ package com.cappielloantonio.tempo.viewmodel;
 
 import android.app.Application;
 import android.app.Dialog;
-import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
@@ -21,8 +20,17 @@ import java.util.List;
 
 public class PlaylistChooserViewModel extends AndroidViewModel {
     private final PlaylistRepository playlistRepository;
-
     private final MutableLiveData<List<Playlist>> playlists = new MutableLiveData<>(null);
+    private final MutableLiveData<Boolean> playlistIsPublic = new MutableLiveData<>(false);
+
+    public Boolean getIsPlaylistPublic() {
+        return playlistIsPublic.getValue();
+    }
+
+    public void setIsPlaylistPublic(boolean isPublic) {
+        playlistIsPublic.setValue(isPublic);
+    }
+
     private ArrayList<Child> toAdd = new ArrayList<>();
 
     public PlaylistChooserViewModel(@NonNull Application application) {
@@ -39,7 +47,7 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
     public void addSongsToPlaylist(LifecycleOwner owner, Dialog dialog, String playlistId) {
         List<String> songIds = Lists.transform(toAdd, Child::getId);
         if (Preferences.allowPlaylistDuplicates()) {
-            playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds));
+            playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds), getIsPlaylistPublic());
             dialog.dismiss();
         } else {
             playlistRepository.getPlaylistSongs(playlistId).observe(owner, playlistSongs -> {
@@ -47,7 +55,7 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
                     List<String> playlistSongIds = Lists.transform(playlistSongs, Child::getId);
                     songIds.removeAll(playlistSongIds);
                 }
-                playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds));
+                playlistRepository.addSongToPlaylist(playlistId, new ArrayList<>(songIds), getIsPlaylistPublic());
                 dialog.dismiss();
             });
         }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/PodcastChannelBottomSheetViewModel.java

@@ -1,14 +1,24 @@
 package com.cappielloantonio.tempo.viewmodel;
 
 import android.app.Application;
+import android.util.Log;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 
 import com.cappielloantonio.tempo.repository.PodcastRepository;
+import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
 import com.cappielloantonio.tempo.subsonic.models.PodcastChannel;
 
+import java.io.IOException;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
 public class PodcastChannelBottomSheetViewModel extends AndroidViewModel {
+    private static final String TAG = "PodcastChannelBottomSheetViewModel";
     private final PodcastRepository podcastRepository;
 
     private PodcastChannel podcastChannel;
@@ -28,6 +38,59 @@ public class PodcastChannelBottomSheetViewModel extends AndroidViewModel {
     }
 
     public void deletePodcastChannel() {
-        if (podcastChannel != null) podcastRepository.deletePodcastChannel(podcastChannel.getId());
+        if (podcastChannel != null && podcastChannel.getId() != null) {
+            podcastRepository.deletePodcastChannel(podcastChannel.getId())
+                    .enqueue(new Callback<ApiResponse>() {
+                        @Override
+                        public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                            if (response.code() == 501) {
+                                Toast.makeText(getApplication(), 
+                                    "Podcasts are not supported by this server", 
+                                    Toast.LENGTH_LONG).show();
+                                return;
+                            }
+
+                            if (response.isSuccessful() && response.body() != null) {
+                                ApiResponse apiResponse = response.body();
+
+                                String status = apiResponse.subsonicResponse.getStatus();
+
+                                if ("ok".equals(status)) {
+                                    Toast.makeText(getApplication(),
+                                        "Podcast channel deleted",
+                                        Toast.LENGTH_SHORT).show();
+                                    //TODO refresh the UI after deleting
+                                    //podcastRepository.refreshPodcasts();
+                                }
+                            } else {
+                                handleHttpError(response);
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                            Toast.makeText(getApplication(), 
+                                "Network error: " + t.getMessage(), 
+                                Toast.LENGTH_LONG).show();
+                        }
+                    });
+        }
     }
+
+    private void handleHttpError(Response<ApiResponse> response) {
+        String errorMsg = "HTTP error: " + response.code();
+        if (response.errorBody() != null) {
+            try {
+                String serverMsg = response.errorBody().string();
+                if (!serverMsg.isEmpty()) {
+                    errorMsg += " - " + serverMsg;
+                }
+            } catch (IOException e) {
+                Log.e(TAG, "Error reading error body", e);
+            }
+        }
+        
+        Toast.makeText(getApplication(), errorMsg, Toast.LENGTH_LONG).show();
+    }
+
 }

app/src/main/java/com/cappielloantonio/tempo/viewmodel/PodcastChannelEditorViewModel.java

@@ -1,27 +1,99 @@
 package com.cappielloantonio.tempo.viewmodel;
 
 import android.app.Application;
+import android.util.Log;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 
+import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.repository.PodcastRepository;
-import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation;
+import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
+
+import java.io.IOException;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 public class PodcastChannelEditorViewModel extends AndroidViewModel {
-    private static final String TAG = "RadioEditorViewModel";
+    private static final String TAG = "PodcastChannelEditorViewModel";
 
     private final PodcastRepository podcastRepository;
 
-    private InternetRadioStation toEdit;
+    private final MutableLiveData<Boolean> isSuccess = new MutableLiveData<>(false);
+    private final MutableLiveData<String> errorMessage = new MutableLiveData<>();
 
     public PodcastChannelEditorViewModel(@NonNull Application application) {
         super(application);
-
         podcastRepository = new PodcastRepository();
     }
 
-    public void createChannel(String url) {
-        podcastRepository.createPodcastChannel(url);
+    public LiveData<Boolean> getIsSuccess() {
+        return isSuccess;
     }
-}
+
+    public LiveData<String> getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void clearError() {
+        errorMessage.setValue(null);
+    }
+
+    public void createChannel(String url) {
+        errorMessage.setValue(null);
+        isSuccess.setValue(false);
+
+        podcastRepository.createPodcastChannel(url)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        if (response.code() == 501) {
+                            showError(getApplication().getString(R.string.podcast_channel_not_supported_snackbar));
+                            return;
+                        }
+
+                        if (response.isSuccessful() && response.body() != null) {
+                            ApiResponse apiResponse = response.body();
+
+                            String status = apiResponse.subsonicResponse.getStatus();
+                            if ("ok".equals(status)) {
+                                isSuccess.setValue(true);
+                            }
+                        } else {
+                            handleHttpError(response);
+                        }
+                    }
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        showError("Network error: " + t.getMessage());
+                        Log.e(TAG, "Network error", t);
+                    }
+                });
+    }
+
+    private void handleHttpError(Response<ApiResponse> response) {
+        String errorMsg = "HTTP error: " + response.code();
+        if (response.errorBody() != null) {
+            try {
+                String serverMsg = response.errorBody().string();
+                if (!serverMsg.isEmpty()) {
+                    errorMsg += " - " + serverMsg;
+                }
+            } catch (IOException e) {
+                Log.e(TAG, "Error reading error body", e);
+            }
+        }
+        showError(errorMsg);
+    }
+
+    private void showError(String message) {
+        Toast.makeText(getApplication(), message, Toast.LENGTH_LONG).show();
+        errorMessage.setValue(message);
+        Log.e(TAG, "Error shown: " + message);
+    }
+}

app/src/main/java/com/cappielloantonio/tempo/viewmodel/RadioEditorViewModel.java

@@ -1,26 +1,47 @@
 package com.cappielloantonio.tempo.viewmodel;
 
 import android.app.Application;
+import android.util.Log;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 
+import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.repository.RadioRepository;
+import com.cappielloantonio.tempo.subsonic.base.ApiResponse;
 import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation;
 
+import java.io.IOException;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
 public class RadioEditorViewModel extends AndroidViewModel {
     private static final String TAG = "RadioEditorViewModel";
 
     private final RadioRepository radioRepository;
-
     private InternetRadioStation toEdit;
+    
+    private final MutableLiveData<Boolean> isSuccess = new MutableLiveData<>(false);
+    private final MutableLiveData<String> errorMessage = new MutableLiveData<>();
 
     public RadioEditorViewModel(@NonNull Application application) {
         super(application);
-
         radioRepository = new RadioRepository();
     }
 
+
+    public LiveData<Boolean> getIsSuccess() { return isSuccess; }
+    public LiveData<String> getErrorMessage() { return errorMessage; }
+    
+    public void clearError() {
+        errorMessage.setValue(null);
+    }
+
     public InternetRadioStation getRadioToEdit() {
         return toEdit;
     }
@@ -30,14 +51,120 @@ public class RadioEditorViewModel extends AndroidViewModel {
     }
 
     public void createRadio(String name, String streamURL, String homepageURL) {
-        radioRepository.createInternetRadioStation(name, streamURL, homepageURL);
+        errorMessage.setValue(null);
+        isSuccess.setValue(false);
+        
+        radioRepository.createInternetRadioStation(name, streamURL, homepageURL)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        // Handle HTTP 501 (Not Implemented) from Navidrome
+                        if (response.code() == 501) {
+                            showError(getApplication().getString(R.string.radio_dialog_not_supported_snackbar));
+                            return;
+                        }
+                        if (response.isSuccessful() && response.body() != null) {
+                            ApiResponse apiResponse = response.body();
+                            String status = apiResponse.subsonicResponse.getStatus();
+                            if ("ok".equals(status)) {
+                                isSuccess.setValue(true);
+                            } else if ("failed".equals(status)) {
+                                handleFailedResponse(apiResponse);
+                            }
+                        } else {
+                            errorMessage.setValue("HTTP error: " + response.code());
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        errorMessage.setValue("Network error: " + t.getMessage());
+                    }
+                });
     }
 
     public void updateRadio(String name, String streamURL, String homepageURL) {
-        if (toEdit != null) radioRepository.updateInternetRadioStation(toEdit.getId(), name, streamURL, homepageURL);
+        if (toEdit != null && toEdit.getId() != null) {
+            errorMessage.setValue(null);
+            isSuccess.setValue(false);
+            
+            radioRepository.updateInternetRadioStation(toEdit.getId(), name, streamURL, homepageURL)
+                    .enqueue(new Callback<ApiResponse>() {
+                        @Override
+                        public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                            if (response.isSuccessful() && response.body() != null) {
+                                ApiResponse apiResponse = response.body();
+                                if (apiResponse.subsonicResponse != null) {
+                                    String status = apiResponse.subsonicResponse.getStatus();
+                                    if ("ok".equals(status)) {
+                                        isSuccess.setValue(true);
+                                    } else if ("failed".equals(status)) {
+                                        handleFailedResponse(apiResponse);
+                                    }
+                                }
+                            } else {
+                                errorMessage.setValue("HTTP error: " + response.code());
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                            errorMessage.setValue("Network error: " + t.getMessage());
+                        }
+                    });
+        }
     }
 
     public void deleteRadio() {
-        if (toEdit != null) radioRepository.deleteInternetRadioStation(toEdit.getId());
+        if (toEdit != null && toEdit.getId() != null) {
+            errorMessage.setValue(null);
+            isSuccess.setValue(false);
+            
+            radioRepository.deleteInternetRadioStation(toEdit.getId())
+                    .enqueue(new Callback<ApiResponse>() {
+                        @Override
+                        public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                            if (response.isSuccessful() && response.body() != null) {
+                                ApiResponse apiResponse = response.body();
+
+                                String status = apiResponse.subsonicResponse.getStatus();
+
+                                if ("ok".equals(status)) {
+                                    isSuccess.setValue(true);
+                                } else if ("failed".equals(status)) {
+                                    handleFailedResponse(apiResponse);
+                                }
+                            } else {
+                                errorMessage.setValue("HTTP error: " + response.code());
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                            errorMessage.setValue("Network error: " + t.getMessage());
+                        }
+                    });
+        }
     }
-}
+
+    private void showError(String message) {
+        Toast.makeText(getApplication(), message, Toast.LENGTH_LONG).show();
+        errorMessage.setValue(message);
+    }
+
+    private void handleFailedResponse(ApiResponse apiResponse) {
+        String errorMsg = "Unknown server error";
+        
+        if (apiResponse.subsonicResponse.getError() != null) {
+            errorMsg = apiResponse.subsonicResponse.getError().getMessage();
+            
+            if ("Not implemented".equals(errorMsg)) {
+                errorMsg = getApplication().getString((R.string.radio_dialog_not_supported_snackbar));
+            }
+        }
+        
+        Toast.makeText(getApplication(), errorMsg, Toast.LENGTH_LONG).show();
+        
+        errorMessage.setValue(errorMsg);
+    }
+}

app/src/main/java/com/cappielloantonio/tempo/viewmodel/SearchViewModel.java

@@ -48,11 +48,11 @@ public class SearchViewModel extends AndroidViewModel {
     }
 
     public void insertNewSearch(String search) {
-        searchingRepository.insert(new RecentSearch(search));
+        searchingRepository.insert(new RecentSearch(search, System.currentTimeMillis() / 1000L));
     }
 
     public void deleteRecentSearch(String search) {
-        searchingRepository.delete(new RecentSearch(search));
+        searchingRepository.delete(new RecentSearch(search, 0));
     }
 
     public LiveData<List<String>> getSearchSuggestion(String query) {

app/src/main/java/com/cappielloantonio/tempo/viewmodel/SongBottomSheetViewModel.java

@@ -10,6 +10,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.media3.common.util.UnstableApi;
 
+import com.cappielloantonio.tempo.interfaces.MediaCallback;
 import com.cappielloantonio.tempo.interfaces.StarCallback;
 import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
@@ -21,6 +22,7 @@ import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.Share;
+import com.cappielloantonio.tempo.util.Constants.SeedType;
 import com.cappielloantonio.tempo.util.DownloadUtil;
 import com.cappielloantonio.tempo.util.MappingUtil;
 import com.cappielloantonio.tempo.util.NetworkUtil;
@@ -128,11 +130,22 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
     public LiveData<List<Child>> getInstantMix(LifecycleOwner owner, Child media) {
         instantMix.setValue(Collections.emptyList());
 
-        songRepository.getInstantMix(media.getId(), 20).observe(owner, instantMix::postValue);
+        songRepository.getInstantMix(media.getId(), SeedType.TRACK, 30).observe(owner, instantMix::postValue);
 
         return instantMix;
     }
 
+    public void getInstantMix(Child media, int count, MediaCallback callback) {
+        
+        songRepository.getInstantMix(media.getId(), SeedType.TRACK, count, songs -> {
+            if (songs != null && !songs.isEmpty()) {
+                callback.onLoadMedia(songs);
+            } else {
+                callback.onLoadMedia(Collections.emptyList());
+            }
+        });
+    }
+
     public MutableLiveData<Share> shareTrack() {
         return sharingRepository.createShare(song.getId(), song.getTitle(), null);
     }

app/src/main/res/drawable/ic_graphic_eq_land.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotY="12"
+        android:pivotX="12"
+        android:rotation="270">
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M8,18c0.55,0 1,-0.45 1,-1L9,7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v10c0,0.55 0.45,1 1,1zM12,22c0.55,0 1,-0.45 1,-1L13,3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v18c0,0.55 0.45,1 1,1zM4,14c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v2c0,0.55 0.45,1 1,1zM16,18c0.55,0 1,-0.45 1,-1L17,7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v10c0,0.55 0.45,1 1,1zM19,11v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1z" />
+    </group>
+</vector>

app/src/main/res/drawable/ic_home_land.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotY="12"
+        android:pivotX="12"
+        android:rotation="270">
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z" />
+    </group>
+</vector>

app/src/main/res/drawable/ic_play_for_work_land.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotY="12"
+        android:pivotX="12"
+        android:rotation="270">
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M11,5v5.59L7.5,10.59l4.5,4.5 4.5,-4.5L13,10.59L13,5h-2zM6,14c0,3.31 2.69,6 6,6s6,-2.69 6,-6h-2c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4L6,14z"/>
+    </group>
+</vector>

app/src/main/res/layout-land/activity_main.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:layout_width="75dp"
+                android:layout_height="match_parent">
+
+                <com.google.android.material.bottomnavigation.BottomNavigationView
+                    android:id="@+id/bottom_navigation"
+                    android:layout_width="250dp"
+                    android:layout_height="75dp"
+                    android:rotation="90"
+                    android:layout_gravity="center"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
+                    android:visibility="gone"
+                    app:menu="@menu/bottom_nav_menu" />
+
+            </FrameLayout>
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/nav_host_fragment"
+                android:name="androidx.navigation.fragment.NavHostFragment"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                app:defaultNavHost="true"
+                app:navGraph="@navigation/nav_graph" />
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/player_bottom_sheet"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:behavior_hideable="true"
+            app:behavior_peekHeight="@dimen/bottom_sheet_peek_height"
+            app:layout_behavior="@string/bottom_sheet_behavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <TextView
+        android:id="@+id/offline_mode_text_view"
+        style="@style/NoConnectionTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/activity_info_offline_mode"
+        android:textSize="6sp"
+        android:visibility="gone" />
+
+</LinearLayout>

app/src/main/res/layout-land/fragment_album_page.xml

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/anim_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorSurface"
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_arrow_back" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/album_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/colorSurface"
+                android:paddingStart="20dp"
+                app:layout_scrollFlags="exitUntilCollapsed">
+
+                <ImageView
+                    android:id="@+id/album_cover_image_view"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_marginLeft="64dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginRight="64dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_constraintDimensionRatio="H,1:1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/album_name_label"
+                    style="@style/LabelExtraLarge"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:paddingTop="8dp"
+                    android:singleLine="false"
+                    android:text="@string/label_placeholder"
+                    android:textAlignment="center"
+                    app:layout_constraintEnd_toEndOf="@+id/album_cover_image_view"
+                    app:layout_constraintStart_toStartOf="@+id/album_cover_image_view"
+                    app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view" />
+
+                <FrameLayout
+                    android:id="@+id/album_other_info_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    app:layout_constraintBottom_toBottomOf="@+id/album_name_label"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/album_name_label"
+                    app:layout_constraintTop_toTopOf="@+id/album_name_label">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:background="@drawable/ic_arrow_down" />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/album_artist_label"
+                    style="@style/LabelMedium"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="@string/label_placeholder"
+                    android:textAlignment="center"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
+
+                <TextView
+                    android:id="@+id/album_release_year_label"
+                    style="@style/LabelSmall"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
+                    android:text="@string/label_placeholder"
+                    android:textAlignment="center"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_artist_label" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/album_detail_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:animateLayoutChanges="true"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="8dp"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_release_year_label"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/album_genres_textview"
+                        style="@style/LabelSmall"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        android:visibility="gone"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:visibility="visible" />
+
+                    <TextView
+                        android:id="@+id/album_song_count_duration_textview"
+                        style="@style/LabelSmall"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:paddingVertical="2dp"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/album_genres_textview" />
+
+                    <TextView
+                        android:id="@+id/album_notes_textview"
+                        style="@style/LabelSmall"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:justificationMode="inter_word"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/album_song_count_duration_textview" />
+
+                    <TextView
+                        android:id="@+id/album_release_years_textview"
+                        style="@style/LabelSmall"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:paddingVertical="4dp"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        android:visibility="gone"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/album_notes_textview" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <View
+                    android:id="@+id/upper_button_divider"
+                    style="@style/Divider"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="18dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_detail_view" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingStart="12dp"
+                    android:paddingTop="4dp"
+                    android:paddingEnd="12dp"
+                    android:paddingBottom="4dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/upper_button_divider">
+
+                    <LinearLayout
+                        android:id="@+id/album_page_button_layout"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/album_page_play_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:layout_weight="1"
+                            android:padding="10dp"
+                            android:text="@string/album_page_play_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_play"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+
+                        <Button
+                            android:id="@+id/album_page_shuffle_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:layout_weight="1"
+                            android:padding="10dp"
+                            android:text="@string/album_page_shuffle_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_shuffle"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+                    </LinearLayout>
+
+                    <ToggleButton
+                        android:id="@+id/button_favorite"
+                        android:layout_width="34dp"
+                        android:layout_height="34dp"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="0dp"
+                        android:background="@drawable/button_favorite_selector"
+                        android:checked="false"
+                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                        android:gravity="center"
+                        android:text=""
+                        android:textOff=""
+                        android:textOn="" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/album_bio_label"
+                    style="@style/LabelSmall"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
+                    android:text="@string/label_placeholder"
+                    android:textAlignment="center"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/album_page_button_layout"
+                    tools:ignore="NotSibling" />
+
+                <View
+                    android:id="@+id/bottom_button_divider"
+                    style="@style/Divider"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
+                    android:layout_marginBottom="18dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_bio_label" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/song_recycler_view"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:nestedScrollingEnabled="false"
+            android:paddingTop="0dp"
+            android:paddingBottom="75dp"
+            android:clipToPadding="false"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>

app/src/main/res/layout-land/fragment_playlist_page.xml

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/anim_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorSurface"
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_arrow_back" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            android:layout_height="match_parent">
+
+            <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/app_bar_layout"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/playlist_info_sector"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/colorSurface"
+                    app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+                    <ImageView
+                        android:id="@+id/playlist_cover_image_view_top_left"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="64dp"
+                        android:layout_marginTop="8dp"
+                        app:layout_constraintDimensionRatio="H,1:1"
+                        app:layout_constraintEnd_toStartOf="@id/playlist_cover_image_view_top_right"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/playlist_cover_image_view_top_right"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginEnd="64dp"
+                        app:layout_constraintDimensionRatio="H,1:1"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/playlist_cover_image_view_top_left"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/playlist_cover_image_view_bottom_left"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="64dp"
+                        android:layout_marginBottom="8dp"
+                        app:layout_constraintDimensionRatio="H,1:1"
+                        app:layout_constraintEnd_toStartOf="@id/playlist_cover_image_view_bottom_right"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/playlist_cover_image_view_top_left" />
+
+                    <ImageView
+                        android:id="@+id/playlist_cover_image_view_bottom_right"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginEnd="64dp"
+                        android:layout_marginBottom="8dp"
+                        app:layout_constraintDimensionRatio="H,1:1"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/playlist_cover_image_view_bottom_left"
+                        app:layout_constraintTop_toTopOf="@id/playlist_cover_image_view_bottom_left" />
+
+
+                    <TextView
+                        android:id="@+id/playlist_name_label"
+                        style="@style/LabelExtraLarge"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:paddingTop="8dp"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/playlist_cover_image_view_bottom_left" />
+
+                    <TextView
+                        android:id="@+id/playlist_song_count_label"
+                        style="@style/LabelMedium"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/playlist_name_label" />
+
+                    <TextView
+                        android:id="@+id/playlist_duration_label"
+                        style="@style/LabelSmall"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/playlist_song_count_label" />
+
+                    <View
+                        android:id="@+id/upper_button_divider"
+                        style="@style/Divider"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginEnd="18dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/playlist_duration_label" />
+
+                    <LinearLayout
+                        android:id="@+id/playlist_page_button_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="4dp"
+                        android:paddingBottom="4dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/upper_button_divider">
+
+                        <Button
+                            android:id="@+id/playlist_page_play_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginEnd="4dp"
+                            android:layout_weight="1"
+                            android:padding="10dp"
+                            android:text="@string/playlist_page_play_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_play"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+
+                        <Button
+                            android:id="@+id/playlist_page_shuffle_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_weight="1"
+                            android:padding="10dp"
+                            android:text="@string/playlist_page_shuffle_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_shuffle"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/album_bio_label"
+                        style="@style/LabelSmall"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:text="@string/label_placeholder"
+                        android:textAlignment="center"
+                        android:visibility="gone"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/playlist_page_button_layout" />
+
+                    <View
+                        android:id="@+id/bottom_button_divider"
+                        style="@style/Divider"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginEnd="18dp"
+                        android:layout_marginBottom="18dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/playlist_page_button_layout" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </com.google.android.material.appbar.AppBarLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/song_recycler_view"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:nestedScrollingEnabled="false"
+                android:paddingTop="8dp"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>

app/src/main/res/layout/fragment_album_page.xml

@@ -174,7 +174,6 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/album_notes_textview" />
 
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
@@ -188,43 +187,69 @@
                     app:layout_constraintTop_toBottomOf="@+id/album_detail_view" />
 
                 <LinearLayout
-                    android:id="@+id/album_page_button_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingTop="4dp"
                     android:paddingBottom="4dp"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="12dp"
+                    android:gravity="center_vertical"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/upper_button_divider">
 
-                    <Button
-                        android:id="@+id/album_page_play_button"
+                    <LinearLayout
+                        android:id="@+id/album_page_button_layout"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="4dp"
                         android:layout_weight="1"
-                        android:padding="10dp"
-                        android:text="@string/album_page_play_button"
-                        android:textAllCaps="false"
-                        app:icon="@drawable/ic_play"
-                        app:iconGravity="textStart"
-                        app:iconPadding="18dp" />
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <Button
+                            android:id="@+id/album_page_play_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:padding="10dp"
+                            android:text="@string/album_page_play_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_play"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+
+                        <Button
+                            android:id="@+id/album_page_shuffle_button"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:padding="10dp"
+                            android:text="@string/album_page_shuffle_button"
+                            android:textAllCaps="false"
+                            app:icon="@drawable/ic_shuffle"
+                            app:iconGravity="textStart"
+                            app:iconPadding="18dp" />
+                    </LinearLayout>
+
+                    <ToggleButton
+                        android:id="@+id/button_favorite"
+                        android:layout_width="34dp"
+                        android:layout_height="34dp"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="0dp"
+                        android:background="@drawable/button_favorite_selector"
+                        android:checked="false"
+                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                        android:gravity="center"
+                        android:text=""
+                        android:textOff=""
+                        android:textOn="" />
 
-                    <Button
-                        android:id="@+id/album_page_shuffle_button"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_weight="1"
-                        android:padding="10dp"
-                        android:text="@string/album_page_shuffle_button"
-                        android:textAllCaps="false"
-                        app:icon="@drawable/ic_shuffle"
-                        app:iconGravity="textStart"
-                        app:iconPadding="18dp" />
                 </LinearLayout>
 
                 <TextView
@@ -239,7 +264,8 @@
                     android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout" />
+                    app:layout_constraintTop_toBottomOf="@id/album_page_button_layout"
+                    tools:ignore="NotSibling" />
 
                 <View
                     android:id="@+id/bottom_button_divider"
@@ -249,7 +275,7 @@
                     android:layout_marginBottom="18dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout" />
+                    app:layout_constraintTop_toBottomOf="@+id/album_bio_label" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/fragment_artist_page.xml

@@ -63,40 +63,80 @@
                 android:layout_marginEnd="18dp" />
 
             <LinearLayout
-                android:id="@+id/album_page_button_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingTop="4dp"
-                android:paddingBottom="4dp">
+                android:paddingBottom="4dp"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:gravity="center_vertical">
 
-                <Button
-                    android:id="@+id/artist_page_shuffle_button"
+
+                <LinearLayout
+                    android:id="@+id/album_page_button_layout"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="4dp"
                     android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="@string/artist_page_shuffle_button"
-                    android:textAllCaps="false"
-                    app:icon="@drawable/ic_shuffle"
-                    app:iconGravity="textStart"
-                    app:iconPadding="18dp" />
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <Button
+                        android:id="@+id/artist_page_shuffle_button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginEnd="6dp"
+                        android:padding="10dp"
+                        android:text="@string/artist_page_shuffle_button"
+                        android:textAllCaps="false"
+                        app:icon="@drawable/ic_shuffle"
+                        app:iconGravity="textStart"
+                        app:iconPadding="18dp" />
+
+                    <Button
+                        android:id="@+id/artist_page_radio_button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginEnd="6dp"
+                        android:padding="10dp"
+                        android:text="@string/artist_page_radio_button"
+                        android:textAllCaps="false"
+                        app:icon="@drawable/ic_feed"
+                        app:iconGravity="textStart"
+                        app:iconPadding="18dp" />
+                </LinearLayout>
+
+                <ToggleButton
+                    android:id="@+id/button_favorite"
+                    android:layout_width="34dp"
+                    android:layout_height="34dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="0dp"
+                    android:background="@drawable/button_favorite_selector"
+                    android:checked="false"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:gravity="center"
+                    android:text=""
+                    android:textOff=""
+                    android:textOn="" />
 
                 <Button
-                    android:id="@+id/artist_page_radio_button"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_weight="1"
-                    android:padding="10dp"
-                    android:text="@string/artist_page_radio_button"
-                    android:textAllCaps="false"
-                    app:icon="@drawable/ic_feed"
-                    app:iconGravity="textStart"
-                    app:iconPadding="18dp" />
+                    android:id="@+id/button_toggle_bio"
+                    android:layout_width="34dp"
+                    android:layout_height="34dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="0dp"
+                    android:background="@drawable/ic_info_stream"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:gravity="center"
+                    android:text=""
+                    android:textOff=""
+                    android:textOn="" />
+
             </LinearLayout>
 
             <View

app/src/main/res/layout/fragment_home_tab_music.xml

@@ -379,16 +379,6 @@
                 android:paddingTop="8dp"
                 android:paddingEnd="8dp"
                 android:paddingBottom="8dp" />
-        </LinearLayout>
-
-        <!--  Best of -->
-        <LinearLayout
-            android:id="@+id/home_best_of_artist_sector"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
 
             <TextView
                 android:id="@+id/most_streamed_song_pre_text_view"
@@ -400,6 +390,16 @@
                 android:paddingEnd="16dp"
                 android:text="@string/home_subtitle_best_of"
                 android:textAllCaps="true" />
+        </LinearLayout>
+
+        <!--  Best of -->
+        <LinearLayout
+            android:id="@+id/home_best_of_artist_sector"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <TextView
                 android:id="@+id/best_of_artist_text_view_refreshable"
@@ -566,6 +566,7 @@
                 android:paddingBottom="8dp" />
         </LinearLayout>
 
+        <!--Starred Albums-->
         <LinearLayout
             android:id="@+id/starred_albums_sector"
             android:layout_width="match_parent"
@@ -615,6 +616,7 @@
                 android:paddingBottom="8dp" />
         </LinearLayout>
 
+        <!--Starred Artists-->
         <LinearLayout
             android:id="@+id/starred_artists_sector"
             android:layout_width="match_parent"
@@ -913,16 +915,36 @@
             android:visibility="gone"
             tools:visibility="visible">
 
+                <!--  Label and button  -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingStart="8dp"
+                android:paddingTop="16dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="8dp">
+
             <TextView
                 android:id="@+id/pinned_playlists_text_view"
                 style="@style/TitleLarge"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="16dp"
+                android:layout_weight="1"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:text="@string/home_title_pinned_playlists" />
 
+            <TextView
+                android:id="@+id/playlist_catalogue_text_view_clickable"
+                style="@style/TitleMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:text="@string/library_title_playlist_see_all_button" />
+                </LinearLayout>
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/pinned_playlists_recycler_view"
                 android:layout_width="match_parent"

app/src/main/res/layout/inner_fragment_player_controller_layout.xml

@@ -16,6 +16,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <Button
+            android:id="@+id/player_playback_speed_button"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="80dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginTop="0dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            app:cornerRadius="30dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:tint="?attr/colorOnPrimaryContainer" />
+
         <com.google.android.material.chip.Chip
             android:id="@+id/player_media_extension"
             style="@style/Widget.Material3.Chip.Suggestion"
@@ -253,23 +270,6 @@
         app:layout_constraintStart_toEndOf="@+id/placeholder_view_middle_right"
         app:layout_constraintTop_toTopOf="@+id/placeholder_view_middle_right" />
 
-    <Button
-        android:id="@+id/player_playback_speed_button"
-        style="@style/Widget.Material3.Button.TextButton"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_marginStart="24dp"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        app:cornerRadius="30dp"
-        app:layout_constraintBottom_toBottomOf="@+id/placeholder_view_middle_left"
-        app:layout_constraintEnd_toStartOf="@+id/placeholder_view_middle_left"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/placeholder_view_middle_left"
-        app:tint="?attr/colorOnPrimaryContainer" />
-
     <ImageButton
         android:id="@+id/exo_shuffle"
         android:layout_width="32dp"

app/src/main/res/layout/inner_fragment_player_lyrics.xml

@@ -46,6 +46,8 @@
             style="@style/BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:lineSpacingExtra="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/inner_fragment_player_queue.xml

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/player_clean_queue_button"
-        style="@style/TitleMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:gravity="center"
-        android:text="@string/player_queue_clean_all_button" />
-
     <com.cappielloantonio.tempo.helper.recyclerview.NestedScrollableHost
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -21,20 +14,74 @@
             android:id="@+id/player_queue_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="40dp"
             android:paddingTop="8dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </com.cappielloantonio.tempo.helper.recyclerview.NestedScrollableHost>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/player_shuffle_queue_fab"
+    <LinearLayout
+        android:id="@+id/fab_menu_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="end"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:contentDescription="@string/content_description_shuffle_button"
-        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
-        app:srcCompat="@drawable/ic_shuffle" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior">
 
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_save_to_playlist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_save_to_playlist"
+            app:icon="@android:drawable/ic_menu_edit" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_clear_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_clean_all_button"
+            app:icon="@android:drawable/ic_menu_delete" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_download_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/menu_download_all_button"
+            app:icon="@android:drawable/stat_sys_download_done" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_load_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/player_queue_load_queue"
+            app:icon="@android:drawable/ic_menu_revert" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/fab_shuffle_queue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            android:text="@string/content_description_shuffle_button"
+            app:icon="@drawable/ic_shuffle" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_menu_toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="Toggle FAB Action menu"
+            tools:ignore="HardcodedText"
+            app:srcCompat="@drawable/ic_add" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/item_library_music_directory.xml

@@ -19,12 +19,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/cover_image_separator"
-        android:layout_width="12dp"
-        android:layout_height="52dp"
+    <ImageView
+        android:id="@+id/music_directory_play_button"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="12dp"
+        android:background="@drawable/ic_play"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/music_directory_cover_image_view"
-        app:layout_constraintEnd_toStartOf="@+id/music_directory_title_text_view"
         app:layout_constraintStart_toEndOf="@+id/music_directory_cover_image_view"
         app:layout_constraintTop_toTopOf="@+id/music_directory_cover_image_view" />
 
@@ -33,13 +36,14 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
         android:ellipsize="marquee"
         android:paddingEnd="12dp"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintBottom_toBottomOf="@id/music_directory_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/music_directory_more_button"
-        app:layout_constraintStart_toEndOf="@+id/cover_image_separator"
+        app:layout_constraintStart_toEndOf="@+id/music_directory_play_button"
         app:layout_constraintTop_toTopOf="@+id/music_directory_cover_image_view" />
 
     <ImageView
@@ -54,17 +58,4 @@
         app:layout_constraintBottom_toBottomOf="@id/music_directory_title_text_view"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/music_directory_title_text_view" />
-
-    <ImageView
-        android:id="@+id/music_directory_play_button"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/ic_play"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="@id/music_directory_title_text_view"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/music_directory_title_text_view" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_library_music_index.xml

@@ -20,12 +20,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/cover_image_separator"
-        android:layout_width="12dp"
-        android:layout_height="52dp"
+    <ImageView
+        android:id="@+id/music_index_play_button"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="12dp"
+        android:background="@drawable/ic_play"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="@+id/music_index_cover_image_view"
-        app:layout_constraintEnd_toStartOf="@+id/music_index_title_text_view"
         app:layout_constraintStart_toEndOf="@+id/music_index_cover_image_view"
         app:layout_constraintTop_toTopOf="@+id/music_index_cover_image_view" />
 
@@ -34,13 +36,14 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
         android:ellipsize="marquee"
         android:paddingEnd="12dp"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintBottom_toBottomOf="@id/music_index_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/music_index_more_button"
-        app:layout_constraintStart_toEndOf="@+id/cover_image_separator"
+        app:layout_constraintStart_toEndOf="@+id/music_index_play_button"
         app:layout_constraintTop_toTopOf="@+id/music_index_cover_image_view" />
 
     <ImageView

app/src/main/res/layout/item_player_queue_song.xml

@@ -139,6 +139,17 @@
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <ImageView
+        android:id="@+id/download_indicator_icon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginEnd="8dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_download"  app:layout_constraintBottom_toBottomOf="@+id/queue_song_cover_image_view"
+        app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
+        app:layout_constraintTop_toTopOf="@+id/queue_song_cover_image_view"
+        tools:visibility="visible" />
+
     <ImageView
         android:id="@+id/queue_song_holder_image"
         android:layout_width="wrap_content"

app/src/main/res/menu-land/bottom_nav_menu.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/homeFragment"
+        android:icon="@drawable/ic_home_land"
+        android:title="@string/menu_home_label" />
+    <item
+        android:id="@+id/libraryFragment"
+        android:icon="@drawable/ic_graphic_eq_land"
+        android:title="@string/menu_library_label" />
+    <item
+        android:id="@+id/downloadFragment"
+        android:icon="@drawable/ic_play_for_work_land"
+        android:title="@string/menu_download_label" />
+</menu>

app/src/main/res/navigation/nav_graph.xml

@@ -65,6 +65,9 @@
         <action
             android:id="@+id/action_homeFragment_to_playlistPageFragment"
             app:destination="@id/playlistPageFragment" />
+        <action
+            android:id="@+id/action_homeFragment_to_playlistCatalogueFragment"
+            app:destination="@id/playlistCatalogueFragment" />
         <action
             android:id="@+id/action_homeFragment_to_podcastChannelCatalogueFragment"
             app:destination="@id/podcastChannelCatalogueFragment" />

app/src/main/res/values-es-rES/arrays.xml

@@ -240,6 +240,15 @@
         <item>8</item>
     </string-array>
 
+    <string-array name="playlist_sort_option_titles">
+        <item>Por nombre</item>
+        <item>Aleatoriamente</item>
+    </string-array>
+    <string-array name="playlist_sort_option_values">
+        <item>ORDER_BY_NAME</item>
+        <item>ORDER_BY_RANDOM</item>
+    </string-array>
+
     <string-array name="skip_min_star_rating_titles">
         <item>0 estrellas como mínimo</item>
         <item>1 estrella como mínimo</item>

app/src/main/res/values-es-rES/strings.xml

@@ -3,7 +3,7 @@
     <string name="album_page_tracks_count_and_duration">%1$d pistas  •  %2$d minutos</string>
     <string name="app_name">Tempus</string>
     <string name="activity_battery_optimizations_conclusion">Si tienes problemas, visita https://dontkillmyapp.com. Ofrece instrucciones detalladas para desactivar características de ahorro de energía que podrían afectar al rendimiento de la app.</string>
-    <string name="activity_battery_optimizations_summary">Por favor, desactive las optimizaciones de batería para continuar la reproducción multimedia mientras la pantalla está apagada.</string>
+    <string name="activity_battery_optimizations_summary">Por favor, desactiva las optimizaciones de batería para continuar la reproducción multimedia mientras la pantalla está apagada.</string>
     <string name="activity_battery_optimizations_title">Optimizaciones de batería</string>
     <string name="activity_info_offline_mode">Modo sin conexión</string>
     <string name="album_bottom_sheet_add_to_playlist">Añadir a la lista de reproducción</string>
@@ -40,6 +40,7 @@
     <string name="artist_list_page_downloaded">Artistas descargados</string>
     <string name="artist_list_page_starred">Artistas destacados</string>
     <string name="artist_list_page_title">Artistas</string>
+    <string name="artist_no_artist_info_toast">No hay más información del artista</string>
     <string name="artist_page_radio_button">Radio</string>
     <string name="artist_page_shuffle_button">Aleatorio</string>
     <string name="artist_page_switch_layout_button">Cambiar disposición</string>
@@ -52,6 +53,7 @@
     <string name="battery_optimization_negative_button">Ignorar</string>
     <string name="battery_optimization_neutral_button">No volver a preguntar</string>
     <string name="battery_optimization_positive_button">Desactivar</string>
+    <string name="bottom_sheet_problem_generating_instant_mix">No se pudieron obtener las pistas del servidor.</string>
     <string name="connection_alert_dialog_negative_button">Cancelar</string>
     <string name="connection_alert_dialog_neutral_button">Habilitar el ahorro de datos</string>
     <string name="connection_alert_dialog_positive_button">Aceptar</string>
@@ -60,9 +62,9 @@
     <string name="content_description_shuffle_button">Aleatorio</string>
     <string name="delete_download_storage_dialog_negative_button">Cancelar</string>
     <string name="delete_download_storage_dialog_positive_button">Continuar</string>
-    <string name="delete_download_storage_dialog_summary">Por favor, sea consciente de que si continúa, todos los elementos descargados de todos los servidores se eliminarán.</string>
+    <string name="delete_download_storage_dialog_summary">Por favor, ten en cuenta que si continúas, todos los elementos descargados de todos los servidores se eliminarán.</string>
     <string name="delete_download_storage_dialog_title">Eliminar elementos guardados</string>
-    <string name="description_empty_title">Descripción no disponible</string>
+    <string name="description_empty_title">Letra no disponible</string>
     <string name="disc_titlefull">Disco %1$s - %2$s</string>
     <string name="disc_titleless">Disco %1$s</string>
     <string name="download_directory_dialog_negative_button">Cancelar</string>
@@ -111,12 +113,12 @@
     <string name="home_rearrangement_dialog_neutral_button">Restablecer</string>
     <string name="home_rearrangement_dialog_positive_button">Guardar</string>
     <string name="home_rearrangement_dialog_title">Reorganizar la página de inicio</string>
-    <string name="home_rearrangement_dialog_subtitle">Tenga en cuenta que para que los cambios surtan efecto, hay que reiniciar la aplicación.</string>
+    <string name="home_rearrangement_dialog_subtitle">Ten en cuenta que para que los cambios surtan efecto, hay que reiniciar la aplicación.</string>
     <string name="home_section_music">Música</string>
     <string name="home_section_podcast">Pódcasts</string>
     <string name="home_section_radio">Radio</string>
     <string name="home_subtitle_best_of">Mejores pistas de tus artistas favoritos</string>
-    <string name="home_subtitle_made_for_you">Iniciar mix desde una cación que te gustó</string>
+    <string name="home_subtitle_made_for_you">Iniciar mix desde una canción que te gustó</string>
     <string name="home_subtitle_new_internet_radio_station">Añadir una nueva emisora de radio</string>
     <string name="home_subtitle_new_podcast_channel">Añadir un nuevo canal de pódcasts</string>
     <string name="home_sync_starred_cancel">Cancelar</string>
@@ -225,6 +227,8 @@
     <string name="playlist_chooser_dialog_title">Añadir a una lista de reproducción</string>
     <string name="playlist_chooser_dialog_toast_add_failure">Error al añadir a la lista</string>
     <string name="playlist_chooser_dialog_toast_all_skipped">Todas las pistas se han descartado porque están repetidas</string>
+    <string name="playlist_chooser_dialog_visibility_public">Público</string>
+    <string name="playlist_chooser_dialog_visibility_private">Privado</string>
     <string name="playlist_counted_tracks">%1$d pistas •  %2$s</string>
     <string name="playlist_duration">Duración  •  %1$s</string>
     <string name="playlist_editor_dialog_action_delete_toast">Pulsación larga para eliminar</string>
@@ -246,6 +250,7 @@
     <string name="podcast_channel_catalogue_title_expanded">Explorar canales</string>
     <string name="podcast_channel_editor_dialog_hint_rss_url">URL del feed RSS</string>
     <string name="podcast_channel_editor_dialog_title">Canal del pódcast</string>
+    <string name="podcast_channel_not_supported_snackbar">Este servidor no soporta pódcasts.</string>
     <string name="podcast_channel_page_title_description_section">Descripción</string>
     <string name="podcast_channel_page_title_episode_section">Episodios</string>
     <string name="podcast_channel_page_title_no_episode_available">No hay episodios disponibles</string>
@@ -260,10 +265,12 @@
     <string name="radio_editor_dialog_negative_button">Cancelar</string>
     <string name="radio_editor_dialog_neutral_button">Eliminar</string>
     <string name="radio_editor_dialog_positive_button">Guardar</string>
-    <string name="radio_editor_dialog_title">"Emisora "</string>
+    <string name="radio_editor_dialog_updated">Emisora de radio actualizada</string>
+    <string name="radio_editor_dialog_title">Emisora</string>
     <string name="radio_station_info_empty_button">Pulsa para ocultar la sección\nLos cambios serán visibles al reiniciar la app</string>
     <string name="radio_station_info_empty_subtitle">Una vez que añadas una emisora de radio, la encontrarás aquí</string>
     <string name="radio_station_info_empty_title">No hay emisoras de radio</string>
+    <string name="radio_dialog_not_supported_snackbar">Este servidor no soporta emisoras de radio en Internet.</string>
     <string name="rating_dialog_negative_button">Cancelar</string>
     <string name="rating_dialog_positive_button">Guardar</string>
     <string name="rating_dialog_title">Valorar</string>
@@ -289,34 +296,34 @@
     <string name="server_unreachable_dialog_negative_button">Cancelar</string>
     <string name="server_unreachable_dialog_neutral_button">Ir al inicio de sesión</string>
     <string name="server_unreachable_dialog_positive_button">Continuar de todas formas</string>
-    <string name="server_unreachable_dialog_summary">El servidor no está disponible. Si decide continuar, este diálogo no aparecerá de nuevo durante una hora.</string>
+    <string name="server_unreachable_dialog_summary">El servidor no está disponible. Si decides continuar, este diálogo no aparecerá de nuevo durante una hora.</string>
     <string name="server_unreachable_dialog_title">No se puede conectar con el servidor</string>
     <string name="settings_about_summary">Tempus es un cliente de música Subsonic ligero y de código abierto, diseñado nativamente para Android.</string>
     <string name="settings_about_title">Acerca de</string>
     <string name="settings_always_on_display">Pantalla siempre activa</string>
-    <string name="settings_allow_playlist_duplicates_summary">Si está habilitada, no se comprobará si hay pistas repetidas cuando se añadan a la lista.</string>
+    <string name="settings_allow_playlist_duplicates_summary">Si se habilita, no se comprobará si hay pistas repetidas cuando se añadan a la lista.</string>
     <string name="settings_audio_transcode_download_format">Formato de transcodificación</string>
-    <string name="settings_audio_transcode_download_priority_summary">Si está habilitada, Tempus no descargará la pista con las opciones de transcodificación que aparecen a continuación.</string>
+    <string name="settings_audio_transcode_download_priority_summary">Si se habilita, Tempus no descargará la pista con las opciones de transcodificación que aparecen a continuación.</string>
     <string name="settings_audio_transcode_download_priority_title">Dar prioridad a las opciones del servidor usadas para el streaming en las descargas</string>
-    <string name="settings_audio_transcode_download_summary">Si está habilitada, Tempus descargará las pistas transcodificadas.</string>
+    <string name="settings_audio_transcode_download_summary">Si se habilita, Tempus descargará las pistas transcodificadas.</string>
     <string name="settings_audio_transcode_download_title">Descargas pistas transcodificadas</string>
-    <string name="settings_audio_transcode_estimate_content_length_summary">Si está habilitada, se pedirá al servidor la duración estimada de la pista.</string>
+    <string name="settings_audio_transcode_estimate_content_length_summary">Si se habilita, se pedirá al servidor la duración estimada de la pista.</string>
     <string name="settings_audio_transcode_estimate_content_length_title">Calcular la duración del contenido</string>
     <string name="settings_audio_transcode_format_download">Formato de transcodificación para las descargas</string>
     <string name="settings_audio_transcode_format_mobile">Formato de transcodificación en red de datos móviles</string>
     <string name="settings_audio_transcode_format_wifi">Formato de transcodificación en red Wi-Fi</string>
-    <string name="settings_audio_transcode_priority_summary">Si está habilitada, Tempus no reproducirá la pista con las opciones de transcodificación que aparecen a continuación.</string>
+    <string name="settings_audio_transcode_priority_summary">Si se habilita, Tempus no reproducirá la pista con las opciones de transcodificación que aparecen a continuación.</string>
     <string name="settings_audio_transcode_priority_title">Dar prioridad a las opciones de transcodificación del servidor</string>
     <string name="settings_audio_transcode_priority_toast">Prioridad a la hora de transcodificar una pista</string>
     <string name="settings_buffering_strategy">Estrategia de buffer</string>
-    <string name="settings_buffering_strategy_summary">Para que los cambios surtan efecto, debes reinciar la app.</string>
+    <string name="settings_buffering_strategy_summary">Para que los cambios surtan efecto, debes reiniciar la app.</string>
     <string name="settings_choose_download_folder">Elige una carpeta para descargar los archivos de música</string>
     <string name="settings_clear_download_folder">Limpiar la carpeta de descargas</string>
     <string name="settings_continuous_play_summary">Permite que la música siga reproduciéndose una vez que la lista de reproducción ha terminado, reproduciendo pistas similares</string>
     <string name="settings_continuous_play_title">Reproducción continua</string>
     <string name="settings_covers_cache">Tamaño de la caché de portadas de álbumes</string>
     <string name="settings_data_saving_mode_summary">Evitar descargar las portadas de álbumes para reducir el uso de datos</string>
-    <string name="settings_data_saving_mode_title">Limitr el uso de datos móviles</string>
+    <string name="settings_data_saving_mode_title">Limitar el uso de datos móviles</string>
     <string name="settings_delete_download_storage_summary">Al continuar se eliminarán de forma irreversible todos los elementos guardados.</string>
     <string name="settings_delete_download_storage_title">Eliminar elementos guardados</string>
     <string name="settings_download_storage_title">Almacenamiento de descargas</string>
@@ -325,21 +332,22 @@
     <string name="settings_max_bitrate_wifi">Tasa de bits en Wi-Fi</string>
     <string name="settings_media_cache">Tamaño de la caché multimedia</string>
     <string name="settings_music_directory">Mostrar carpetas de música</string>
-    <string name="settings_music_directory_summary">Si está habilitada, se mostrará la sección de carpetas de música. Tenga en cuenta que para que la navegación funcione correctamente, el servidor debe soportar esta característica.</string>
+    <string name="settings_music_directory_summary">Si se habilita, se mostrará la sección de carpetas de música. Tenga en cuenta que para que la navegación funcione correctamente, el servidor debe soportar esta característica.</string>
     <string name="settings_podcast">Mostrar pódcasts</string>
-    <string name="settings_podcast_summary">Si está habilitada, se mostrará la sección de pódcasts. Reinicia la aplicación para que los cambios surtan efecto.</string>
+    <string name="settings_podcast_summary">Si se habilita, se mostrará la sección de pódcasts. Reinicia la aplicación para que los cambios surtan efecto.</string>
+    <string name="settings_playlist_sort">Ordenar listas de reproducción</string>
     <string name="settings_audio_quality">Mostrar calidad de audio</string>
     <string name="settings_audio_quality_summary">La tasa de bits y el formato de audio se mostrarán para cada pista de audio.</string>
-    <string name="settings_song_rating_summary">Si está habilitada, muestra la valoración de la pista como barra de 5 estrellas en la página del control de reproducción.\n\n*Requiere reiniciar la aplicación</string>
+    <string name="settings_song_rating_summary">Si se habilita, muestra la valoración de la pista como barra de 5 estrellas en la página del control de reproducción.\n\n*Requiere reiniciar la aplicación</string>
     <string name="settings_item_rating">Mostrar valoración de los elementos</string>
     <string name="settings_queue_syncing_title">Sincronizar cola de reproducción para este usuario</string>
-    <string name="settings_show_mini_shuffle_button_summary">Si está habilitada, muestra el botón de reproducción aleatoria y oculta el botón de «Favoritos» en el minirreproductor</string>
+    <string name="settings_show_mini_shuffle_button_summary">Si se habilita, muestra el botón de reproducción aleatoria y oculta el botón de «Favoritos» en el minirreproductor.</string>
     <string name="settings_radio">Mostrar emisoras de radio</string>
     <string name="settings_auto_download_lyrics_summary">Descargar las letras automáticamente cuando estén disponibles para que se puedan mostrar cuando no hay conexión.</string>
     <string name="settings_replay_gain">Configurar el modo de ganancia de reproducción</string>
     <string name="settings_rounded_corner">Esquinas redondeadas</string>
     <string name="settings_rounded_corner_size">Tamaño de las esquinas</string>
-    <string name="settings_rounded_corner_summary">Si está habilitada, establece un ángulo de curvatura para todas las portadas de álbumes. Los cambios se aplicarán después de reiniciar la app.</string>
+    <string name="settings_rounded_corner_summary">Si se habilita, establece un ángulo de curvatura para todas las portadas de álbumes. Los cambios se aplicarán después de reiniciar la app.</string>
     <string name="settings_scan_title">Escanear biblioteca</string>
     <string name="streaming_cache_storage_dialog_summary">Cambiar la ubicación de los archivos en caché a otro almacenamiento puede causar el borrado de todos los archivos en caché en el anterior almacenamiento.</string>
     <string name="streaming_cache_storage_dialog_title">Seleccióna un tipo de almacenamiento</string>
@@ -368,10 +376,10 @@
     <string name="settings_summary_streaming_cache_size">%1$s\nEn uso:   %2$s MiB</string>
     <string name="undraw_url">https://undraw.co/</string>
     <string name="track_info_track_number">Número de pista</string>
-    <string name="settings_item_rating_summary">Si está habilitada, se mostrará la valoración del elemento y si está marcado como favorito.</string>
+    <string name="settings_item_rating_summary">Si se habilita, se mostrará la valoración del elemento y si está marcado como favorito.</string>
     <string name="settings_queue_syncing_countdown">Temporizador de sincronización</string>
-    <string name="settings_queue_syncing_summary">Si está habilitada, el usuario podrá guardar la cola de reproducción y restaurarla cuando abra la aplicación.</string>
-    <string name="settings_radio_summary">Si está habilitada, se mostrará la sección de emisoras de radio. Reinicia la app para que los cambios surtan efecto.</string>
+    <string name="settings_queue_syncing_summary">Si se habilita, el usuario podrá guardar la cola de reproducción y restaurarla cuando abra la aplicación.</string>
+    <string name="settings_radio_summary">Si se habilita, se mostrará la sección de emisoras de radio. Reinicia la app para que los cambios surtan efecto.</string>
     <string name="settings_rounded_corner_size_summary">Establece la proporción del ángulo de curvatura.</string>
     <string name="track_info_dialog_title">Información de la pista</string>
     <string name="track_info_disc_number">Número de disco</string>
@@ -443,10 +451,10 @@
     <string name="starred_sync_dialog_title">Sincronizar las pistas destacadas</string>
     <string name="starred_album_sync_dialog_title">Sincronizar álbumes favoritos</string>
     <string name="streaming_cache_storage_dialog_sub_summary">Para que los cambios tengan efecto, reinicia la app.</string>
-    <string name="settings_summary_transcoding_download">Descarga los archivos multimedia transcodificados. Si esta opción está habilitada, no se usará el endpoint de descarga, sino las siguientes opciones.\n\nSi el formato de transcodificación para las descargas se establece en \"Descarga directa\", no se modificará la tasa de bits del archivo.</string>
+    <string name="settings_summary_transcoding_download">Descarga los archivos multimedia transcodificados. Si se habilita, no se usará el endpoint de descarga, sino las siguientes opciones.\n\nSi el formato de transcodificación para las descargas se establece en \"Descarga directa\", no se modificará la tasa de bits del archivo.</string>
     <string name="settings_summary_transcoding_estimate_content_length">Cuando el archivo se transcodifica en tiempo real, el cliente normalmente no muestra la duración de la pista. Es posible solicitar a los servidores que soporten esta característica, que calculen la duración de la pista que se está reproduciendo, pero los tiempos de respuesta podrían aumentar.</string>
     <string name="settings_sync_starred_albums_for_offline_use_title">Sincronizar álbumes favoritos para uso sin conexión</string>
-    <string name="settings_sync_starred_tracks_for_offline_use_summary">Si está habilitada, las pistas destacadas se descargarán para uso sin conexión.</string>
+    <string name="settings_sync_starred_tracks_for_offline_use_summary">Si se habilita, las pistas destacadas se descargarán para uso sin conexión.</string>
     <string name="track_info_summary_downloaded_file">El archivo se ha descargado usando las APIs de Subsonic. El códec y la tasa de bits del archivo se mantienen sin cambios respecto al archivo de origen.</string>
     <string name="track_info_summary_full_transcode">La aplicación pedirá al servidor transcodificar el archivo y modificar su tasa de bits. El códec pedido por el usuario es %1$s, con una tasa de bits de %2$s. Cualquier cambio en el códec y tasa de bits del archivo en el formato elegido será manejado por el servidor, que puede, o no, soportar esta operación.</string>
     <string name="track_info_summary_original_file">La aplicación solo leerá el archivo original ofrecido por el servidor. La app pedirá al servidor, de forma explícita, el archivo sin transcodificar con la tasa de bits de origen.</string>
@@ -456,7 +464,7 @@
     <string name="settings_song_rating">Mostrar valoración de las pistas</string>
     <string name="home_sync_starred_albums_title">Sincronizar álbumes favoritos</string>
     <string name="settings_sync_starred_artists_for_offline_use_title">Sincronizar artistas destacados para uso sin conexión</string>
-    <string name="settings_sync_starred_albums_for_offline_use_summary">Si está habilitada, los álbumes favoritos se descargarán para uso sin conexión.</string>
+    <string name="settings_sync_starred_albums_for_offline_use_summary">Si se habilita, los álbumes favoritos se descargarán para uso sin conexión.</string>
     <string name="starred_artist_sync_dialog_title">Sincronizar artistas destacados</string>
     <string name="starred_album_sync_dialog_summary">Descargar los álbumes favoritos puede consumir una gran cantidad de datos.</string>
     <string name="equalizer_fragment_title">Ecualizador</string>
@@ -479,6 +487,7 @@
     <string name="widget_content_desc_prev">Pista anterior</string>
     <string name="download_refresh_no_directory">Establece una carpeta de descarga para actualizar tus descargas</string>
     <string name="home_sync_starred_artists_title">Sincronizar artistas destacados</string>
+    <string name="player_queue_load_queue">Cargar cola de reproducción</string>
     <string name="player_lyrics_download_content_description">Descargar letras para uso sin conexión</string>
     <string name="player_lyrics_downloaded_content_description">Letras descargadas para uso sin conexión</string>
     <string name="player_lyrics_download_success">Letra guardada para uso sin conexión</string>
@@ -488,13 +497,13 @@
     <string name="settings_show_mini_shuffle_button">Mostrar el botón «Aleatorio»</string>
     <string name="settings_auto_download_lyrics">Descargar automáticamente las letras</string>
     <string name="starred_artist_sync_dialog_summary">Descargar los artistas destacados podría consumir una gran cantidad de datos.</string>
-    <string name="settings_sync_starred_artists_for_offline_use_summary">Si está habilitada, los artistas destacados se descargarán para uso sin conexión.</string>
+    <string name="settings_sync_starred_artists_for_offline_use_summary">Si se habilita, los artistas destacados se descargarán para uso sin conexión.</string>
     <string name="widget_time_elapsed_placeholder">0:00</string>
     <string name="exo_controls_heart_off_description">Eliminar de favoritos</string>
     <string name="asset_link_chip_text">%1$s • %2$s</string>
     <string name="asset_link_copied_toast">Copiado %1$s al portapapeles</string>
     <string name="settings_album_detail">Mostrar los detalles del álbum</string>
-    <string name="settings_album_detail_summary">Si está habilitada, muestra los detalles del álbum, como el género, el número de pistas, etc. en la página de álbum</string>
+    <string name="settings_album_detail_summary">Si se habilita, muestra los detalles del álbum, como el género, el número de pistas, etc. en la página de álbum</string>
     <string name="asset_link_clipboard_label">Enlace de recurso de Tempus</string>
     <string name="asset_link_label_song">UID de la pista</string>
     <string name="asset_link_label_album">UID del álbum</string>
@@ -509,6 +518,14 @@
     <string name="asset_link_error_artist">No se ha podido abrir el artista</string>
     <string name="asset_link_error_playlist">No se ha podido abrir la lista de reproducción</string>
     <string name="settings_github_update">Actualizaciones</string>
+    <string name="bottom_sheet_generating_instant_mix">Generando mix instantáneo…</string>
+    <string name="player_queue_save_to_playlist">Guardar cola en una lista de reproducción</string>
+    <string name="radio_editor_dialog_added">Emisora de radio añadida</string>
     <string name="settings_artist_sort_by_album_count">Ordenar artistas por número de álbumes</string>
-    <string name="settings_artist_sort_by_album_count_summary">Ordena los artistas por número de álbumes si la opción está habilitada. Si no, los ordena por nombre.</string>
+    <string name="settings_artist_sort_by_album_count_summary">Si se habilita, ordena los artistas por número de álbumes. En caso contrario, se ordenan por nombre.</string>
+    <string name="folder_play_collecting">Obteniendo pistas de la carpeta…</string>
+    <string name="folder_play_playing">Reproduciendo %d pistas</string>
+    <string name="folder_play_no_songs">No se encontraron pistas en la carpeta</string>
+    <string name="search_sort_title">Ordenar las búsquedas recientes cronológicamente</string>
+    <string name="search_sort_summary">Si se habilita, se ordenan las búsquedas en orden cronológico. En caso contrario, se ordenan por nombre.</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -39,6 +39,7 @@
     <string name="artist_list_page_downloaded">Artistes téléchargés</string>
     <string name="artist_list_page_starred">Artistes favoris</string>
     <string name="artist_list_page_title">Artistes</string>
+    <string name="artist_no_artist_info_toast">Pas d\'autre information sur l\'artiste</string>
     <string name="artist_page_radio_button">Radio</string>
     <string name="artist_page_shuffle_button">Mélanger</string>
     <string name="artist_page_switch_layout_button">Changer la disposition</string>
@@ -51,6 +52,8 @@
     <string name="battery_optimization_negative_button">Ignorer</string>
     <string name="battery_optimization_neutral_button">Ne pas me redemander</string>
     <string name="battery_optimization_positive_button">Désactiver</string>
+    <string name="bottom_sheet_generating_instant_mix">Génération du mix instantané…</string>
+    <string name="bottom_sheet_problem_generating_instant_mix">Echec de récupération de pistes du serveur Subsonic.</string>
     <string name="connection_alert_dialog_negative_button">Annuler</string>
     <string name="connection_alert_dialog_neutral_button">Activer l\'économie de données</string>
     <string name="connection_alert_dialog_positive_button">OK</string>
@@ -61,13 +64,14 @@
     <string name="delete_download_storage_dialog_positive_button">Continuer</string>
     <string name="delete_download_storage_dialog_summary">Attention, la poursuite de cette action entraînera la suppression définitive de tous les éléments sauvegardés et téléchargés à partir de tous les serveurs</string>
     <string name="delete_download_storage_dialog_title">Supprimer les éléments téléchargés</string>
-    <string name="description_empty_title">Aucune description disponible</string>
+    <string name="description_empty_title">Paroles non disponibles</string>
     <string name="disc_titlefull">Disque %1$s - %2$s</string>
     <string name="disc_titleless">Disque %1$s</string>
     <string name="download_directory_dialog_negative_button">Annuler</string>
     <string name="download_directory_dialog_positive_button">Télécharger</string>
     <string name="download_directory_dialog_summary">Toutes les pistes dans ce dossier seront téléchargées. Les pistes dans les sous-dossiers ne seront pas téléchargées.</string>
     <string name="download_directory_dialog_title">Télécharger toutes les pistes.</string>
+    <string name="download_directory_set">Répertoire de téléchargement de la musique</string>
     <string name="download_info_empty_subtitle">Dès que vous téléchargerez une musique, vous la trouverez ici</string>
     <string name="download_info_empty_title">Aucun téléchargement pour l\'instant</string>
     <string name="download_item_multiple_subtitle_formatter">%1$s  •  %2$s éléments</string>
@@ -78,7 +82,15 @@
     <string name="download_storage_dialog_title">Sélectionnez l\'option de stockage</string>
     <string name="download_storage_external_dialog_positive_button">Externe</string>
     <string name="download_storage_internal_dialog_negative_button">Interne</string>
+    <string name="download_storage_directory_dialog_neutral_button">Répertoire</string>
     <string name="download_title_section">Téléchargements</string>
+    <string name="download_refresh_no_directory">Sélectionner un répertoire pour rafraîchir vos téléchargements.</string>
+    <string name="download_refresh_no_changes">Aucun téléchargement manquant détecté.</string>
+    <plurals name="download_refresh_removed">
+        <item quantity="one">%d téléchargement manquant retiré.</item>
+        <item quantity="other">%d téléchargements manquants retirés.</item>
+    </plurals>
+    <string name="download_refresh_button_content_description">Rafraîchir les téléchargements</string>
     <string name="downloaded_bottom_sheet_add_to_queue">Ajouter à la liste d\'attente</string>
     <string name="downloaded_bottom_sheet_play_next">Lire juste après</string>
     <string name="downloaded_bottom_sheet_remove">Retirer</string>
@@ -88,6 +100,9 @@
     <string name="error_required">Requis</string>
     <string name="error_server_prefix">préfixe http ou https requis</string>
     <string name="exo_download_notification_channel_name">Téléchargements</string>
+    <string name="exo_controls_heart_off_description">Désactiver les boutons Cœur</string>
+    <string name="exo_controls_heart_on_description">Activer les boutons Cœur</string>
+    <string name="cast_expanded_controller_loading">Chargement…</string>
     <string name="filter_info_selection">Sélectionnez deux filtres ou plus</string>
     <string name="filter_title">Filtrer</string>
     <string name="filter_artist">Filtrer par artiste</string>
@@ -118,7 +133,13 @@
     <string name="home_sync_starred_subtitle">Télécharger ces titres peut entraîner une utilisation importante de données</string>
     <string name="home_sync_starred_title">On dirait qu\'il y a des titres favoris à synchroniser</string>
     <string name="home_sync_starred_albums_title">Synchroniser les albums favoris</string>
-    <string name="home_sync_starred_albums_subtitle">Les albums marqués d\'une étoile seront disponibles hors-ligne</string>
+    <string name="home_sync_starred_albums_subtitle">Les albums favoris seront disponibles hors-ligne</string>
+    <string name="home_sync_starred_artists_title">Synchroniser les artistes favoris</string>
+    <string name="home_sync_starred_artists_subtitle">Pour certains de vos artistes favoris, il reste des titres à télécharger</string>
+    <plurals name="home_sync_starred_songs_count">
+        <item quantity="one">%d titre doit être synchronisé</item>
+        <item quantity="other">%d titres doivent être synchronisés</item>
+    </plurals>
     <string name="home_title_best_of">Best of</string>
     <string name="home_title_discovery">Découverte</string>
     <string name="home_title_discovery_shuffle_all_button">Tout mélanger</string>
@@ -184,6 +205,7 @@
     <string name="menu_sort_artist">Artiste</string>
     <string name="menu_sort_name">Nom</string>
     <string name="menu_sort_random">Aléatoire</string>
+    <string name="menu_sort_album_count">Nombre d\'albums</string>
     <string name="menu_sort_recently_added">Récemment ajoutés</string>
     <string name="menu_sort_recently_played">Récemment lus</string>
     <string name="menu_sort_most_played">Plus lus</string>
@@ -195,6 +217,12 @@
     <string name="player_playback_speed">%1$.2fx</string>
     <string name="player_queue_clean_all_button">Vider la file d\'attente</string>
     <string name="player_queue_save_queue_success">File d\'attente sauvegardée</string>
+    <string name="player_queue_save_to_playlist">Sauvegarder la file d\'attente dans une playlist</string>
+    <string name="player_queue_load_queue">Charger la file d\'attente</string>
+    <string name="player_lyrics_download_content_description">Télécharger les paroles pour lecture hors-ligne</string>
+    <string name="player_lyrics_downloaded_content_description">Paroles téléchargées pour lecture hors-ligne</string>
+    <string name="player_lyrics_download_success">Paroles sauvegardées pour lecture hors-ligne.</string>
+    <string name="player_lyrics_download_failure">Impossible de télécharger les paroles.</string>
     <string name="player_server_priority">Priorité serveur</string>
     <string name="player_unknown_format">Format inconnu</string>
     <string name="player_transcoding">Transcodage</string>
@@ -207,6 +235,9 @@
     <string name="playlist_chooser_dialog_title">Ajouter à une playlist</string>
     <string name="playlist_chooser_dialog_toast_add_success">Titre ajouté à la playlist</string>
     <string name="playlist_chooser_dialog_toast_add_failure">Échec d\'ajout du titre à la playlist</string>
+    <string name="playlist_chooser_dialog_toast_all_skipped">Tous les titres ont été traités comme des doublons et ignorés</string>
+    <string name="playlist_chooser_dialog_visibility_public">Publique</string>
+    <string name="playlist_chooser_dialog_visibility_private">Privé</string>
     <string name="playlist_counted_tracks">%1$d titres •  %2$s</string>
     <string name="playlist_duration">Durée  •  %1$s</string>
     <string name="playlist_editor_dialog_action_delete_toast">Appui long pour supprimer</string>
@@ -228,13 +259,14 @@
     <string name="podcast_channel_catalogue_title_expanded">Parcourir les chaînes</string>
     <string name="podcast_channel_editor_dialog_hint_rss_url">Url RSS</string>
     <string name="podcast_channel_editor_dialog_title">Chaîne</string>
+    <string name="podcast_channel_not_supported_snackbar">Ce serveur ne supporte pas les podcasts.</string>
     <string name="podcast_channel_page_title_description_section">Description</string>
     <string name="podcast_channel_page_title_episode_section">Épisodes</string>
     <string name="podcast_channel_page_title_no_episode_available">Aucun épisode disponible</string>
     <string name="podcast_episode_download_request_snackbar">Votre requête a été envoyée au serveur</string>
     <string name="podcast_info_empty_button">Cliquez pour cacher la section\nLes changements seront visibles au redémarrage de l\'app</string>
     <string name="podcast_info_empty_subtitle">Dès que vous ajouterez une chaîne, vous la retrouverez ici</string>
-    <string name="podcast_info_empty_title">Aucun podcast trouvé!</string>
+    <string name="podcast_info_empty_title">Aucun podcast trouvé !</string>
     <string name="podcast_release_date_duration_formatter">%1$s  •  %2$s</string>
     <string name="radio_editor_dialog_hint_homepage_url">URL de la page d\'accueil de la radio</string>
     <string name="radio_editor_dialog_hint_name">Nom de la radio</string>
@@ -242,10 +274,13 @@
     <string name="radio_editor_dialog_negative_button">Annuler</string>
     <string name="radio_editor_dialog_neutral_button">Supprimer</string>
     <string name="radio_editor_dialog_positive_button">Enregistrer</string>
-    <string name="radio_editor_dialog_title">Station Radio Internet</string>
+    <string name="radio_editor_dialog_added">Station de radio ajoutée</string>
+    <string name="radio_editor_dialog_updated">Station de radio modifiée</string>
+    <string name="radio_editor_dialog_title">Station de radio Internet</string>
     <string name="radio_station_info_empty_button">Cliquez pour cacher la section\nLes changements seront visibles au redémarrage de l\'app</string>
     <string name="radio_station_info_empty_subtitle">Dès que vous ajouterez une station radio, vous la retrouverez ici</string>
-    <string name="radio_station_info_empty_title">Aucune station trouvée!</string>
+    <string name="radio_station_info_empty_title">Aucune station trouvée !</string>
+    <string name="radio_dialog_not_supported_snackbar">Ce serveur ne supporte pas la gestion de radios Internet.</string>
     <string name="rating_dialog_negative_button">Annuler</string>
     <string name="rating_dialog_positive_button">Enregistrer</string>
     <string name="rating_dialog_title">Noter</string>
@@ -273,6 +308,8 @@
     <string name="settings_about_summary">Tempus est un client open source et léger pour Subsonic, développé et compilé nativement pour Android.</string>
     <string name="settings_about_title">À propos</string>
     <string name="settings_always_on_display">Toujours visible</string>
+    <string name="settings_allow_playlist_duplicates">Autoriser l\'ajout de doublons à une playlist</string>
+    <string name="settings_allow_playlist_duplicates_summary">Si activé, les doublons ne seront pas détectés à l\'ajout d\'un titre à une playlist.</string>
     <string name="settings_audio_transcode_download_format">Format de transcodage</string>
     <string name="settings_audio_transcode_download_priority_summary">Si activé, Tempus ne forcera pas le téléchargement de la piste avec les paramètres de transcodage ci-dessous.</string>
     <string name="settings_audio_transcode_download_priority_title">Prioriser les paramètres du serveurs, utilisés pour le streaming, dans les téléchargements</string>
@@ -288,6 +325,8 @@
     <string name="settings_audio_transcode_priority_toast">La priorité au transcodage de la piste est donnée au serveur</string>
     <string name="settings_buffering_strategy">Stratégie de mise en mémoire tampon</string>
     <string name="settings_buffering_strategy_summary">Redémarrez l\'application pour appliquer les changements.</string>
+    <string name="settings_choose_download_folder">Sélectionner un répertoire pour le téléchargement des fichiers de musique</string>
+    <string name="settings_clear_download_folder">Vider le répertoire de téléchargement</string>
     <string name="settings_continuous_play_summary">Permet de prolonger la lecture après la fin d\'une playlist avec des titres similaires</string>
     <string name="settings_continuous_play_title">Lecture continue</string>
     <string name="settings_covers_cache">Taille du cache des illustrations</string>
@@ -296,16 +335,26 @@
     <string name="settings_delete_download_storage_summary">Continuer entraînera la suppression irréversible de tous les éléments sauvegardés.</string>
     <string name="settings_delete_download_storage_title">Supprimer les éléments sauvegardés</string>
     <string name="settings_download_storage_title">Stockage des téléchargements</string>
-    <string name="settings_system_equalizer_summary">Ajuster les paramètres audios</string>
+    <string name="settings_download_folder_cleared">Répertoire de téléchargement vidé.</string>
+    <string name="settings_download_folder_set">Répertoire de téléchargement réglé</string>
+    <string name="settings_set_download_folder">Régler le répertoire de téléchargement</string>
+    <string name="settings_system_equalizer_summary">Ajuster les paramètres audio</string>
     <string name="settings_system_equalizer_title">Égaliseur du système</string>
     <string name="settings_github_link">https://github.com/eddyizm/tempus</string>
     <string name="settings_github_summary">Suivre le développement</string>
     <string name="settings_github_title">Github</string>
+    <string name="settings_support_discussion_link">https://github.com/eddyizm/tempus/discussions</string>
+    <string name="settings_github_update">Mises à jour</string>
+    <string name="settings_github_update_title">Vérifier les mises à jour sur Github</string>
+    <string name="settings_github_update_summary">Si vous utilisez l\'app publiée sur Github, elle vérifiera par défaut les sorties de nouvelles versions. Cliquer ici pour désactiver les vérifications automatiques</string>
+    <string name="settings_support_summary">Rejoindre les discussions et le support de la communauté</string>
+    <string name="settings_support_title">Support utilisateur</string>
+    <string name="settings_scan_result">Analyse : comptage de %1$d pistes</string>
     <string name="settings_image_size">Définir la résolution des images</string>
     <string name="settings_language">Langue</string>
     <string name="settings_logout_title">Se déconnecter</string>
     <string name="settings_max_bitrate_download">Débit binaire pour les téléchargements</string>
-    <string name="settings_max_bitrate_mobile">Débit binaire en données mobile</string>
+    <string name="settings_max_bitrate_mobile">Débit binaire en données mobiles</string>
     <string name="settings_max_bitrate_wifi">Débit binaire en Wi-Fi</string>
     <string name="settings_media_cache">Taille du cache des fichiers audio</string>
     <string name="settings_music_directory">Afficher les dossiers</string>
@@ -320,14 +369,18 @@
     <string name="settings_item_rating_summary">Si activé, la note et le statut de mise en favori de l\'élément seront affichés.</string>
     <string name="settings_queue_syncing_countdown">Minuteur de synchronisation</string>
     <string name="settings_queue_syncing_summary">Si activé, l\'utilisateur pourra sauvegarder sa file d\'attente et la recharger au démarrage de l\'application.</string>
-    <string name="settings_queue_syncing_title">Synchroniser la file d\'attente pour cet utilisateur</string>
+    <string name="settings_queue_syncing_title">Synchroniser la file d\'attente pour cet utilisateur [fonctionnalité en évolution]</string>
+    <string name="settings_show_mini_shuffle_button">Afficher le bouton Mélanger</string>
+    <string name="settings_show_mini_shuffle_button_summary">Si activé, le bouton Mélanger sera visible et le bouton Cœur caché sur le mini-lecteur</string>
     <string name="settings_radio">Voir les radios</string>
-    <string name="settings_radio_summary">Si activé, rend visible la section Radio</string>
+    <string name="settings_radio_summary">Si activé, rend visible la section Radio. Redémarrez l\'application pour appliquer ce paramètre.</string>
+    <string name="settings_auto_download_lyrics">Téléchargement automatique des paroles</string>
+    <string name="settings_auto_download_lyrics_summary">Ce paramètre active la sauvegarde automatique des paroles pour affichage hors-ligne, si elles sont disponibles.</string>
     <string name="settings_replay_gain">Ajuster le Replay Gain</string>
     <string name="settings_rounded_corner">Coins arrondis</string>
     <string name="settings_rounded_corner_size">Taille des arrondis</string>
     <string name="settings_rounded_corner_size_summary">Définit l\'ampleur de l\'angle de courbure.</string>
-    <string name="settings_rounded_corner_summary">Si activé, arrondi les angles des illustrations. Les modifications prendront effet au redémarrage.</string>
+    <string name="settings_rounded_corner_summary">Si activé, arrondit les angles des illustrations. Les modifications prendront effet au redémarrage.</string>
     <string name="settings_scan_title">Scanner la bibliothèque</string>
     <string name="settings_scrobble_title">Activer le scrobbling</string>
     <string name="settings_system_language">Langue du système</string>
@@ -344,13 +397,16 @@
     <string name="settings_summary_transcoding">Le mode de transcodage à prioriser. Si réglé sur \"Lecture directe\", le débit binaire du fichier ne sera pas modifié.</string>
     <string name="settings_summary_transcoding_download">Télécharge les médias transcodés. Si activé, les paramètres de transcodage suivants seront utilisés pour les téléchargements.\n\n Si le format de transcodage est reglé à \"Téléchargement direct\", le débit binaire du fichier ne sera pas modifé.</string>
     <string name="settings_summary_transcoding_estimate_content_length">Quand le fichier est transcodé à la volée, en général, le client n\'affiche pas la durée de la piste. Il est possible de demander aux serveurs qui le supportent d\'estimer la durée de la piste écoutée, mais les temps de réponses peuvent être plus longs.</string>
-    <string name="settings_sync_starred_albums_for_offline_use_summary">Si activé, les albums favoris seront téléchargés pour l\'écoute hors-ligne</string>
+    <string name="settings_sync_starred_artists_for_offline_use_summary">Si activé, les titres des artistes favoris seront téléchargés pour l\'écoute hors-ligne.</string>
+    <string name="settings_sync_starred_artists_for_offline_use_title">Synchronisation des artistes favoris pour écoute hors-ligne</string>
+    <string name="settings_sync_starred_albums_for_offline_use_summary">Si activé, les albums favoris seront téléchargés pour l\'écoute hors-ligne.</string>
     <string name="settings_sync_starred_albums_for_offline_use_title">Synchronisation des albums favoris pour écoute hors-ligne</string>
-    <string name="settings_sync_starred_tracks_for_offline_use_summary">Si activé, les pistes favorites seront téléchargées pour l\'écoute hors-ligne</string>
+    <string name="settings_sync_starred_tracks_for_offline_use_summary">Si activé, les pistes favorites seront téléchargées pour l\'écoute hors-ligne.</string>
     <string name="settings_sync_starred_tracks_for_offline_use_title">Synchronisation des pistes favorites pour écoute hors-ligne</string>
     <string name="settings_theme">Thème</string>
     <string name="settings_title_data">Données</string>
     <string name="settings_title_general">Géneral</string>
+    <string name="settings_title_playlist">Playlist</string>
     <string name="settings_title_rating">Note</string>
     <string name="settings_title_replay_gain">Replay Gain</string>
     <string name="settings_title_scrobble">Scrobble</string>
@@ -369,7 +425,24 @@
     <string name="share_bottom_sheet_delete">Supprimer le partage</string>
     <string name="share_bottom_sheet_update">Mettre à jour le partage</string>
     <string name="share_subtitle_item">Date d\'expiration : %1$s</string>
+    <string name="share_no_expiration">Jamais</string>
     <string name="share_unsupported_error">Le partage n\'est pas supporté ou pas activé</string>
+    <string name="asset_link_clipboard_label">Lien ressource Tempus</string>
+    <string name="asset_link_label_song">UID titre</string>
+    <string name="asset_link_label_album">UID album</string>
+    <string name="asset_link_label_artist">UID artiste</string>
+    <string name="asset_link_label_playlist">UID playlist</string>
+    <string name="asset_link_label_genre">UID genre</string>
+    <string name="asset_link_label_year">UID année</string>
+    <string name="asset_link_label_unknown">UID ressource</string>
+    <string name="asset_link_error_unsupported">Lien ressource non supportée</string>
+    <string name="asset_link_error_song">Echec d\'accès au titre</string>
+    <string name="asset_link_error_album">Echec d\'accès à l\'album</string>
+    <string name="asset_link_error_artist">Echec d\'accès à l\'artiste</string>
+    <string name="asset_link_error_playlist">Echec d\'accès à la playlist</string>
+    <string name="asset_link_chip_text">%1$s • %2$s</string>
+    <string name="asset_link_copied_toast">%1$s ressource(s) copiée(s) dans le presse-papier</string>
+    <string name="asset_link_debug_toast">Lien ressource : %1$s</string>
     <string name="share_update_dialog_hint_description">Description</string>
     <string name="share_update_dialog_hint_expiration_date">Date d\'expiration</string>
     <string name="share_update_dialog_negative_button">Annuler</string>
@@ -400,7 +473,9 @@
     <string name="starred_sync_dialog_positive_button">Continuer et télécharger</string>
     <string name="starred_sync_dialog_summary">Le téléchargement des titres favoris pourrait consommer beaucoup de données.</string>
     <string name="starred_sync_dialog_title">Synchroniser les titres favoris</string>
-    <string name="starred_album_sync_dialog_summary">Le téléchargement des titres favoris pourrait consommer beaucoup de données.</string>
+    <string name="starred_artist_sync_dialog_summary">Le téléchargement des titres d\'artistes favoris pourrait consommer beaucoup de données.</string>
+    <string name="starred_artist_sync_dialog_title">Synchroniser les artistes favoris</string>
+    <string name="starred_album_sync_dialog_summary">Le téléchargement des albums favoris pourrait consommer beaucoup de données.</string>
     <string name="starred_album_sync_dialog_title">Synchroniser les albums favoris</string>
     <string name="streaming_cache_storage_dialog_sub_summary">Veuillez redémarrer l\'app pour appliquer les changements.</string>
     <string name="streaming_cache_storage_dialog_summary">Modifier le chemin de stockage des fichiers mis en cache risque de provoquer la suppression de tous les fichiers précédemment mis en cache dans le nouvel espace de stockage.</string>
@@ -436,14 +511,45 @@
     <string name="undraw_page">unDraw</string>
     <string name="undraw_thanks">Un grand merci à unDraw, nous n\'aurions pas pu rendre cette application aussi belle sans leurs illustrations.</string>
     <string name="undraw_url">https://undraw.co/</string>
+    <string name="widget_label">Widget Tempus</string>
+    <string name="widget_not_playing">Pas de lecture</string>
+    <string name="widget_placeholder_subtitle">Ouvrir Tempus</string>
+    <string name="widget_time_elapsed_placeholder">0:00</string>
+    <string name="widget_time_duration_placeholder">0:00</string>
+    <string name="widget_content_desc_album_art">Couverture de l\'album</string>
+    <string name="widget_content_desc_play_pause">Lecture ou pause</string>
+    <string name="widget_content_desc_next">Piste suivante</string>
+    <string name="widget_content_desc_prev">Piste précédente</string>
+    <string name="widget_content_desc_shuffle">Activer/désactiver le mélange</string>
+    <string name="widget_content_desc_repeat">Changer le mode de répétition</string>
     <plurals name="home_sync_starred_albums_count">
         <item quantity="one">%d album à synchroniser</item>
         <item quantity="other">%d albums à synchroniser</item>
     </plurals>
+    <plurals name="home_sync_starred_artists_count">
+        <item quantity="one">%d artiste à synchroniser</item>
+        <item quantity="other">%d artistes à synchroniser</item>
+    </plurals>
+    <plurals name="songs_download_started">
+        <item quantity="one">Téléchargement de %d titre</item>
+        <item quantity="other">Téléchargement de %d titres</item>
+    </plurals>
     <string name="equalizer_fragment_title">Égaliseur</string>
     <string name="equalizer_reset">Réinitialiser</string>
     <string name="equalizer_enable">Activer</string>
     <string name="equalizer_not_supported">Non supporté sur cet appareil</string>
     <string name="settings_app_equalizer">Égaliseur</string>
     <string name="settings_app_equalizer_summary">Ouvrir l\'égaliseur intégré</string>
+
+    <string name="settings_album_detail">Afficher les détails de l\'album</string>
+    <string name="settings_album_detail_summary">Si activé, affiche les détails de l\'album tels que le genre, le nombre de titres etc. sur l\'écran de l\'album</string>
+    <string name="settings_artist_sort_by_album_count">Trier les artistes par nombre d\'albums</string>
+    <string name="settings_artist_sort_by_album_count_summary">Si activé, les artistes seront triés par ordre des nombres d\'albums. Si désactivé, ils le seront par ordre alphabétique.</string>
+
+    <string name="folder_play_collecting">Collecte des titres du répertoire…</string>
+    <string name="folder_play_playing">Lecture de %d titres</string>
+    <string name="folder_play_no_songs">Aucun titre trouvé dans le répertoire</string>
+
+    <string name="search_sort_title">Trier les recherches récentes par ordre chronologique</string>
+    <string name="search_sort_summary">Si activé, les recherches récentes seront triées par ordre chronologique. Si désactivé, elles le seront par ordre alphabétique.</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -61,7 +61,7 @@
     <string name="delete_download_storage_dialog_positive_button">Continua</string>
     <string name="delete_download_storage_dialog_summary">Attenzione, procedendo questa azione eliminerà definitivamente tutti gli elementi scaricati da tutti i server.</string>
     <string name="delete_download_storage_dialog_title">Elimina elementi salvati</string>
-    <string name="description_empty_title">Descrizione non disponibile</string>
+    <string name="description_empty_title">Testo non disponibile</string>
     <string name="disc_titlefull">Disco %1$s - %2$s</string>
     <string name="disc_titleless">Disco %1$s</string>
     <string name="download_directory_dialog_negative_button">Annulla</string>
@@ -229,6 +229,8 @@
     <string name="playlist_chooser_dialog_toast_add_success">Aggiunta di un brano alla playlist</string>
     <string name="playlist_chooser_dialog_toast_add_failure">Impossibile aggiungere un brano alla playlist</string>
     <string name="playlist_chooser_dialog_toast_all_skipped">Tutte le canzoni sono state saltate perché duplicate</string>
+    <string name="playlist_chooser_dialog_visibility_public">Pubblico</string>
+    <string name="playlist_chooser_dialog_visibility_private">Privato</string>
     <string name="playlist_counted_tracks">%1$d brani • %2$s</string>
     <string name="playlist_duration">Durata  •  %1$s</string>
     <string name="playlist_editor_dialog_action_delete_toast">Premi a lungo per eliminare</string>

app/src/main/res/values-night/styles.xml

@@ -32,6 +32,8 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:scrollbars">none</item>
+
+        <item name="floatingActionButtonStyle">@style/FloatingActionButtonStyle</item>
     </style>
 
     <style name="Divider">
@@ -40,6 +42,21 @@
         <item name="android:background">@color/dividerColor</item>
     </style>
 
+    <style name="FloatingActionButtonStyle" parent="Widget.MaterialComponents.FloatingActionButton">
+        <item name="backgroundTint">?attr/colorSecondary</item>
+        <item name="tint">?attr/colorOnPrimary</item>
+        <item name="shapeAppearanceOverlay">@style/FabShapeStyle</item>
+    </style>
+
+    <style name="FabShapeStyle" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+        <item name="cornerSize">50%</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerFamilyBottomLeft">rounded</item>
+        <item name="cornerFamilyBottomRight">rounded</item>
+    </style>
+
     <style name="NoConnectionTextView">
         <item name="background">?attr/colorErrorContainer</item>
         <item name="android:textColor">?attr/colorOnErrorContainer</item>

app/src/main/res/values-pl/arrays.xml

@@ -239,7 +239,16 @@
         <item>4</item>
         <item>8</item>
     </string-array>
-
+    
+   <string-array name="playlist_sort_option_titles">
+        <item>Po nazwie</item>
+        <item>Losowo</item>
+    </string-array>
+    <string-array name="playlist_sort_option_values">
+        <item>ORDER_BY_NAME</item>
+        <item>ORDER_BY_RANDOM</item>
+    </string-array>
+    
     <string-array name="skip_min_star_rating_titles">
         <item>Minimum 0 gwiazdek</item>
         <item>Minimum 1 gwiazdka</item>
@@ -254,4 +263,4 @@
         <item>3</item>
         <item>4</item>
     </string-array>
-</resources>
+</resources>

app/src/main/res/values-pl/strings.xml

@@ -39,6 +39,7 @@
     <string name="artist_list_page_downloaded">Pobrani wykonawcy</string>
     <string name="artist_list_page_starred">Wykonawcy oznaczeni gwiazdką</string>
     <string name="artist_list_page_title">Wykonawcy</string>
+    <string name="artist_no_artist_info_toast">Brak dodatkowych informacji o wykonawcy</string>
     <string name="artist_page_radio_button">Radio</string>
     <string name="artist_page_shuffle_button">Odtwarzanie losowe</string>
     <string name="artist_page_switch_layout_button">Zmień układ</string>
@@ -51,6 +52,8 @@
     <string name="battery_optimization_negative_button">Ignoruj</string>
     <string name="battery_optimization_neutral_button">Nie pytaj ponownie</string>
     <string name="battery_optimization_positive_button">Wyłącz</string>
+    <string name="bottom_sheet_generating_instant_mix">Generowanie natychmiastowego mixu...</string>
+    <string name="bottom_sheet_problem_generating_instant_mix">Nie udało się pobrać utworów z serwera subsonic.</string>
     <string name="connection_alert_dialog_negative_button">Anuluj</string>
     <string name="connection_alert_dialog_neutral_button">Włącz oszczędzanie danych</string>
     <string name="connection_alert_dialog_positive_button">OK</string>
@@ -61,7 +64,7 @@
     <string name="delete_download_storage_dialog_positive_button">Kontynuuj</string>
     <string name="delete_download_storage_dialog_summary">Miej na uwadze to że kontynuowanie tej operacji spowoduje usunięcie wszystkich pobranych plików z wszystkich serwerów.</string>
     <string name="delete_download_storage_dialog_title">Usuwanie zapisanych plików</string>
-    <string name="description_empty_title">Brak opisu</string>
+    <string name="description_empty_title">Brak tekstu</string>
     <string name="disc_titlefull">Płyta %1$s - %2$s</string>
     <string name="disc_titleless">Płyta %1$s</string>
     <string name="download_directory_dialog_negative_button">Anuluj</string>
@@ -124,6 +127,10 @@
     <string name="home_sync_starred_albums_subtitle">Albumy oznaczone gwiazdką będą dostępne offline</string>
     <string name="home_sync_starred_artists_title">Synchronizacja wykonawców oznaczonych gwiazdką</string>
     <string name="home_sync_starred_artists_subtitle">Masz wykonawców oznaczonych gwiazdką, bez pobranej muzyki</string>
+    <plurals name="home_sync_starred_songs_count">
+        <item quantity="one">%d piosenka wymaga synchronizacji</item>
+        <item quantity="other">%d piosenek wymaga synchronizacji</item>
+    </plurals>
     <string name="home_title_best_of">Najlepsze</string>
     <string name="home_title_discovery">Odkrywanie</string>
     <string name="home_title_discovery_shuffle_all_button">Odtwórz wszystkie losowo</string>
@@ -201,7 +208,9 @@
     <string name="menu_sort_year">Rok</string>
     <string name="player_playback_speed">%1$.2fx</string>
     <string name="player_queue_clean_all_button">Wyczyść kolejkę odtwarzania</string>
-    <string name="player_queue_save_queue_success">Zapisana kolejka odtwarzania</string>
+    <string name="player_queue_save_queue_success">Zapisano kolejkę odtwarzania</string>
+    <string name="player_queue_save_to_playlist">Zapisz kolejkę do playlisty</string>
+    <string name="player_queue_load_queue">Wczytaj kolejkę</string>
     <string name="player_lyrics_download_content_description">Pobierz teksty do odtwarzania offline</string>
     <string name="player_lyrics_downloaded_content_description">Teksty pobrane do odtwarzania offline</string>
     <string name="player_lyrics_download_success">Zapisano tekst do odtwarzania offline.</string>
@@ -219,6 +228,8 @@
     <string name="playlist_chooser_dialog_toast_add_success">Dodano piosenki do playlisty</string>
     <string name="playlist_chooser_dialog_toast_add_failure">Nie udało się dodać piosenek do playlisty</string>
     <string name="playlist_chooser_dialog_toast_all_skipped">Pominięto wszystkie piosenki jako duplikaty</string>
+    <string name="playlist_chooser_dialog_visibility_public">Publiczna</string>
+    <string name="playlist_chooser_dialog_visibility_private">Prywatna</string>
     <string name="playlist_counted_tracks">%1$d utworów •  %2$s</string>
     <string name="playlist_duration">Długość  •  %1$s</string>
     <string name="playlist_editor_dialog_action_delete_toast">Przytrzymaj aby usunąć</string>
@@ -240,6 +251,7 @@
     <string name="podcast_channel_catalogue_title_expanded">Przeglądaj Kanały</string>
     <string name="podcast_channel_editor_dialog_hint_rss_url">Url RSS</string>
     <string name="podcast_channel_editor_dialog_title">Kanał Podcastu</string>
+    <string name="podcast_channel_not_supported_snackbar">Podcasty nie są obsługiwane przez ten serwer.</string>
     <string name="podcast_channel_page_title_description_section">Opis</string>
     <string name="podcast_channel_page_title_episode_section">Odcinki</string>
     <string name="podcast_channel_page_title_no_episode_available">Brak dostępnych odcinków</string>
@@ -254,10 +266,13 @@
     <string name="radio_editor_dialog_negative_button">Anuluj</string>
     <string name="radio_editor_dialog_neutral_button">Usuń</string>
     <string name="radio_editor_dialog_positive_button">Zapisz</string>
+    <string name="radio_editor_dialog_added">Dodano stację radiową</string>
+    <string name="radio_editor_dialog_updated">Stacja radiowa uaktualniona</string>
     <string name="radio_editor_dialog_title">Internetowa Stacja Radiowa</string>
     <string name="radio_station_info_empty_button">Naciśnij aby ukryć tę sekcję\nEfekty będą widoczne po restarcie</string>
     <string name="radio_station_info_empty_subtitle">Gdy dodasz stację radiową, znajdziesz ją tutaj</string>
     <string name="radio_station_info_empty_title">Nie znaleziono stacji!</string>
+    <string name="radio_dialog_not_supported_snackbar">Zarządzanie internetowymi stacjami radiowymi nie jest obsługiwane przez ten serwer.</string>
     <string name="rating_dialog_negative_button">Anuluj</string>
     <string name="rating_dialog_positive_button">Zapisz</string>
     <string name="rating_dialog_title">Oceń</string>
@@ -330,6 +345,9 @@
     <string name="settings_image_size">Rozdzielczość obrazów</string>
     <string name="settings_language">Język</string>
     <string name="settings_logout_title">Wyloguj</string>
+    <string name="settings_ping_timeout_title">Timeout pingów serwera</string>
+    <string name="settings_ping_timeout_summary">Timeout lokalnego adresu URL. Domyślnie to 2 sekundy. (Serwer zdalny będzie używał trzykrotności tej wartości maksymalnie do 10 sekund.)</string>
+    <string name="settings_ping_timeout_dialog">Bazowy timeout w sekundach.</string>
     <string name="settings_max_bitrate_download">Bitrate dla pobierania</string>
     <string name="settings_max_bitrate_mobile">Bitrate dla danych komórkowych</string>
     <string name="settings_max_bitrate_wifi">Bitrate dla Wi-Fi</string>
@@ -338,6 +356,7 @@
     <string name="settings_music_directory_summary">Jeżeli włączone, widoczna będzie sekcja z folderami z muzyką. Weź pod uwagę że żeby funkcja nawigacji po folderach działała poprawnie, serwer musi wspierać tę funkcję.</string>
     <string name="settings_podcast">Pokazuj podcasty</string>
     <string name="settings_podcast_summary">Jeżeli włączone, widoczna będzie sekcja z podcastami. Zrestartuj aplikację aby, zmiany przyniosły pełny efekt.</string>
+    <string name="settings_playlist_sort">Sortowanie playlist</string>
     <string name="settings_audio_quality">Pokaż jakość audio</string>
     <string name="settings_audio_quality_summary">Bitrate i format audio będzie pokazywany dla każdego utworu.</string>
     <string name="settings_song_rating">Pokaż ocenę piosenek w gwiazdkach</string>
@@ -522,4 +541,9 @@
     <string name="settings_album_detail_summary">Jeżeli włączone, pokaż szczegóły albumu takie jak gatunek, ilość piosenek itp. na stronie albumu</string>
     <string name="settings_artist_sort_by_album_count">Sortuj wykonawców po ilości albumów</string>
     <string name="settings_artist_sort_by_album_count_summary">Jeżeli włączone, sortuje wykonawców po ilości albumów. Jeżeli wyłączone, sortuje albumy po nazwach.</string>
+    <string name="folder_play_collecting">Zbieranie piosenek z folderu…</string>
+    <string name="folder_play_playing">Odtwarzanie %d piosenek</string>
+    <string name="folder_play_no_songs">Nie znaleziono piosenek w folderze</string>
+    <string name="search_sort_title">Sortuj ostatnie wyszukiwania chronologicznie</string>
+    <string name="search_sort_summary">Jeżeli włączone, sortuje wyszukiwania chronologicznie. Sortuje po naziwe jeżeli wyłączone.</string>    
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -164,6 +164,8 @@
     <string name="playlist_chooser_dialog_title">Adicionar a uma playlist</string>
     <string name="playlist_chooser_dialog_toast_add_success">Adicionada playlist de reprodução</string>
     <string name="playlist_chooser_dialog_toast_add_failure">Falha ao adicionar uma playlist de reprodução</string>
+    <string name="playlist_chooser_dialog_visibility_public">Pública</string>
+    <string name="playlist_chooser_dialog_visibility_private">Privada</string>
     <string name="playlist_counted_tracks">%1$d faixas •  %2$s</string>
     <string name="playlist_duration">Duração  •  %1$s</string>
     <string name="playlist_editor_dialog_hint_name">Nome da playlist</string>

app/src/main/res/values-ro/arrays.xml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="theme_list_titles">
+        <item>Luminos</item>
+        <item>Întunecat</item>
+        <item>Setare implicită sistem</item>
+    </string-array>
+    <string-array name="theme_list_values">
+        <item>light</item>
+        <item>dark</item>
+        <item>default</item>
+    </string-array>
+
+    <string-array name="pref_cache_size_titles">
+        <item>Înalt</item>
+        <item>Mediu</item>
+        <item>Scăzut</item>
+    </string-array>
+    <string-array name="pref_cache_size_values">
+        <item>500</item>
+        <item>250</item>
+        <item>125</item>
+    </string-array>
+
+    <string-array name="pref_image_size_titles">
+        <item>Înalt</item>
+        <item>Mediu</item>
+        <item>Scăzut</item>
+    </string-array>
+    <string-array name="pref_image_size_values">
+        <item>-1</item>
+        <item>500</item>
+        <item>300</item>
+    </string-array>
+
+    <string-array name="streaming_cache_size_titles">
+        <item>Dezactivat</item>
+        <item>128 MiB</item>
+        <item>256 MiB</item>
+        <item>512 MiB</item>
+        <item>1024 MiB</item>
+    </string-array>
+    <string-array name="streaming_cache_size_values">
+        <item>0</item>
+        <item>128</item>
+        <item>256</item>
+        <item>512</item>
+        <item>1024</item>
+    </string-array>
+
+    <string-array name="max_bitrate_wifi_list_titles">
+        <item>Original</item>
+        <item>32 kbps</item>
+        <item>48 kbps</item>
+        <item>64 kbps</item>
+        <item>80 kbps</item>
+        <item>96 kbps</item>
+        <item>112 kbps</item>
+        <item>128 kbps</item>
+        <item>160 kbps</item>
+        <item>192 kbps</item>
+        <item>256 kbps</item>
+        <item>320 kbps</item>
+    </string-array>
+    <string-array name="max_bitrate_wifi_list_values">
+        <item>0</item>
+        <item>32</item>
+        <item>48</item>
+        <item>64</item>
+        <item>80</item>
+        <item>96</item>
+        <item>112</item>
+        <item>128</item>
+        <item>160</item>
+        <item>192</item>
+        <item>256</item>
+        <item>320</item>
+    </string-array>
+
+    <string-array name="max_bitrate_mobile_list_titles">
+        <item>Original</item>
+        <item>32 kbps</item>
+        <item>48 kbps</item>
+        <item>64 kbps</item>
+        <item>80 kbps</item>
+        <item>96 kbps</item>
+        <item>112 kbps</item>
+        <item>128 kbps</item>
+        <item>160 kbps</item>
+        <item>192 kbps</item>
+        <item>256 kbps</item>
+        <item>320 kbps</item>
+    </string-array>
+    <string-array name="max_bitrate_mobile_list_values">
+        <item>0</item>
+        <item>32</item>
+        <item>48</item>
+        <item>64</item>
+        <item>80</item>
+        <item>96</item>
+        <item>112</item>
+        <item>128</item>
+        <item>160</item>
+        <item>192</item>
+        <item>256</item>
+        <item>320</item>
+    </string-array>
+
+    <string-array name="max_bitrate_download_list_titles">
+        <item>Original</item>
+        <item>32 kbps</item>
+        <item>48 kbps</item>
+        <item>64 kbps</item>
+        <item>80 kbps</item>
+        <item>96 kbps</item>
+        <item>112 kbps</item>
+        <item>128 kbps</item>
+        <item>160 kbps</item>
+        <item>192 kbps</item>
+        <item>256 kbps</item>
+        <item>320 kbps</item>
+    </string-array>
+    <string-array name="max_bitrate_download_list_values">
+        <item>0</item>
+        <item>32</item>
+        <item>48</item>
+        <item>64</item>
+        <item>80</item>
+        <item>96</item>
+        <item>112</item>
+        <item>128</item>
+        <item>160</item>
+        <item>192</item>
+        <item>256</item>
+        <item>320</item>
+    </string-array>
+
+    <string-array name="audio_transcode_format_wifi_list_titles">
+        <item>Redare directă</item>
+        <item>Opus</item>
+        <item>AAC</item>
+        <item>Mp3</item>
+        <item>Flac</item>
+    </string-array>
+    <string-array name="audio_transcode_format_wifi_list_values">
+        <item>raw</item>
+        <item>opus</item>
+        <item>aac</item>
+        <item>mp3</item>
+        <item>flac</item>
+    </string-array>
+
+    <string-array name="audio_transcode_format_mobile_list_titles">
+        <item>Redare directă</item>
+        <item>Opus</item>
+        <item>AAC</item>
+        <item>Mp3</item>
+        <item>Flac</item>
+    </string-array>
+    <string-array name="audio_transcode_format_mobile_list_values">
+        <item>raw</item>
+        <item>opus</item>
+        <item>aac</item>
+        <item>mp3</item>
+        <item>flac</item>
+    </string-array>
+
+    <string-array name="audio_transcode_format_download_list_titles">
+        <item>Descărcare directă</item>
+        <item>Opus</item>
+        <item>AAC</item>
+        <item>Mp3</item>
+        <item>Flac</item>
+    </string-array>
+    <string-array name="audio_transcode_format_download_list_values">
+        <item>raw</item>
+        <item>opus</item>
+        <item>aac</item>
+        <item>mp3</item>
+        <item>flac</item>
+    </string-array>
+
+    <string-array name="queue_syncing_countdown_titles">
+        <item>Zece secunde</item>
+        <item>Cinci secunde</item>
+        <item>Două secunde</item>
+    </string-array>
+    <string-array name="queue_syncing_countdown_values">
+        <item>10</item>
+        <item>5</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="rounded_corner_size_titles">
+        <item>Înalt</item>
+        <item>Mediu</item>
+        <item>Scăzut</item>
+    </string-array>
+    <string-array name="rounded_corner_size_values">
+        <item>18</item>
+        <item>12</item>
+        <item>6</item>
+    </string-array>
+
+    <string-array name="replay_gain_titles">
+        <item>Dezactivat</item>
+        <item>Piesă</item>
+        <item>Album</item>
+        <item>Automat</item>
+    </string-array>
+    <string-array name="replay_gain_values">
+        <item>disabled</item>
+        <item>track</item>
+        <item>album</item>
+        <item>auto</item>
+    </string-array>
+
+    <string-array name="transcoded_download_option_list_titles">
+        <item>Nu transcodaţi</item>
+        <item>Setări server</item>
+        <item>Format transcodare Wi-Fi</item>
+        <item>Format transcodare mobil</item>
+    </string-array>
+    <string-array name="transcoded_download_option_list_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="buffering_strategy_titles">
+        <item>Minim</item>
+        <item>Moderat</item>
+        <item>Agresiv</item>
+        <item>Extrem</item>
+    </string-array>
+    <string-array name="buffering_strategy_values">
+        <item>.1</item>
+        <item>1</item>
+        <item>4</item>
+        <item>8</item>
+    </string-array>
+
+    <string-array name="skip_min_star_rating_titles">
+        <item>0 stele minim</item>
+        <item>1 stea minim</item>
+        <item>2 stele minim</item>
+        <item>3 stele minim</item>
+        <item>4 stele minim</item>
+    </string-array>
+    <string-array name="skip_min_star_rating_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+</resources>

app/src/main/res/values-ro/strings.xml

@@ -0,0 +1,557 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="activity_battery_optimizations_conclusion">Dacă întâmpinați probleme acesați https://dontkillmyapp.com, unde veți găsi instrucțiuni detaliate despre cum să dezactivați funcțiile de economisire baterie care pot afecta performanța aplicației.</string>
+    <string name="activity_battery_optimizations_summary">Dezactivați optimizările bateriei pentru redarea media în timp ce ecranul este oprit.</string>
+    <string name="activity_battery_optimizations_title">Optimizări Baterie</string>
+    <string name="activity_info_offline_mode">Modul offline</string>
+    <string name="album_bottom_sheet_add_to_playlist">Adăugați la playlist</string>
+    <string name="album_bottom_sheet_add_to_queue">Adăugați la coadă</string>
+    <string name="album_bottom_sheet_download_all">Descărcați tot</string>
+    <string name="album_bottom_sheet_go_to_artist">Mergeți la artist</string>
+    <string name="album_bottom_sheet_instant_mix">Mix instant</string>
+    <string name="album_bottom_sheet_play_next">Redați următoarea</string>
+    <string name="album_bottom_sheet_remove_all">Eliminați tot</string>
+    <string name="album_bottom_sheet_share">Partajați</string>
+    <string name="album_bottom_sheet_shuffle">Amestecare</string>
+    <string name="album_catalogue_title">Albume</string>
+    <string name="album_catalogue_title_expanded">Răsfoiți Albume</string>
+    <string name="album_error_retrieving_artist">Eroare la preluarea artistului</string>
+    <string name="album_list_page_downloaded">Albume descărcate</string>
+    <string name="album_list_page_most_played">Albume cele mai ascultate</string>
+    <string name="album_list_page_new_releases">Lansări noi</string>
+    <string name="album_list_page_recently_added">Albume adăugate recent</string>
+    <string name="album_list_page_recently_played">Albume redate recent</string>
+    <string name="album_list_page_starred">Albume marcate</string>
+    <string name="album_list_page_title">Albume</string>
+    <string name="album_page_extra_info_button">Mai mult ca aceasta</string>
+    <string name="album_page_play_button">Redare</string>
+    <string name="album_page_release_date_label">Lansat pe %1$s</string>
+    <string name="album_page_release_dates_label">Lansat pe %1$s, inițial %2$s</string>
+    <string name="album_page_shuffle_button">Amestecare</string>
+    <string name="album_page_tracks_count_and_duration">%1$d cântece  •  %2$d minute</string>
+    <string name="app_name">Tempus</string>
+    <string name="artist_adapter_radio_station_starting">Se caută…</string>
+    <string name="artist_bottom_sheet_instant_mix">Mix instant</string>
+    <string name="artist_bottom_sheet_shuffle">Amestecare</string>
+    <string name="artist_catalogue_title">Artiști</string>
+    <string name="artist_catalogue_title_expanded">Răsfoiți Artiști</string>
+    <string name="artist_error_retrieving_radio">Eroare la preluarea radioului artistului</string>
+    <string name="artist_error_retrieving_tracks">Eroare la preluarea cântecelor artistului</string>
+    <string name="artist_list_page_downloaded">Artiști descărcați</string>
+    <string name="artist_list_page_starred">Artiști marcați</string>
+    <string name="artist_list_page_title">Artiști</string>
+    <string name="artist_no_artist_info_toast">Nu sunt informații suplimentare despre artist</string>
+    <string name="artist_page_radio_button">Radio</string>
+    <string name="artist_page_shuffle_button">Amestecare</string>
+    <string name="artist_page_switch_layout_button">Schimbați aspectul</string>
+    <string name="artist_page_title_album_more_like_this_button">Mai mult ca aceasta</string>
+    <string name="artist_page_title_album_section">Albume</string>
+    <string name="artist_page_title_biography_more_button">Mai mult</string>
+    <string name="artist_page_title_biography_section">Biografie</string>
+    <string name="artist_page_title_most_streamed_song_section">Cele mai ascultate cântece</string>
+    <string name="artist_page_title_most_streamed_song_see_all_button">Vezi tot</string>
+    <string name="battery_optimization_negative_button">Ignoraţi</string>
+    <string name="battery_optimization_neutral_button">Nu mai întreba</string>
+    <string name="battery_optimization_positive_button">Dezactivaţi</string>
+    <string name="bottom_sheet_generating_instant_mix">Se generează mix instant...</string>
+    <string name="bottom_sheet_problem_generating_instant_mix">Nu s-au putut prelua cântecele din serverul subsonic.</string>
+    <string name="connection_alert_dialog_negative_button">Anulati</string>
+    <string name="connection_alert_dialog_neutral_button">Activaţi economisitor de date</string>
+    <string name="connection_alert_dialog_positive_button">OK</string>
+    <string name="connection_alert_dialog_summary">Accesul la serverul Subsonic pe conexiuni alte decât Wi-Fi a fost restricționat. Pentru a preveni reapariția acestui dialog, dezactivați verificarea conexiunii în setările aplicației.</string>
+    <string name="connection_alert_dialog_title">Wi-Fi nu este conectat</string>
+    <string name="content_description_shuffle_button">Amestecare</string>
+    <string name="delete_download_storage_dialog_negative_button">Anulati</string>
+    <string name="delete_download_storage_dialog_positive_button">Continuaţi</string>
+    <string name="delete_download_storage_dialog_summary">Vă rugăm să fiți conștienți că continuarea cu această acțiune va duce la ștergerea permanentă a tuturor articolelor salvate descărcate de pe toți serverele.</string>
+    <string name="delete_download_storage_dialog_title">Ștergeți articolele salvate</string>
+    <string name="description_empty_title">Nu sunt versuri disponibile</string>
+    <string name="disc_titlefull">Disc %1$s - %2$s</string>
+    <string name="disc_titleless">Disc %1$s</string>
+    <string name="download_directory_dialog_negative_button">Anulati</string>
+    <string name="download_directory_dialog_positive_button">Descarcaţi</string>
+    <string name="download_directory_dialog_summary">Toate piesele din acest folder vor fi descărcate. Piesele prezente în subfoldere nu vor fi descărcate.</string>
+    <string name="download_directory_dialog_title">Descărcați piesele</string>
+    <string name="download_directory_set">Setați unde sunt descărcate muzica</string>
+    <string name="download_info_empty_subtitle">Odată ce descărcați o cântec, o veți găsi aici</string>
+    <string name="download_info_empty_title">Nicio descărcare încă!</string>
+    <string name="download_item_multiple_subtitle_formatter">%1$s  •  %2$s articole</string>
+    <string name="download_item_single_subtitle_formatter">%1$s articole</string>
+    <string name="download_shuffle_all_subtitle">Amestecare toate</string>
+    <string name="download_storage_dialog_sub_summary">Pentru ca schimbările să aibă efect, reporniți aplicația.</string>
+    <string name="download_storage_dialog_summary">Schimbarea destinației fișierelor descărcate de la un spațiu de stocare la altul va duce la ștergerea imediată a oricăror fișiere descărcate anterior în celălalt spațiu de stocare.</string>
+    <string name="download_storage_dialog_title">Selectați opțiunea de stocare</string>
+    <string name="download_storage_external_dialog_positive_button">Extern</string>
+    <string name="download_storage_internal_dialog_negative_button">Intern</string>
+    <string name="download_storage_directory_dialog_neutral_button">Director</string>
+    <string name="download_title_section">Descărcări</string>
+    <string name="download_refresh_no_directory">Setați un folder de descărcare pentru a vă reîmprospăta descărcările.</string>
+    <string name="download_refresh_no_changes">Nu au fost găsite descărcări lipsă.</string>
+    <plurals name="download_refresh_removed">
+        <item quantity="one">Eliminată %d descărcare lipsă.</item>
+        <item quantity="other">Eliminate %d descărcări lipsă.</item>
+    </plurals>
+    <string name="download_refresh_button_content_description">Reîmprospătați articolele descărcate</string>
+    <string name="downloaded_bottom_sheet_add_to_queue">Adăugați la coadă</string>
+    <string name="downloaded_bottom_sheet_play_next">Redați următoarea</string>
+    <string name="downloaded_bottom_sheet_remove">Eliminaţi</string>
+    <string name="downloaded_bottom_sheet_remove_all">Eliminați tot</string>
+    <string name="downloaded_bottom_sheet_shuffle">Amestecare</string>
+    <string name="empty_string" />
+    <string name="error_required">Necesar</string>
+    <string name="error_server_prefix">Prefixul http sau https este necesar</string>
+    <string name="exo_download_notification_channel_name">Descărcări</string>
+    <string name="exo_controls_heart_off_description">Comutați inima în stare inactivă</string>
+    <string name="exo_controls_heart_on_description">Comutați inima în stare activă</string>
+    <string name="cast_expanded_controller_loading">Se încarcă…</string>
+    <string name="filter_info_selection">Selectați doi sau mai mulți filtre</string>
+    <string name="filter_title">Filtru</string>
+    <string name="filter_artist">Filtrați artiști</string>
+    <string name="filter_title_expanded">Filtrați Genuri</string>
+    <string name="generic_list_page_count">(%1$d)</string>
+    <string name="generic_list_page_count_unknown">(+%1$d)</string>
+    <string name="genre_catalogue_title">Catalogul Genuri</string>
+    <string name="genre_catalogue_title_expanded">Răsfoiți Genuri</string>
+    <string name="github_update_dialog_negative_button">Reamintitor mai târziu</string>
+    <string name="github_update_dialog_neutral_button">Susțineți-mă</string>
+    <string name="github_update_dialog_positive_button">Descărcați acum</string>
+    <string name="github_update_dialog_summary">Există o nouă versiune a aplicației disponibilă pe Github.</string>
+    <string name="github_update_dialog_title">Actualizare disponibilă</string>
+    <string name="home_rearrangement_dialog_negative_button">Anulati</string>
+    <string name="home_rearrangement_dialog_neutral_button">Resetaţi</string>
+    <string name="home_rearrangement_dialog_positive_button">Salvaţi</string>
+    <string name="home_rearrangement_dialog_title">Rearanjați pagina de start</string>
+    <string name="home_rearrangement_dialog_subtitle">Rețineți că pentru ca modificările să aibă efect, este necesar să reporniți aplicația.</string>
+    <string name="home_section_music">Muzică</string>
+    <string name="home_section_podcast">Podcast</string>
+    <string name="home_section_radio">Radio</string>
+    <string name="home_subtitle_best_of">Top piese din artiștii dvs. preferați</string>
+    <string name="home_subtitle_made_for_you">Porniți mix-ul dintr-o cântec pe care ți-a plăcut</string>
+    <string name="home_subtitle_new_internet_radio_station">Adăugați o nouă radio</string>
+    <string name="home_subtitle_new_podcast_channel">Adăugați un nou canal podcast</string>
+    <string name="home_sync_starred_cancel">Anulati</string>
+    <string name="home_sync_starred_download">Descarcaţi</string>
+    <string name="home_sync_starred_subtitle">Descărcarea acestor piese poate implica o utilizare semnificativă a datelor</string>
+    <string name="home_sync_starred_title">Se pare că sunt niște piese marcate de sincronizat</string>
+    <string name="home_sync_starred_albums_title">Sincronizați Albume Marcate</string>
+    <string name="home_sync_starred_albums_subtitle">Albumele marcate cu o stea vor fi disponibile offline</string>
+    <string name="home_sync_starred_artists_title">Sincronizare Artiști Marcați</string>
+    <string name="home_sync_starred_artists_subtitle">Aveți artiști marcați cu muzică care nu a fost descărcată</string>
+    <plurals name="home_sync_starred_songs_count">
+        <item quantity="one">%d cântec trebuie sincronizată</item>
+        <item quantity="other">%d cântece trebuie sincronizate</item>
+    </plurals>
+    <string name="home_title_best_of">Cel mai bun</string>
+    <string name="home_title_discovery">Descoperire</string>
+    <string name="home_title_discovery_shuffle_all_button">Amestecare toate</string>
+    <string name="home_title_flashback">Retrospectivă</string>
+    <string name="home_title_internet_radio_station">Stații radio internet</string>
+    <string name="home_title_last_played">Redată ultima dată</string>
+    <string name="home_title_last_played_see_all_button">Vezi tot</string>
+    <string name="home_title_last_week">Săptămâna trecută</string>
+    <string name="home_title_last_month">Luna trecută</string>
+    <string name="home_title_last_year">Anul trecut</string>
+    <string name="home_title_made_for_you">Făcut pentru tine</string>
+    <string name="home_title_most_played">Cele mai ascultate</string>
+    <string name="home_title_most_played_see_all_button">Vezi tot</string>
+    <string name="home_title_new_releases">Lansări noi</string>
+    <string name="home_title_newest_podcasts">Podcasturi cele mai noi</string>
+    <string name="home_title_pinned_playlists">Playlisturi</string>
+    <string name="home_title_podcast_channels">Canale</string>
+    <string name="home_title_podcast_channels_see_all_button">Vezi tot</string>
+    <string name="home_title_radio_station">Stații radio</string>
+    <string name="home_title_recently_added">Adăugate recent</string>
+    <string name="home_title_recently_added_see_all_button">Vezi tot</string>
+    <string name="home_title_shares">Partajări</string>
+    <string name="home_title_starred_albums">★ Albume marcate</string>
+    <string name="home_title_starred_albums_see_all_button">Vezi tot</string>
+    <string name="home_title_starred_artists">★ Artiști marcați</string>
+    <string name="home_title_starred_artists_see_all_button">Vezi tot</string>
+    <string name="home_title_starred_tracks">★ Piese marcate</string>
+    <string name="home_title_starred_tracks_see_all_button">Vezi tot</string>
+    <string name="home_title_top_songs">Piesa dvs. top</string>
+    <string name="home_option_reorganize">Reorganizați</string>
+    <string name="label_dot_separator" translatable="false">•</string>
+    <string name="label_placeholder" translatable="false">--</string>
+    <string name="library_title_album">Albume</string>
+    <string name="library_title_album_see_all_button">Vezi tot</string>
+    <string name="library_title_artist">Artiști</string>
+    <string name="library_title_artist_see_all_button">Vezi tot</string>
+    <string name="library_title_genre">Genuri</string>
+    <string name="library_title_genre_see_all_button">Vezi tot</string>
+    <string name="library_title_music_folder">Foldere de muzică</string>
+    <string name="library_title_playlist">Playlisturi</string>
+    <string name="library_title_playlist_see_all_button">Vezi tot</string>
+    <string name="login_empty">Niciun server adăugat</string>
+    <string name="login_title">Servere Subsonic</string>
+    <string name="login_title_expanded">Servere Subsonic</string>
+    <string name="media_route_menu_title">Cast</string>
+    <string name="menu_add_button">Adăugaţi</string>
+    <string name="menu_add_to_playlist_button">Adăugați la playlist</string>
+    <string name="menu_download_all_button">Descărcați tot</string>
+    <string name="menu_rate_album">Evaluați albumul</string>
+    <string name="menu_download_label">Descarcaţi</string>
+    <string name="menu_filter_all">Toate</string>
+    <string name="menu_filter_download">Descarcate</string>
+    <string name="menu_group_by_album">Album</string>
+    <string name="menu_group_by_artist">Artist</string>
+    <string name="menu_group_by_genre">Gen</string>
+    <string name="menu_group_by_track">Piesă</string>
+    <string name="menu_group_by_year">Anul</string>
+    <string name="menu_home_label">Acasă</string>
+    <string name="menu_last_week_name">Săptămâna trecută</string>
+    <string name="menu_last_month_name">Luna trecută</string>
+    <string name="menu_last_year_name">Anul trecut</string>
+    <string name="menu_library_label">Bibliotecă</string>
+    <string name="menu_search_button">Cautaţi</string>
+    <string name="menu_settings_button">Setări</string>
+    <string name="menu_sort_artist">Artist</string>
+    <string name="menu_sort_name">Nume</string>
+    <string name="menu_sort_random">Aleatoriu</string>
+    <string name="menu_sort_album_count">Număr Album</string>
+    <string name="menu_sort_recently_added">Adăugate recent</string>
+    <string name="menu_sort_recently_played">Redate recent</string>
+    <string name="menu_sort_most_played">Cele mai ascultate</string>
+    <string name="menu_sort_most_recently_starred">Cel mai recent marcat</string>
+    <string name="menu_sort_least_recently_starred">Cel mai puțin recent marcat</string>
+    <string name="menu_pin_button">Adăugați pe ecranul de start</string>
+    <string name="menu_unpin_button">Eliminați din ecranul de start</string>
+    <string name="menu_sort_year">Anul</string>
+    <string name="player_playback_speed">%1$.2fx</string>
+    <string name="player_queue_clean_all_button">Curățați coada de redare</string>
+    <string name="player_queue_save_queue_success">Coadă de redare salvată</string>
+    <string name="player_queue_save_to_playlist">Salvați Coada în Playlist</string>
+    <string name="player_queue_load_queue">Încărcați Coada</string>
+    <string name="player_lyrics_download_content_description">Descărcați versuri pentru redare offline</string>
+    <string name="player_lyrics_downloaded_content_description">Versuri descărcate pentru redare offline</string>
+    <string name="player_lyrics_download_success">Versuri salvate pentru redare offline.</string>
+    <string name="player_lyrics_download_failure">Versurile nu sunt disponibile pentru descărcare.</string>
+    <string name="player_server_priority">Prioritate Server</string>
+    <string name="player_unknown_format">Format necunoscut</string>
+    <string name="player_transcoding">Transcodare</string>
+    <string name="player_transcoding_requested">cerut</string>
+    <string name="playlist_catalogue_title">Catalogul Playlisturi</string>
+    <string name="playlist_catalogue_title_expanded">Răsfoiți Playlisturi</string>
+    <string name="playlist_chooser_dialog_empty">Niciun playlist creat</string>
+    <string name="playlist_chooser_dialog_negative_button">Anulati</string>
+    <string name="playlist_chooser_dialog_neutral_button">Creaţi</string>
+    <string name="playlist_chooser_dialog_title">Adăugați la un playlist</string>
+    <string name="playlist_chooser_dialog_toast_add_success">Piesa(e) adăugată(e) la playlist</string>
+    <string name="playlist_chooser_dialog_toast_add_failure">Eșec la adăugarea piese(lor) la playlist</string>
+    <string name="playlist_chooser_dialog_toast_all_skipped">Toate piesele au fost omise ca duplicate</string>
+    <string name="playlist_counted_tracks">%1$d piese •  %2$s</string>
+    <string name="playlist_duration">Durată  •  %1$s</string>
+    <string name="playlist_editor_dialog_action_delete_toast">Apasă lung pentru a șterge</string>
+    <string name="playlist_editor_dialog_hint_name">Nume Playlist</string>
+    <string name="playlist_editor_dialog_negative_button">Anulati</string>
+    <string name="playlist_editor_dialog_neutral_button">Ștergeţi</string>
+    <string name="playlist_editor_dialog_positive_button">Salvaţi</string>
+    <string name="playlist_editor_dialog_title">Editați playlist</string>
+    <string name="playlist_page_play_button">Redare</string>
+    <string name="playlist_page_shuffle_button">Amestecare</string>
+    <string name="playlist_song_count">Playlist  •  %1$d cântece</string>
+    <string name="podcast_bottom_sheet_add_to_queue">Adăugați la coadă</string>
+    <string name="podcast_bottom_sheet_delete">Ștergeţi</string>
+    <string name="podcast_bottom_sheet_download">Descarcaţi</string>
+    <string name="podcast_bottom_sheet_go_to_channel">Mergeți la canal</string>
+    <string name="podcast_bottom_sheet_play_next">Redați următoarea</string>
+    <string name="podcast_bottom_sheet_remove">Eliminaţi</string>
+    <string name="podcast_channel_catalogue_title">Canale</string>
+    <string name="podcast_channel_catalogue_title_expanded">Răsfoiți Canale</string>
+    <string name="podcast_channel_editor_dialog_hint_rss_url">URL RSS</string>
+    <string name="podcast_channel_editor_dialog_title">Canal Podcast</string>
+    <string name="podcast_channel_not_supported_snackbar">Podcasturile nu sunt acceptate de acest server.</string>
+    <string name="podcast_channel_page_title_description_section">Descriere</string>
+    <string name="podcast_channel_page_title_episode_section">Episoade</string>
+    <string name="podcast_channel_page_title_no_episode_available">Nu sunt episoade disponibile</string>
+    <string name="podcast_episode_download_request_snackbar">Solicitarea dvs. a fost trimisă la server</string>
+    <string name="podcast_info_empty_button">Faceți clic pentru a ascunde secțiunea\nEfectele vor fi vizibile la restart</string>
+    <string name="podcast_info_empty_subtitle">Odată ce adăugați un canal, îl veți găsi aici</string>
+    <string name="podcast_info_empty_title">Nu au fost găsite podcasturi!</string>
+    <string name="podcast_release_date_duration_formatter">%1$s  •  %2$s</string>
+    <string name="radio_editor_dialog_hint_homepage_url">URL Pagină de Start Radio</string>
+    <string name="radio_editor_dialog_hint_name">Nume Radio</string>
+    <string name="radio_editor_dialog_hint_stream_url">URL Flux Radio</string>
+    <string name="radio_editor_dialog_negative_button">Anulati</string>
+    <string name="radio_editor_dialog_neutral_button">Ștergeţi</string>
+    <string name="radio_editor_dialog_positive_button">Salvaţi</string>
+    <string name="radio_editor_dialog_added">Stație radio adăugată</string>
+    <string name="radio_editor_dialog_updated">Stație radio actualizată</string>
+    <string name="radio_editor_dialog_title">Stație Radio Internet</string>
+    <string name="radio_station_info_empty_button">Faceți clic pentru a ascunde secțiunea\nEfectele vor fi vizibile la restart</string>
+    <string name="radio_station_info_empty_subtitle">Odată ce adăugați o stație radio, o veți găsi aici</string>
+    <string name="radio_station_info_empty_title">Nu au fost găsite stații!</string>
+    <string name="radio_dialog_not_supported_snackbar">Gestionarea radioului internet nu este acceptată de acest server.</string>
+    <string name="rating_dialog_negative_button">Anulati</string>
+    <string name="rating_dialog_positive_button">Salvaţi</string>
+    <string name="rating_dialog_title">Evaluaţi</string>
+    <string name="search_hint">Căutare titlu, artiști sau albume</string>
+    <string name="search_info_minimum_characters">Introduceți cel puțin trei caractere</string>
+    <string name="search_title_album">Albume</string>
+    <string name="search_title_artist">Artiști</string>
+    <string name="search_title_song">Cântece</string>
+    <string name="server_signup_dialog_action_low_security">Securitate redusă</string>
+    <string name="server_signup_dialog_action_delete_toast">Apasă lung pentru a șterge</string>
+    <string name="server_signup_dialog_hint_local_address">URL Local</string>
+    <string name="server_signup_dialog_hint_name">Nume Server</string>
+    <string name="server_signup_dialog_hint_password">Parolă</string>
+    <string name="server_signup_dialog_hint_url">URL Server</string>
+    <string name="server_signup_dialog_hint_username">Nume Utilizator</string>
+    <string name="server_signup_dialog_negative_button">Anulati</string>
+    <string name="server_signup_dialog_neutral_button">Ștergeţi</string>
+    <string name="server_signup_dialog_positive_button">Salvaţi</string>
+    <string name="server_signup_dialog_title">Adăugați server</string>
+    <string name="server_unreachable_dialog_negative_button">Anulati</string>
+    <string name="server_unreachable_dialog_neutral_button">Mergeți la conectare</string>
+    <string name="server_unreachable_dialog_positive_button">Continuaţi oricum</string>
+    <string name="server_unreachable_dialog_summary">Serverul solicitat este indisponibil. Dacă alegeți să continuați, acest dialog nu va apărea pentru următoarea oră.</string>
+    <string name="server_unreachable_dialog_title">Server inaccesibil</string>
+    <string name="settings_about_summary">Tempus este un client de muzică open source și ușor pentru Subsonic, proiectat și construit nativ pentru Android.</string>
+    <string name="settings_about_title">Despre</string>
+    <string name="settings_always_on_display">Afișaj mereu activ</string>
+    <string name="settings_allow_playlist_duplicates">Permiteți adăugarea duplicatelor la playlist</string>
+    <string name="settings_allow_playlist_duplicates_summary">Dacă este activat, duplicatele nu vor fi verificate la adăugarea la un playlist.</string>
+    <string name="settings_audio_transcode_download_format">Format transcodare</string>
+    <string name="settings_audio_transcode_download_priority_summary">Dacă este activat, Tempus nu va forța descărcarea pistei cu setările de transcodare de mai jos.</string>
+    <string name="settings_audio_transcode_download_priority_title">Prioritizați setările serverului utilizate pentru streaming în descărcări</string>
+    <string name="settings_audio_transcode_download_summary">Dacă este activat, Tempus va descărca piste transcodate.</string>
+    <string name="settings_audio_transcode_download_title">Descărcați piste transcodate</string>
+    <string name="settings_audio_transcode_estimate_content_length_summary">Dacă este activat, serverul va fi întrebat cu privire la durata estimată a piesei.</string>
+    <string name="settings_audio_transcode_estimate_content_length_title">Estimare lungime conținut</string>
+    <string name="settings_audio_transcode_format_download">Format transcodare pentru descărcări</string>
+    <string name="settings_audio_transcode_format_mobile">Format transcodare pe mobil</string>
+    <string name="settings_audio_transcode_format_wifi">Format transcodare pe Wi-Fi</string>
+    <string name="settings_audio_transcode_priority_summary">Dacă este activat, Tempus nu va forța streamarea piesei cu setările de transcodare de mai jos.</string>
+    <string name="settings_audio_transcode_priority_title">Prioritizați setările de transcodare ale serverului</string>
+    <string name="settings_audio_transcode_priority_toast">Prioritate pentru transcodarea piesei acordată serverului</string>
+    <string name="settings_buffering_strategy">Strategie de bufering</string>
+    <string name="settings_buffering_strategy_summary">Pentru ca modificarea să aibă efect, trebuie să reporniți manual aplicația.</string>
+    <string name="settings_choose_download_folder">Alegeți un folder pentru fișierele de muzică descărcate</string>
+    <string name="settings_clear_download_folder">Curățați folderul de descărcare</string>
+    <string name="settings_continuous_play_summary">Permite muzicii să continue redarea după ce o playlist s-a încheiat, redând piese similare</string>
+    <string name="settings_continuous_play_title">Redare continuă</string>
+    <string name="settings_covers_cache">Dimensiune cache-ul picturilor</string>
+    <string name="settings_data_saving_mode_summary">Pentru a reduce consumul de date, evitați descărcarea coperii.</string>
+    <string name="settings_data_saving_mode_title">Limitați utilizarea datelor mobile</string>
+    <string name="settings_delete_download_storage_summary">Continuarea va duce la ștergerea ireversibilă a tuturor articolelor salvate.</string>
+    <string name="settings_delete_download_storage_title">Ștergeți articolele salvate</string>
+    <string name="settings_download_storage_title">Stocare descărcare</string>
+    <string name="settings_download_folder_cleared">Folderul de descărcare a fost golit.</string>
+    <string name="settings_download_folder_set">Folderul de descărcare a fost setat</string>
+    <string name="settings_set_download_folder">Setați folderul de descărcare</string>
+    <string name="settings_system_equalizer_summary">Ajustați setările audio</string>
+    <string name="settings_system_equalizer_title">Egalizator sistem</string>
+    <string name="settings_github_link">https://github.com/eddyizm/tempus</string>
+    <string name="settings_github_summary">Urmăriți dezvoltarea</string>
+    <string name="settings_github_title">Github</string>
+    <string name="settings_support_discussion_link">https://github.com/eddyizm/tempus/discussions</string>
+    <string name="settings_github_update">Actualizări</string>
+    <string name="settings_github_update_title">Verificați pe github lansări noi</string>
+    <string name="settings_github_update_summary">Dacă utilizați versiunea github, prin implicare, aplicația va verifica noile versiuni de apk. Comutați pentru a dezactiva verificările automate pe github</string>
+    <string name="settings_support_summary">Alăturați-vă discuțiilor comunității și asistență</string>
+    <string name="settings_support_title">Asistență utilizator</string>
+    <string name="settings_scan_result">Scanare: numărare %1$d piese</string>
+    <string name="settings_image_size">Setați rezoluția imaginii</string>
+    <string name="settings_language">Limbă</string>
+    <string name="settings_logout_title">Deconectaţi</string>
+    <string name="settings_max_bitrate_download">Bitrate pentru descărcări</string>
+    <string name="settings_max_bitrate_mobile">Bitrate pe mobil</string>
+    <string name="settings_max_bitrate_wifi">Bitrate pe Wi-Fi</string>
+    <string name="settings_media_cache">Dimensiune cache-ul fișierelor media</string>
+    <string name="settings_music_directory">Arătați directoare de muzică</string>
+    <string name="settings_music_directory_summary">Dacă este activat, afișează secțiunea directorului de muzică. Vă rugăm să rețineți că pentru ca navigarea folderului să funcționeze corect, serverul trebuie să suporte această funcție.</string>
+    <string name="settings_podcast">Arătați podcast</string>
+    <string name="settings_podcast_summary">Dacă este activat, afișează secțiunea podcast. Reporniți aplicația pentru ca aceasta să aibă efect complet.</string>
+    <string name="settings_audio_quality">Arătați calitate audio</string>
+    <string name="settings_audio_quality_summary">Bitrate-ul și formatul audio vor fi afișate pentru fiecare pistă audio.</string>
+    <string name="settings_song_rating">Arătați evaluarea cu stele a cântecului</string>
+    <string name="settings_song_rating_summary">Dacă este activat, afișează evaluarea cu 5 stele pentru piesă pe pagina cântecului\n\n*Necesită restartarea aplicației</string>
+    <string name="settings_item_rating">Arătați evaluarea articolului</string>
+    <string name="settings_item_rating_summary">Dacă este activat, va fi afișată evaluarea articolului și dacă este marcat ca favorit.</string>
+    <string name="settings_queue_syncing_countdown">Cronometru sincronizare</string>
+    <string name="settings_queue_syncing_summary">Dacă este activat, utilizatorul va avea capacitatea de a-și salva coada de redare și va putea să încărce starea la deschiderea aplicației.</string>
+    <string name="settings_queue_syncing_title">Sincronizare coadă de redare pentru acest utilizator [Nu este complet finalizat]</string>
+    <string name="settings_show_mini_shuffle_button">Arătați butonul Amestecare</string>
+    <string name="settings_show_mini_shuffle_button_summary">Dacă este activat, afișează butonul amestecare, elimină inima din mini player</string>
+    <string name="settings_radio">Arătați radio</string>
+    <string name="settings_radio_summary">Dacă este activat, afișează secțiunea radio. Reporniți aplicația pentru ca aceasta să aibă efect complet.</string>
+    <string name="settings_auto_download_lyrics">Descarcă versuri automat</string>
+    <string name="settings_auto_download_lyrics_summary">Salvați automat versurile când sunt disponibile, astfel încât să poată fi afișate offline.</string>
+    <string name="settings_replay_gain">Setați modul replay gain</string>
+    <string name="settings_rounded_corner">Colțuri rotunjite</string>
+    <string name="settings_rounded_corner_size">Dimensiunea colțuri</string>
+    <string name="settings_rounded_corner_size_summary">Setează magnitudinea unghiului de curbură.</string>
+    <string name="settings_rounded_corner_summary">Dacă este activat, stabilește un unghi de curbură pentru toate coperii redate. Modificările vor avea efect la restart.</string>
+    <string name="settings_scan_title">Biblioteca de scanare</string>
+    <string name="settings_scrobble_title">Activați scrobbling muzică</string>
+    <string name="settings_system_language">Limba sistemului</string>
+    <string name="settings_share_title">Activați partajarea muzicii</string>
+    <string name="settings_streaming_cache_size">Dimensiune cache-ul de streaming</string>
+    <string name="settings_streaming_cache_storage_title">Stocare cache-ul de streaming</string>
+    <string name="settings_sub_summary_scrobble">Este important de remarcat că scrobbling se bazează și pe faptul că serverul este activat pentru a primi aceste date.</string>
+    <string name="settings_summary_skip_min_star_rating">La ascultarea radioului unui artist, a unui mix instant sau la amestecare toate, piesele sub o anumită evaluare a utilizatorului vor fi ignorate.</string>
+    <string name="settings_summary_replay_gain">Replay gain este o funcție care vă permite să ajustați nivelul de volum al pistelor audio pentru o experiență de ascultare consistentă. Această setare este eficace doar dacă piesa conține metadatele necesare.</string>
+    <string name="settings_summary_scrobble">Scrobbling este o funcție care permite dispozitivului dvs. să trimită informații despre cântecele pe care le ascultați la serverul de muzică. Aceste informații ajută la crearea de recomandări personalizate pe baza preferințelor dvs. de muzică.</string>
+    <string name="settings_summary_share">Permite utilizatorului să partajeze muzică printr-un link. Funcționalitatea trebuie să fie acceptată și activată pe server și este limitată la piese individuale, albume și playlisturi.</string>
+    <string name="settings_summary_syncing">Returnează starea cozii de redare pentru acest utilizator. Aceasta include pistele din coada de redare, piesa în curs de redare și poziția din aceasta. Serverul trebuie să suporte această funcție.\n*Această setare nu funcționează 100% pe toate serverele/dispozitivele.</string>
+    <string name="settings_summary_streaming_cache_size">%1$s \nActual în uz:   %2$s MiB</string>
+    <string name="settings_summary_transcoding">Prioritate acordată modului de transcodare. Dacă este setat la \"Redare directă\", bitrate-ul fișierului nu va fi modificat.</string>
+    <string name="settings_summary_transcoding_download">Descărcați media transcodat. Dacă este activat, punctul final de descărcare nu va fi utilizat, ci următoarele setări. \n\n Dacă \"Format transcodare pentru descărcări\" este setat la \"Descărcare directă\", bitrate-ul fișierului nu va fi modificat.</string>
+    <string name="settings_summary_transcoding_estimate_content_length">Când fișierul este transcodat în mișcare, clientul nu arată de obicei lungimea pistei. Este posibil să se ceară serverelor care acceptă funcționalitatea să estimeze durata piesei în curs de redare, dar timpii de răspuns pot fi mai lungi.</string>
+    <string name="settings_sync_starred_artists_for_offline_use_summary">Dacă este activat, artiștii marcați vor fi descărcați pentru utilizare offline.</string>
+    <string name="settings_sync_starred_artists_for_offline_use_title">Sincronizați artiștii marcați pentru utilizare offline</string>
+    <string name="settings_sync_starred_albums_for_offline_use_summary">Dacă este activat, albumele marcate vor fi descărcate pentru utilizare offline.</string>
+    <string name="settings_sync_starred_albums_for_offline_use_title">Sincronizați albumele marcate pentru utilizare offline</string>
+    <string name="settings_sync_starred_tracks_for_offline_use_summary">Dacă este activat, piesele marcate vor fi descărcate pentru utilizare offline.</string>
+    <string name="settings_sync_starred_tracks_for_offline_use_title">Sincronizați piesele marcate pentru utilizare offline</string>
+    <string name="settings_theme">Temă</string>
+    <string name="settings_title_data">Date</string>
+    <string name="settings_title_general">General</string>
+    <string name="settings_title_playlist">Playlist</string>
+    <string name="settings_title_rating">Evaluare</string>
+    <string name="settings_title_replay_gain">Replay Gain</string>
+    <string name="settings_title_scrobble">Scrobble</string>
+    <string name="settings_title_skip_min_star_rating">Ignoraţi piesele pe baza evaluării</string>
+    <string name="settings_title_skip_min_star_rating_dialog">Cântece cu o evaluare de:</string>
+    <string name="settings_title_share">Partajare</string>
+    <string name="settings_title_syncing">Sincronizare</string>
+    <string name="settings_title_transcoding">Transcodare</string>
+    <string name="settings_title_transcoding_download">Descărcare Transcodare</string>
+    <string name="settings_title_ui">UI</string>
+    <string name="settings_transcoded_download">Descărcare transcodată</string>
+    <string name="settings_version_summary" translatable="false">3.1.0</string>
+    <string name="settings_version_title">Versiune</string>
+    <string name="settings_wifi_only_summary">Cere confirmarea utilizatorului înainte de streaming pe rețeaua mobilă.</string>
+    <string name="settings_wifi_only_title">Alerta stream numai Wi-Fi</string>
+    <string name="share_bottom_sheet_copy_link">Copiaţi link</string>
+    <string name="share_bottom_sheet_delete">Ștergeţi partajare</string>
+    <string name="share_bottom_sheet_update">Actualizaţi partajare</string>
+    <string name="share_subtitle_item">Data expirării: %1$s</string>
+    <string name="share_no_expiration">Niciodată</string>
+    <string name="share_unsupported_error">Partajarea nu este acceptată sau nu este activată</string>
+    <string name="asset_link_clipboard_label">Link activ Tempus</string>
+    <string name="asset_link_label_song">UID Cântec</string>
+    <string name="asset_link_label_album">UID Album</string>
+    <string name="asset_link_label_artist">UID Artist</string>
+    <string name="asset_link_label_playlist">UID Playlist</string>
+    <string name="asset_link_label_genre">UID Gen</string>
+    <string name="asset_link_label_year">UID Anul</string>
+    <string name="asset_link_label_unknown">UID Activ</string>
+    <string name="asset_link_error_unsupported">Link activ neacceptat</string>
+    <string name="asset_link_error_song">Cântecul nu a putut fi deschis</string>
+    <string name="asset_link_error_album">Albumul nu a putut fi deschis</string>
+    <string name="asset_link_error_artist">Artistul nu a putut fi deschis</string>
+    <string name="asset_link_error_playlist">Playlistul nu a putut fi deschis</string>
+    <string name="asset_link_chip_text">%1$s • %2$s</string>
+    <string name="asset_link_copied_toast">Copiat %1$s în clipboard</string>
+    <string name="asset_link_debug_toast">Link activ: %1$s</string>
+    <string name="share_update_dialog_hint_description">Descriere</string>
+    <string name="share_update_dialog_hint_expiration_date">Data expirării</string>
+    <string name="share_update_dialog_negative_button">Anulati</string>
+    <string name="share_update_dialog_positive_button">Salvaţi</string>
+    <string name="share_update_dialog_title">Partajare</string>
+    <string name="song_bottom_sheet_add_to_playlist">Adăugați la playlist</string>
+    <string name="song_bottom_sheet_add_to_queue">Adăugați la coadă</string>
+    <string name="song_bottom_sheet_download">Descarcaţi</string>
+    <string name="song_bottom_sheet_error_retrieving_album">Eroare la preluarea albumului</string>
+    <string name="song_bottom_sheet_error_retrieving_artist">Eroare la preluarea artistului</string>
+    <string name="song_bottom_sheet_go_to_album">Mergeți la album</string>
+    <string name="song_bottom_sheet_go_to_artist">Mergeți la artist</string>
+    <string name="song_bottom_sheet_instant_mix">Mix instant</string>
+    <string name="song_bottom_sheet_play_next">Redați următoarea</string>
+    <string name="song_bottom_sheet_rate">Evaluaţi</string>
+    <string name="song_bottom_sheet_remove">Eliminaţi</string>
+    <string name="song_bottom_sheet_share">Partajați</string>
+    <string name="song_list_page_downloaded">Descarcate</string>
+    <string name="song_list_page_most_played">Piese cele mai ascultate</string>
+    <string name="song_list_page_recently_added">Piese adăugate recent</string>
+    <string name="song_list_page_recently_played">Piese redate recent</string>
+    <string name="song_list_page_starred">Piese marcate</string>
+    <string name="song_list_page_top">Piesele top ale lui %1$s</string>
+    <string name="song_list_page_year">Anul %1$d</string>
+    <string name="song_subtitle_formatter">%1$s  •  %2$s  %3$s</string>
+    <string name="starred_sync_dialog_negative_button">Anulati</string>
+    <string name="starred_sync_dialog_neutral_button">Continuaţi</string>
+    <string name="starred_sync_dialog_positive_button">Continuaţi și descarcaţi</string>
+    <string name="starred_sync_dialog_summary">Descărcarea pieselor marcate poate necesita o cantitate mare de date.</string>
+    <string name="starred_sync_dialog_title">Sincronizează piesele marcate</string>
+    <string name="starred_artist_sync_dialog_summary">Descărcarea artiștilor marcați poate necesita o cantitate mare de date.</string>
+    <string name="starred_artist_sync_dialog_title">Sincronizează artiștii marcați</string>
+    <string name="starred_album_sync_dialog_summary">Descărcarea albumelor marcate poate necesita o cantitate mare de date.</string>
+    <string name="starred_album_sync_dialog_title">Sincronizează albumele marcate</string>
+    <string name="streaming_cache_storage_dialog_sub_summary">Pentru ca modificările să aibă efect, reporniți aplicația.</string>
+    <string name="streaming_cache_storage_dialog_summary">Schimbarea destinației fișierelor cache-ului dintr-un spațiu de stocare la altul poate duce la ștergerea oricăror fișiere cache-ului anterior în celălalt spațiu de stocare.</string>
+    <string name="streaming_cache_storage_dialog_title">Selectați opțiunea de stocare</string>
+    <string name="streaming_cache_storage_external_dialog_positive_button">Extern</string>
+    <string name="streaming_cache_storage_internal_dialog_negative_button">Intern</string>
+    <string name="support_url">https://ko-fi.com/eddyizm</string>
+    <string name="track_info_album">Album</string>
+    <string name="track_info_artist">Artist</string>
+    <string name="track_info_bit_depth">Adâncime bit</string>
+    <string name="track_info_bitrate">Bitrate</string>
+    <string name="track_info_content_type">Tip conținut</string>
+    <string name="track_info_dialog_positive_button">OK</string>
+    <string name="track_info_dialog_title">Informații piesă</string>
+    <string name="track_info_disc_number">Număr disc</string>
+    <string name="track_info_duration">Durată</string>
+    <string name="track_info_genre">Gen</string>
+    <string name="track_info_path">Cale</string>
+    <string name="track_info_sampling_rate">Rată de eșantionare</string>
+    <string name="track_info_size">Dimensiune</string>
+    <string name="track_info_suffix">Sufix</string>
+    <string name="track_info_summary_downloaded_file">Fișierul a fost descărcat folosind API-urile Subsonic. Codecul și bitrate-ul fișierului rămân neschimbate din fișierul sursă.</string>
+    <string name="track_info_summary_full_transcode">Aplicația va cere serverului să transcodeze fișierul și să-i modifice bitrate-ul. Codecul solicitat de utilizator este %1$s, cu un bitrate de %2$s. Orice posibile modificări ale codecului și bitrate-ul fișierului în formatul ales vor fi gestionate de server, care poate sau nu să suporte operația.</string>
+    <string name="track_info_summary_original_file">Aplicația va citi doar fișierul original furnizat de server. Aplicația va cere în mod explicit serverului fișierul netranscodat cu bitrate-ul sursei originale.</string>
+    <string name="track_info_summary_server_prioritized">Calitatea fișierului care urmează a fi redat este lăsată la alegerea serverului. Aplicația nu va forța alegerea codecului și bitrate-ului pentru nicio posibilă transcodare.</string>
+    <string name="track_info_summary_transcoding_bitrate">Aplicația va cere serverului să modifice bitrate-ul fișierului. Utilizatorul a solicitat un bitrate de %1$s, în timp ce codecul fișierului sursă va rămâne același. Orice modificări ale bitrate-ului fișierului în formatul ales vor fi făcute de server, care poate sau nu să suporte operația.</string>
+    <string name="track_info_summary_transcoding_codec">Aplicația va cere serverului să transcodeze fișierul. Codecul solicitat de utilizator este %1$s, în timp ce bitrate-ul va fi același cu fișierul sursă. Potențiala transcodare a fișierului în formatul ales depinde de server, deoarece poate sau nu să suporte operația.</string>
+    <string name="track_info_title">Titlu</string>
+    <string name="track_info_track_number">Număr piesă</string>
+    <string name="track_info_transcoded_content_type">Tip conținut transcodat</string>
+    <string name="track_info_transcoded_suffix">Sufix transcodat</string>
+    <string name="track_info_year">Anul</string>
+    <string name="undraw_page">unDraw</string>
+    <string name="undraw_thanks">Mulțumiri speciale merită unDraw fără ale cărui ilustrații nu am putut face această aplicație mai frumoasă.</string>
+    <string name="undraw_url">https://undraw.co/</string>
+    <string name="widget_label">Widget Tempus</string>
+    <string name="widget_not_playing">Nu se redă</string>
+    <string name="widget_placeholder_subtitle">Deschideți Tempus</string>
+    <string name="widget_time_elapsed_placeholder">0:00</string>
+    <string name="widget_time_duration_placeholder">0:00</string>
+    <string name="widget_content_desc_album_art">Ilustrație album</string>
+    <string name="widget_content_desc_play_pause">Redare sau pauză</string>
+    <string name="widget_content_desc_next">Piesa următoare</string>
+    <string name="widget_content_desc_prev">Piesa anterioară</string>
+    <string name="widget_content_desc_shuffle">Activaţi amestecare</string>
+    <string name="widget_content_desc_repeat">Schimbați modul repetare</string>
+    <plurals name="home_sync_starred_albums_count">
+        <item quantity="one">%d album de sincronizat</item>
+        <item quantity="other">%d albume de sincronizat</item>
+    </plurals>
+    <plurals name="home_sync_starred_artists_count">
+        <item quantity="one">%d artist de sincronizat</item>
+        <item quantity="other">%d artiști de sincronizat</item>
+    </plurals>
+    <plurals name="songs_download_started">
+        <item quantity="one">Se descarcă %d cântec</item>
+        <item quantity="other">Se descarcă %d cântece</item>
+    </plurals>
+    <string name="equalizer_fragment_title">Egalizator</string>
+    <string name="equalizer_reset">Resetaţi</string>
+    <string name="equalizer_enable">Activaţi</string>
+    <string name="equalizer_not_supported">Nu este acceptat pe acest dispozitiv</string>
+    <string name="settings_app_equalizer">Egalizator</string>
+    <string name="settings_app_equalizer_summary">Deschideți egalizatorul încorporat</string>
+
+    <string name="settings_album_detail">Arătați detalii album</string>
+    <string name="settings_album_detail_summary">Dacă este activat, afișează detalii album cum ar fi gen, număr de cântece etc. pe pagina albumului</string>
+    <string name="settings_artist_sort_by_album_count">Sortaţi artiști după numărul de albume</string>
+    <string name="settings_artist_sort_by_album_count_summary">Dacă este activat, sortează artiștii după numărul de albume. Sortează după nume dacă este dezactivat.</string>
+
+    <string name="folder_play_collecting">Se colectează cântece din folder…</string>
+    <string name="folder_play_playing">Se redau %d cântece</string>
+    <string name="folder_play_no_songs">Nu au fost găsite cântece în folder</string>
+
+    <string name="search_sort_title">Sortaţi căutările recente cronologic</string>
+    <string name="search_sort_summary">Dacă este activat, sortează căutările cronologic. Sortează după nume dacă este dezactivat.</string>
+</resources>

app/src/main/res/values-zh/arrays.xml

@@ -32,6 +32,21 @@
         <item>300</item>
     </string-array>
 
+    <string-array name="streaming_cache_size_titles">
+        <item>禁用</item>
+        <item>128 MiB</item>
+        <item>256 MiB</item>
+        <item>512 MiB</item>
+        <item>1024 MiB</item>
+    </string-array>
+    <string-array name="streaming_cache_size_values">
+        <item>0</item>
+        <item>128</item>
+        <item>256</item>
+        <item>512</item>
+        <item>1024</item>
+    </string-array>
+
     <string-array name="max_bitrate_wifi_list_titles">
         <item>原始</item>
         <item>32 kbps</item>
@@ -224,4 +239,19 @@
         <item>4</item>
         <item>8</item>
     </string-array>
+
+    <string-array name="skip_min_star_rating_titles">
+        <item>不筛选评分</item>
+        <item>1 星及以上</item>
+        <item>2 星及以上</item>
+        <item>3 星及以上</item>
+        <item>4 星及以上</item>
+    </string-array>
+    <string-array name="skip_min_star_rating_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
 </resources>