chore: bumped version for build fix

fix: updated constraints causing fata lint build failures (#478 )
chore: bumped version and change log for release
2026-03-01 20:20:08 -08:00 · 2026-03-01 20:19:05 -08:00 · 2026-03-01 19:59:28 -08:00 · 2026-03-01 19:48:15 -08:00 · 2026-03-01 19:36:48 -08:00 · 2026-03-01 19:36:03 -08:00
133 changed files with 5755 additions and 809 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,108 @@
 # Changelog

+## What's Changed
+## [4.12.4](https://github.com/eddyizm/tempo/releases/tag/v4.12.4) (2026-03-01)
+* feat: advertise existing long press to refresh per section on library page by @tvillega in https://github.com/eddyizm/tempus/pull/467
+* fix: playlist filter returns properly filtered list and reset correctly by @eddyizm in https://github.com/eddyizm/tempus/pull/476
+* feat: toggle player bitrate visibility on touch by @tvillega in https://github.com/eddyizm/tempus/pull/466
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.12.0...v4.12.3
+
+## What's Changed
+## [4.12.0](https://github.com/eddyizm/tempo/releases/tag/v4.12.0) (2026-02-28)
+* chore(i18n): Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/441
+* feat: radio logos support for AndroidAuto by @dmachard in https://github.com/eddyizm/tempus/pull/435
+* feat: Port remove song of playlist from tempus ng by @tvillega in https://github.com/eddyizm/tempus/pull/457
+* fix: artist sort by name case sensitive by @tvillega in https://github.com/eddyizm/tempus/pull/462
+* feat: added slide out enhanced navigation for tab mode and optionally portrait mode by @tvillega in https://github.com/eddyizm/tempus/pull/450
+* feat: Android Auto: improve media service browsing by @MaFo-28 in https://github.com/eddyizm/tempus/pull/437
+* feat: Support specifying a client certificate for mTLS auth by @tinsukE in https://github.com/eddyizm/tempus/pull/458
+
+## New Contributors
+* @MaFo-28 made their first contribution in https://github.com/eddyizm/tempus/pull/437
+* @tinsukE made their first contribution in https://github.com/eddyizm/tempus/pull/458
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.11.0...v4.12.0
+
+## What's Changed
+## [4.11.0](https://github.com/eddyizm/tempo/releases/tag/v4.11.0) (2026-02-15)
+* fix: added dynamic application id from gradle variant by @eddyizm in https://github.com/eddyizm/tempus/pull/425
+* fix: Use Bluetooth tethering connection by @jaime-grj in https://github.com/eddyizm/tempus/pull/428
+* chore(i18n): Update Spanish translation by @jaime-grj in https://github.com/eddyizm/tempus/pull/427
+* fix: visual glitches on landscape navbar by @tvillega in https://github.com/eddyizm/tempus/pull/429
+* fix: radio playback "source error" on android auto by @dmachard in https://github.com/eddyizm/tempus/pull/426
+* fix: speed button overlaps with shuffle on landscape by @tvillega in https://github.com/eddyizm/tempus/pull/430
+* fix: local url used in share link instead of server url by @tvillega in https://github.com/eddyizm/tempus/pull/431
+* Feat :prefer downloaded files by @eddyizm in https://github.com/eddyizm/tempus/pull/433
+* fix: radio metadata displayed by @TrackArcher in https://github.com/eddyizm/tempus/pull/352
+* feat: improve playlist chooser dialog UI by @tvillega in https://github.com/eddyizm/tempus/pull/439
+
+## New Contributors
+* @dmachard made their first contribution in https://github.com/eddyizm/tempus/pull/426
+* @TrackArcher made their first contribution in https://github.com/eddyizm/tempus/pull/352
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.10.1...v4.11.0
+
+## What's Changed
+## [4.10.1](https://github.com/eddyizm/tempo/releases/tag/v4.10.1) (2026-02-08)
+* 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.1
+
+## 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
--- a/README.md
+++ b/README.md
@@ -10,15 +10,21 @@

 <div align="center">

+<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>
@@ -31,6 +37,10 @@ Tempus does not rely on magic algorithms to decide what you should listen to. In

 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.**
@@ -46,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.
@@ -62,7 +67,7 @@ Please note the two variants in the release assets include release/debug and 32/
 - **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 similar songs by artist/album and randomSongs endpoints to server a larger play queue more reliably.
+- **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.* 
 - **Multiple Libraries**: Tempus handles multi-library setups gracefully. They are displayed as Library folders.
@@ -115,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`  
@@ -124,6 +132,7 @@ 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)

--- a/USAGE.md
+++ b/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

@@ -193,15 +192,12 @@ To allow the Tempus app on your car's head unit, "Unknown sources" needs to be e
 ### 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:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
        minSdkVersion 24
        targetSdk 35

-        versionCode 13
-        versionName '4.6.4'
+        versionCode 22
+        versionName '4.12.4'
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

        javaCompileOptions {
@@ -101,6 +101,7 @@ dependencies {
    implementation 'androidx.room:room-runtime:2.6.1'
    implementation 'androidx.core:core-splashscreen:1.0.1'
    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0"

    // Android Material
    implementation 'com.google.android.material:material:1.10.0'
--- a/app/schemas/com.cappielloantonio.tempo.database.AppDatabase/14.json
+++ b/app/schemas/com.cappielloantonio.tempo.database.AppDatabase/14.json
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -96,7 +96,12 @@
                android:resource="@xml/widget_info"/>
        </receiver>

-
+        <provider
+            android:name=".provider.AlbumArtContentProvider"
+            android:authorities="${applicationId}.albumart.provider"
+            android:enabled="true"
+            android:exported="true"
+        />

    </application>
 </manifest>
--- a/app/src/main/java/com/cappielloantonio/tempo/App.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/App.java
@@ -11,6 +11,7 @@ import com.cappielloantonio.tempo.github.Github;
 import com.cappielloantonio.tempo.helper.ThemeHelper;
 import com.cappielloantonio.tempo.subsonic.Subsonic;
 import com.cappielloantonio.tempo.subsonic.SubsonicPreferences;
+import com.cappielloantonio.tempo.util.ClientCertManager;
 import com.cappielloantonio.tempo.util.Preferences;

 public class App extends Application {
@@ -31,6 +32,8 @@ public class App extends Application {
        instance = new App();
        context = getApplicationContext();
        preferences = PreferenceManager.getDefaultSharedPreferences(context);
+
+        ClientCertManager.setupSslSocketFactory(context);
    }

    public static App getInstance() {
@@ -55,6 +58,48 @@ public class App extends Application {
        }
        return subsonic;
    }
+    
+    public static Subsonic getSubsonicPublicClientInstance(boolean override) {
+
+        /*
+        If I do the shortcut that the IDE suggests:
+            SubsonicPreferences preferences = getSubsonicPreferences1();
+        During the chain of calls it will run the following:
+            String server = Preferences.getInUseServerAddress();
+        Which could return Local URL, causing issues like generating public shares with Local URL
+
+        To prevent this I just replicated the entire chain of functions here,
+        if you need a call to Subsonic using the Server (Public) URL use this function.
+         */
+
+        String server = Preferences.getServer();
+        String username = Preferences.getUser();
+        String password = Preferences.getPassword();
+        String token = Preferences.getToken();
+        String salt = Preferences.getSalt();
+        boolean isLowSecurity = Preferences.isLowScurity();
+
+        SubsonicPreferences preferences = new SubsonicPreferences();
+        preferences.setServerUrl(server);
+        preferences.setUsername(username);
+        preferences.setAuthentication(password, token, salt, isLowSecurity);
+
+        if (subsonic == null || override) {
+            
+            if (preferences.getAuthentication() != null) {
+                if (preferences.getAuthentication().getPassword() != null)
+                    Preferences.setPassword(preferences.getAuthentication().getPassword());
+                if (preferences.getAuthentication().getToken() != null)
+                    Preferences.setToken(preferences.getAuthentication().getToken());
+                if (preferences.getAuthentication().getSalt() != null)
+                    Preferences.setSalt(preferences.getAuthentication().getSalt());
+            }
+
+            
+        }
+        
+        return new Subsonic(preferences);
+    }

    public static Github getGithubClientInstance() {
        if (github == null) {
--- a/app/src/main/java/com/cappielloantonio/tempo/database/AppDatabase.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/database/AppDatabase.java
@@ -30,9 +30,13 @@ import com.cappielloantonio.tempo.subsonic.models.Playlist;

@UnstableApi
@Database(
-        version = 13,
+        version = 14,
        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)}
+        autoMigrations = {
+                @AutoMigration(from = 10, to = 11),
+                @AutoMigration(from = 11, to = 12),
+                @AutoMigration(from = 13, to = 14),
+        }
 )
@TypeConverters({DateConverters.class})
 public abstract class AppDatabase extends RoomDatabase {
--- a/app/src/main/java/com/cappielloantonio/tempo/database/dao/PlaylistDao.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/database/dao/PlaylistDao.java
@@ -19,6 +19,9 @@ public interface PlaylistDao {
    @Query("SELECT * FROM playlist")
    LiveData<List<Playlist>> getAll();

+    @Query("SELECT * FROM playlist")
+    List<Playlist> getAllSync();
+
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    void insert(Playlist playlist);

--- a/app/src/main/java/com/cappielloantonio/tempo/model/Server.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/model/Server.kt
@@ -2,7 +2,6 @@ package com.cappielloantonio.tempo.model

 import android.os.Parcelable
 import androidx.annotation.Keep
-import androidx.annotation.Nullable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
@@ -35,5 +34,8 @@ data class Server(
    val timestamp: Long,

    @ColumnInfo(name = "low_security", defaultValue = "false")
-    val isLowSecurity: Boolean
+    val isLowSecurity: Boolean,
+
+    @ColumnInfo(name = "client_cert")
+    val clientCert: String?,
 ) : Parcelable
--- a/app/src/main/java/com/cappielloantonio/tempo/model/SessionMediaItem.kt
+++ b/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
@@ -193,11 +195,20 @@ class SessionMediaItem() {
        title = internetRadioStation.name
        streamUrl = internetRadioStation.streamUrl
        type = Constants.MEDIA_TYPE_RADIO
+
+        val homePageUrl = internetRadioStation.homePageUrl
+        if (homePageUrl != null && homePageUrl.isNotEmpty() && MusicUtil.isImageUrl(homePageUrl)) {
+            val encodedUrl = android.util.Base64.encodeToString(
+                homePageUrl.toByteArray(java.nio.charset.StandardCharsets.UTF_8),
+                android.util.Base64.URL_SAFE or android.util.Base64.NO_WRAP
+            )
+            coverArtId = "ir_$encodedUrl"
+        }
    }

    fun getMediaItem(): MediaItem {
        val uri: Uri = getStreamUri()
-        val artworkUri = Uri.parse(CustomGlideRequest.createUrl(coverArtId, getImageSize()))
+        val artworkUri = if (coverArtId != null) AlbumArtContentProvider.contentUri(coverArtId!!) else null

        val bundle = Bundle()
        bundle.putString("id", id)
@@ -227,7 +238,7 @@ class SessionMediaItem() {
        bundle.putLong("starred", starred?.time ?: 0)
        bundle.putString("albumId", albumId)
        bundle.putString("artistId", artistId)
-        bundle.putString("type", Constants.MEDIA_TYPE_MUSIC)
+        bundle.putString("type", type)
        bundle.putLong("bookmarkPosition", bookmarkPosition ?: 0)
        bundle.putInt("originalWidth", originalWidth ?: 0)
        bundle.putInt("originalHeight", originalHeight ?: 0)
--- a/app/src/main/java/com/cappielloantonio/tempo/provider/AlbumArtContentProvider.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/provider/AlbumArtContentProvider.java
@@ -0,0 +1,159 @@
+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 android.util.Base64;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.cappielloantonio.tempo.BuildConfig;
+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 = BuildConfig.APPLICATION_ID + ".albumart.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;
+
+        if (albumId != null && albumId.startsWith("ir_")) {
+            String encodedUrl = albumId.substring("ir_".length());
+            String decodedUrl = new String(Base64.decode(encodedUrl, Base64.URL_SAFE | Base64.NO_WRAP));
+            artworkUri = Uri.parse(decodedUrl);
+        } else {
+            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;
+    }
+}
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/AutomotiveRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/AutomotiveRepository.java
@@ -1,6 +1,6 @@
 package com.cappielloantonio.tempo.repository;

-
+import android.content.ContentResolver;
 import android.net.Uri;
 import android.view.View;

@@ -22,6 +22,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;
@@ -67,10 +68,20 @@ public class AutomotiveRepository {
                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbumList2() != null && response.body().getSubsonicResponse().getAlbumList2().getAlbums() != null) {
                            List<AlbumID3> albums = response.body().getSubsonicResponse().getAlbumList2().getAlbums();

+                            // add by MFO
+                            // Hack for artist view
+                            if("alphabeticalByArtist".equals(type))for(AlbumID3 album : albums){
+                                String artistName = album.getArtist();
+                                String albumName = album.getName();
+                                album.setName(artistName);
+                                album.setArtist(albumName);
+                            }
+                            // end add by MFO
+
                            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 +228,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 +283,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 +408,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 +462,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 +561,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())
@@ -604,20 +615,7 @@ public class AutomotiveRepository {
                            List<MediaItem> mediaItems = new ArrayList<>();

                            for (InternetRadioStation radioStation : radioStations) {
-                                MediaMetadata mediaMetadata = new MediaMetadata.Builder()
-                                        .setTitle(radioStation.getName())
-                                        .setIsBrowsable(false)
-                                        .setIsPlayable(true)
-                                        .setMediaType(MediaMetadata.MEDIA_TYPE_RADIO_STATION)
-                                        .build();
-
-                                MediaItem mediaItem = new MediaItem.Builder()
-                                        .setMediaId(radioStation.getId())
-                                        .setMediaMetadata(mediaMetadata)
-                                        .setUri(radioStation.getStreamUrl())
-                                        .build();
-
-                                mediaItems.add(mediaItem);
+                                mediaItems.add(MappingUtil.mapInternetRadioStation(radioStation));
                            }

                            setInternetRadioStationsMetadata(radioStations);
@@ -687,7 +685,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 +798,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 +820,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())
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/PlaylistRepository.java
@@ -1,13 +1,13 @@
 package com.cappielloantonio.tempo.repository;

-import static android.provider.Settings.System.getString;
-
-import android.provider.Settings;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import androidx.media3.common.util.UnstableApi;

 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.R;
@@ -26,8 +26,45 @@ import retrofit2.Callback;
 import retrofit2.Response;

 public class PlaylistRepository {
+    private static final MutableLiveData<Boolean> playlistUpdateTrigger = new MutableLiveData<>();
+
+    public LiveData<Boolean> getPlaylistUpdateTrigger() {
+        return playlistUpdateTrigger;
+    }
+
+    public void notifyPlaylistChanged() {
+        playlistUpdateTrigger.postValue(true);
+        refreshAllPlaylists();
+    }
+
    @androidx.media3.common.util.UnstableApi
    private final PlaylistDao playlistDao = AppDatabase.getInstance().playlistDao();
+    private static final MutableLiveData<List<Playlist>> allPlaylistsLiveData = new MutableLiveData<>();
+
+    public LiveData<List<Playlist>> getAllPlaylists(LifecycleOwner owner) {
+        refreshAllPlaylists();
+        return allPlaylistsLiveData;
+    }
+
+    public void refreshAllPlaylists() {
+        App.getSubsonicClientInstance(false)
+                .getPlaylistClient()
+                .getPlaylists()
+                .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().getPlaylists() != null) {
+                            List<Playlist> playlists = response.body().getSubsonicResponse().getPlaylists().getPlaylists();
+                            allPlaylistsLiveData.postValue(playlists);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                    }
+                });
+    }
+
    public MutableLiveData<List<Playlist>> getPlaylists(boolean random, int size) {
        MutableLiveData<List<Playlist>> listLivePlaylists = new MutableLiveData<>(new ArrayList<>());

@@ -107,27 +144,62 @@ public class PlaylistRepository {
        return playlistLiveData;
    }

-    public void addSongToPlaylist(String playlistId, ArrayList<String> songsId) {
+    public interface AddToPlaylistCallback {
+        void onSuccess();
+        void onFailure();
+        void onAllSkipped();
+    }
+
+    public void addSongToPlaylist(String playlistId, ArrayList<String> songsId, Boolean playlistVisibilityIsPublic, AddToPlaylistCallback callback) {
+        android.util.Log.d("PlaylistRepository", "addSongToPlaylist: id=" + playlistId + ", songs=" + songsId);
        if (songsId.isEmpty()) {
-            Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_all_skipped), Toast.LENGTH_SHORT).show();
+            if (callback != null) callback.onAllSkipped();
        } 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) {
-                            Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_success), Toast.LENGTH_SHORT).show();
+                            if (response.isSuccessful()) notifyPlaylistChanged();
+                            if (callback != null) callback.onSuccess();
                        }

                        @Override
                        public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-                            Toast.makeText(App.getContext(), App.getContext().getString(R.string.playlist_chooser_dialog_toast_add_failure), Toast.LENGTH_SHORT).show();
+                            if (callback != null) callback.onFailure();
                        }
                    });
        }
    }

+    public void removeSongFromPlaylist(String playlistId, int index, AddToPlaylistCallback callback) {
+        ArrayList<Integer> indexes = new ArrayList<>();
+        indexes.add(index);
+        App.getSubsonicClientInstance(false)
+                .getPlaylistClient()
+                .updatePlaylist(playlistId, null, true, null, indexes)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        if (response.isSuccessful()) notifyPlaylistChanged();
+                        if (callback != null) {
+                            if (response.isSuccessful()) callback.onSuccess();
+                            else callback.onFailure();
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        if (callback != null) callback.onFailure();
+                    }
+                });
+    }
+
+    public void addSongToPlaylist(String playlistId, ArrayList<String> songsId, Boolean playlistVisibilityIsPublic) {
+        addSongToPlaylist(playlistId, songsId, playlistVisibilityIsPublic, null);
+    }
+
    public void createPlaylist(String playlistId, String name, ArrayList<String> songsId) {
        App.getSubsonicClientInstance(false)
                .getPlaylistClient()
@@ -135,7 +207,7 @@ public class PlaylistRepository {
                .enqueue(new Callback<ApiResponse>() {
                    @Override
                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
+                        if (response.isSuccessful()) notifyPlaylistChanged();
                    }

                    @Override
@@ -148,20 +220,45 @@ public class PlaylistRepository {
    public void updatePlaylist(String playlistId, String name, ArrayList<String> songsId) {
        App.getSubsonicClientInstance(false)
                .getPlaylistClient()
-                .deletePlaylist(playlistId)
+                .updatePlaylist(playlistId, name, true, null, null)
                .enqueue(new Callback<ApiResponse>() {
                    @Override
                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        createPlaylist(null, name, songsId);
+                        if (response.isSuccessful()) {
+                            // After renaming, we need to handle the song list update.
+                            // Subsonic doesn't have a "replace all songs" in updatePlaylist.
+                            // So we might still need to recreate if the songs changed significantly,
+                            // but if we just renamed, we should update the local pinned database.
+                            updateLocalPinnedPlaylistName(playlistId, name);
+                            notifyPlaylistChanged();
+                        }
+
+                        // If songsId is provided, we might want to re-sync them.
+                        // For now, let's at least fix the name duplication issue.
                    }

                    @Override
                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
                    }
                });
    }

+    @OptIn(markerClass = UnstableApi.class)
+    private void updateLocalPinnedPlaylistName(String id, String newName) {
+        new Thread(() -> {
+            List<Playlist> pinned = playlistDao.getAllSync();
+            if (pinned != null) {
+                for (Playlist p : pinned) {
+                    if (p.getId().equals(id)) {
+                        p.setName(newName);
+                        playlistDao.insert(p); // Replace strategy will update it
+                        break;
+                    }
+                }
+            }
+        }).start();
+    }
+
    public void deletePlaylist(String playlistId) {
        App.getSubsonicClientInstance(false)
                .getPlaylistClient()
@@ -169,7 +266,7 @@ public class PlaylistRepository {
                .enqueue(new Callback<ApiResponse>() {
                    @Override
                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-
+                        if (response.isSuccessful()) notifyPlaylistChanged();
                    }

                    @Override
@@ -197,6 +294,49 @@ public class PlaylistRepository {
        thread.start();
    }

+    @androidx.media3.common.util.UnstableApi
+    public void updatePinnedPlaylists() {
+        updatePinnedPlaylists(null);
+    }
+
+    @androidx.media3.common.util.UnstableApi
+    public void updatePinnedPlaylists(List<String> forceIds) {
+        new Thread(() -> {
+            List<Playlist> pinned = playlistDao.getAllSync();
+            if (pinned != null && !pinned.isEmpty()) {
+                App.getSubsonicClientInstance(false)
+                        .getPlaylistClient()
+                        .getPlaylists()
+                        .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().getPlaylists() != null) {
+                                    List<Playlist> remotes = response.body().getSubsonicResponse().getPlaylists().getPlaylists();
+                                    new Thread(() -> {
+                                        for (Playlist p : pinned) {
+                                            for (Playlist r : remotes) {
+                                                if (p.getId().equals(r.getId())) {
+                                                    p.setName(r.getName());
+                                                    p.setSongCount(r.getSongCount());
+                                                    p.setDuration(r.getDuration());
+                                                    p.setCoverArtId(r.getCoverArtId());
+                                                    playlistDao.insert(p);
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }).start();
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                            }
+                        });
+            }
+        }).start();
+    }
+
    private static class InsertThreadSafe implements Runnable {
        private final PlaylistDao playlistDao;
        private final Playlist playlist;
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/SharingRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/SharingRepository.java
@@ -41,7 +41,7 @@ public class SharingRepository {
    public MutableLiveData<Share> createShare(String id, String description, Long expires) {
        MutableLiveData<Share> share = new MutableLiveData<>();

-        App.getSubsonicClientInstance(false)
+        App.getSubsonicPublicClientInstance(false)
                .getSharingClient()
                .createShare(id, description, expires)
                .enqueue(new Callback<ApiResponse>() {
@@ -64,7 +64,7 @@ public class SharingRepository {
    }

    public void updateShare(String id, String description, Long expires) {
-        App.getSubsonicClientInstance(false)
+        App.getSubsonicPublicClientInstance(false)
                .getSharingClient()
                .updateShare(id, description, expires)
                .enqueue(new Callback<ApiResponse>() {
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java
@@ -283,7 +283,10 @@ public class SongRepository {
            @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) {
-                    songs.addAll(Objects.requireNonNull(response.body().getSubsonicResponse().getRandomSongs().getSongs()));
+                    List<Child> returned = response.body().getSubsonicResponse().getRandomSongs().getSongs();
+                    if (returned != null) {
+                        songs.addAll(returned);
+                    }
                }
                randomSongsSample.setValue(songs);
            }
@@ -299,7 +302,10 @@ public class SongRepository {
            @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) {
-                    songs.addAll(Objects.requireNonNull(response.body().getSubsonicResponse().getRandomSongs().getSongs()));
+                    List<Child> returned = response.body().getSubsonicResponse().getRandomSongs().getSongs();
+                    if (returned != null) {
+                        songs.addAll(returned);
+                    }
                }
                randomSongsSample.setValue(songs);
            }
@@ -342,7 +348,10 @@ public class SongRepository {
                @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(Objects.requireNonNull(response.body().getSubsonicResponse().getSongsByGenre().getSongs()));
+                        List<Child> returned = response.body().getSubsonicResponse().getSongsByGenre().getSongs();
+                        if (returned != null) {
+                            songs.addAll(returned);
+                        }
                    }
                    songsByGenre.setValue(songs);
                }
--- a/app/src/main/java/com/cappielloantonio/tempo/service/BaseMediaService.kt
+++ b/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
@@ -23,6 +24,9 @@ import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.ShuffleOrder.DefaultShuffleOrder
 import androidx.media3.session.*
 import androidx.media3.session.MediaSession.ControllerInfo
+import androidx.media3.extractor.metadata.icy.IcyInfo
+import androidx.media3.extractor.metadata.id3.TextInformationFrame
+import androidx.media3.extractor.metadata.vorbis.VorbisComment
 import com.cappielloantonio.tempo.R
 import com.cappielloantonio.tempo.repository.QueueRepository
 import com.cappielloantonio.tempo.ui.activity.MainActivity
@@ -31,6 +35,14 @@ import com.cappielloantonio.tempo.widget.WidgetUpdateManager
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
+
+private const val TAG = "BaseMediaService"

@UnstableApi
 open class BaseMediaService : MediaLibraryService() {
@@ -67,6 +79,13 @@ open class BaseMediaService : MediaLibraryService() {
        }
    }

+    private val radioHeaderCheckExecutor: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor()
+    private var radioHeaderCheckScheduled = false
+    private var radioHeaderCheckFuture: ScheduledFuture<*>? = null
+    private val radioHeaderCheckRunnable = Runnable {
+        checkRadioHttpHeaders()
+    }
+
    private val binder = LocalBinder()

    open fun playerInitHook() {
@@ -81,7 +100,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
@@ -117,20 +136,33 @@ open class BaseMediaService : MediaLibraryService() {
        updateWidget(player)
    }

+    private var lastRadioArtist: String? = null
+    private var lastRadioTitle: String? = null
+
    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) {
                    MediaManager.setLastPlayedTimestamp(mediaItem)
                }
+                
+                // Restart header checks for radio streams when media item changes
+                val mediaType = mediaItem.mediaMetadata.extras?.getString("type")
+                if (mediaType == Constants.MEDIA_TYPE_RADIO && player.isPlaying) {
+                    stopRadioHeaderChecks()
+                    scheduleRadioHeaderChecks()
+                } else if (mediaType != Constants.MEDIA_TYPE_RADIO) {
+                    stopRadioHeaderChecks()
+                }
+                
                updateWidget(player)
            }

            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 +170,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()
@@ -162,8 +199,98 @@ open class BaseMediaService : MediaLibraryService() {
                }
            }

+            override fun onMetadata(metadata: Metadata) {
+                // Handle streaming metadata (ICY, ID3) for radio / streaming content
+                val currentItem = player.currentMediaItem ?: return
+                val extras = currentItem.mediaMetadata.extras
+                if (extras?.getString("type") != Constants.MEDIA_TYPE_RADIO) return
+
+                var artist: String? = null
+                var title: String? = null
+
+                // Extract metadata from ICY/ID3/Vorbis
+                for (i in 0 until metadata.length()) {
+                    when (val entry = metadata[i]) {
+                        is IcyInfo -> {
+                            entry.title?.let { icyTitle ->
+                                val parts = icyTitle.split(" - ", limit = 2)
+                                if (parts.size == 2) {
+                                    artist = parts[0].trim().ifEmpty { null }
+                                    title = parts[1].trim().ifEmpty { null }
+                                } else {
+                                    title = icyTitle.trim().ifEmpty { null }
+                                }
+                            }
+                        }
+                        is TextInformationFrame -> {
+                            @Suppress("DEPRECATION")
+                            val value = entry.value
+                            when (entry.id) {
+                                "TPE1" -> if (!value.isNullOrBlank()) artist = value
+                                "TIT2" -> if (!value.isNullOrBlank()) title = value
+                            }
+                        }
+                        is VorbisComment -> {
+                            @Suppress("DEPRECATION")
+                            val value = entry.value
+                            when (entry.key) {
+                                "ARTIST" -> if (!value.isNullOrBlank()) artist = value
+                                "TITLE" -> if (!value.isNullOrBlank()) title = value
+                            }
+                        }
+                    }
+                }
+
+                if (artist.isNullOrBlank() && title.isNullOrBlank()) return
+                if (artist == lastRadioArtist && title == lastRadioTitle) return // Deduplicate
+                
+                lastRadioArtist = artist
+                lastRadioTitle = title
+
+                // Stop HTTP header checks since we have embedded metadata
+                stopRadioHeaderChecks()
+
+                val currentIndex = player.currentMediaItemIndex
+                if (currentIndex == C.INDEX_UNSET) return
+
+                val metadataBuilder = currentItem.mediaMetadata.buildUpon()
+                val newExtras = Bundle(extras ?: Bundle())
+
+                // Store individual values in extras for UI
+                artist?.let { newExtras.putString("radioArtist", it) }
+                title?.let { newExtras.putString("radioTitle", it) }
+
+                // Get station name (preserve if already set)
+                val stationName = extras?.getString("stationName")
+                    ?: currentItem.mediaMetadata.title?.toString()
+                    ?: ""
+                if (stationName.isNotBlank()) {
+                    newExtras.putString("stationName", stationName)
+                }
+
+                // Format for notification/player: Title = "Artist - Song", Artist = "Station Name"
+                val formattedTitle = when {
+                    !artist.isNullOrBlank() && !title.isNullOrBlank() -> "$artist - $title"
+                    !title.isNullOrBlank() -> title
+                    !artist.isNullOrBlank() -> artist
+                    else -> stationName
+                }
+
+                metadataBuilder.setTitle(formattedTitle)
+                if (stationName.isNotBlank()) {
+                    metadataBuilder.setArtist(stationName)
+                }
+
+                (player as? ExoPlayer)?.let { exo ->
+                    exo.replaceMediaItem(currentIndex, currentItem.buildUpon()
+                        .setMediaMetadata(metadataBuilder.setExtras(newExtras).build())
+                        .build())
+                    updateWidget(exo)
+                }
+            }
+
            override fun onIsPlayingChanged(isPlaying: Boolean) {
-                Log.d(javaClass.toString(), "onIsPlayingChanged " + player.currentMediaItemIndex)
+                Log.d(TAG, "onIsPlayingChanged " + player.currentMediaItemIndex)
                if (!isPlaying) {
                    MediaManager.setPlayingPausedTimestamp(
                        player.currentMediaItem,
@@ -174,14 +301,16 @@ open class BaseMediaService : MediaLibraryService() {
                }
                if (isPlaying) {
                    scheduleWidgetUpdates()
+                    scheduleRadioHeaderChecks()
                } else {
                    stopWidgetUpdates()
+                    stopRadioHeaderChecks()
                }
                updateWidget(player)
            }

            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 +327,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 +351,7 @@ open class BaseMediaService : MediaLibraryService() {
            }

            override fun onAudioSessionIdChanged(audioSessionId: Int) {
-                Log.d(javaClass.toString(), "onAudioSessionIdChanged")
+                Log.d(TAG, "onAudioSessionIdChanged")
                attachEqualizerIfPossible(audioSessionId)
            }
        })
@@ -279,6 +408,8 @@ open class BaseMediaService : MediaLibraryService() {
        releaseNetworkCallback()
        equalizerManager.release()
        stopWidgetUpdates()
+        stopRadioHeaderChecks()
+        radioHeaderCheckExecutor.shutdown()
        releasePlayers()
        mediaLibrarySession.release()
        super.onDestroy()
@@ -314,7 +445,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))
@@ -397,6 +528,148 @@ open class BaseMediaService : MediaLibraryService() {
        widgetUpdateScheduled = false
    }

+    private fun scheduleRadioHeaderChecks() {
+        val player = mediaLibrarySession.player
+        val currentItem = player.currentMediaItem ?: return
+        val mediaType = currentItem.mediaMetadata.extras?.getString("type")
+        if (mediaType != Constants.MEDIA_TYPE_RADIO) return
+        
+        if (radioHeaderCheckScheduled) return
+        
+        // Check immediately, then periodically
+        checkRadioHttpHeaders()
+        radioHeaderCheckFuture = radioHeaderCheckExecutor.scheduleWithFixedDelay(
+            radioHeaderCheckRunnable,
+            RADIO_HEADER_CHECK_INTERVAL_SECONDS,
+            RADIO_HEADER_CHECK_INTERVAL_SECONDS,
+            TimeUnit.SECONDS
+        )
+        radioHeaderCheckScheduled = true
+    }
+
+    private fun stopRadioHeaderChecks() {
+        if (!radioHeaderCheckScheduled) return
+        radioHeaderCheckFuture?.cancel(false)
+        radioHeaderCheckFuture = null
+        radioHeaderCheckScheduled = false
+    }
+
+    private fun checkRadioHttpHeaders() {
+        val player = mediaLibrarySession.player
+        val currentItem = player.currentMediaItem ?: return
+        val extras = currentItem.mediaMetadata.extras
+        val mediaType = extras?.getString("type")
+        if (mediaType != Constants.MEDIA_TYPE_RADIO) return
+        
+        // Skip if we already have embedded metadata (ICY/ID3) - HTTP headers are only fallback
+        val hasEmbeddedMetadata = !currentItem.mediaMetadata.artist.isNullOrBlank() ||
+                !currentItem.mediaMetadata.title.isNullOrBlank() ||
+                (extras != null && !extras.getString("radioArtist").isNullOrBlank()) ||
+                (extras != null && !extras.getString("radioTitle").isNullOrBlank())
+        if (hasEmbeddedMetadata) return
+        
+        val streamUrl = extras?.getString("uri") ?: currentItem.requestMetadata.mediaUri?.toString()
+        if (streamUrl.isNullOrBlank()) return
+
+        try {
+            val url = URL(streamUrl)
+            val connection = url.openConnection() as? HttpURLConnection ?: return
+            
+            // Only try HEAD request (lightweight) - skip GET fallback as it's unreliable
+            connection.requestMethod = "HEAD"
+            connection.setRequestProperty("Icy-MetaData", "1")
+            connection.setRequestProperty("User-Agent", "Tempus/1.0")
+            connection.connectTimeout = 3000 // Reduced timeout
+            connection.readTimeout = 3000
+            
+            connection.connect()
+            
+            if (connection.responseCode >= 400) {
+                connection.disconnect()
+                return
+            }
+            
+            // Check for metadata in HTTP headers
+            val streamTitle = connection.getHeaderField("icy-name")
+                ?: connection.getHeaderField("StreamTitle")
+                ?: connection.getHeaderField("stream-title")
+            
+            connection.disconnect()
+            
+            if (!streamTitle.isNullOrBlank()) {
+                processStreamTitle(streamTitle, player)
+            }
+        } catch (e: Exception) {
+            // Silently fail - this is a fallback mechanism, ICY metadata is primary
+        }
+    }
+    
+    private fun processStreamTitle(streamTitle: String, player: Player) {
+        // Parse "Artist - Title" format
+        val parts = streamTitle.split(" - ", limit = 2)
+        val artist = if (parts.size == 2) parts[0].trim().ifEmpty { null } else null
+        val title = if (parts.size == 2) parts[1].trim().ifEmpty { null } else streamTitle.trim().ifEmpty { null }
+        
+        if (artist.isNullOrBlank() && title.isNullOrBlank()) return
+        if (artist == lastRadioArtist && title == lastRadioTitle) return // Deduplicate
+        
+        lastRadioArtist = artist
+        lastRadioTitle = title
+        
+        // Update on main thread
+        widgetUpdateHandler.post {
+            val currentItemNow = player.currentMediaItem ?: return@post
+            val currentIndex = player.currentMediaItemIndex
+            if (currentIndex == C.INDEX_UNSET) return@post
+            
+            val currentExtras = currentItemNow.mediaMetadata.extras
+            if (currentExtras?.getString("type") != Constants.MEDIA_TYPE_RADIO) return@post
+            
+            // Double-check we still don't have embedded metadata (might have arrived since check)
+            val hasEmbeddedMetadata = !currentItemNow.mediaMetadata.artist.isNullOrBlank() ||
+                    !currentItemNow.mediaMetadata.title.isNullOrBlank() ||
+                    (currentExtras != null && !currentExtras.getString("radioArtist").isNullOrBlank()) ||
+                    (currentExtras != null && !currentExtras.getString("radioTitle").isNullOrBlank())
+            if (hasEmbeddedMetadata) return@post
+            
+            val metadataBuilder = currentItemNow.mediaMetadata.buildUpon()
+            val newExtras = Bundle(currentExtras ?: Bundle())
+            
+            // Store individual values in extras for UI
+            artist?.let { newExtras.putString("radioArtist", it) }
+            title?.let { newExtras.putString("radioTitle", it) }
+            
+            // Get station name (preserve if already set)
+            val stationName = currentExtras?.getString("stationName")
+                ?: currentItemNow.mediaMetadata.title?.toString()
+                ?: ""
+            if (stationName.isNotBlank()) {
+                newExtras.putString("stationName", stationName)
+            }
+            
+            // Format for notification/player: Title = "Artist - Song", Artist = "Station Name"
+            val formattedTitle = when {
+                !artist.isNullOrBlank() && !title.isNullOrBlank() -> "$artist - $title"
+                !title.isNullOrBlank() -> title
+                !artist.isNullOrBlank() -> artist
+                else -> stationName
+            }
+            
+            metadataBuilder.setTitle(formattedTitle)
+            if (stationName.isNotBlank()) {
+                metadataBuilder.setArtist(stationName)
+            }
+            metadataBuilder.setExtras(newExtras)
+            
+            (player as? ExoPlayer)?.let { exo ->
+                exo.replaceMediaItem(currentIndex, currentItemNow.buildUpon()
+                    .setMediaMetadata(metadataBuilder.build())
+                    .build())
+                updateWidget(exo)
+            }
+        }
+    }
+
    private fun attachEqualizerIfPossible(audioSessionId: Int): Boolean {
        if (audioSessionId == 0 || audioSessionId == -1) return false
        val attached = equalizerManager.attachToSession(audioSessionId)
@@ -461,7 +734,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 +759,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()
@@ -587,4 +860,5 @@ open class BaseMediaService : MediaLibraryService() {
 }

 private const val WIDGET_UPDATE_INTERVAL_MS = 1000L
+private const val RADIO_HEADER_CHECK_INTERVAL_SECONDS = 30L // Reduced frequency - only fallback when ICY fails

--- a/app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java
@@ -444,29 +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().getContinuousMix(mediaItem.mediaId,25);
-
-            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) {
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/RetrofitClient.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/RetrofitClient.kt
@@ -3,6 +3,7 @@ package com.cappielloantonio.tempo.subsonic
 import com.cappielloantonio.tempo.App
 import com.cappielloantonio.tempo.subsonic.utils.CacheUtil
 import com.cappielloantonio.tempo.subsonic.utils.EmptyDateTypeAdapter
+import com.cappielloantonio.tempo.util.ClientCertManager
 import com.google.gson.GsonBuilder
 import okhttp3.Cache
 import okhttp3.OkHttpClient
@@ -13,7 +14,7 @@ import java.util.Date
 import java.util.concurrent.TimeUnit

 class RetrofitClient(subsonic: Subsonic) {
-    var retrofit: Retrofit
+    val retrofit: Retrofit

    init {
        val gson = GsonBuilder()
@@ -50,6 +51,7 @@ class RetrofitClient(subsonic: Subsonic) {
            .addInterceptor(cacheUtil.offlineInterceptor)
            // .addNetworkInterceptor(cacheUtil.onlineInterceptor)
            .cache(getCache())
+            .setupSsl()
            .build()
    }

@@ -63,4 +65,11 @@ class RetrofitClient(subsonic: Subsonic) {
        val cacheSize = 10 * 1024 * 1024
        return Cache(App.getContext().cacheDir, cacheSize.toLong())
    }
+
+    private fun OkHttpClient.Builder.setupSsl(): OkHttpClient.Builder {
+        ClientCertManager.sslSocketFactory?.let { sslSocketFactory ->
+            sslSocketFactory(sslSocketFactory, ClientCertManager.trustManager)
+        }
+        return this
+    }
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java
+++ b/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;
    }
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/models/InternetRadioStation.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/models/InternetRadioStation.kt
@@ -3,6 +3,7 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import kotlinx.parcelize.Parcelize
+import com.google.gson.annotations.SerializedName

@Keep
@Parcelize
@@ -10,5 +11,6 @@ class InternetRadioStation(
    var id: String? = null,
    var name: String? = null,
    var streamUrl: String? = null,
+    @SerializedName("homePageUrl", alternate = ["homepageUrl"])
    var homePageUrl: String? = null,
 ) : Parcelable
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/CacheUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/CacheUtil.java
@@ -62,7 +62,8 @@ public class CacheUtil {

        boolean hasAppropriateTransport = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET);
+                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
+                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH);
        if (!hasAppropriateTransport) {
            return false;
        }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/activity/MainActivity.java
@@ -3,23 +3,31 @@ package com.cappielloantonio.tempo.ui.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
+import android.widget.FrameLayout;

 import androidx.annotation.NonNull;
 import androidx.core.splashscreen.SplashScreen;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MediaMetadata;
-import androidx.media3.common.Player;
 import androidx.media3.common.MimeTypes;
+import androidx.media3.common.Player;
 import androidx.media3.common.util.UnstableApi;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
@@ -45,6 +53,7 @@ import com.cappielloantonio.tempo.viewmodel.MainViewModel;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.color.DynamicColors;
+import com.google.android.material.navigation.NavigationView;
 import com.google.common.util.concurrent.MoreExecutors;

 import java.util.Objects;
@@ -60,8 +69,12 @@ public class MainActivity extends BaseActivity {
    private FragmentManager fragmentManager;
    private NavHostFragment navHostFragment;
    private BottomNavigationView bottomNavigationView;
+    private FrameLayout bottomNavigationViewFrame;
    public NavController navController;
+    private DrawerLayout drawerLayout;
+    private NavigationView navigationView;
    private BottomSheetBehavior bottomSheetBehavior;
+    public boolean isLandscape = false;
    private AssetLinkNavigator assetLinkNavigator;
    private AssetLinkUtil.AssetLink pendingAssetLink;

@@ -85,6 +98,8 @@ public class MainActivity extends BaseActivity {
        connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this);
        connectivityStatusReceiverManager(true);

+        isLandscape = (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
+
        init();
        checkConnectionType();
        getOpenSubsonicExtensions();
@@ -105,6 +120,7 @@ public class MainActivity extends BaseActivity {
    protected void onResume() {
        super.onResume();
        pingServer();
+        toggleNavigationDrawerLockOnOrientationChange();
    }

    @Override
@@ -141,6 +157,9 @@ public class MainActivity extends BaseActivity {
        } else {
            goToLogin();
        }
+
+        toggleNavigationDrawerLockOnOrientationChange();
+
    }

    // BOTTOM SHEET/NAVIGATION
@@ -215,7 +234,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);
+                    }
                }
            };

@@ -242,8 +263,12 @@ public class MainActivity extends BaseActivity {

    private void initNavigation() {
        bottomNavigationView = findViewById(R.id.bottom_navigation);
+        bottomNavigationViewFrame = findViewById(R.id.bottom_navigation_frame);
        navHostFragment = (NavHostFragment) fragmentManager.findFragmentById(R.id.nav_host_fragment);
        navController = Objects.requireNonNull(navHostFragment).getNavController();
+        // This is the lateral slide-in drawer
+        drawerLayout = findViewById(R.id.drawer_layout);
+        navigationView = findViewById(R.id.nav_view);

        /*
         * In questo modo intercetto il cambio schermata tramite navbar e se il bottom sheet è aperto,
@@ -260,16 +285,90 @@ public class MainActivity extends BaseActivity {
        });

        NavigationUI.setupWithNavController(bottomNavigationView, navController);
+        NavigationUI.setupWithNavController(navigationView, navController);
    }

    public void setBottomNavigationBarVisibility(boolean visibility) {
        if (visibility) {
            bottomNavigationView.setVisibility(View.VISIBLE);
+            bottomNavigationViewFrame.setVisibility(View.VISIBLE);
        } else {
            bottomNavigationView.setVisibility(View.GONE);
+            bottomNavigationViewFrame.setVisibility(View.GONE);
        }
    }

+    public void toggleBottomNavigationBarVisibilityOnOrientationChange() {
+        // Ignore orientation change, bottom navbar always hidden
+        if (Preferences.getHideBottomNavbarOnPortrait()) {
+            setBottomNavigationBarVisibility(false);
+            setPortraitPlayerBottomSheetPeekHeight(56);
+            setSystemBarsVisibility(!isLandscape);
+            return;
+        }
+
+        if (!isLandscape) {
+            // Show app navbar + show system bars
+            setPortraitPlayerBottomSheetPeekHeight(136);
+            setBottomNavigationBarVisibility(true);
+            setSystemBarsVisibility(true);
+        } else {
+            // Hide app navbar + hide system bars
+            setPortraitPlayerBottomSheetPeekHeight(56);
+            setBottomNavigationBarVisibility(false);
+            setSystemBarsVisibility(false);
+        }
+    }
+
+    public void setNavigationDrawerLock(boolean locked) {
+        int mode = locked
+                ? DrawerLayout.LOCK_MODE_LOCKED_CLOSED
+                : DrawerLayout.LOCK_MODE_UNLOCKED;
+        drawerLayout.setDrawerLockMode(mode);
+    }
+
+    public void toggleNavigationDrawerLockOnOrientationChange() {
+        // Ignore orientation check, drawer always unlocked
+        if (Preferences.getEnableDrawerOnPortrait()) {
+            setNavigationDrawerLock(false);
+            return;
+        }
+        if (!isLandscape) {
+            setNavigationDrawerLock(true);
+        } else {
+            setNavigationDrawerLock(false);
+        }
+    }
+
+    public void setSystemBarsVisibility(boolean visibility) {
+        WindowInsetsControllerCompat insetsController;
+        View decorView = getWindow().getDecorView();
+        insetsController = new WindowInsetsControllerCompat(getWindow(), decorView);
+
+        if (visibility) {
+            WindowCompat.setDecorFitsSystemWindows(getWindow(), true);
+            insetsController.show(WindowInsetsCompat.Type.navigationBars());
+            insetsController.show(WindowInsetsCompat.Type.statusBars());
+            insetsController.setSystemBarsBehavior(
+                    WindowInsetsControllerCompat.BEHAVIOR_DEFAULT);
+        } else {
+            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+            insetsController.hide(WindowInsetsCompat.Type.navigationBars());
+            insetsController.hide(WindowInsetsCompat.Type.statusBars());
+            insetsController.setSystemBarsBehavior(
+                    WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+        }
+    }
+
+    private void setPortraitPlayerBottomSheetPeekHeight(int peekHeight) {
+        FrameLayout bottomSheet = findViewById(R.id.player_bottom_sheet);
+        BottomSheetBehavior<FrameLayout> behavior =
+                BottomSheetBehavior.from(bottomSheet);
+
+        int newPeekPx = (int) (peekHeight * getResources().getDisplayMetrics().density);
+        behavior.setPeekHeight(newPeekPx);
+    }
+
    private void initService() {
        MediaManager.check(getMediaBrowserListenableFuture());

@@ -351,10 +450,11 @@ public class MainActivity extends BaseActivity {
        Preferences.setServer(null);
        Preferences.setLocalAddress(null);
        Preferences.setUser(null);
+        Preferences.setClientCert(null);

        // 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 +484,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 +528,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);
@@ -553,4 +653,4 @@ public class MainActivity extends BaseActivity {

        MediaManager.playDownloadedMediaItem(getMediaBrowserListenableFuture(), mediaItem);
    }
-}
+}
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
@@ -146,7 +146,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
    public void sort(String order) {
        switch (order) {
            case Constants.ARTIST_ORDER_BY_NAME:
-                artists.sort(Comparator.comparing(ArtistID3::getName));
+                artists.sort(Comparator.comparing(ArtistID3::getName,String.CASE_INSENSITIVE_ORDER));
                break;
            case Constants.ARTIST_ORDER_BY_RANDOM:
                Collections.shuffle(artists);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/InternetRadioStationAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/InternetRadioStationAdapter.java
@@ -42,8 +42,13 @@ public class InternetRadioStationAdapter extends RecyclerView.Adapter<InternetRa
        holder.item.internetRadioStationTitleTextView.setText(internetRadioStation.getName());
        holder.item.internetRadioStationSubtitleTextView.setText(internetRadioStation.getStreamUrl());

+        String imageId = internetRadioStation.getHomePageUrl();
+        if (imageId == null || imageId.isEmpty()) {
+            imageId = internetRadioStation.getStreamUrl();
+        }
+
        CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), internetRadioStation.getStreamUrl(), CustomGlideRequest.ResourceType.Radio)
+                .from(holder.itemView.getContext(), imageId, CustomGlideRequest.ResourceType.Radio)
                .build()
                .into(holder.item.internetRadioStationCoverImageView);
    }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlaylistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlaylistHorizontalAdapter.java
@@ -47,6 +47,7 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori

            FilterResults results = new FilterResults();
            results.values = filteredList;
+            results.count = filteredList.size();

            return results;
        }
@@ -54,7 +55,9 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
        @Override
        protected void publishResults(CharSequence constraint, FilterResults results) {
            playlists.clear();
-            if (results.count > 0) playlists.addAll((List) results.values);
+            if (results.values != null) {
+                playlists.addAll((List<Playlist>) results.values);
+            }
            notifyDataSetChanged();
        }
    };
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
+++ b/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) {
@@ -357,6 +359,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
        private boolean onLongClick() {
            Bundle bundle = new Bundle();
            bundle.putParcelable(Constants.TRACK_OBJECT, songs.get(getBindingAdapterPosition()));
+            bundle.putInt(Constants.ITEM_POSITION, getBindingAdapterPosition());

            click.onMediaLongClick(bundle);

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaybackSpeedDialog.java
+++ b/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
+    }
+}
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java
@@ -19,28 +19,30 @@ import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.viewmodel.PlaylistChooserViewModel;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;

-import java.util.Objects;
-
 public class PlaylistChooserDialog extends DialogFragment implements ClickCallback {
    private DialogPlaylistChooserBinding bind;
    private PlaylistChooserViewModel playlistChooserViewModel;
-
    private PlaylistDialogHorizontalAdapter playlistDialogHorizontalAdapter;

-
    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        DialogPlaylistChooserBinding.inflate(getLayoutInflater());
        bind = DialogPlaylistChooserBinding.inflate(getLayoutInflater());

        playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class);

-        return new MaterialAlertDialogBuilder(getActivity())
+        bind.playlistDialogChooserVisibilitySwitch.setOnCheckedChangeListener(
+                (buttonView,
+                 isChecked) -> playlistChooserViewModel.setIsPlaylistPublic(isChecked)
+        );
+        bind.playlistChooserDialogCreateButton.setOnClickListener(v -> launchPlaylistEditor());
+        bind.playlistChooserDialogCancelButton.setOnClickListener(v -> dismiss());
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext())
                .setView(bind.getRoot())
-                .setTitle(R.string.playlist_chooser_dialog_title)
-                .setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { })
-                .setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel())
-                .create();
+                .setTitle(R.string.playlist_chooser_dialog_title);
+        return builder.create();
    }

    @Override
@@ -55,25 +57,26 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba

        initPlaylistView();
        setSongInfo();
-        setButtonAction();
    }

    private void setSongInfo() {
        playlistChooserViewModel.setSongsToAdd(requireArguments().getParcelableArrayList(Constants.TRACKS_OBJECT));
    }

-    private void setButtonAction() {
-        androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());
-        alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
-            Bundle bundle = new Bundle();
-            bundle.putParcelableArrayList(Constants.TRACKS_OBJECT, playlistChooserViewModel.getSongsToAdd());
+    private void launchPlaylistEditor() {
+        Bundle bundle = new Bundle();
+        bundle.putParcelableArrayList(
+                Constants.TRACKS_OBJECT,
+                playlistChooserViewModel.getSongsToAdd()
+        );

-            PlaylistEditorDialog dialog = new PlaylistEditorDialog(null);
-            dialog.setArguments(bundle);
-            dialog.show(requireActivity().getSupportFragmentManager(), null);
+        PlaylistEditorDialog editorDialog = new PlaylistEditorDialog(null);
+        editorDialog.setArguments(bundle);
+        editorDialog.show(
+                requireActivity().getSupportFragmentManager(),
+                null);

-            Objects.requireNonNull(getDialog()).dismiss();
-        });
+        dismiss();
    }

    private void initPlaylistView() {
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java
@@ -2,8 +2,8 @@ package com.cappielloantonio.tempo.ui.dialog;

 import android.app.Dialog;
 import android.os.Bundle;
+import android.security.KeyChain;
 import android.text.TextUtils;
-import android.view.View;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
@@ -32,11 +32,21 @@ public class ServerSignupDialog extends DialogFragment {
    private String server;
    private String localAddress;
    private boolean lowSecurity = false;
+    private String clientCertAlias;

    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        bind = DialogServerSignupBinding.inflate(getLayoutInflater());
+        bind.clientCertTextView.setOnClickListener(v -> {
+            if (TextUtils.isEmpty(bind.clientCertTextView.getText())) {
+                KeyChain.choosePrivateKeyAlias(requireActivity(), alias -> {
+                    bind.clientCertTextView.setText(alias);
+                }, null, null, null, null);
+            } else {
+                bind.clientCertTextView.setText(null);
+            }
+        });

        loginViewModel = new ViewModelProvider(requireActivity()).get(LoginViewModel.class);

@@ -74,6 +84,7 @@ public class ServerSignupDialog extends DialogFragment {
                bind.serverTextView.setText(loginViewModel.getServerToEdit().getAddress());
                bind.localAddressTextView.setText(loginViewModel.getServerToEdit().getLocalAddress());
                bind.lowSecurityCheckbox.setChecked(loginViewModel.getServerToEdit().isLowSecurity());
+                bind.clientCertTextView.setText(loginViewModel.getServerToEdit().getClientCert());
            }
        } else {
            loginViewModel.setServerToEdit(null);
@@ -106,6 +117,7 @@ public class ServerSignupDialog extends DialogFragment {
        server = bind.serverTextView.getText() != null && !bind.serverTextView.getText().toString().trim().isBlank() ? bind.serverTextView.getText().toString().trim() : null;
        localAddress = bind.localAddressTextView.getText() != null && !bind.localAddressTextView.getText().toString().trim().isBlank() ? bind.localAddressTextView.getText().toString().trim() : null;
        lowSecurity = bind.lowSecurityCheckbox.isChecked();
+        clientCertAlias = bind.clientCertTextView.getText() != null && !bind.clientCertTextView.getText().toString().trim().isBlank() ? bind.clientCertTextView.getText().toString().trim() : null;

        if (TextUtils.isEmpty(serverName)) {
            bind.serverNameTextView.setError(getString(R.string.error_required));
@@ -137,6 +149,6 @@ public class ServerSignupDialog extends DialogFragment {

    private void saveServerPreference() {
        String serverID = loginViewModel.getServerToEdit() != null ? loginViewModel.getServerToEdit().getServerId() : UUID.randomUUID().toString();
-        loginViewModel.addServer(new Server(serverID, this.serverName, this.username, this.password, this.server, this.localAddress, System.currentTimeMillis(), this.lowSecurity));
+        loginViewModel.addServer(new Server(serverID, this.serverName, this.username, this.password, this.server, this.localAddress, System.currentTimeMillis(), this.lowSecurity, this.clientCertAlias));
    }
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ShareUpdateDialog.java
+++ b/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;
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java
@@ -61,13 +61,47 @@ public class TrackInfoDialog extends DialogFragment {
    private void setTrackInfo() {
        genreLink = null;
        yearLink = null;
-        bind.trakTitleInfoTextView.setText(mediaMetadata.title);
-        bind.trakArtistInfoTextView.setText(
-                mediaMetadata.artist != null
-                        ? mediaMetadata.artist
-                        : mediaMetadata.extras != null && Objects.equals(mediaMetadata.extras.getString("type"), Constants.MEDIA_TYPE_RADIO)
-                        ? mediaMetadata.extras.getString("uri", getString(R.string.label_placeholder))
-                        : "");
+        
+        String type = mediaMetadata.extras != null ? mediaMetadata.extras.getString("type") : null;
+        boolean isRadio = Objects.equals(type, Constants.MEDIA_TYPE_RADIO);
+        
+        if (isRadio) {
+            // For radio: always read from extras first (radioArtist, radioTitle, stationName)
+            // MediaMetadata.title/artist are formatted for notification
+            String stationName = mediaMetadata.extras != null
+                    ? mediaMetadata.extras.getString("stationName",
+                    mediaMetadata.artist != null ? String.valueOf(mediaMetadata.artist) : "")
+                    : mediaMetadata.artist != null ? String.valueOf(mediaMetadata.artist) : "";
+            
+            String artist = mediaMetadata.extras != null
+                    ? mediaMetadata.extras.getString("radioArtist", "")
+                    : "";
+            
+            String title = mediaMetadata.extras != null
+                    ? mediaMetadata.extras.getString("radioTitle", "")
+                    : "";
+            
+            // Format: "Artist - Song" or fallback to title or station name
+            String mainTitle;
+            if (!android.text.TextUtils.isEmpty(artist) && !android.text.TextUtils.isEmpty(title)) {
+                mainTitle = artist + " - " + title;
+            } else if (!android.text.TextUtils.isEmpty(title)) {
+                mainTitle = title;
+            } else if (!android.text.TextUtils.isEmpty(artist)) {
+                mainTitle = artist;
+            } else {
+                mainTitle = stationName;
+            }
+            
+            bind.trakTitleInfoTextView.setText(mainTitle);
+            bind.trakArtistInfoTextView.setText(stationName);
+        } else {
+            bind.trakTitleInfoTextView.setText(mediaMetadata.title);
+            bind.trakArtistInfoTextView.setText(
+                    mediaMetadata.artist != null
+                            ? mediaMetadata.artist
+                            : "");
+        }

        if (mediaMetadata.extras != null) {
            songLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_SONG, mediaMetadata.extras.getString("id"));
@@ -90,6 +124,27 @@ public class TrackInfoDialog extends DialogFragment {
            String artistValue = mediaMetadata.extras.getString("artist", getString(R.string.label_placeholder));
            String genreValue = mediaMetadata.extras.getString("genre", getString(R.string.label_placeholder));
            int yearValue = mediaMetadata.extras.getInt("year", 0);
+            
+            // Handle radio-specific metadata
+            if (isRadio) {
+                String stationName = mediaMetadata.extras.getString("stationName", getString(R.string.label_placeholder));
+                String radioArtist = mediaMetadata.extras.getString("radioArtist", "");
+                String radioTitle = mediaMetadata.extras.getString("radioTitle", "");
+                
+                // Show station name in station section
+                bind.stationInfoSector.setVisibility(android.view.View.VISIBLE);
+                bind.stationValueSector.setText(stationName);
+                
+                // Use radio metadata for title/artist if available
+                if (!android.text.TextUtils.isEmpty(radioTitle)) {
+                    titleValue = radioTitle;
+                }
+                if (!android.text.TextUtils.isEmpty(radioArtist)) {
+                    artistValue = radioArtist;
+                }
+            } else {
+                bind.stationInfoSector.setVisibility(android.view.View.GONE);
+            }

            if (genreLink == null && genreValue != null && !genreValue.isEmpty() && !getString(R.string.label_placeholder).contentEquals(genreValue)) {
                genreLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_GENRE, genreValue);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java
+++ b/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);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistCatalogueFragment.java
+++ b/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);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistPageFragment.java
@@ -2,6 +2,7 @@ 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;
@@ -63,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();
@@ -72,6 +75,10 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
        artistPageViewModel = new ViewModelProvider(requireActivity()).get(ArtistPageViewModel.class);
        playbackViewModel = new ViewModelProvider(requireActivity()).get(PlaybackViewModel.class);

+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            spanCount = Preferences.getLandscapeItemsPerRow();
+        }
+
        init(view);
        initAppBar();
        initArtistInfo();
@@ -277,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);
@@ -296,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);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/DownloadFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/DownloadFragment.java
@@ -83,7 +83,7 @@ public class DownloadFragment extends Fragment implements ClickCallback {
        super.onStart();

        initializeMediaBrowser();
-        activity.setBottomNavigationBarVisibility(true);
+        activity.toggleBottomNavigationBarVisibilityOnOrientationChange();
        activity.setBottomSheetVisibility(true);
    }

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/EqualizerFragment.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/EqualizerFragment.kt
@@ -21,18 +21,26 @@ import com.cappielloantonio.tempo.R
 import com.cappielloantonio.tempo.service.EqualizerManager
 import com.cappielloantonio.tempo.service.BaseMediaService
 import com.cappielloantonio.tempo.service.MediaService
+import com.cappielloantonio.tempo.ui.activity.MainActivity
 import com.cappielloantonio.tempo.util.Preferences

 class EqualizerFragment : Fragment() {

+    private lateinit var activity: MainActivity
    private var equalizerManager: EqualizerManager? = null
    private lateinit var eqBandsContainer: LinearLayout
    private lateinit var eqSwitch: Switch
    private lateinit var resetButton: Button
    private lateinit var safeSpace: Space
    private val bandSeekBars = mutableListOf<SeekBar>()
-
    private var receiverRegistered = false
+
+    @OptIn(UnstableApi::class)
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        activity = requireActivity() as MainActivity
+    }
+
    private val equalizerUpdatedReceiver = object : BroadcastReceiver() {
        @OptIn(UnstableApi::class)
        override fun onReceive(context: Context?, intent: Intent?) {
@@ -73,6 +81,8 @@ class EqualizerFragment : Fragment() {
            )
            receiverRegistered = true
        }
+        val showBottomBar = !Preferences.getHideBottomNavbarOnPortrait()
+        activity.setBottomNavigationBarVisibility(showBottomBar)
    }

    override fun onStop() {
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/GenreCatalogueFragment.java
+++ b/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);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeFragment.java
@@ -53,7 +53,7 @@ public class HomeFragment extends Fragment {
    public void onStart() {
        super.onStart();

-        activity.setBottomNavigationBarVisibility(true);
+        activity.toggleBottomNavigationBarVisibilityOnOrientationChange();
        activity.setBottomSheetVisibility(true);
    }

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java
@@ -1262,7 +1262,7 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {

            if (mediaBrowserListenableFuture != null) {
                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;
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java
@@ -9,6 +9,8 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.session.MediaBrowser;
@@ -16,8 +18,11 @@ import androidx.media3.session.SessionToken;
 import androidx.navigation.Navigation;

 import android.content.ComponentName;
+import android.widget.Toast;
+
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

 import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.databinding.FragmentLibraryBinding;
@@ -43,6 +48,7 @@ import java.util.Objects;
@UnstableApi
 public class LibraryFragment extends Fragment implements ClickCallback {
    private static final String TAG = "LibraryFragment";
+    private static final String TOAST_MSG = "Long press to refresh" ;

    private FragmentLibraryBinding bind;
    private MainActivity activity;
@@ -81,13 +87,14 @@ public class LibraryFragment extends Fragment implements ClickCallback {
        initArtistView();
        initGenreView();
        initPlaylistView();
+        initSwipeToRefresh();
    }

    @Override
    public void onStart() {
        super.onStart();
        initializeMediaBrowser();
-        activity.setBottomNavigationBarVisibility(true);
+        activity.toggleBottomNavigationBarVisibilityOnOrientationChange();
    }

    @Override
@@ -112,22 +119,41 @@ public class LibraryFragment extends Fragment implements ClickCallback {
            activity.navController.navigate(R.id.action_libraryFragment_to_playlistCatalogueFragment, bundle);
        });

+        // Album
        bind.albumCatalogueSampleTextViewRefreshable.setOnLongClickListener(view -> {
            libraryViewModel.refreshAlbumSample(getViewLifecycleOwner());
            return true;
        });
+        bind.albumCatalogueSampleTextViewRefreshable.setOnClickListener( v ->
+            Toast.makeText(requireContext(), TOAST_MSG, Toast.LENGTH_SHORT).show()
+        );
+
+        // Artist
        bind.artistCatalogueSampleTextViewRefreshable.setOnLongClickListener(view -> {
            libraryViewModel.refreshArtistSample(getViewLifecycleOwner());
            return true;
        });
+        bind.artistCatalogueSampleTextViewRefreshable.setOnClickListener( v ->
+            Toast.makeText(requireContext(), TOAST_MSG, Toast.LENGTH_SHORT).show()
+        );
+
+        // Genre
        bind.genreCatalogueSampleTextViewRefreshable.setOnLongClickListener(view -> {
            libraryViewModel.refreshGenreSample(getViewLifecycleOwner());
            return true;
        });
+        bind.genreCatalogueSampleTextViewRefreshable.setOnClickListener(v ->
+            Toast.makeText(requireContext(), TOAST_MSG, Toast.LENGTH_SHORT).show()
+        );
+
+        // Playlist
        bind.playlistCatalogueSampleTextViewRefreshable.setOnLongClickListener(view -> {
            libraryViewModel.refreshPlaylistSample(getViewLifecycleOwner());
            return true;
        });
+        bind.playlistCatalogueSampleTextViewRefreshable.setOnClickListener( v ->
+            Toast.makeText(requireContext(), TOAST_MSG, Toast.LENGTH_SHORT).show()
+        );
    }

    private void initAppBar() {
@@ -304,4 +330,20 @@ public class LibraryFragment extends Fragment implements ClickCallback {
    private void initializeMediaBrowser() {
        mediaBrowserListenableFuture = new MediaBrowser.Builder(requireContext(), new SessionToken(requireContext(), new ComponentName(requireContext(), MediaService.class))).buildAsync();
    }
+
+    public void initSwipeToRefresh() {
+        bind.swipeLibraryToRefresh.setOnRefreshListener(() -> {
+            pullToRefresh();
+            bind.swipeLibraryToRefresh.setRefreshing(false);
+        });
+    }
+
+    private void pullToRefresh() {
+        LifecycleOwner lifecycleOwner = getViewLifecycleOwner();
+        libraryViewModel.refreshAlbumSample(lifecycleOwner);
+        libraryViewModel.refreshGenreSample(lifecycleOwner);
+        libraryViewModel.refreshArtistSample(lifecycleOwner);
+        libraryViewModel.refreshPlaylistSample(lifecycleOwner);
+
+    }
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LoginFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LoginFragment.java
@@ -117,7 +117,7 @@ public class LoginFragment extends Fragment implements ClickCallback {
    @Override
    public void onServerClick(Bundle bundle) {
        Server server = bundle.getParcelable("server_object");
-        saveServerPreference(server.getServerId(), server.getAddress(), server.getLocalAddress(), server.getUsername(), server.getPassword(), server.isLowSecurity());
+        saveServerPreference(server.getServerId(), server.getAddress(), server.getLocalAddress(), server.getUsername(), server.getPassword(), server.isLowSecurity(), server.getClientCert());

        SystemRepository systemRepository = new SystemRepository();
        systemRepository.checkUserCredential(new SystemCallback() {
@@ -142,13 +142,14 @@ public class LoginFragment extends Fragment implements ClickCallback {
        dialog.show(activity.getSupportFragmentManager(), null);
    }

-    private void saveServerPreference(String serverId, String server, String localAddress, String user, String password, boolean isLowSecurity) {
+    private void saveServerPreference(String serverId, String server, String localAddress, String user, String password, boolean isLowSecurity, String clientCert) {
        Preferences.setServerId(serverId);
        Preferences.setServer(server);
        Preferences.setLocalAddress(localAddress);
        Preferences.setUser(user);
        Preferences.setPassword(password);
        Preferences.setLowSecurity(isLowSecurity);
+        Preferences.setClientCert(clientCert);

        App.getSubsonicClientInstance(true);
    }
@@ -161,6 +162,7 @@ public class LoginFragment extends Fragment implements ClickCallback {
        Preferences.setToken(null);
        Preferences.setSalt(null);
        Preferences.setLowSecurity(false);
+        Preferences.setClientCert(null);

        App.getSubsonicClientInstance(true);
    }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java
@@ -3,6 +3,7 @@ package com.cappielloantonio.tempo.ui.fragment;
 import android.content.ComponentName;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -173,25 +174,54 @@ public class PlayerBottomSheetFragment extends Fragment {
            playerBottomSheetViewModel.setLiveArtist(getViewLifecycleOwner(), mediaMetadata.extras.getString("type"), mediaMetadata.extras.getString("artistId"));
            playerBottomSheetViewModel.setLiveDescription(mediaMetadata.extras.getString("description", null));

-            bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setText(mediaMetadata.extras.getString("title"));
-            bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setText(
-                    mediaMetadata.artist != null
-                            ? mediaMetadata.artist
-                            : Objects.equals(mediaMetadata.extras.getString("type"), Constants.MEDIA_TYPE_RADIO)
-                            ? mediaMetadata.extras.getString("uri", getString(R.string.label_placeholder))
-                            : "");
+            String type = mediaMetadata.extras.getString("type");
+
+            if (Objects.equals(type, Constants.MEDIA_TYPE_RADIO)) {
+                // For radio: keep header consistent with full player
+                String stationName = mediaMetadata.extras.getString(
+                        "stationName",
+                        mediaMetadata.artist != null ? String.valueOf(mediaMetadata.artist) : ""
+                );
+
+                String artist = mediaMetadata.extras.getString("radioArtist", "");
+                String title = mediaMetadata.extras.getString("radioTitle", "");
+
+                String mainTitle;
+                if (!TextUtils.isEmpty(artist) && !TextUtils.isEmpty(title)) {
+                    mainTitle = artist + " - " + title;
+                } else if (!TextUtils.isEmpty(title)) {
+                    mainTitle = title;
+                } else if (!TextUtils.isEmpty(artist)) {
+                    mainTitle = artist;
+                } else {
+                    mainTitle = stationName;
+                }
+
+                bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setText(mainTitle);
+                bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setText(stationName);
+
+                bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setVisibility(!TextUtils.isEmpty(mainTitle) ? View.VISIBLE : View.GONE);
+                bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setVisibility(!TextUtils.isEmpty(stationName) ? View.VISIBLE : View.GONE);
+            } else {
+                // Default (music, podcast, etc.)
+                bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setText(mediaMetadata.extras.getString("title"));
+                bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setText(
+                        mediaMetadata.artist != null
+                                ? mediaMetadata.artist
+                                : ""
+                );
+
+                bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setVisibility(mediaMetadata.extras.getString("title") != null && !Objects.equals(mediaMetadata.extras.getString("title"), "") ? View.VISIBLE : View.GONE);
+                bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setVisibility(
+                        mediaMetadata.extras.getString("artist") != null && !Objects.equals(mediaMetadata.extras.getString("artist"), "")
+                                ? View.VISIBLE
+                                : View.GONE);
+            }

            CustomGlideRequest.Builder
                    .from(requireContext(), mediaMetadata.extras.getString("coverArtId"), CustomGlideRequest.ResourceType.Song)
                    .build()
                    .into(bind.playerHeaderLayout.playerHeaderMediaCoverImage);
-
-            bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setVisibility(mediaMetadata.extras.getString("title") != null && !Objects.equals(mediaMetadata.extras.getString("title"), "") ? View.VISIBLE : View.GONE);
-            bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setVisibility(
-                    (mediaMetadata.extras.getString("artist") != null && !Objects.equals(mediaMetadata.extras.getString("artist"), ""))
-                            || (Objects.equals(mediaMetadata.extras.getString("type"), Constants.MEDIA_TYPE_RADIO) && mediaMetadata.extras.getString("uri") != null)
-                            ? View.VISIBLE
-                            : View.GONE);
        }
    }

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java
@@ -7,9 +7,12 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -32,6 +35,10 @@ import androidx.media3.session.SessionToken;
 import androidx.navigation.NavController;
 import androidx.navigation.NavOptions;
 import androidx.navigation.fragment.NavHostFragment;
+import androidx.transition.ChangeBounds;
+import androidx.transition.Slide;
+import androidx.transition.TransitionManager;
+import androidx.transition.TransitionSet;
 import androidx.viewpager2.widget.ViewPager2;

 import com.cappielloantonio.tempo.R;
@@ -39,6 +46,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;
@@ -54,7 +62,6 @@ import com.google.android.material.elevation.SurfaceColors;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;

-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -213,12 +220,53 @@ public class PlayerControllerFragment extends Fragment {
    }

    private void setMetadata(MediaMetadata mediaMetadata) {
+        String type = mediaMetadata.extras != null ? mediaMetadata.extras.getString("type") : null;
+
+        if (Objects.equals(type, Constants.MEDIA_TYPE_RADIO)) {
+            // For radio: always read from extras first (radioArtist, radioTitle, stationName)
+            // MediaMetadata.title/artist are formatted for notification
+            String stationName = mediaMetadata.extras != null
+                    ? mediaMetadata.extras.getString("stationName",
+                    mediaMetadata.artist != null ? String.valueOf(mediaMetadata.artist) : "")
+                    : mediaMetadata.artist != null ? String.valueOf(mediaMetadata.artist) : "";
+
+            String artist = mediaMetadata.extras != null
+                    ? mediaMetadata.extras.getString("radioArtist", "")
+                    : "";
+
+            String title = mediaMetadata.extras != null
+                    ? mediaMetadata.extras.getString("radioTitle", "")
+                    : "";
+
+            // Format: "Artist - Song" or fallback to title or station name
+            String mainTitle;
+            if (!TextUtils.isEmpty(artist) && !TextUtils.isEmpty(title)) {
+                mainTitle = artist + " - " + title;
+            } else if (!TextUtils.isEmpty(title)) {
+                mainTitle = title;
+            } else if (!TextUtils.isEmpty(artist)) {
+                mainTitle = artist;
+            } else {
+                mainTitle = stationName;
+            }
+
+            playerMediaTitleLabel.setText(mainTitle);
+            playerArtistNameLabel.setText(stationName);
+
+            playerMediaTitleLabel.setSelected(true);
+            playerArtistNameLabel.setSelected(true);
+
+            playerMediaTitleLabel.setVisibility(!TextUtils.isEmpty(mainTitle) ? View.VISIBLE : View.GONE);
+            playerArtistNameLabel.setVisibility(!TextUtils.isEmpty(stationName) ? View.VISIBLE : View.GONE);
+
+            updateAssetLinkChips(mediaMetadata);
+            return;
+        }
+
        playerMediaTitleLabel.setText(String.valueOf(mediaMetadata.title));
        playerArtistNameLabel.setText(
                mediaMetadata.artist != null
                        ? String.valueOf(mediaMetadata.artist)
-                        : mediaMetadata.extras != null && Objects.equals(mediaMetadata.extras.getString("type"), Constants.MEDIA_TYPE_RADIO)
-                        ? mediaMetadata.extras.getString("uri", getString(R.string.label_placeholder))
                        : "");

        playerMediaTitleLabel.setSelected(true);
@@ -235,41 +283,80 @@ public class PlayerControllerFragment extends Fragment {
    }

    private void setMediaInfo(MediaMetadata mediaMetadata) {
+        boolean isLocal = false;
+        
+        if (mediaBrowserListenableFuture != null && mediaBrowserListenableFuture.isDone()) {
+            try {
+                MediaBrowser browser = mediaBrowserListenableFuture.get();
+                if (browser != null && browser.getCurrentMediaItem() != null) {
+                    android.net.Uri currentUri = browser.getCurrentMediaItem().requestMetadata.mediaUri;
+                    if (currentUri != null) {
+                        String scheme = currentUri.getScheme();
+                        isLocal = "content".equals(scheme) || "file".equals(scheme);
+                    }
+                }
+            } catch (Exception e) {
+                Log.e("DEBUG_PLAYER", "Error getting browser for UI update", e);
+            }
+        }
+
        if (mediaMetadata.extras != null) {
            String extension = mediaMetadata.extras.getString("suffix", getString(R.string.player_unknown_format));
-            String bitrate = mediaMetadata.extras.getInt("bitrate", 0) != 0 ? mediaMetadata.extras.getInt("bitrate", 0) + "kbps" : "Original";
-            String samplingRate = mediaMetadata.extras.getInt("samplingRate", 0) != 0 ? new DecimalFormat("0.#").format(mediaMetadata.extras.getInt("samplingRate", 0) / 1000.0) + "kHz" : "";
+            int rawBitrate = mediaMetadata.extras.getInt("bitrate", 0);
+            String bitrate = rawBitrate != 0 ? rawBitrate + "kbps" : "Original";
+            String samplingRate = mediaMetadata.extras.getInt("samplingRate", 0) != 0 ? 
+                    new java.text.DecimalFormat("0.#").format(mediaMetadata.extras.getInt("samplingRate", 0) / 1000.0) + "kHz" : "";
            String bitDepth = mediaMetadata.extras.getInt("bitDepth", 0) != 0 ? mediaMetadata.extras.getInt("bitDepth", 0) + "b" : "";

            playerMediaExtension.setText(extension);

-            if (bitrate.equals("Original")) {
+            if (bitrate.equals("Original") && !isLocal) {
                playerMediaBitrate.setVisibility(View.GONE);
            } else {
-                List<String> mediaQualityItems = new ArrayList<>();
-
-                if (!bitrate.trim().isEmpty()) mediaQualityItems.add(bitrate);
-                if (!bitDepth.trim().isEmpty()) mediaQualityItems.add(bitDepth);
-                if (!samplingRate.trim().isEmpty()) mediaQualityItems.add(samplingRate);
-
-                String mediaQuality = TextUtils.join(" • ", mediaQualityItems);
-                playerMediaBitrate.setVisibility(View.VISIBLE);
-                playerMediaBitrate.setText(mediaQuality);
+                List<String> items = new ArrayList<>();
+                if (!bitrate.trim().isEmpty()) items.add(bitrate);
+                if (!bitDepth.trim().isEmpty()) items.add(bitDepth);
+                if (!samplingRate.trim().isEmpty()) items.add(samplingRate);
+                String mediaQuality = TextUtils.join(" • ", items);
+                
+                playerMediaBitrate.setVisibility(Preferences.getBitrateVisible() ? View.VISIBLE : View.GONE);
+                playerMediaBitrate.setText(isLocal ? mediaQuality : mediaQuality);
            }
        }

-        boolean isTranscodingExtension = !MusicUtil.getTranscodingFormatPreference().equals("raw");
-        boolean isTranscodingBitrate = !MusicUtil.getBitratePreference().equals("0");
+        
+        if (!isLocal) {
+            boolean isTranscodingExtension = !MusicUtil.getTranscodingFormatPreference().equals("raw");
+            boolean isTranscodingBitrate = !MusicUtil.getBitratePreference().equals("0");
+            if (isTranscodingExtension || isTranscodingBitrate) {
+                playerMediaExtension.setText(MusicUtil.getTranscodingFormatPreference() + " (" + getString(R.string.player_transcoding) + ")");
+                playerMediaBitrate.setText(!MusicUtil.getBitratePreference().equals("0") ? 
+                        MusicUtil.getBitratePreference() + "kbps" : getString(R.string.player_transcoding_requested));
+            }

-        if (isTranscodingExtension || isTranscodingBitrate) {
-            playerMediaExtension.setText(MusicUtil.getTranscodingFormatPreference() + " (" + getString(R.string.player_transcoding) + ")");
-            playerMediaBitrate.setText(!MusicUtil.getBitratePreference().equals("0") ? MusicUtil.getBitratePreference() + "kbps" : getString(R.string.player_transcoding_requested));
        }

        playerTrackInfo.setOnClickListener(view -> {
            TrackInfoDialog dialog = new TrackInfoDialog(mediaMetadata);
            dialog.show(activity.getSupportFragmentManager(), null);
-        });
+            });
+
+        playerMediaExtension.setOnClickListener( v -> toggleBitrateVisibility() );
+        playerMediaBitrate.setOnClickListener(v -> toggleBitrateVisibility() );
+    }
+
+    private void toggleBitrateVisibility() {
+        ViewGroup parent = (ViewGroup) playerMediaBitrate.getParent();
+
+        TransitionSet transition = new TransitionSet()
+                .addTransition(new Slide(Gravity.START))
+                .addTransition(new ChangeBounds())
+                .setDuration(500)
+                .setInterpolator(new AccelerateDecelerateInterpolator());
+        TransitionManager.beginDelayedTransition(parent, transition);
+
+        playerMediaBitrate.setVisibility(Preferences.getBitrateVisible() ? View.GONE : View.VISIBLE);
+        Preferences.setBitrateVisible(!Preferences.getBitrateVisible());
    }

    private void updateAssetLinkChips(MediaMetadata mediaMetadata) {
@@ -413,10 +500,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 +609,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 +666,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
    }

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerLyricsFragment.java
+++ b/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;

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistCatalogueFragment.java
+++ b/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;
            }

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistPageFragment.java
@@ -216,8 +216,9 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {
                });

                bind.playlistPageShuffleButton.setOnClickListener(v -> {
-                    Collections.shuffle(songs);
-                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
+                    java.util.List<com.cappielloantonio.tempo.subsonic.models.Child> shuffledSongs = new java.util.ArrayList<>(songs);
+                    java.util.Collections.shuffle(shuffledSongs);
+                    MediaManager.startQueue(mediaBrowserListenableFuture, shuffledSongs, 0);
                    activity.setBottomSheetInPeek(true);
                });
            }
@@ -227,32 +228,33 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {
    private void initBackCover() {
        playlistPageViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> {
            if (bind != null && songs != null && !songs.isEmpty()) {
-                Collections.shuffle(songs);
+                java.util.List<com.cappielloantonio.tempo.subsonic.models.Child> randomSongs = new java.util.ArrayList<>(songs);
+                java.util.Collections.shuffle(randomSongs);

                // Pic top-left
                CustomGlideRequest.Builder
-                        .from(requireContext(), !songs.isEmpty() ? songs.get(0).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
+                        .from(requireContext(), !randomSongs.isEmpty() ? randomSongs.get(0).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
                        .build()
                        .transform(new GranularRoundedCorners(CustomGlideRequest.CORNER_RADIUS, 0, 0, 0))
                        .into(bind.playlistCoverImageViewTopLeft);

                // Pic top-right
                CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 1 ? songs.get(1).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
+                        .from(requireContext(), randomSongs.size() > 1 ? randomSongs.get(1).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
                        .build()
                        .transform(new GranularRoundedCorners(0, CustomGlideRequest.CORNER_RADIUS, 0, 0))
                        .into(bind.playlistCoverImageViewTopRight);

                // Pic bottom-left
                CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 2 ? songs.get(2).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
+                        .from(requireContext(), randomSongs.size() > 2 ? randomSongs.get(2).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
                        .build()
                        .transform(new GranularRoundedCorners(0, 0, 0, CustomGlideRequest.CORNER_RADIUS))
                        .into(bind.playlistCoverImageViewBottomLeft);

                // Pic bottom-right
                CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 3 ? songs.get(3).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
+                        .from(requireContext(), randomSongs.size() > 3 ? randomSongs.get(3).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.ResourceType.Song)
                        .build()
                        .transform(new GranularRoundedCorners(0, 0, CustomGlideRequest.CORNER_RADIUS, 0))
                        .into(bind.playlistCoverImageViewBottomRight);
@@ -271,6 +273,11 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {

        playlistPageViewModel.getPlaylistSongLiveList().observe(getViewLifecycleOwner(), songs -> {
            songHorizontalAdapter.setItems(songs);
+            if (songs != null) {
+                bind.playlistSongCountLabel.setText(getString(R.string.playlist_song_count, songs.size()));
+                long totalDuration = songs.stream().mapToLong(s -> s.getDuration() != null ? s.getDuration() : 0).sum();
+                bind.playlistDurationLabel.setText(getString(R.string.playlist_duration, MusicUtil.getReadableDurationString(totalDuration, false)));
+            }
            reapplyPlayback();
        });
    }
@@ -291,6 +298,7 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {

    @Override
    public void onMediaLongClick(Bundle bundle) {
+        bundle.putString(Constants.PLAYLIST_ID, playlistPageViewModel.getPlaylist().getId());
        Navigation.findNavController(requireView()).navigate(R.id.songBottomSheetDialog, bundle);
    }

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
+++ b/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;
@@ -127,6 +130,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
        super.onStart();
        activity.setBottomNavigationBarVisibility(false);
        activity.setBottomSheetVisibility(false);
+        activity.setNavigationDrawerLock(true);
+        activity.setSystemBarsVisibility(!activity.isLandscape);
    }

    @Override
@@ -141,6 +146,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
        setStreamingCacheSize();
        setAppLanguage();
        setVersion();
+        setNetorkPingTimeoutBase();

        actionLogout();
        actionScan();
@@ -163,6 +169,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
    public void onStop() {
        super.onStop();
        activity.setBottomSheetVisibility(true);
+        activity.toggleNavigationDrawerLockOnOrientationChange();
+        activity.setSystemBarsVisibility(!activity.isLandscape);
    }

    @Override
@@ -261,6 +269,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");

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
@@ -229,6 +229,34 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
        });

        updateDownloadButtons();
+        
+        String playlistId = requireArguments().getString(Constants.PLAYLIST_ID);
+        int itemPosition = requireArguments().getInt(Constants.ITEM_POSITION, -1);
+
+        TextView removeFromPlaylist = view.findViewById(R.id.remove_from_playlist_text_view);
+        if (playlistId != null && itemPosition != -1) {
+            removeFromPlaylist.setVisibility(View.VISIBLE);
+            removeFromPlaylist.setOnClickListener(v -> {
+                songBottomSheetViewModel.removeFromPlaylist(playlistId, itemPosition, new com.cappielloantonio.tempo.repository.PlaylistRepository.AddToPlaylistCallback() {
+                    @Override
+                    public void onSuccess() {
+                        Toast.makeText(requireContext(), R.string.playlist_chooser_dialog_toast_remove_success, Toast.LENGTH_SHORT).show();
+                        dismissBottomSheet();
+                    }
+
+                    @Override
+                    public void onFailure() {
+                        Toast.makeText(requireContext(), R.string.playlist_chooser_dialog_toast_remove_failure, Toast.LENGTH_SHORT).show();
+                        dismissBottomSheet();
+                    }
+
+                    @Override
+                    public void onAllSkipped() {
+                        dismissBottomSheet();
+                    }
+                });
+            });
+        }

        TextView addToPlaylist = view.findViewById(R.id.add_to_playlist_text_view);
        addToPlaylist.setOnClickListener(v -> {
--- a/app/src/main/java/com/cappielloantonio/tempo/util/ClientCertManager.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/ClientCertManager.kt
@@ -0,0 +1,95 @@
+package com.cappielloantonio.tempo.util
+
+import android.content.Context
+import android.security.KeyChain
+import android.util.Log
+import androidx.core.net.toUri
+import okhttp3.internal.platform.Platform
+import java.net.Socket
+import java.security.KeyManagementException
+import java.security.NoSuchAlgorithmException
+import java.security.Principal
+import java.security.PrivateKey
+import java.security.cert.X509Certificate
+import javax.net.ssl.HttpsURLConnection
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.X509KeyManager
+
+object ClientCertManager {
+
+    private const val TAG = "ClientCertManager"
+
+    val trustManager = Platform.get().platformTrustManager()
+    var sslSocketFactory: SSLSocketFactory? = null
+        private set
+
+    @JvmStatic
+    fun setupSslSocketFactory(context: Context) {
+        sslSocketFactory = createSslSocketFactory(context)
+        sslSocketFactory?.let {
+            // HttpsURLConnection is used both by:
+            // - Glide: in IPv6StringLoader
+            // - ExoPlayer: in DefaultHttpDataSource
+            HttpsURLConnection.setDefaultSSLSocketFactory(it)
+        }
+    }
+
+    private fun createSslSocketFactory(context: Context): SSLSocketFactory? {
+        return try {
+            val clientKeyManager = object : X509KeyManager {
+                override fun getClientAliases(keyType: String?, issuers: Array<Principal>?) = null
+
+                override fun chooseClientAlias(
+                    keyType: Array<String>?,
+                    issuers: Array<Principal>?,
+                    socket: Socket?
+                ): String? {
+                    val clientCert = Preferences.getClientCert() ?: return null
+                    val server = Preferences.getServer() ?: return null
+                    return if (server.toUri().host == socket?.inetAddress?.hostName) {
+                        clientCert
+                    } else null
+                }
+
+                override fun getServerAliases(keyType: String?, issuers: Array<Principal>?) = null
+
+                override fun chooseServerAlias(
+                    keyType: String?,
+                    issuers: Array<Principal>?,
+                    socket: Socket?
+                ) = null
+
+                override fun getCertificateChain(alias: String?): Array<X509Certificate>? {
+                    val clientCert = Preferences.getClientCert()
+                    return if (alias == clientCert && clientCert != null) {
+                        KeyChain.getCertificateChain(
+                            context,
+                            clientCert
+                        )
+                    } else null
+                }
+
+                override fun getPrivateKey(alias: String?): PrivateKey? {
+                    val clientCert = Preferences.getClientCert()
+                    return if (alias == clientCert && clientCert != null) {
+                        KeyChain.getPrivateKey(
+                            context,
+                            clientCert
+                        )
+                    } else null
+                }
+            }
+
+            val sslContext = SSLContext.getInstance("TLS")
+            sslContext.init(arrayOf(clientKeyManager), arrayOf(trustManager), null)
+            sslContext.socketFactory
+        } catch (e: NoSuchAlgorithmException) {
+            Log.e(TAG, "Failed setting mTLS", e)
+            null
+        } catch (e: KeyManagementException) {
+            Log.e(TAG, "Failed setting mTLS", e)
+            null
+        }
+    }
+}
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
@@ -11,6 +11,7 @@ object Constants {
    const val ARTIST_OBJECT = "ARTIST_OBJECT"
    const val GENRE_OBJECT = "GENRE_OBJECT"
    const val PLAYLIST_OBJECT = "PLAYLIST_OBJECT"
+    const val PLAYLIST_ID = "PLAYLIST_ID"
    const val PODCAST_OBJECT = "PODCAST_OBJECT"
    const val PODCAST_CHANNEL_OBJECT = "PODCAST_CHANNEL_OBJECT"
    const val INTERNET_RADIO_STATION_OBJECT = "INTERNET_RADIO_STATION_OBJECT"
@@ -61,13 +62,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"
--- a/app/src/main/java/com/cappielloantonio/tempo/util/DownloadUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/DownloadUtil.java
@@ -29,6 +29,8 @@ import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Executors;

@UnstableApi
@@ -78,12 +80,33 @@ public final class DownloadUtil {
        return httpDataSourceFactory;
    }

+    public static synchronized DataSource.Factory getHttpDataSourceFactoryForRadio() {
+        CookieManager cookieManager = new CookieManager();
+        cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
+        CookieHandler.setDefault(cookieManager);
+        
+        // Create a factory with ICY metadata support for radio streams
+        Map<String, String> defaultRequestProperties = new HashMap<>();
+        defaultRequestProperties.put("Icy-MetaData", "1");
+        defaultRequestProperties.put("User-Agent", "Tempus/1.0");
+        
+        return new DefaultHttpDataSource
+                .Factory()
+                .setAllowCrossProtocolRedirects(true)
+                .setDefaultRequestProperties(defaultRequestProperties);
+    }
+
    public static synchronized DataSource.Factory getUpstreamDataSourceFactory(Context context) {
        DefaultDataSource.Factory upstreamFactory = new DefaultDataSource.Factory(context, getHttpDataSourceFactory());
        dataSourceFactory = buildReadOnlyCacheDataSource(upstreamFactory, getDownloadCache(context));
        return dataSourceFactory;
    }

+    public static synchronized DataSource.Factory getUpstreamDataSourceFactoryForRadio(Context context) {
+        DefaultDataSource.Factory upstreamFactory = new DefaultDataSource.Factory(context, getHttpDataSourceFactoryForRadio());
+        return buildReadOnlyCacheDataSource(upstreamFactory, getDownloadCache(context));
+    }
+
    public static synchronized DataSource.Factory getCacheDataSourceFactory(Context context) {
        CacheDataSource.Factory streamCacheFactory = new CacheDataSource.Factory()
                .setCache(getStreamingCache(context))
--- a/app/src/main/java/com/cappielloantonio/tempo/util/DynamicMediaSourceFactory.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/DynamicMediaSourceFactory.kt
@@ -20,10 +20,15 @@ class DynamicMediaSourceFactory(
 ) : MediaSource.Factory {

    override fun createMediaSource(mediaItem: MediaItem): MediaSource {
-        val mediaType: String? = mediaItem.mediaMetadata.extras?.getString("type", "")
+        // Detect radio streams in a backwards-compatible way.
+        // Older Tempus versions tagged radio items via MediaMetadata extras
+        // (`type == MEDIA_TYPE_RADIO`), while newer upstream changes use an
+        // "ir-" mediaId prefix. Support BOTH so radio works after rebases.
+        val mediaType = mediaItem.mediaMetadata.extras?.getString("type", "")
+        val isRadio = mediaType == Constants.MEDIA_TYPE_RADIO || mediaItem.mediaId.startsWith("ir-")

        val streamingCacheSize = Preferences.getStreamingCacheSize()
-        val bypassCache = mediaType == Constants.MEDIA_TYPE_RADIO
+        val bypassCache = isRadio

        val useUpstream = when {
            streamingCacheSize.toInt() == 0 -> true
@@ -32,7 +37,10 @@ class DynamicMediaSourceFactory(
            else -> true
        }

-        val dataSourceFactory: DataSource.Factory = if (useUpstream) {
+        val dataSourceFactory: DataSource.Factory = if (bypassCache) {
+            // For radio streams, use a DataSourceFactory with ICY metadata support
+            DownloadUtil.getUpstreamDataSourceFactoryForRadio(context)
+        } else if (useUpstream) {
            DownloadUtil.getUpstreamDataSourceFactory(context)
        } else {
            DownloadUtil.getCacheDataSourceFactory(context)
@@ -46,8 +54,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)
+                }
            }
        }
    }
--- a/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
@@ -1,8 +1,10 @@
 package com.cappielloantonio.tempo.util;

+import android.content.ContentResolver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
+import android.util.Base64;

 import androidx.annotation.OptIn;
 import androidx.lifecycle.LifecycleOwner;
@@ -15,6 +17,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;
@@ -23,6 +26,7 @@ import com.google.common.collect.ImmutableList;

 import java.util.ArrayList;
 import java.util.List;
+import java.nio.charset.StandardCharsets;

@OptIn(markerClass = UnstableApi.class)
 public class MappingUtil {
@@ -45,7 +49,7 @@ public class MappingUtil {
            Uri artworkUri = null;

            if (coverArtId != null) {
-                artworkUri = Uri.parse(CustomGlideRequest.createUrl(coverArtId, Preferences.getImageSize()));
+                artworkUri = AlbumArtContentProvider.contentUri(coverArtId);
            }

            Bundle bundle = new Bundle();
@@ -205,18 +209,34 @@ public class MappingUtil {

    public static MediaItem mapInternetRadioStation(InternetRadioStation internetRadioStation) {
        Uri uri = Uri.parse(internetRadioStation.getStreamUrl());
+        Uri artworkUri = null;
+        String homePageUrl = internetRadioStation.getHomePageUrl();
+        String coverArtId = null;
+
+        if (homePageUrl != null && !homePageUrl.isEmpty() && MusicUtil.isImageUrl(homePageUrl)) {
+                String encodedUrl = Base64.encodeToString(homePageUrl.getBytes(StandardCharsets.UTF_8),
+                                Base64.URL_SAFE | Base64.NO_WRAP);
+                coverArtId = "ir_" + encodedUrl;
+                artworkUri = AlbumArtContentProvider.contentUri(coverArtId);
+        }

        Bundle bundle = new Bundle();
        bundle.putString("id", internetRadioStation.getId());
        bundle.putString("title", internetRadioStation.getName());
+        bundle.putString("stationName", internetRadioStation.getName());
        bundle.putString("uri", uri.toString());
        bundle.putString("type", Constants.MEDIA_TYPE_RADIO);
+        bundle.putString("coverArtId", coverArtId);
+        if (homePageUrl != null) {
+                bundle.putString("homepageUrl", homePageUrl);
+        }

        return new MediaItem.Builder()
                .setMediaId(internetRadioStation.getId())
                .setMediaMetadata(
                        new MediaMetadata.Builder()
                                .setTitle(internetRadioStation.getName())
+                                .setArtworkUri(artworkUri)
                                .setExtras(bundle)
                                .setIsBrowsable(false)
                                .setIsPlayable(true)
@@ -235,7 +255,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());
@@ -286,13 +306,24 @@ public class MappingUtil {
    }

    private static Uri getUri(Child media) {
+        // Check if it's in our local SQL Database
+        DownloadRepository repo = new DownloadRepository();
+        Download localDownload = repo.getDownload(media.getId());
+
+        if (localDownload != null && localDownload.getDownloadUri() != null && !localDownload.getDownloadUri().isEmpty()) {
+            Log.d(TAG, "Playing local file for: " + media.getTitle());
+            return Uri.parse(localDownload.getDownloadUri());
+        }
+
+        // Legacy check for external directory, i think this was broken/buggy
        if (Preferences.getDownloadDirectoryUri() != null) {
            Uri local = ExternalAudioReader.getUri(media);
-            return local != null ? local : MusicUtil.getStreamUri(media.getId());
+            if (local != null) return local;
        }
-        return DownloadUtil.getDownloadTracker(App.getContext()).isDownloaded(media.getId())
-                ? getDownloadUri(media.getId())
-                : MusicUtil.getStreamUri(media.getId());
+
+        // Fallback to streaming
+        Log.d(TAG, "No local file found. Streaming: " + media.getTitle());
+        return MusicUtil.getStreamUri(media.getId());
    }

    private static Uri getUri(PodcastEpisode podcastEpisode) {
@@ -316,4 +347,4 @@ public class MappingUtil {
        }
        ExternalAudioReader.getRefreshEvents().observe(owner, event -> onRefresh.run());
    }
-}
+}
--- a/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java
+++ b/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();
@@ -52,12 +52,18 @@ public class MusicUtil {
        if (params.containsKey("c") && params.get("c") != null)
            uri.append("&c=").append(params.get("c"));

+        String selectedBitrate = getBitratePreference();
+        String selectedFormat = getTranscodingFormatPreference();
+        Log.i(TAG, "DEBUG: Requesting Format: " + selectedFormat + " at Bitrate: " + selectedBitrate);
+        
        if (!Preferences.isServerPrioritized())
            uri.append("&maxBitRate=").append(getBitratePreference());
        if (!Preferences.isServerPrioritized())
            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,8 +72,22 @@ public class MusicUtil {
        return Uri.parse(uri.toString());
    }

+    public static Uri getStreamUri(String id) {
+        return getStreamUri(id, 0);
+    }
+
    public static Uri updateStreamUri(Uri uri) {
+        if (uri == null) return null;
+
+        String scheme = uri.getScheme();
+        // If it is local (content:// or file://), return it IMMEDIATELY.
+        // This prevents the code below from appending &maxBitRate to a local path.
+        if (scheme != null && (scheme.equals("content") || scheme.equals("file"))) {
+            return uri;
+        }
+        
        String s = uri.toString();
+
        Matcher m1 = BITRATE_PATTERN.matcher(s);
        s = m1.replaceAll("");
        Matcher m2 = FORMAT_PATTERN.matcher(s);
@@ -151,7 +171,6 @@ public class MusicUtil {
        return Uri.parse(uri.toString());
    }

-
    public static String getReadableDurationString(Long duration, boolean millis) {
        long lenght = duration != null ? duration : 0;

@@ -297,13 +316,17 @@ public class MusicUtil {

        if (network == null || networkCapabilities == null) return "raw";

+        String format;
        if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
-            return Preferences.getAudioTranscodeFormatWifi();
+            format = Preferences.getAudioTranscodeFormatWifi();
+            Log.d(TAG, "DEBUG: Using WIFI Format: " + format);
        } else if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-            return Preferences.getAudioTranscodeFormatMobile();
+            format = Preferences.getAudioTranscodeFormatMobile();
+            Log.d(TAG, "DEBUG: Using MOBILE Format: " + format);
        } else {
-            return Preferences.getAudioTranscodeFormatWifi();
+            format = Preferences.getAudioTranscodeFormatWifi();
        }
+        return format;
    }

    public static String getBitratePreferenceForDownload() {
@@ -354,4 +377,15 @@ public class MusicUtil {

        toFilter.addAll(filtered);
    }
+
+    public static boolean isImageUrl(String url) {
+        if (url == null || url.isEmpty())
+            return false;
+        String path = url.toLowerCase().trim().split("\\?")[0];
+
+        return path.endsWith(".jpg") || path.endsWith(".jpeg") ||
+                path.endsWith(".png") || path.endsWith(".webp") ||
+                path.endsWith(".gif") || path.endsWith(".bmp") ||
+                path.endsWith(".svg");
+    }
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -16,6 +16,7 @@ object Preferences {
    private const val TOKEN = "token"
    private const val SALT = "salt"
    private const val LOW_SECURITY = "low_security"
+    private const val CLIENT_CERT = "client_cert"
    private const val BATTERY_OPTIMIZATION = "battery_optimization"
    private const val SERVER_ID = "server_id"
    private const val OPEN_SUBSONIC = "open_subsonic"
@@ -24,11 +25,15 @@ object Preferences {
    private const val IN_USE_SERVER_ADDRESS = "in_use_server_address"
    private const val NEXT_SERVER_SWITCH = "next_server_switch"
    private const val PLAYBACK_SPEED = "playback_speed"
+    private const val BITRATE_VISIBLE = "bitrate_visible"
    private const val SKIP_SILENCE = "skip_silence"
    private const val SHUFFLE_MODE = "shuffle_mode"
    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 ENABLE_DRAWER_ON_PORTRAIT = "enable_drawer_on_portrait"
+    private const val HIDE_BOTTOM_NAVBAR_ON_PORTRAIT = "hide_bottom_navbar_on_portrait"
    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 +79,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"
@@ -83,8 +90,19 @@ object Preferences {
    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"
-
-    @JvmStatic
+    private const val NETWORK_PING_TIMEOUT = "network_ping_timeout_base"
+    
+    private const val AA_ALBUM_VIEW = "androidauto_album_view"
+	private const val AA_HOME_VIEW = "androidauto_home_view"
+    private const val AA_PLAYLIST_VIEW = "androidauto_playlist_view"
+    private const val AA_PODCAST_VIEW = "androidauto_podcast_view"
+    private const val AA_RADIO_VIEW = "androidauto_radio_view"
+	private const val AA_FIRST_TAB = "androidauto_first_tab"
+	private const val AA_SECOND_TAB = "androidauto_second_tab"
+	private const val AA_THIRD_TAB = "androidauto_third_tab"
+	private const val AA_FOURTH_TAB = "androidauto_fourth_tab"
+    
+	@JvmStatic
    fun getServer(): String? {
        return App.getInstance().preferences.getString(SERVER, null)
    }
@@ -94,6 +112,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)
@@ -144,6 +175,16 @@ object Preferences {
        App.getInstance().preferences.edit().putBoolean(LOW_SECURITY, isLowSecurity).apply()
    }

+    @JvmStatic
+    fun getClientCert(): String? {
+        return App.getInstance().preferences.getString(CLIENT_CERT, null)
+    }
+
+    @JvmStatic
+    fun setClientCert(clientCert: String?) {
+        App.getInstance().preferences.edit().putString(CLIENT_CERT, clientCert).apply()
+    }
+
    @JvmStatic
    fun getServerId(): String? {
        return App.getInstance().preferences.getString(SERVER_ID, null)
@@ -252,6 +293,16 @@ object Preferences {
        App.getInstance().preferences.edit().putFloat(PLAYBACK_SPEED, playbackSpeed).apply()
    }

+    @JvmStatic
+    fun getBitrateVisible(): Boolean {
+        return App.getInstance().preferences.getBoolean(BITRATE_VISIBLE, true)
+    }
+
+    @JvmStatic
+    fun setBitrateVisible(bitrateVisible: Boolean) {
+        App.getInstance().preferences.edit().putBoolean(BITRATE_VISIBLE, bitrateVisible).apply()
+    }
+
    @JvmStatic
    fun isSkipSilenceMode(): Boolean {
        return App.getInstance().preferences.getBoolean(SKIP_SILENCE, false)
@@ -287,6 +338,21 @@ 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 getEnableDrawerOnPortrait(): Boolean {
+        return App.getInstance().preferences.getBoolean(ENABLE_DRAWER_ON_PORTRAIT, false)
+    }
+
+    @JvmStatic
+    fun getHideBottomNavbarOnPortrait(): Boolean {
+        return App.getInstance().preferences.getBoolean(HIDE_BOTTOM_NAVBAR_ON_PORTRAIT, false)
+    }
+
    @JvmStatic
    fun getImageSize(): Int {
        return App.getInstance().preferences.getString(IMAGE_SIZE, "-1")!!.toInt()
@@ -625,6 +691,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()
@@ -691,4 +767,50 @@ object Preferences {
    fun setArtistDisplayBiography(displayBiographyEnabled: Boolean) {
        App.getInstance().preferences.edit().putBoolean(ARTIST_DISPLAY_BIOGRAPHY, displayBiographyEnabled).apply()
    }
+
+    @JvmStatic
+    fun isAndroidAutoAlbumViewEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(AA_ALBUM_VIEW, true)
+    }
+
+    @JvmStatic
+    fun isAndroidAutoHomeViewEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(AA_HOME_VIEW, false)
+    }
+
+    @JvmStatic
+    fun isAndroidAutoPlaylistViewEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(AA_PLAYLIST_VIEW, false)
+    }
+
+    @JvmStatic
+    fun isAndroidAutoPodcastViewEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(AA_PODCAST_VIEW, false)
+    }
+
+    @JvmStatic
+    fun isAndroidAutoRadioViewEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(AA_RADIO_VIEW, false)
+    }
+
+    @JvmStatic
+    fun getAndroidAutoFirstTab(): Int {
+        return App.getInstance().preferences.getString(AA_FIRST_TAB, "0")!!.toInt()
+    }
+
+    @JvmStatic
+    fun getAndroidAutoSecondTab(): Int {
+        return App.getInstance().preferences.getString(AA_SECOND_TAB, "1")!!.toInt()
+    }
+
+    @JvmStatic
+    fun getAndroidAutoThirdTab(): Int {
+        return App.getInstance().preferences.getString(AA_THIRD_TAB, "2")!!.toInt()
+    }
+	
+    @JvmStatic
+    fun getAndroidAutoFourthTab(): Int {
+        return App.getInstance().preferences.getString(AA_FOURTH_TAB, "3")!!.toInt()
+    }
+	
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/util/ReplayGainUtil.java
+++ b/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) {
--- a/app/src/main/java/com/cappielloantonio/tempo/util/TranscodingMediaSource.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/TranscodingMediaSource.kt
@@ -0,0 +1,328 @@
+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
+        val uri = mediaItem.localConfiguration?.uri
+        val isLocal = uri?.scheme == "content" || uri?.scheme == "file"
+
+        // Only apply the override if it's NOT a local file
+        if (!isLocal && extras != null && extras.containsKey("duration")) {
+            val seconds = extras.getInt("duration")
+            if (seconds > 0) {
+                durationUs = Util.msToUs(seconds * 1000L)
+            }
+        }
+
+        currentSource = progressiveMediaSourceFactory.createMediaSource(mediaItem)
+    }
+
+    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
+        }
+    }
+}
--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/HomeViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/HomeViewModel.java
@@ -24,6 +24,7 @@ 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;
@@ -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) {
@@ -250,12 +251,19 @@ public class HomeViewModel extends AndroidViewModel {
        playlistRepository.getPlaylists(false, -1).observe(owner, remotes -> {
            if (remotes != null && !remotes.isEmpty()) {
                List<Playlist> playlists = new ArrayList<>(remotes);
-                Collections.shuffle(playlists);
-                List<Playlist> randomPlaylists = playlists.size() > 5
+                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(randomPlaylists);
+                pinnedPlaylists.setValue(subsetPlaylists);
            }
        });

--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlaylistChooserViewModel.java
+++ b/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();
            });
        }
--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlaylistPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlaylistPageViewModel.java
@@ -20,14 +20,36 @@ public class PlaylistPageViewModel extends AndroidViewModel {
    private Playlist playlist;
    private boolean isOffline;

+    private final MutableLiveData<List<Child>> songLiveList = new MutableLiveData<>();
+
    public PlaylistPageViewModel(@NonNull Application application) {
        super(application);

        playlistRepository = new PlaylistRepository();
+        playlistRepository.getPlaylistUpdateTrigger().observeForever(needsRefresh -> {
+            if (needsRefresh != null && needsRefresh && playlist != null) {
+                refreshSongs();
+            }
+        });
    }

    public LiveData<List<Child>> getPlaylistSongLiveList() {
-        return playlistRepository.getPlaylistSongs(playlist.getId());
+        if (songLiveList.getValue() == null && playlist != null) {
+            refreshSongs();
+        }
+        return songLiveList;
+    }
+
+    private void refreshSongs() {
+        if (playlist == null) return;
+        LiveData<List<Child>> remoteData = playlistRepository.getPlaylistSongs(playlist.getId());
+        remoteData.observeForever(new androidx.lifecycle.Observer<List<Child>>() {
+            @Override
+            public void onChanged(List<Child> songs) {
+                songLiveList.postValue(songs);
+                remoteData.removeObserver(this);
+            }
+        });
    }

    public Playlist getPlaylist() {
@@ -35,7 +57,10 @@ public class PlaylistPageViewModel extends AndroidViewModel {
    }

    public void setPlaylist(Playlist playlist) {
-        this.playlist = playlist;
+        if (this.playlist == null || !this.playlist.getId().equals(playlist.getId())) {
+            this.playlist = playlist;
+            this.songLiveList.setValue(null); // Clear old data immediately
+        }
    }

    public LiveData<Boolean> isPinned(LifecycleOwner owner) {
--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SongBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SongBottomSheetViewModel.java
@@ -16,6 +16,7 @@ import com.cappielloantonio.tempo.model.Download;
 import com.cappielloantonio.tempo.repository.AlbumRepository;
 import com.cappielloantonio.tempo.repository.ArtistRepository;
 import com.cappielloantonio.tempo.repository.FavoriteRepository;
+import com.cappielloantonio.tempo.repository.PlaylistRepository;
 import com.cappielloantonio.tempo.repository.SharingRepository;
 import com.cappielloantonio.tempo.repository.SongRepository;
 import com.cappielloantonio.tempo.subsonic.models.AlbumID3;
@@ -39,6 +40,7 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
    private final ArtistRepository artistRepository;
    private final FavoriteRepository favoriteRepository;
    private final SharingRepository sharingRepository;
+    private final PlaylistRepository playlistRepository;

    private Child song;

@@ -52,6 +54,7 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
        artistRepository = new ArtistRepository();
        favoriteRepository = new FavoriteRepository();
        sharingRepository = new SharingRepository();
+        playlistRepository = new PlaylistRepository();
    }

    public Child getSong() {
@@ -62,6 +65,10 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
        this.song = song;
    }

+    public void removeFromPlaylist(String playlistId, int index, PlaylistRepository.AddToPlaylistCallback callback) {
+        playlistRepository.removeSongFromPlaylist(playlistId, index, callback);
+    }
+
    public void setFavorite(Context context) {
        if (song.getStarred() != null) {
            if (NetworkUtil.isOffline()) {
--- a/app/src/main/res/drawable/ic_aa_added_album.xml
+++ b/app/src/main/res/drawable/ic_aa_added_album.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M720,800L720,680L600,680L600,600L720,600L720,480L800,480L800,600L920,600L920,680L800,680L800,800L720,800ZM120,840Q87,840 63.5,816.5Q40,793 40,760L40,200Q40,167 63.5,143.5Q87,120 120,120L680,120Q713,120 736.5,143.5Q760,167 760,200L760,400L680,400L680,320L120,320L120,760Q120,760 120,760Q120,760 120,760L640,760L640,840L120,840ZM120,240L680,240L680,200Q680,200 680,200Q680,200 680,200L120,200Q120,200 120,200Q120,200 120,200L120,240ZM120,240L120,200Q120,200 120,200Q120,200 120,200L120,200Q120,200 120,200Q120,200 120,200L120,240Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_added_title.xml
+++ b/app/src/main/res/drawable/ic_aa_added_title.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,468Q821,459 801,452.5Q781,446 760,443L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L442,760Q445,782 451.5,802Q458,822 467,840L200,840ZM200,720Q200,731 200,740.5Q200,750 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200Q200,200 200,200Q200,200 200,200L200,443Q200,441 200,440.5Q200,440 200,440Q200,440 200,522Q200,604 200,720ZM280,680L443,680Q446,659 452.5,639Q459,619 467,600L280,600L280,680ZM280,520L524,520Q556,490 595.5,470Q635,450 680,443L680,440L280,440L280,520ZM280,360L680,360L680,280L280,280L280,360ZM720,920Q637,920 578.5,861.5Q520,803 520,720Q520,637 578.5,578.5Q637,520 720,520Q803,520 861.5,578.5Q920,637 920,720Q920,803 861.5,861.5Q803,920 720,920ZM700,840L740,840L740,740L840,740L840,700L740,700L740,600L700,600L700,700L600,700L600,740L700,740L700,840Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_albums.xml
+++ b/app/src/main/res/drawable/ic_aa_albums.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,660Q555,660 607.5,607.5Q660,555 660,480Q660,405 607.5,352.5Q555,300 480,300Q405,300 352.5,352.5Q300,405 300,480Q300,555 352.5,607.5Q405,660 480,660ZM451.5,508.5Q440,497 440,480Q440,463 451.5,451.5Q463,440 480,440Q497,440 508.5,451.5Q520,463 520,480Q520,497 508.5,508.5Q497,520 480,520Q463,520 451.5,508.5ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+
+</vector>
--- a/app/src/main/res/drawable/ic_aa_artists.xml
+++ b/app/src/main/res/drawable/ic_aa_artists.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M740,400L880,400L880,480L800,480L800,700Q800,742 771,771Q742,800 700,800Q658,800 629,771Q600,742 600,700Q600,658 629,629Q658,600 700,600Q708,600 718,601.5Q728,603 740,608L740,400ZM120,800L120,688Q120,653 137.5,625Q155,597 184,582Q246,551 310,535.5Q374,520 440,520Q482,520 523.5,526.5Q565,533 607,546Q587,558 571,575Q555,592 543,612Q517,606 491.5,603Q466,600 440,600Q383,600 328,614Q273,628 220,654Q211,659 205.5,668Q200,677 200,688L200,720L521,720Q523,740 530.5,760Q538,780 551,800L120,800ZM327,433Q280,386 280,320Q280,254 327,207Q374,160 440,160Q506,160 553,207Q600,254 600,320Q600,386 553,433Q506,480 440,480Q374,480 327,433ZM496.5,376.5Q520,353 520,320Q520,287 496.5,263.5Q473,240 440,240Q407,240 383.5,263.5Q360,287 360,320Q360,353 383.5,376.5Q407,400 440,400Q473,400 496.5,376.5ZM440,320Q440,320 440,320Q440,320 440,320Q440,320 440,320Q440,320 440,320Q440,320 440,320Q440,320 440,320Q440,320 440,320Q440,320 440,320ZM440,720L440,720L440,720Q440,720 440,720Q440,720 440,720Q440,720 440,720Q440,720 440,720Q440,720 440,720Q440,720 440,720Q440,720 440,720Q440,720 440,720Z"/>
+
+</vector>
--- a/app/src/main/res/drawable/ic_aa_folders.xml
+++ b/app/src/main/res/drawable/ic_aa_folders.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M120,840Q87,840 63.5,816.5Q40,793 40,760L40,240L120,240L120,760Q120,760 120,760Q120,760 120,760L800,760L800,840L120,840ZM280,680Q247,680 223.5,656.5Q200,633 200,600L200,160Q200,127 223.5,103.5Q247,80 280,80L480,80L560,160L840,160Q873,160 896.5,183.5Q920,207 920,240L920,600Q920,633 896.5,656.5Q873,680 840,680L280,680ZM280,600L840,600Q840,600 840,600Q840,600 840,600L840,240Q840,240 840,240Q840,240 840,240L527,240L447,160L280,160Q280,160 280,160Q280,160 280,160L280,600Q280,600 280,600Q280,600 280,600ZM280,600Q280,600 280,600Q280,600 280,600L280,160Q280,160 280,160Q280,160 280,160L280,160L280,240L280,240Q280,240 280,240Q280,240 280,240L280,600Q280,600 280,600Q280,600 280,600Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_for_you.xml
+++ b/app/src/main/res/drawable/ic_aa_for_you.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M649,463.5Q737,447 800,420L800,820Q740,847 654,863.5Q568,880 480,880Q392,880 306,863.5Q220,847 160,820L160,420Q223,447 311,463.5Q399,480 480,480Q561,480 649,463.5ZM720,760L720,530Q670,544 604.5,552Q539,560 480,560Q421,560 355.5,552Q290,544 240,530L240,760Q290,778 355,789Q420,800 480,800Q540,800 605,789Q670,778 720,760ZM593,127Q640,174 640,240Q640,306 593,353Q546,400 480,400Q414,400 367,353Q320,306 320,240Q320,174 367,127Q414,80 480,80Q546,80 593,127ZM536.5,296.5Q560,273 560,240Q560,207 536.5,183.5Q513,160 480,160Q447,160 423.5,183.5Q400,207 400,240Q400,273 423.5,296.5Q447,320 480,320Q513,320 536.5,296.5ZM480,240Q480,240 480,240Q480,240 480,240Q480,240 480,240Q480,240 480,240Q480,240 480,240Q480,240 480,240Q480,240 480,240Q480,240 480,240ZM480,665Q480,665 480,665Q480,665 480,665Q480,665 480,665Q480,665 480,665L480,665Q480,665 480,665Q480,665 480,665Q480,665 480,665Q480,665 480,665Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_home.xml
+++ b/app/src/main/res/drawable/ic_aa_home.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M240,760L360,760L360,520L600,520L600,760L720,760L720,400L480,220L240,400L240,760ZM160,840L160,360L480,120L800,360L800,840L520,840L520,600L440,600L440,840L160,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_mostplayed.xml
+++ b/app/src/main/res/drawable/ic_aa_mostplayed.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M400,640L640,480L400,320L400,640ZM324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,437 89,395.5Q98,354 115,315L177,377Q169,403 164.5,428.5Q160,454 160,480Q160,614 253,707Q346,800 480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q453,160 427.5,164.5Q402,169 377,177L316,116Q356,98 396,89Q436,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Q397,880 324,848.5ZM177.5,262.5Q160,245 160,220Q160,195 177.5,177.5Q195,160 220,160Q245,160 262.5,177.5Q280,195 280,220Q280,245 262.5,262.5Q245,280 220,280Q195,280 177.5,262.5ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_other.xml
+++ b/app/src/main/res/drawable/ic_aa_other.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M120,880L120,800L840,800L840,880L120,880ZM120,640L120,560L840,560L840,640L120,640ZM120,400L120,320L840,320L840,400L120,400ZM120,160L120,80L840,80L840,160L120,160Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_playlist.xml
+++ b/app/src/main/res/drawable/ic_aa_playlist.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M120,640L120,560L440,560L440,640L120,640ZM120,480L120,400L600,400L600,480L120,480ZM120,320L120,240L600,240L600,320L120,320ZM640,840L640,520L880,680L640,840Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_podcasts.xml
+++ b/app/src/main/res/drawable/ic_aa_podcasts.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M440,880L440,549Q422,538 411,520.5Q400,503 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,503 549,521Q538,539 520,549L520,880L440,880ZM204,770Q147,715 113.5,640.5Q80,566 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,566 846.5,641Q813,716 756,770L700,714Q746,670 773,609.5Q800,549 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,549 187,609Q214,669 261,713L204,770ZM317,657Q282,624 261,578.5Q240,533 240,480Q240,380 310,310Q380,240 480,240Q580,240 650,310Q720,380 720,480Q720,533 699,579Q678,625 643,657L586,600Q611,577 625.5,546Q640,515 640,480Q640,414 593,367Q546,320 480,320Q414,320 367,367Q320,414 320,480Q320,516 334.5,546.5Q349,577 374,600L317,657Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_radio.xml
+++ b/app/src/main/res/drawable/ic_aa_radio.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M160,880Q127,880 103.5,856.5Q80,833 80,800L80,320Q80,295 93.5,275Q107,255 130,246L636,40L662,106L332,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,800Q880,833 856.5,856.5Q833,880 800,880L160,880ZM160,800L800,800Q800,800 800,800Q800,800 800,800L800,520L160,520L160,800Q160,800 160,800Q160,800 160,800ZM391,731Q420,702 420,660Q420,618 391,589Q362,560 320,560Q278,560 249,589Q220,618 220,660Q220,702 249,731Q278,760 320,760Q362,760 391,731ZM160,440L640,440L640,360L720,360L720,440L800,440L800,320Q800,320 800,320Q800,320 800,320L160,320Q160,320 160,320Q160,320 160,320L160,440ZM160,800Q160,800 160,800Q160,800 160,800L160,520L160,520L160,800Q160,800 160,800Q160,800 160,800Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_random.xml
+++ b/app/src/main/res/drawable/ic_aa_random.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M280,800L80,600L280,400L336,457L233,560L520,560L520,640L233,640L336,743L280,800ZM680,560L624,503L727,400L440,400L440,320L727,320L624,217L680,160L880,360L680,560Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_recent.xml
+++ b/app/src/main/res/drawable/ic_aa_recent.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="
+            M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z
+
+    "/>
+</vector>
--- a/app/src/main/res/drawable/ic_aa_recent_title.xml
+++ b/app/src/main/res/drawable/ic_aa_recent_title.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M380,660L380,300L660,480L380,660ZM480,920Q372,920 277.5,870.5Q183,821 120,732L120,840L40,840L40,600L280,600L280,680L182,680Q233,755 311.5,797.5Q390,840 480,840Q595,840 688.5,774Q782,708 820,599L898,617Q853,753 738,836.5Q623,920 480,920ZM42,440Q49,373 74,311.5Q99,250 143,198L200,255Q168,296 148,342.5Q128,389 123,440L42,440ZM256,199L199,142Q252,98 313,72.5Q374,47 440,42L440,122Q389,127 343,147Q297,167 256,199ZM705,199Q664,167 617.5,147Q571,127 520,122L520,42Q587,48 648.5,73Q710,98 762,142L705,199ZM838,440Q833,389 813,342.5Q793,296 761,255L818,198Q862,250 887,311.5Q912,373 918,440L838,440Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_star_album.xml
+++ b/app/src/main/res/drawable/ic_aa_star_album.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M320,720L480,598L640,720L580,522L740,408L544,408L480,200L416,408L220,408L380,522L320,720ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_aa_star_title.xml
+++ b/app/src/main/res/drawable/ic_aa_star_title.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M489,500L580,445L671,500L647,396L727,327L622,318L580,220L538,318L433,327L513,396L489,500ZM508,760L732,760Q725,786 708,802Q691,818 664,822L228,875Q195,880 168.5,859.5Q142,839 138,806L85,369Q81,336 101,310Q121,284 154,280L200,274L200,354L164,359Q164,359 164,359Q164,359 164,359L218,796Q218,796 218,796Q218,796 218,796L508,760ZM360,680Q327,680 303.5,656.5Q280,633 280,600L280,160Q280,127 303.5,103.5Q327,80 360,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,600Q880,633 856.5,656.5Q833,680 800,680L360,680ZM360,600L800,600Q800,600 800,600Q800,600 800,600L800,160Q800,160 800,160Q800,160 800,160L360,160Q360,160 360,160Q360,160 360,160L360,600Q360,600 360,600Q360,600 360,600ZM580,380Q580,380 580,380Q580,380 580,380L580,380Q580,380 580,380Q580,380 580,380L580,380Q580,380 580,380Q580,380 580,380L580,380Q580,380 580,380Q580,380 580,380ZM218,796L218,796L218,796L218,796L218,796Q218,796 218,796Q218,796 218,796Z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/ic_albums.xml
+++ b/app/src/main/res/drawable/ic_albums.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,17.4V2.6C2,2.269 2.269,2 2.6,2H17.4C17.731,2 18,2.269 18,2.6V17.4C18,17.731 17.731,18 17.4,18H2.6C2.269,18 2,17.731 2,17.4Z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M8,22H21.4C21.731,22 22,21.731 22,21.4V8"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M11,12.5C11,13.328 10.328,14 9.5,14C8.672,14 8,13.328 8,12.5C8,11.672 8.672,11 9.5,11C10.328,11 11,11.672 11,12.5ZM11,12.5V6.6C11,6.269 11.269,6 11.6,6H13"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
--- a/app/src/main/res/drawable/ic_artists.xml
+++ b/app/src/main/res/drawable/ic_artists.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1,20V19C1,15.134 4.134,12 8,12V12C11.866,12 15,15.134 15,19V20"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M13,14V14C13,11.239 15.239,9 18,9V9C20.761,9 23,11.239 23,14V14.5"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8,12C10.209,12 12,10.209 12,8C12,5.791 10.209,4 8,4C5.791,4 4,5.791 4,8C4,10.209 5.791,12 8,12Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M18,9C19.657,9 21,7.657 21,6C21,4.343 19.657,3 18,3C16.343,3 15,4.343 15,6C15,7.657 16.343,9 18,9Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
--- a/app/src/main/res/drawable/ic_genres.xml
+++ b/app/src/main/res/drawable/ic_genres.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="49dp"
+    android:height="49dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,17.4V6.6C3,6.269 3.269,6 3.6,6H16.679C16.879,6 17.067,6.1 17.178,6.267L20.778,11.667C20.913,11.869 20.913,12.131 20.778,12.333L17.178,17.733C17.067,17.9 16.879,18 16.679,18H3.6C3.269,18 3,17.731 3,17.4Z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_graphic_eq_land.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_home_land.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_play_for_work_land.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_playlist.xml
+++ b/app/src/main/res/drawable/ic_playlist.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="49dp"
+    android:height="49dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,11L16,11"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M2,17L13,17"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M2,5L20,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,18.5C20,19.328 19.328,20 18.5,20C17.672,20 17,19.328 17,18.5C17,17.672 17.672,17 18.5,17C19.328,17 20,17.672 20,18.5ZM20,18.5V10.6C20,10.269 20.269,10 20.6,10H22"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:id="@+id/bottom_navigation_frame"
+                android:layout_width="55dp"
+                android:layout_height="match_parent">
+
+                <com.google.android.material.bottomnavigation.BottomNavigationView
+                    android:id="@+id/bottom_navigation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:rotation="90"
+                    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>
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:menu="@menu/nav_drawer"
+        app:headerLayout="@layout/nav_drawer_header" />
+
+    <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" />
+</androidx.drawerlayout.widget.DrawerLayout>
--- a/app/src/main/res/layout-land/fragment_album_page.xml
+++ b/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>
--- a/app/src/main/res/layout-land/fragment_playlist_page.xml
+++ b/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>
--- a/app/src/main/res/layout-land/inner_fragment_player_controller_layout.xml
+++ b/app/src/main/res/layout-land/inner_fragment_player_controller_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/now_playing_media_controller_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
@@ -23,30 +24,42 @@
        app:layout_constraintStart_toEndOf="@+id/vertical_guideline"
        app:layout_constraintTop_toTopOf="parent">

-        <com.google.android.material.chip.Chip
-            android:id="@+id/player_media_extension"
-            style="@style/Widget.Material3.Chip.Suggestion"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/player_media_quality_sector_center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:checked="true"
-            android:clickable="false"
-            android:text="Unknown"
-            app:chipStrokeWidth="0dp"
+            android:layout_marginVertical="8dp"
            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/player_media_bitrate"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintHorizontal_chainStyle="packed"/>
+            app:layout_constraintEnd_toEndOf="parent">

-        <TextView
-            android:id="@+id/player_media_bitrate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            app:layout_constraintTop_toTopOf="@id/player_media_extension"
-            app:layout_constraintBottom_toBottomOf="@id/player_media_extension"
-            app:layout_constraintStart_toEndOf="@id/player_media_extension"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <TextView
+                android:id="@+id/player_media_bitrate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                app:layout_constraintTop_toTopOf="@id/player_media_extension"
+                app:layout_constraintBottom_toBottomOf="@id/player_media_extension"
+                app:layout_constraintStart_toEndOf="@id/player_media_extension"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/player_media_extension"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:checked="true"
+                android:focusable="true"
+                android:text="Unknown"
+                app:chipStrokeWidth="0dp"
+                app:chipBackgroundColor="@color/material_dynamic_secondary40"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/player_media_bitrate"
+                app:layout_constraintHorizontal_chainStyle="packed"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>

        <ImageButton
            android:id="@+id/player_info_track"
@@ -57,11 +70,25 @@
            android:background="?attr/selectableItemBackgroundBorderless"
            android:scaleType="fitCenter"
            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/player_media_extension"
-            app:layout_constraintBottom_toBottomOf="@id/player_media_extension"
+            app:layout_constraintTop_toTopOf="@id/player_media_quality_sector_center"
+            app:layout_constraintBottom_toBottomOf="@id/player_media_quality_sector_center"
            app:srcCompat="@drawable/ic_info_stream"
            app:tint="?attr/colorOnPrimaryContainer" />

+        <Button
+            android:id="@+id/player_playback_speed_button"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            app:cornerRadius="30dp"
+            app:tint="?attr/colorOnPrimaryContainer"
+            tools:layout_editor_absoluteX="36dp"
+            tools:layout_editor_absoluteY="2dp" />
+
    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.viewpager2.widget.ViewPager2
@@ -244,23 +271,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_toEndOf="@+id/vertical_guideline"
-        app:layout_constraintTop_toTopOf="@+id/placeholder_view_middle_left"
-        app:tint="?attr/colorOnPrimaryContainer" />
-
    <ImageButton
        android:id="@+id/exo_shuffle"
        android:layout_width="32dp"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
-    android:orientation="vertical">
+    android:background="?attr/colorSurface">
+

    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/drawer_layout"
        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent">

        <androidx.fragment.app.FragmentContainerView
            android:id="@+id/nav_host_fragment"
@@ -35,11 +35,31 @@
            android:layout_gravity="bottom"
            android:paddingStart="24dp"
            android:paddingEnd="24dp"
-            android:visibility="gone"
            app:menu="@menu/bottom_nav_menu" />

+
    </androidx.coordinatorlayout.widget.CoordinatorLayout>

+    <!--
+    This FrameLayout id is always called,
+    if removed the app crashes
+    -->
+    <FrameLayout
+        android:id="@+id/bottom_navigation_frame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        android:clickable="false"
+        android:focusable="false" />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:menu="@menu/nav_drawer"
+        app:headerLayout="@layout/nav_drawer_header" />
+
    <TextView
        android:id="@+id/offline_mode_text_view"
        style="@style/NoConnectionTextView"
@@ -47,8 +67,6 @@
        android:layout_height="wrap_content"
        android:gravity="center"
        android:text="@string/activity_info_offline_mode"
-        android:textSize="12sp"
-        android:textStyle="bold"
+        android:textSize="6sp"
        android:visibility="gone" />
-
-</LinearLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
--- a/app/src/main/res/layout/bottom_sheet_song_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
@@ -164,6 +164,20 @@
            android:paddingBottom="12dp"
            android:text="@string/song_bottom_sheet_remove" />

+        <TextView
+            android:id="@+id/remove_from_playlist_text_view"
+            style="@style/LabelMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:paddingStart="20dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="12dp"
+            android:text="@string/song_bottom_sheet_remove_from_playlist"
+            android:visibility="gone" />
+
        <TextView
            android:id="@+id/add_to_playlist_text_view"
            style="@style/LabelMedium"
--- a/app/src/main/res/layout/dialog_playlist_chooser.xml
+++ b/app/src/main/res/layout/dialog_playlist_chooser.xml
@@ -3,6 +3,26 @@
    android:layout_height="wrap_content"
    android:orientation="vertical">

+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/playlist_dialog_chooser_visibility_switch"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:paddingStart="30dp"
+        android:paddingEnd="30dp"
+        android:checked="false"
+        android:showText="false"
+        android:text="@string/playlist_chooser_dialog_visibility_switch_label" />
+
+    <TextView
+        android:id="@+id/playlist_dialog_chooser_visibility_summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="30dp"
+        android:paddingEnd="30dp"
+        android:text="@string/playlist_chooser_dialog_visibility_summary"
+        android:layout_marginTop="8dp"/>
+
    <TextView
        android:id="@+id/no_playlists_created_text_view"
        style="@style/TitleMedium"
@@ -23,4 +43,35 @@
        android:layout_weight="1"
        android:layout_marginTop="8dp"
        android:clipToPadding="false" />
+
+    <LinearLayout
+        android:id="@+id/button_bar"
+        style="?android:attr/buttonBarStyle"
+        android:orientation="horizontal"
+        android:gravity="bottom|center_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:weightSum="2"
+        android:layout_marginTop="16dp">
+
+        <Button
+            android:id="@+id/playlist_chooser_dialog_create_button"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="start"
+            android:text="@string/playlist_chooser_dialog_create_button" />
+
+        <Button
+            android:id="@+id/playlist_chooser_dialog_cancel_button"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:layout_gravity="end"
+            android:text="@string/playlist_chooser_dialog_cancel_button"/>
+    </LinearLayout>
+
 </LinearLayout>
--- a/app/src/main/res/layout/dialog_server_signup.xml
+++ b/app/src/main/res/layout/dialog_server_signup.xml
@@ -129,6 +129,25 @@
                android:layout_marginStart="24dp"
                android:layout_marginEnd="24dp"
                android:text="@string/server_signup_dialog_action_low_security" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:id="@+id/client_cert_text_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginEnd="24dp"
+                android:textColorHint="?android:textColorHint">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/client_cert_text_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusableInTouchMode="false"
+                    android:hint="@string/server_signup_dialog_hint_client_certificate"
+                    android:inputType="textNoSuggestions"
+                    android:textCursorDrawable="@null" />
+            </com.google.android.material.textfield.TextInputLayout>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/dialog_track_info.xml
+++ b/app/src/main/res/layout/dialog_track_info.xml
@@ -131,6 +131,33 @@
                android:text="@string/label_placeholder" />
        </LinearLayout>

+        <View
+            style="@style/Divider"
+            android:layout_gravity="center_vertical"
+            android:layout_marginVertical="8dp" />
+
+        <LinearLayout
+            android:id="@+id/station_info_sector"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/station_key_sector"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="4"
+                android:paddingEnd="8dp"
+                android:text="@string/track_info_station" />
+
+            <TextView
+                android:id="@+id/station_value_sector"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="7"
+                android:text="@string/label_placeholder" />
+        </LinearLayout>
+
        <View
            style="@style/Divider"
            android:layout_gravity="center_vertical"
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -11,6 +11,12 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />

+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_library_to_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
    <androidx.core.widget.NestedScrollView
        android:id="@+id/fragment_library_nested_scroll_view"
        android:layout_width="match_parent"
@@ -77,21 +83,41 @@
                    android:paddingEnd="8dp"
                    android:paddingBottom="8dp">

-                    <TextView
+                    <!-- Refreshable area -->
+                    <LinearLayout
                        android:id="@+id/album_catalogue_sample_text_view_refreshable"
-                        style="@style/TitleLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            style="@style/TitleLarge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="8dp"
+                            android:paddingEnd="8dp"
+                            android:text="@string/library_title_album" />
+
+                        <ImageView
+                            android:layout_width="28dp"
+                            android:layout_height="28dp"
+                            android:layout_gravity="bottom"
+                            android:layout_marginBottom="2dp"
+                            android:alpha="0.4"
+                            android:src="@drawable/ic_refresh"/>
+
+                    </LinearLayout>
+
+                    <View
                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        android:text="@string/library_title_album" />
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />

                    <TextView
                        android:id="@+id/album_catalogue_text_view_clickable"
                        style="@style/TitleMedium"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
                        android:paddingStart="8dp"
                        android:paddingEnd="8dp"
                        android:text="@string/library_title_album_see_all_button" />
@@ -130,22 +156,41 @@
                    android:paddingEnd="8dp"
                    android:paddingBottom="8dp">

-                    <TextView
+                    <!-- Refreshable area -->
+                    <LinearLayout
                        android:id="@+id/artist_catalogue_sample_text_view_refreshable"
-                        style="@style/TitleLarge"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        android:text="@string/library_title_artist" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" >

+                        <TextView
+                            style="@style/TitleLarge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="8dp"
+                            android:paddingEnd="8dp"
+                            android:text="@string/library_title_artist" />
+
+                        <ImageView
+                            android:layout_width="28dp"
+                            android:layout_height="28dp"
+                            android:layout_gravity="bottom"
+                            android:layout_marginBottom="2dp"
+                            android:alpha="0.4"
+                            android:src="@drawable/ic_refresh"/>
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />

                    <TextView
                        android:id="@+id/artist_catalogue_text_view_clickable"
                        style="@style/TitleMedium"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
                        android:paddingStart="8dp"
                        android:paddingEnd="8dp"
                        android:text="@string/library_title_artist_see_all_button" />
@@ -184,25 +229,45 @@
                    android:paddingEnd="8dp"
                    android:paddingBottom="8dp">

-                    <TextView
+                    <!-- Refreshable area -->
+                    <LinearLayout
                        android:id="@+id/genre_catalogue_sample_text_view_refreshable"
-                        style="@style/TitleLarge"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        android:text="@string/library_title_genre" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" >

+                        <TextView
+                            style="@style/TitleLarge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="8dp"
+                            android:paddingEnd="8dp"
+                            android:text="@string/library_title_genre" />
+
+                        <ImageView
+                            android:layout_width="28dp"
+                            android:layout_height="28dp"
+                            android:layout_gravity="bottom"
+                            android:layout_marginBottom="2dp"
+                            android:alpha="0.4"
+                            android:src="@drawable/ic_refresh"/>
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />

                    <TextView
                        android:id="@+id/genre_catalogue_text_view_clickable"
                        style="@style/TitleMedium"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
                        android:paddingStart="8dp"
                        android:paddingEnd="8dp"
                        android:text="@string/library_title_genre_see_all_button" />
+
                </LinearLayout>

                <androidx.recyclerview.widget.RecyclerView
@@ -236,21 +301,41 @@
                    android:paddingEnd="8dp"
                    android:paddingBottom="8dp">

-                    <TextView
+                    <!-- Refreshable area -->
+                    <LinearLayout
                        android:id="@+id/playlist_catalogue_sample_text_view_refreshable"
-                        style="@style/TitleLarge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            style="@style/TitleLarge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="8dp"
+                            android:paddingEnd="8dp"
+                            android:text="@string/library_title_playlist" />
+
+                        <ImageView
+                            android:layout_width="28dp"
+                            android:layout_height="28dp"
+                            android:layout_gravity="bottom"
+                            android:layout_marginBottom="2dp"
+                            android:alpha="0.4"
+                            android:src="@drawable/ic_refresh"/>
+
+                    </LinearLayout>
+
+                    <View
                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingStart="8dp"
-                        android:paddingEnd="8dp"
-                        android:text="@string/library_title_playlist" />
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />

                    <TextView
                        android:id="@+id/playlist_catalogue_text_view_clickable"
                        style="@style/TitleMedium"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
+                        android:layout_gravity="end|center_vertical"
                        android:paddingStart="8dp"
                        android:paddingEnd="8dp"
                        android:text="@string/library_title_playlist_see_all_button" />
@@ -270,4 +355,5 @@
            </LinearLayout>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
+++ b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
@@ -16,30 +16,59 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

-        <com.google.android.material.chip.Chip
-            android:id="@+id/player_media_extension"
-            style="@style/Widget.Material3.Chip.Suggestion"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:clickable="false"
-            android:text="Unknown"
-            app:chipStrokeWidth="0dp"
+        <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:layout_constraintEnd_toStartOf="@id/player_media_bitrate"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintHorizontal_chainStyle="packed"/>
+            app:tint="?attr/colorOnPrimaryContainer" />

-        <TextView
-            android:id="@+id/player_media_bitrate"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/player_media_quality_sector_center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            app:layout_constraintTop_toTopOf="@id/player_media_extension"
-            app:layout_constraintBottom_toBottomOf="@id/player_media_extension"
-            app:layout_constraintStart_toEndOf="@id/player_media_extension"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            android:layout_marginVertical="8dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <TextView
+                android:id="@+id/player_media_bitrate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                app:layout_constraintTop_toTopOf="@id/player_media_extension"
+                app:layout_constraintBottom_toBottomOf="@id/player_media_extension"
+                app:layout_constraintStart_toEndOf="@id/player_media_extension"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/player_media_extension"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:checked="true"
+                android:focusable="true"
+                android:text="Unknown"
+                app:chipStrokeWidth="0dp"
+                app:chipBackgroundColor="@color/material_dynamic_secondary40"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/player_media_bitrate"
+                app:layout_constraintHorizontal_chainStyle="packed"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>

        <ImageButton
            android:id="@+id/player_info_track"
@@ -50,8 +79,8 @@
            android:background="?attr/selectableItemBackgroundBorderless"
            android:scaleType="fitCenter"
            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/player_media_extension"
-            app:layout_constraintBottom_toBottomOf="@id/player_media_extension"
+            app:layout_constraintTop_toTopOf="@id/player_media_quality_sector_center"
+            app:layout_constraintBottom_toBottomOf="@id/player_media_quality_sector_center"
            app:srcCompat="@drawable/ic_info_stream"
            app:tint="?attr/colorOnPrimaryContainer" />

@@ -253,23 +282,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"
--- a/app/src/main/res/layout/inner_fragment_player_lyrics.xml
+++ b/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" />
--- a/app/src/main/res/layout/nav_drawer_header.xml
+++ b/app/src/main/res/layout/nav_drawer_header.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="28dp"
+        android:paddingTop="30dp">
+
+        <ImageView
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/ic_toolbar_tempo" />
+
+        <TextView
+            style="@style/HeadlineMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:text="@string/app_name" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/menu-land/bottom_nav_menu.xml
+++ b/app/src/main/res/menu-land/bottom_nav_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/homeFragment"
+        android:icon="@drawable/ic_home_land" />
+    <item
+        android:id="@+id/libraryFragment"
+        android:icon="@drawable/ic_graphic_eq_land" />
+    <item
+        android:id="@+id/downloadFragment"
+        android:icon="@drawable/ic_play_for_work_land" />
+</menu>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
eddyizm	3086a8b9f9	chore: bumped version for build fix	2026-03-01 20:20:08 -08:00
eddyizm	10c2172be0	fix: updated constraints causing fata lint build failures (#478 )	2026-03-01 20:19:05 -08:00
eddyizm	918bf6928e	chore: bumped version and change log for release	2026-03-01 19:59:28 -08:00
Tom	c9cf86acb5	feat: toggle player bitrate visibility on touch (#466 ) * feat: touch player chip to toggle bitrate visibility * feat: player bitrate visibility is remembered * fix: player landscape layout not grouping chip with textview * feat: touch bitrate to toggle its visibility This catches the edge case where the the chip is not reachable due to insuficient horizontal space --------- Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-03-01 19:48:15 -08:00
eddyizm	0487f3bb9b	fix: returns filtered list and reset correctly (#476 )	2026-03-01 19:36:48 -08:00
Tom	c7f2524085	feat: feat: advertise existing long press to refresh per section (#467 ) * feat: advertise existing long press to refresh per section --------- Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-03-01 19:36:03 -08:00
eddyizm	88c2129cd4	chore: bumping version for release	2026-02-28 09:07:59 -08:00
Angelo Suzuki	aa5d0f92db	Support specifying a client certificate for mTLS auth (#458 ) * feat: collect and save client certificate * feat: use client certificate for Retrofit, Glide and ExoPlayer --------- Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-02-26 21:20:01 -08:00
MaFo-28	3ba2255205	Android Auto: improve media service browsing (#437 ) * Add Android Auto icons and improve media service browsing * chore: changelog and build updated for release * add grid/list setting for playlist, podcast and radio --------- Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-02-26 21:09:49 -08:00
Tom	145bb82eb0	feat: enhance navigation (#450 ) * feat: enhance navigation * fix: leaving settings always unlocks drawer * feat: set app settings inside a frame layout In order to add a toolbar with a back button in settings I needed to extend from a fragment so I converted SettingsFragment into a fragment and created SettingsContainerFragment, the latter is injected as a child of SettingsFragment inside a FrameLayout. Since SettingsContainerFragment extends from PreferenceFragmentCompat, this allows to swap it for other and, in the bigger picture, allow an arbitrary organization. * fix: onStop declaration on wrong class * fix: equalizer not respecting navigation ui directives * Revert "fix: equalizer not respecting navigation ui directives" This reverts commit `eeb125542d`. * fix: navbar + bottom sheet behavior on equalizer fragment * Revert "fix: onStop declaration on wrong class" This reverts commit `34d354d803`. * Revert "feat: set app settings inside a frame layout" This reverts commit `52cfd36b09`. * chore: set experimental label to settings title Hide bottom navigation bar on portrait and unlock drawer on portrait	2026-02-26 07:14:42 -08:00
Tom	932d1aaa8c	fix: artist sort by name case sensitive (#462 )	2026-02-25 17:40:50 -08:00
Tom	4f8212d491	Port remove song of playlist from tempus ng (#457 ) * feat: implement track removal from playlists with real-time UI updates - Added 'Remove from playlist' option to song bottom sheet (appears only when inside a playlist) - Implemented immediate UI refresh for track count and duration in playlist header - Fixed a bug where shuffling for covers scrambled the actual playlist song order - Improved PlaylistPageViewModel to clear stale data and handle isolated updates correctly - Added dedicated success/failure messages for track removal in English and Italian - Unified heart icon size to 14dp across all track list items * fix: missing code from port process The cherry-pick was missing the database getter and the function to remove a song from a playlist --------- Co-authored-by: beeetfarmer <176325048+beeetfarmer@users.noreply.github.com>	2026-02-25 11:37:43 -08:00
Denis Machard	b403d69982	feat: radio logos support for AndroidAuto (#435 ) * feat: radio logos support for AndroidAuto * resolve a merge conflict. * fix auto lint * fix auto lint * fix auto break line * fix auto break line * fix auto break line * fix: add alternate serialized name for InternetRadioStation homePageUrl to support both `homePageUrl` and `homepageUrl` JSON keys. * improve internet radio station cover art handling by prioritizing home page URLs * fix: remove unnecessary blank line and adjust formatting in MusicUtil * refactor: improve formatting and clean up whitespace in MappingUtil and MusicUtil	2026-02-22 08:08:01 -08:00
eddyizm	a49f2b97a2	Merge branch 'main' into development	2026-02-21 22:12:56 -08:00
skajmer	c44e60c0e5	chore(i18n): Update Polish translation (#441 ) * Add #338 * Add #3700 (strings.xml) * Add #370 (arrays.xml) * Add #386 * Add #394 * Add #411 and #413 * Add #411 (arrays) * misspelling	2026-02-16 09:45:57 -08:00
eddyizm	4cd15b4284	chore: changelog and build updated for release	2026-02-15 10:35:22 -08:00
eddyizm	72d7aea6e3	fix: release build errors	2026-02-15 10:30:01 -08:00
Tom	9adaf8c013	feat: improve playlist chooser dialog UI (#439 ) * fix: lock buttons at dialog bottom The previous implementation appended the buttons to the RecyclerView programmatically this disabled the scroll and pushed the buttons outside the visible dialog area if too there were too many playlists. To fix this now the XML defines a fixed location for the buttons, enabling the scroll of the RecyclerView and preventing the buttons to become unreachable * feat: improve playlist chooser dialog UI Implement it in the XML layout and not programmatically. * fix: detached listeners from XML layout * fix: missing dialog title	2026-02-15 09:42:07 -08:00
TrackArcher	661346ca3a	feat: radio metadata (#352 ) * feat: support dynamic metadata for internet radio stations - Implemented `onMetadata` in `BaseMediaService` to extract "Artist - Title" info from ICY, ID3, and Vorbis streams. - Added a fallback mechanism to periodically check HTTP headers (e.g., `icy-name`, `StreamTitle`) for radio metadata. - Updated `PlayerControllerFragment` and `TrackInfoDialog` to display the station name alongside dynamic track information. - Enhanced `TrackInfoDialog` layout to include a dedicated "Station" field for radio tracks. - Modified `MappingUtil` to preserve station names in media metadata extras. * fix crashing issue * radio bob metadata works now. fix crashing issue * Fixing unchecked operation warnings in SongHorizontalAdapter.java. * optimizing a bit and better format for notification * removed xml files affecting build and enviroment * removed xml files affecting build and enviroment * fix ui internet radio bottomview * Revert "fix ui internet radio bottomview" This reverts commit `c237ed451f`. * rebased to upstream/development and fixed metadata to show up for radio after the rebase * misc.xml restored * Apply suggestion from @eddyizm --------- Co-authored-by: eddyizm <wtfisup@hotmail.com> Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-02-15 08:03:00 -08:00
eddyizm	dbd32baa12	feat: prefer locally downloaded media vs server stream (#433 ) resolves #404 and should address #285	2026-02-11 21:31:46 -08:00
Tom	3958cbcc1c	fix: local url used in share link instead of server url (#431 ) fix: use explicitly Server Public URl in link sharing	2026-02-09 20:02:15 -08:00
Tom	fb568d1d74	fix: speed button overlaps with shuffle on landscape (#430 ) fix: buttons overlap on landscape player	2026-02-09 20:01:02 -08:00
Denis Machard	e06a168350	fix: radio playback "source error" on android auto (#426 )	2026-02-09 20:00:33 -08:00
Tom	b8dc985279	fix: visual glitches on landscape navbar (#429 )	2026-02-09 20:00:03 -08:00
Jaime García	090701b92b	chore(i18n): Update Spanish translation (#427 )	2026-02-09 19:59:39 -08:00
Jaime García	7767a66fb8	fix: Use Bluetooth tethering connection (#428 )	2026-02-09 19:59:20 -08:00
eddyizm	d1122bef4e	fix: updated album art provider from hardcoded to build config id	2026-02-09 17:49:30 -08:00
eddyizm	72d4495582	fix: added dynamic application id from gradle variant (#425 )	2026-02-08 21:23:35 -08:00
eddyizm	499644d041	fix: bungled the last release	2026-02-08 16:34:14 -08:00
eddyizm	21ed78d959	chore: bumping version, fastlane and changelog	2026-02-08 16:14:22 -08:00
Tom	5ad99b9f27	feat: increase items per row on landscape view (#411 ) * 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>	2026-02-08 15:20:53 -08:00
T R	3de5390140	fix: album art now displays on android auto (#414 ) Co-authored-by: Thomas R <tdr@thomasr.co> Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-02-08 10:34:44 -08:00
eddyizm	d215581e19	fix: keep observer until data is received on continuous play (#421 )	2026-02-08 10:18:36 -08:00
tiltshiftfocus	54612c6b74	patch: Addressing some UI/UX quirks (#413 ) * beautify lyrics display * use dialog to select playback speed to prevent accidental clicks	2026-02-08 10:18:01 -08:00
eddyizm	eaac728a26	chore: bump version and change logs	2026-02-02 20:25:40 -08:00
skajmer	65d2f8e33f	chore(i18n): Update Polish translation (#402 ) * Add #338 * Add #3700 (strings.xml) * Add #370 (arrays.xml) * Add #386 * Add #394	2026-02-02 07:09:29 -08:00
Tom	baf4e0f0fc	chore(i18n): set links as untranslatable (#400 )	2026-01-31 17:37:41 -08:00
Tom	26c7bee106	feat: Add selector for playlist visibility (#394 ) * feat: add selector for playlist visiblity when adding a song * fix: wrong number of arguments * feat: make dialog text localized * chore: add es, fr, it, pt localization for playlist visibility dialog --------- Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-01-31 17:10:58 -08:00
Pascal Grittmann	6e51611867	Improve Synced Lyrics (#384 ) * feature: click on synced lyrics to navigate in song * only update lyrics if needed improves performance and allows user to scroll synced lyrics * fix: don't scroll to start after end of song	2026-01-31 08:16:13 -08:00
eddyizm	d67e432731	chore: added playlist strings for pr #394	2026-01-31 08:10:30 -08:00
Pascal Grittmann	8b61396b0f	Fix missing Replay Gain metadata from .m4a files (#396 ) fix missing replay gain metadata from .m4a files	2026-01-29 20:22:09 -08:00
eddyizm	0fb6e55b12	chore: update changelog and fastlane	2026-01-26 21:32:07 -08:00
eddyizm	dd7aa2291b	chore: bump version	2026-01-26 21:29:40 -08:00
eddyizm	ec33c32c89	fix: updated dialog import to address crashing on android 15 (#392 ) resolves #362	2026-01-26 21:25:27 -08:00
Jaime García	e0ad4e3701	fix: Avoid crash when server has no songs (#389 )	2026-01-26 16:24:23 -08:00
eddyizm	253f8033c5	Merge branch 'development'	2026-01-25 11:41:50 -08:00
eddyizm	c1aed1a4c1	chore: version/changelog/fastlane bumps	2026-01-25 11:41:26 -08:00
eddyizm	23f58439ba	Merge branch 'development'	2026-01-25 11:34:27 -08:00
eddyizm	4c99ced597	chore: version/changelog/fastlane bumps	2026-01-25 11:34:16 -08:00
eddyizm	8d215a7f1c	feat: add configurable timeout (#386 )	2026-01-25 11:27:12 -08:00
eddyizm	38fc4a0936	chore: forget to check in fastlane change log	2026-01-25 08:06:29 -08:00
eddyizm	d9949349da	chore: forget to check in fastlane change log	2026-01-25 08:06:06 -08:00
Jaime García	877d29d285	chore(i18n): Update Spanish translation (#381 )	2026-01-24 14:05:52 -08:00
Jaime García	9a17aa8b98	fix: Proper raw stream detection (#382 )	2026-01-24 14:05:36 -08:00
eddyizm	fd41395ab8	chore: bump version for tag	2026-01-24 09:11:41 -08:00
eddyizm	269066e036	Merge branch 'development'	2026-01-24 09:09:23 -08:00
eddyizm	488460ea9d	chore: bump version/changelog	2026-01-24 09:07:26 -08:00
Pascal Grittmann	d16a9c234f	feat: Playback speed controls for music (#376 ) Enable playback speed controls for music Button is moved to the top left, next to bit rate, because it would overlap with the "shuffle" button. The speed rotation logic was cleaned up to 0.25x increments without all the hard-coded constants and code duplication. Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-01-24 08:39:57 -08:00
eddyizm	07b507691c	chore: fixed read me donate link	2026-01-24 08:33:34 -08:00
drakeerv	bde34d3df0	feat: Implement duration and seeking for transcodes (#358 ) Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-01-24 08:28:47 -08:00
Pascal Grittmann	e5b7756f96	fix: Check for OpenSubsonic extensions also with password authentication (#375 ) check for OpenSubsonic extensions also with pwd auth Co-authored-by: eddyizm <eddyizm@gmail.com>	2026-01-24 08:28:20 -08:00
eddyizm	04e692e5e9	chore: fixed read me donate link	2026-01-24 07:51:30 -08:00
skajmer	a23a663d32	chore(i18n): Update Polish translation (#374 ) * Add #338 * Add #3700 (strings.xml) * Add #370 (arrays.xml)	2026-01-23 22:15:51 -08:00
eddyizm	023bd8071a	fix: use existing future when adding tracks, dialed random album trac… (#373 ) fix: use existing future when adding tracks, dialed random album tracks back to 100, vs 1000.	2026-01-22 22:09:49 -08:00
eddyizm	72b1517f61	chore: added openapk badge, contributor shoutout, another link fix	2026-01-22 22:08:52 -08:00
eddyizm	e62ea72c2f	merge-conflit	2026-01-21 07:54:51 -08:00
eddyizm	a24ccf2556	chore: added attribute	2026-01-21 07:53:08 -08:00
eddyizm	49838e2e0f	chore: another attempt at fixing the links	2026-01-21 07:46:02 -08:00
eddyizm	8ed1248ee1	docs: fixed main links for github page	2026-01-21 07:21:24 -08:00
eddyizm	e9d54957ae	chore: pending release notes update and href links on readme	2026-01-20 21:59:48 -08:00
eddyizm	3cd5843c4b	feat: sort preference for playlists (#370 )	2026-01-18 16:39:28 -08:00
eddyizm	75513d3bd4	fix: sort playlist catalog view (#368 ) fix: sorts playlist catalog view	2026-01-18 08:54:25 -08:00
eddyizm	c0c84269ef	fix: toast for made for you click indication (#365 )	2026-01-17 18:21:14 -08:00
eddyizm	fa2e029f9f	Merge branch 'main' into development	2026-01-17 18:18:32 -08:00
eddyizm	f1bfb095b7	chore: updated readme and added known issues for airsonic work around (#366 )	2026-01-17 18:17:23 -08:00
Jaime García	4328415efc	chore(i18n): Update Spanish translation (#364 )	2026-01-17 08:43:24 -08:00
Benoît Smith	092ae14ea2	chore: French localization update (#356 ) * Add toast message for no artist info * Add French strings for instant mix generation messages * Add French string for music download directory * Add neutral button string for download storage dialog * Add French strings for download refresh features * Add French translations for heart controls and loading * Update French strings for starred albums and artists * Add album count string to French resources * Add French translations for player lyrics features * Update French strings for pluralization and playlist * Fix French translation for podcast info title * Add and update French radio station strings * Add settings for playlist duplicates in French strings * Add download folder settings in French strings * Add download folder settings and update equalizer summary * Add support discussion and update strings in French * Update French strings for UI elements Updated French translations for heart control descriptions, mobile bitrate settings, queue syncing title, and added mini shuffle button settings. * Update French strings for settings and lyrics * Update French strings for offline sync settings * Add playlist string to French resources * Add French translations for asset links * Revise French subtitles for starred artists and albums Updated subtitles for starred artists and albums in French localization. * Add French strings for widget and settings	2026-01-14 21:44:36 -08:00
eddyizm	26af8a692f	Merge branch 'main' into development	2026-01-14 21:27:18 -08:00
eddyizm	b870f4c866	fix: added country code to catalan	2026-01-14 21:27:14 -08:00
DevMatei	cf4e78eafc	i18n: Add Romanian translation (including locale_config this time!) (#357 ) * i18n: Add Romanian (ro) translation * feat(i18n): add Romanian (ro) locale support * fix: added Country code --------- Co-authored-by: eddyizm <wtfisup@hotmail.com>	2026-01-14 21:25:45 -08:00
eddyizm	83e23c44d9	chore: updated instant mix verbage	2026-01-14 21:17:52 -08:00