fix: disabled workflow, manual build

#158, #161

.github/workflows/github_release.yml

@@ -35,21 +35,21 @@ jobs:
           echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
           echo Last build tool version is: $BUILD_TOOL_VERSION
 
-      - name: Build All APKs
+      - name: Build All Release APKs
         id: build
         run: |
-          # Build release variants
-          bash ./gradlew assembleTempoRelease
-          bash ./gradlew assembleNotquitemyRelease
-          # Build debug variants  
-          bash ./gradlew assembleTempoDebug
-          bash ./gradlew assembleNotquitemyDebug
+          # Only build release variants (removed debug builds)
+          bash ./gradlew assembleTempusRelease
+          bash ./gradlew assembleDegoogledRelease
 
-      - name: Sign Tempo Release APKs
-        id: sign_tempo_release
+      - name: Create Artifact Staging Directory
+        run: mkdir -p release-artifacts
+
+      - name: Sign Tempus Release APKs
+        id: sign_tempus_release
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/tempo/release
+          releaseDirectory: app/build/outputs/apk/tempus/release
           signingKeyBase64: ${{ secrets.KEYSTORE_BASE64 }}
           alias: ${{ secrets.KEY_ALIAS_GITHUB }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -57,11 +57,31 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
-      - name: Sign NotQuiteMy Release APKs
-        id: sign_notquitemy_release
+      - name: Prepare Signed Tempus APKs for Release
+        run: |
+          TEMPUS_PATH=app/build/outputs/apk/tempus/release
+          
+          echo "--- Tempus Files BEFORE Move ---"
+          ls -la $TEMPUS_PATH
+          echo "--------------------------------"
+          
+          # FIX: Use find/xargs for robust file matching and moving.
+          
+          # Renaming 64-bit APK and moving to safe staging directory
+          find $TEMPUS_PATH -name '*arm64-v8a*signed.apk' -print0 | xargs -0 mv -t ./release-artifacts/
+          mv ./release-artifacts/*arm64-v8a*signed.apk ./release-artifacts/app-tempus-arm64-v8a-release.apk
+          
+          # Renaming 32-bit APK and moving to safe staging directory
+          find $TEMPUS_PATH -name '*armeabi-v7a*signed.apk' -print0 | xargs -0 mv -t ./release-artifacts/
+          mv ./release-artifacts/*armeabi-v7a*signed.apk ./release-artifacts/app-tempus-armeabi-v7a-release.apk
+          
+          echo "Prepared Tempus APKs."
+
+      - name: Sign Degoogled Release APKs
+        id: sign_degoogled_release
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/notquitemy/release
+          releaseDirectory: app/build/outputs/apk/degoogled/release
           signingKeyBase64: ${{ secrets.KEYSTORE_BASE64 }}
           alias: ${{ secrets.KEY_ALIAS_GITHUB }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -69,50 +89,41 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
+      - name: Prepare Signed Degoogled APKs for Release
+        run: |
+          DEGOOGLED_PATH=app/build/outputs/apk/degoogled/release
+          
+          echo "--- Degoogled Files BEFORE Move ---"
+          ls -la $DEGOOGLED_PATH
+          echo "--------------------------------"
+          
+          # FIX: Use find/xargs for robust file matching and moving.
+          
+          # Renaming 64-bit APK and moving to safe staging directory
+          find $DEGOOGLED_PATH -name '*arm64-v8a*signed.apk' -print0 | xargs -0 mv -t ./release-artifacts/
+          mv ./release-artifacts/*arm64-v8a*signed.apk ./release-artifacts/app-degoogled-arm64-v8a-release.apk
+          
+          # Renaming 32-bit APK and moving to safe staging directory
+          find $DEGOOGLED_PATH -name '*armeabi-v7a*signed.apk' -print0 | xargs -0 mv -t ./release-artifacts/
+          mv ./release-artifacts/*armeabi-v7a*signed.apk ./release-artifacts/app-degoogled-armeabi-v7a-release.apk
+          
+          echo "Prepared Degoogled APKs."
+          ls -la ./release-artifacts/
+
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release v${{ github.ref }}
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
           body: '> Changelog coming soon'
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+          draft: false
+          prerelease: false
+          files: ./release-artifacts/*.apk
 
-      - name: Upload Release APKs
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{steps.sign_tempo_release.outputs.signedReleaseFile}}
-          asset_name: app-tempo-release.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload NotQuiteMy Release APK
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{steps.sign_notquitemy_release.outputs.signedReleaseFile}}
-          asset_name: app-notquitemy-release.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Debug APKs as artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: debug-apks
-          path: |
-            app/build/outputs/apk/tempo/debug/
-            app/build/outputs/apk/notquitemy/debug/
-          retention-days: 30
-
-      - name: Upload Release APKs as artifacts
+      - name: Upload Release APKs as artifacts (For easy pipeline access)
         uses: actions/upload-artifact@v4
         with:
           name: release-apks
-          path: |
-            ${{steps.sign_tempo_release.outputs.signedReleaseFile}}
-            ${{steps.sign_notquitemy_release.outputs.signedReleaseFile}}
-          retention-days: 30
+          path: ./release-artifacts/*.apk
+          retention-days: 30

.gitignore

@@ -17,4 +17,5 @@
 .vscode/settings.json
 # release / debug files
 tempus-release-key.jks
-app/tempo/
+app/tempus/
+app/degoogled/

CHANGELOG.md

@@ -1,6 +1,45 @@
 # Changelog
 
-***This log is for this fork to detail updates since 3.9.0 from the main repo.***
+## [4.0.2](https://github.com/eddyizm/tempo/releases/tag/v4.0.2) (2025-10-26)
+## Attention
+This release will not update previous installs as it is considered a new app, no longer `Tempo`, new icon, new app id, and new app name. Hoping it will not be a huge inconvenience but was necessary in order to publish to app stores like IzzyDroid and FDroid.  
+
+**Android Auto** 
+Support should be the same as before, however, I was not able to test any of the icons/visuals, so please let me know if there are any remnants of the tempo logo/icon as I believe I removed them all and replaced them successfully.  
+
+## What's Changed
+* Check also underlying transport by @zc-devs in https://github.com/eddyizm/tempus/pull/90
+* fix: updated workflow for 32/64 bit apks by @eddyizm in https://github.com/eddyizm/tempus/pull/176
+* Unhide genre from album details view by @sebaFlame in https://github.com/eddyizm/tempus/pull/161
+* fix: persist album sorting on resume by @eddyizm in https://github.com/eddyizm/tempus/pull/181
+* chore: update readme and usage references to tempus. added new banner… by @eddyizm in https://github.com/eddyizm/tempus/pull/182
+* Tempus rebrand by @eddyizm in https://github.com/eddyizm/tempus/pull/183
+* Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/188
+
+## New Contributors
+* @zc-devs made their first contribution in https://github.com/eddyizm/tempus/pull/90
+* @sebaFlame made their first contribution in https://github.com/eddyizm/tempus/pull/161
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v3.17.14...v4.0.1
+
+## [3.17.14](https://github.com/eddyizm/tempo/releases/tag/v3.17.14) (2025-10-16)
+## What's Changed
+* fix: General build warning and playback issues by @le-firehawk in https://github.com/eddyizm/tempo/pull/167
+* fix: persist album sort preference by @eddyizm in https://github.com/eddyizm/tempo/pull/168
+* Fix album parse empty date field by @eddyizm in https://github.com/eddyizm/tempo/pull/171
+* fix: Include shuffle/repeat controls in f-droid build's media notific… by @le-firehawk in https://github.com/eddyizm/tempo/pull/174
+* fix: limits image size to prevent widget crash #172 by @eddyizm in https://github.com/eddyizm/tempo/pull/175
+
+**Full Changelog**: https://github.com/eddyizm/tempo/compare/v3.17.0...v3.17.14
+
+## [3.17.0](https://github.com/eddyizm/tempo/releases/tag/v3.17.0) (2025-10-10)
+## What's Changed
+* chore: adding screenshot and docs for 4 icons/buttons in player control by @eddyizm in https://github.com/eddyizm/tempo/pull/162
+* Update Polish translation by @skajmer in https://github.com/eddyizm/tempo/pull/160
+* feat: Make all objects in Tempo references for quick access by @le-firehawk in https://github.com/eddyizm/tempo/pull/158
+* fix: Glide module incorrectly encoding IPv6 addresses by @le-firehawk in https://github.com/eddyizm/tempo/pull/159
+
+**Full Changelog**: https://github.com/eddyizm/tempo/compare/v3.16.6...v3.17.0
 
 ## [3.16.6](https://github.com/eddyizm/tempo/releases/tag/v3.16.6) (2025-10-08)
 ## What's Changed
@@ -151,3 +190,5 @@
  [\#400](https://github.com/CappielloAntonio/tempo/pull/400)
 - [Chore] Spanish translation [\#374](https://github.com/CappielloAntonio/tempo/pull/374)
 - [Chore] Polish translation [\#378](https://github.com/CappielloAntonio/tempo/pull/378)
+
+***This log is for this fork to detail updates since 3.9.0 from the main repo.***

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img alt="Tempo" title="Tempo" src="mockup/svg/horizontal_logo.svg" width="250">
+  <img alt="Tempus" title="Tempus" src="mockup/svg/tempus_horizontal_logo.png" width="250">
 </p>
 
 <p align="center">
@@ -14,54 +14,52 @@
     <a href="https://apt.izzysoft.de/fdroid/index/apk/com.cappielloantonio.tempo"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" width="200"></a>
 </p> -->
 
-**Tempo** is an open-source and lightweight music client for Subsonic, designed and built natively for Android. It provides a seamless and intuitive music streaming experience, allowing you to access and play your Subsonic music library directly from your Android device. 
+**Tempus** is an open-source and lightweight music client for Subsonic, designed and built natively for Android. It provides a seamless and intuitive music streaming experience, allowing you to access and play your Subsonic music library directly from your Android device. 
 
-Tempo does not rely on magic algorithms to decide what you should listen to. Instead, the interface is built around your listening history, randomness, and optionally integrates with services like Last.fm to personalize your music experience.
+Tempus does not rely on magic algorithms to decide what you should listen to. Instead, the interface is built around your listening history, randomness, and optionally integrates with services like Last.fm to personalize your music experience.
 
-**If you find Tempo useful, please consider starring the project on GitHub. It would mean a lot to me and help promote the app to a wider audience.**
+The project is a fork of [Tempo](#credits).
+
+**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.**
 
-## Fork  
-
 sha256 signing key fingerprint   
-`SHA256: B7:85:01:B9:34:D0:4E:0A:CA:8D:94:AF:D6:72:6A:4D:1D:CE:65:79:7F:1D:41:71:0F:64:3C:29:00:EB:1D:1D`  
-
-This fork is my attempt to keep development moving forward and merge in PR's that have been sitting for a while in the main repo. Thankful to @CappielloAntonio for the amazing app and hopefully we can continue to build on top of it. I will only be releasing on github and if I am not able to merge back to the main repo, I plan to rename the app to be able to publish it to fdroid and possibly google play? We will see.
+`B7:85:01:B9:34:D0:4E:0A:CA:8D:94:AF:D6:72:6A:4D:1D:CE:65:79:7F:1D:41:71:0F:64:3C:29:00:EB:1D:1D`  
 
 ### Releases  
 
 Please note the two variants in the release assets include release/debug and 32/64 bit flavors.
 
-`app-tempo` <- The github release with all the android auto/chromecast features 
+`app-tempus` <- The github release with all the android auto/chromecast features 
 
-`app-notquitemy*` <- The f-droid release that goes without any of the google stuff. It was last released at 3.8.1 from the original repo. Since I don't have access to that original repo, I am releasing the apk's here on github.
+`app-degoogled*` <- The f-droid release that goes without any of the google stuff. It was last released at 3.8.1 from the original repo. Since I don't have access to that original repo, I am releasing the apk's here on github.
 
-As mentioned above, I am working towards a rebrand to get into app stores with a new name an icon.
+[CHANGELOG.md](CHANGELOG.md)
 
-Moved details to [CHANGELOG.md](https://github.com/eddyizm/tempo/blob/main/CHANGELOG.md)
+[**Buy me a coffee**](https://ko-fi.com/eddyizm)
 
-Fork [**sponsorship here**](https://ko-fi.com/eddyizm). 
 
 ## Usage
 
 [Documentation](USAGE.md) (work in progress)
 
 ## Features
-- **Subsonic Integration**: Tempo seamlessly integrates with your Subsonic server, providing you with easy access to your entire music collection on the go.
+- **Subsonic Integration**: Tempus seamlessly integrates with your Subsonic server, providing you with easy access to your entire music collection on the go.
 - **Sleek and Intuitive UI**: Enjoy a clean and user-friendly interface designed to enhance your music listening experience, tailored to your preferences and listening history.
 - **Browse and Search**: Easily navigate through your music library using various browsing and searching options, including artists, albums, genres, playlists, decades and more.
 - **Streaming and Offline Mode**: Stream music directly from your Subsonic server. Offline mode is currently under active development and may have limitations when using multiple servers.
 - **Playlist Management**: Create, edit, and manage playlists to curate your perfect music collection.
 - **Gapless Playback**: Experience uninterrupted playback with gapless listening mode.
 - **Chromecast Support**: Stream your music to Chromecast devices. The support is currently in a rudimentary state.
-- **Scrobbling Integration**: Optionally integrate Tempo with Last.fm 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 Tempo, expanding your audio entertainment options.
+- **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.
 - **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.
-
-## Credits
-Thanks to the original repo/creator [CappielloAntonio](https://github.com/CappielloAntonio) (3.9.0)
+- **Multiple Libraries**: Tempus handles multi-library setups gracefully. They are displayed as Library folders.
+- **Equalizer**: Option to use in app equalizer.
+- **Widget**: New widget to keeping the basic controls on your screen at all times.
+- **Available in 11 languages**: Currently in Chinese, French, German, Italian, Korean, Polish, Portuguese, Russion, Spanish and Turkish
 
 ## Screenshot
 
@@ -70,14 +68,13 @@ Thanks to the original repo/creator [CappielloAntonio](https://github.com/Cappie
 </p>
 
 <p align="center">
-    <img src="mockup/light/1_screenshot.png" width=200>
-    <img src="mockup/light/2_screenshot.png" width=200>
-    <img src="mockup/light/3_screenshot.png" width=200>
-    <img src="mockup/light/4_screenshot.png" width=200>
-    <img src="mockup/light/5_screenshot.png" width=200>
-    <img src="mockup/light/6_screenshot.png" width=200>
-    <img src="mockup/light/7_screenshot.png" width=200>
-    <img src="mockup/light/8_screenshot.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1_light.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2_light.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3_light.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4_light.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5_light.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/6_light.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/8_light.png" width=200>
 </p>
 
 <br>
@@ -87,26 +84,31 @@ Thanks to the original repo/creator [CappielloAntonio](https://github.com/Cappie
 </p>
 
 <p align="center">
-    <img src="mockup/dark/1_screenshot.png" width=200>
-    <img src="mockup/dark/2_screenshot.png" width=200>
-    <img src="mockup/dark/3_screenshot.png" width=200>
-    <img src="mockup/dark/4_screenshot.png" width=200>
-    <img src="mockup/dark/5_screenshot.png" width=200>
-    <img src="mockup/dark/6_screenshot.png" width=200>
-    <img src="mockup/dark/7_screenshot.png" width=200>
-    <img src="mockup/dark/8_screenshot.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1_dark.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2_dark.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3_dark.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4_dark.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5_dark.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/6_dark.png" width=200>
+    <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/8_dark.png" width=200>
+    
 </p>
 
 ## Contributing  
 
 Please fork and open PR's against the development branch. Make sure your PR builds successfully. 
 
-If there is a UI change, please provide a before/after screenshot and a short video/gif if that helps elaborating the fix/feature in the PR. 
+If there is an UI change, please include a before/after screenshot and a short video/gif if that helps elaborating the fix/feature in the PR. 
 
-Currently there are not tests but I would love to start on some unit tests. 
+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. 
 
 ## License
 
-Tempo 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. 
+Tempus is released under the [GNU General Public License v3.0](LICENSE). Feel free to modify, distribute, and use the app in accordance with the terms of the license. Contributions to the project are also welcome. 
+
+## Credits
+Thanks to the original repo/creator [CappielloAntonio](https://github.com/CappielloAntonio) (forked from v3.9.0)
+
+[Opensvg.org](https://opensvg.org) for the new turntable logo. 

USAGE.md

@@ -1,4 +1,4 @@
-# Tempo Usage Guide 
+# Tempus Usage Guide 
 [<- back home](README.md)
 
 ## Table of Contents
@@ -34,7 +34,7 @@ This app works with any service that implements the Subsonic API, including:
 ## Getting Started
 
 ### Installation
-1. Download the APK from the [Releases](https://github.com/eddyizm/tempo/releases) section
+1. Download the APK from the [Releases](https://github.com/eddyizm/tempus/releases) section
 2. Enable "Install from unknown sources" in your Android settings
 3. Install the application
 
@@ -57,7 +57,14 @@ This app works with any service that implements the Subsonic API, including:
 ## Main Features
 
 ### Library View
-**TODO**
+
+**Multi-library**
+
+Tempus handles multi-library setups gracefully. They are displayed as Library folders. 
+
+However, if you want to limit or change libraries you could use a workaround, if your server supports it.
+
+You can create multiple users , one for each library, and save each of them in Tempus app.
 
 ### Now Playing Screen
 
@@ -150,8 +157,8 @@ On the main player control screen, tapping on the artwork will reveal a small co
 
 ### Support
 For additional help:
-- Question? Start a [Discussion](https://github.com/eddyizm/tempo/discussions)
-- Open an [issue](https://github.com/eddyizm/tempo/issues) if you don't find a discussion solving your issue. 
+- Question? Start a [Discussion](https://github.com/eddyizm/tempus/discussions)
+- Open an [issue](https://github.com/eddyizm/tempus/issues) if you don't find a discussion solving your issue. 
 - Consult your Subsonic server's documentation
 
 ---

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 24
         targetSdk 35
 
-        versionCode 35
-        versionName '3.17.0'
+        versionCode 1
+        versionName '4.0.6'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         javaCompileOptions {
@@ -40,14 +40,14 @@ android {
     flavorDimensions += "default"
 
     productFlavors {
-        tempo {
+        tempus {
             dimension = "default"
-            applicationId 'com.cappielloantonio.tempo'
+            applicationId 'com.eddyizm.tempus'
         }
 
-        notquitemy {
+        degoogled {
             dimension = "default"
-            applicationId "com.cappielloantonio.notquitemy.tempo"
+            applicationId "com.eddyizm.degoogled.tempus"
         }
 
     }
@@ -110,7 +110,7 @@ dependencies {
     implementation 'androidx.media3:media3-exoplayer:1.5.1'
     implementation 'androidx.media3:media3-ui:1.5.1'
     implementation 'androidx.media3:media3-exoplayer-hls:1.5.1'
-    tempoImplementation 'androidx.media3:media3-cast:1.5.1'
+    tempusImplementation 'androidx.media3:media3-cast:1.5.1'
 
 
     annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'

app/src/degoogled/java/com/cappielloantonio/tempo/service/MediaService.kt

@@ -14,16 +14,19 @@ import androidx.media3.common.*
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.TrackGroupArray
 import androidx.media3.exoplayer.trackselection.TrackSelectionArray
 import androidx.media3.session.*
 import androidx.media3.session.MediaSession.ControllerInfo
 import com.cappielloantonio.tempo.R
+import com.cappielloantonio.tempo.repository.QueueRepository
 import com.cappielloantonio.tempo.ui.activity.MainActivity
 import com.cappielloantonio.tempo.util.AssetLinkUtil
 import com.cappielloantonio.tempo.util.Constants
 import com.cappielloantonio.tempo.util.DownloadUtil
 import com.cappielloantonio.tempo.util.DynamicMediaSourceFactory
+import com.cappielloantonio.tempo.util.MappingUtil
 import com.cappielloantonio.tempo.util.Preferences
 import com.cappielloantonio.tempo.util.ReplayGainUtil
 import com.cappielloantonio.tempo.widget.WidgetUpdateManager
@@ -84,6 +87,7 @@ class MediaService : MediaLibraryService() {
         initializeCustomCommands()
         initializePlayer()
         initializeMediaLibrarySession()
+        restorePlayerFromQueue()
         initializePlayerListener()
         initializeEqualizerManager()
 
@@ -119,15 +123,17 @@ class MediaService : MediaLibraryService() {
             val connectionResult = super.onConnect(session, controller)
             val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
 
-            shuffleCommands.forEach { commandButton ->
-                // TODO: Aggiungere i comandi personalizzati
-                // commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
+            (shuffleCommands + repeatCommands).forEach { commandButton ->
+                commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
             }
 
-            return MediaSession.ConnectionResult.accept(
-                availableSessionCommands.build(),
-                connectionResult.availablePlayerCommands
-            )
+            customLayout = buildCustomLayout(session.player)
+
+            return MediaSession.ConnectionResult.AcceptedResultBuilder(session)
+                .setAvailableSessionCommands(availableSessionCommands.build())
+                .setAvailablePlayerCommands(connectionResult.availablePlayerCommands)
+                .setCustomLayout(customLayout)
+                .build()
         }
 
         override fun onPostConnect(session: MediaSession, controller: ControllerInfo) {
@@ -226,7 +232,7 @@ class MediaService : MediaLibraryService() {
     private fun initializePlayer() {
         player = ExoPlayer.Builder(this)
             .setRenderersFactory(getRenderersFactory())
-            .setMediaSourceFactory(DynamicMediaSourceFactory(this))
+            .setMediaSourceFactory(getMediaSourceFactory())
             .setAudioAttributes(AudioAttributes.DEFAULT, true)
             .setHandleAudioBecomingNoisy(true)
             .setWakeMode(C.WAKE_MODE_NETWORK)
@@ -269,6 +275,33 @@ class MediaService : MediaLibraryService() {
         }
     }
 
+    private fun restorePlayerFromQueue() {
+        if (player.mediaItemCount > 0) return
+
+        val queueRepository = QueueRepository()
+        val storedQueue = queueRepository.media
+        if (storedQueue.isNullOrEmpty()) return
+
+        val mediaItems = MappingUtil.mapMediaItems(storedQueue)
+        if (mediaItems.isEmpty()) return
+
+        val lastIndex = try {
+            queueRepository.lastPlayedMediaIndex
+        } catch (_: Exception) {
+            0
+        }.coerceIn(0, mediaItems.size - 1)
+
+        val lastPosition = try {
+            queueRepository.lastPlayedMediaTimestamp
+        } catch (_: Exception) {
+            0L
+        }.let { if (it < 0L) 0L else it }
+
+        player.setMediaItems(mediaItems, lastIndex, lastPosition)
+        player.prepare()
+        updateWidget()
+    }
+
     private fun initializePlayerListener() {
         player.addListener(object : Player.Listener {
             override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
@@ -399,7 +432,7 @@ class MediaService : MediaLibraryService() {
             .build()
     }
 
-    private fun ignoreFuture(customLayout: ListenableFuture<SessionResult>) {
+    private fun ignoreFuture(@Suppress("UNUSED_PARAMETER") customLayout: ListenableFuture<SessionResult>) {
         /* Do nothing. */
     }
 
@@ -464,6 +497,7 @@ class MediaService : MediaLibraryService() {
 
     private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
 
+    private fun getMediaSourceFactory(): MediaSource.Factory = DynamicMediaSourceFactory(this)
 }
 
 private const val WIDGET_UPDATE_INTERVAL_MS = 1000L

app/src/degoogled/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,54 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.49"
+      android:scaleY="0.49"
+      android:translateX="130.56"
+      android:translateY="130.56">
+
+    <path
+        android:pathData="M512,437.33c0,11.78 -9.56,21.34 -21.34,21.34H21.33C9.55,458.67 0,449.11 0,437.33V96c0,-11.78 9.55,-21.33 21.33,-21.33h469.33c11.78,0 21.34,9.55 21.34,21.33L512,437.33L512,437.33z"
+        android:fillColor="#8CC152"/> <path
+      android:pathData="M512,416.01c0,11.78 -9.56,21.31 -21.34,21.31H21.33C9.55,437.33 0,427.8 0,416.01V74.67c0,-11.78 9.55,-21.34 21.33,-21.34h469.33c11.78,0 21.34,9.56 21.34,21.34L512,416.01L512,416.01z"
+      android:fillColor="#62A43B"/> <path
+      android:pathData="M63.99,160c-5.89,0 -10.66,4.78 -10.66,10.67v149.34c0,5.88 4.77,10.66 10.66,10.66c5.89,0 10.67,-4.78 10.67,-10.66V170.67C74.66,164.78 69.88,160 63.99,160z"
+      android:fillColor="#8CC152"/> <path
+      android:pathData="M74.66,106.67c0,5.89 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.77 -10.66,-10.66S58.1,96 63.99,96C69.88,96 74.66,100.78 74.66,106.67z"
+      android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M74.66,384.01c0,5.88 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.78 -10.66,-10.66c0,-5.91 4.77,-10.69 10.66,-10.69C69.88,373.33 74.66,378.11 74.66,384.01z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M448,123.73h-21.34v203.19l-40.31,50.41v0.02c-1.47,1.83 -2.34,4.14 -2.34,6.67c0,5.88 4.78,10.66 10.66,10.66c3.38,0 6.38,-1.56 8.33,-4h0.02l42.66,-53.34l0,0c1.47,-1.81 2.34,-4.13 2.34,-6.66V123.73z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M437.33,149.33c-11.77,0 -21.33,-9.56 -21.33,-21.33s9.56,-21.33 21.33,-21.33s21.33,9.56 21.33,21.33S449.09,149.33 437.33,149.33z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M437.33,96c-17.67,0 -32,14.33 -32,32s14.33,32 32,32s32,-14.33 32,-32S455,96 437.33,96zM437.33,138.67c-5.89,0 -10.67,-4.8 -10.67,-10.67c0,-5.88 4.78,-10.67 10.67,-10.67s10.67,4.8 10.67,10.67C448,133.88 443.22,138.67 437.33,138.67z"
+        android:fillColor="#CCD1D9"/>
+    <path
+        android:pathData="M405.33,245.33c0,82.48 -66.86,149.34 -149.33,149.34c-82.47,0 -149.33,-66.86 -149.33,-149.34C106.66,162.86 173.52,96 255.99,96C338.47,96 405.33,162.86 405.33,245.33z"
+        android:fillColor="#434A54"/>
+    <path
+        android:pathData="M266.66,149.33c0,-5.89 -4.77,-10.66 -10.67,-10.66c-58.91,0 -106.66,47.75 -106.66,106.65l0,0c0,5.89 4.77,10.67 10.67,10.67s10.67,-4.78 10.67,-10.67l0,0c0,-22.78 8.88,-44.22 24.99,-60.33c16.12,-16.13 37.55,-25 60.34,-25C261.89,160 266.66,155.22 266.66,149.33z"
+        android:fillColor="#656D78"/>
+    <path
+        android:pathData="M352,234.67c-5.9,0 -10.67,4.77 -10.67,10.66l0,0c0,22.8 -8.88,44.23 -24.98,60.34c-16.13,16.13 -37.56,25 -60.35,25c-5.89,0 -10.66,4.78 -10.66,10.66c0,5.91 4.77,10.69 10.66,10.69c58.91,0 106.66,-47.77 106.66,-106.69C362.65,239.44 357.89,234.67 352,234.67z"
+        android:fillColor="#656D78"/>
+    <path
+        android:pathData="M255.99,288.01c-23.52,0 -42.66,-19.16 -42.66,-42.69c0,-23.52 19.14,-42.66 42.66,-42.66c23.54,0 42.66,19.14 42.66,42.66C298.65,268.86 279.53,288.01 255.99,288.01z"
+        android:fillColor="#FFCE54"/>
+    <path
+        android:pathData="M255.99,192c-29.45,0 -53.33,23.88 -53.33,53.33s23.88,53.34 53.33,53.34c29.46,0 53.34,-23.89 53.34,-53.34S285.45,192 255.99,192zM255.99,277.34c-17.64,0 -32,-14.36 -32,-32.02c0,-17.64 14.36,-32 32,-32c17.65,0 32.01,14.36 32.01,32C288,262.98 273.64,277.34 255.99,277.34z"
+        android:fillColor="#F6BB42"/>
+    <path
+        android:pathData="M266.66,245.33c0,5.89 -4.77,10.67 -10.67,10.67c-5.89,0 -10.66,-4.78 -10.66,-10.67s4.77,-10.66 10.66,-10.66C261.89,234.67 266.66,239.44 266.66,245.33z"
+        android:fillColor="#434A54"/>
+    <path
+        android:pathData="M74.66,234.67H53.33c-5.89,0 -10.66,4.77 -10.66,10.66s4.77,10.67 10.66,10.67h21.34c5.89,0 10.66,-4.78 10.66,-10.67S80.56,234.67 74.66,234.67z"
+        android:fillColor="#434A54"/>
+  </group>
+</vector>

app/src/degoogled/res/drawable/ic_splash_logo.xml

@@ -0,0 +1,53 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.55"
+      android:scaleY="0.55"
+      android:translateX="150.56"
+      android:translateY="150.56">
+  <path
+      android:pathData="M512,437.33c0,11.78 -9.56,21.34 -21.34,21.34H21.33C9.55,458.67 0,449.11 0,437.33V96c0,-11.78 9.55,-21.33 21.33,-21.33h469.33c11.78,0 21.34,9.55 21.34,21.33L512,437.33L512,437.33z"
+      android:fillColor="#8CC152"/> <path
+    android:pathData="M512,416.01c0,11.78 -9.56,21.31 -21.34,21.31H21.33C9.55,437.33 0,427.8 0,416.01V74.67c0,-11.78 9.55,-21.34 21.33,-21.34h469.33c11.78,0 21.34,9.56 21.34,21.34L512,416.01L512,416.01z"
+    android:fillColor="#62A43B"/> <path
+    android:pathData="M63.99,160c-5.89,0 -10.66,4.78 -10.66,10.67v149.34c0,5.88 4.77,10.66 10.66,10.66c5.89,0 10.67,-4.78 10.67,-10.66V170.67C74.66,164.78 69.88,160 63.99,160z"
+    android:fillColor="#8CC152"/> <path
+    android:pathData="M74.66,106.67c0,5.89 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.77 -10.66,-10.66S58.1,96 63.99,96C69.88,96 74.66,100.78 74.66,106.67z"
+    android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M74.66,384.01c0,5.88 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.78 -10.66,-10.66c0,-5.91 4.77,-10.69 10.66,-10.69C69.88,373.33 74.66,378.11 74.66,384.01z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M448,123.73h-21.34v203.19l-40.31,50.41v0.02c-1.47,1.83 -2.34,4.14 -2.34,6.67c0,5.88 4.78,10.66 10.66,10.66c3.38,0 6.38,-1.56 8.33,-4h0.02l42.66,-53.34l0,0c1.47,-1.81 2.34,-4.13 2.34,-6.66V123.73z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M437.33,149.33c-11.77,0 -21.33,-9.56 -21.33,-21.33s9.56,-21.33 21.33,-21.33s21.33,9.56 21.33,21.33S449.09,149.33 437.33,149.33z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M437.33,96c-17.67,0 -32,14.33 -32,32s14.33,32 32,32s32,-14.33 32,-32S455,96 437.33,96zM437.33,138.67c-5.89,0 -10.67,-4.8 -10.67,-10.67c0,-5.88 4.78,-10.67 10.67,-10.67s10.67,4.8 10.67,10.67C448,133.88 443.22,138.67 437.33,138.67z"
+      android:fillColor="#CCD1D9"/>
+  <path
+      android:pathData="M405.33,245.33c0,82.48 -66.86,149.34 -149.33,149.34c-82.47,0 -149.33,-66.86 -149.33,-149.34C106.66,162.86 173.52,96 255.99,96C338.47,96 405.33,162.86 405.33,245.33z"
+      android:fillColor="#434A54"/>
+  <path
+      android:pathData="M266.66,149.33c0,-5.89 -4.77,-10.66 -10.67,-10.66c-58.91,0 -106.66,47.75 -106.66,106.65l0,0c0,5.89 4.77,10.67 10.67,10.67s10.67,-4.78 10.67,-10.67l0,0c0,-22.78 8.88,-44.22 24.99,-60.33c16.12,-16.13 37.55,-25 60.34,-25C261.89,160 266.66,155.22 266.66,149.33z"
+      android:fillColor="#656D78"/>
+  <path
+      android:pathData="M352,234.67c-5.9,0 -10.67,4.77 -10.67,10.66l0,0c0,22.8 -8.88,44.23 -24.98,60.34c-16.13,16.13 -37.56,25 -60.35,25c-5.89,0 -10.66,4.78 -10.66,10.66c0,5.91 4.77,10.69 10.66,10.69c58.91,0 106.66,-47.77 106.66,-106.69C362.65,239.44 357.89,234.67 352,234.67z"
+      android:fillColor="#656D78"/>
+  <path
+      android:pathData="M255.99,288.01c-23.52,0 -42.66,-19.16 -42.66,-42.69c0,-23.52 19.14,-42.66 42.66,-42.66c23.54,0 42.66,19.14 42.66,42.66C298.65,268.86 279.53,288.01 255.99,288.01z"
+      android:fillColor="#FFCE54"/>
+  <path
+      android:pathData="M255.99,192c-29.45,0 -53.33,23.88 -53.33,53.33s23.88,53.34 53.33,53.34c29.46,0 53.34,-23.89 53.34,-53.34S285.45,192 255.99,192zM255.99,277.34c-17.64,0 -32,-14.36 -32,-32.02c0,-17.64 14.36,-32 32,-32c17.65,0 32.01,14.36 32.01,32C288,262.98 273.64,277.34 255.99,277.34z"
+      android:fillColor="#F6BB42"/>
+  <path
+      android:pathData="M266.66,245.33c0,5.89 -4.77,10.67 -10.67,10.67c-5.89,0 -10.66,-4.78 -10.66,-10.67s4.77,-10.66 10.66,-10.66C261.89,234.67 266.66,239.44 266.66,245.33z"
+      android:fillColor="#434A54"/>
+  <path
+      android:pathData="M74.66,234.67H53.33c-5.89,0 -10.66,4.77 -10.66,10.66s4.77,10.67 10.66,10.67h21.34c5.89,0 10.66,-4.78 10.66,-10.67S80.56,234.67 74.66,234.67z"
+      android:fillColor="#434A54"/>
+  </group>
+</vector>

app/src/degoogled/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/degoogled/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/degoogled/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#626A75</color>
+</resources>

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

@@ -8,18 +8,18 @@ import androidx.room.PrimaryKey
 import com.cappielloantonio.tempo.subsonic.models.Child
 import com.cappielloantonio.tempo.util.Preferences
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
 @Entity(tableName = "chronology")
-class Chronology(@PrimaryKey override val id: String) : Child(id) {
+class Chronology(
+    @PrimaryKey override val id: String,
     @ColumnInfo(name = "timestamp")
-    var timestamp: Long = System.currentTimeMillis()
-
+    var timestamp: Long = System.currentTimeMillis(),
     @ColumnInfo(name = "server")
-    var server: String? = null
-
+    var server: String? = null,
+) : Child(id) {
     constructor(mediaItem: MediaItem) : this(mediaItem.mediaMetadata.extras!!.getString("id")!!) {
         parentId = mediaItem.mediaMetadata.extras!!.getString("parentId")
         isDir = mediaItem.mediaMetadata.extras!!.getBoolean("isDir")

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

@@ -10,19 +10,17 @@ import kotlinx.parcelize.Parcelize
 @Keep
 @Parcelize
 @Entity(tableName = "download")
-class Download(@PrimaryKey override val id: String) : Child(id) {
+class Download(
+    @PrimaryKey override val id: String,
     @ColumnInfo(name = "playlist_id")
-    var playlistId: String? = null
-
+    var playlistId: String? = null,
     @ColumnInfo(name = "playlist_name")
-    var playlistName: String? = null
-
+    var playlistName: String? = null,
     @ColumnInfo(name = "download_state", defaultValue = "1")
-    var downloadState: Int = 0
-
+    var downloadState: Int = 0,
     @ColumnInfo(name = "download_uri", defaultValue = "")
-    var downloadUri: String? = null
-
+    var downloadUri: String? = null,
+) : Child(id) {
     constructor(child: Child) : this(child.id) {
         parentId = child.parentId
         isDir = child.isDir
@@ -62,5 +60,5 @@ class Download(@PrimaryKey override val id: String) : Child(id) {
 @Keep
 data class DownloadStack(
     var id: String,
-    var view: String?
+    var view: String?,
 )

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

@@ -10,20 +10,18 @@ import kotlinx.parcelize.Parcelize
 @Keep
 @Parcelize
 @Entity(tableName = "queue")
-class Queue(override val id: String) : Child(id) {
+class Queue(
+    override val id: String,
     @PrimaryKey
     @ColumnInfo(name = "track_order")
-    var trackOrder: Int = 0
-
+    var trackOrder: Int = 0,
     @ColumnInfo(name = "last_play")
-    var lastPlay: Long = 0
-
+    var lastPlay: Long = 0,
     @ColumnInfo(name = "playing_changed")
-    var playingChanged: Long = 0
-
+    var playingChanged: Long = 0,
     @ColumnInfo(name = "stream_id")
-    var streamId: String? = null
-
+    var streamId: String? = null,
+) : Child(id) {
     constructor(child: Child) : this(child.id) {
         parentId = child.parentId
         isDir = child.isDir

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

@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.repository;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
+import android.util.Log;
 
 import com.cappielloantonio.tempo.App;
 import com.cappielloantonio.tempo.interfaces.DecadesCallback;
@@ -31,14 +32,22 @@ public class AlbumRepository {
                 .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().getAlbumList2() != null && response.body().getSubsonicResponse().getAlbumList2().getAlbums() != null) {
+                        if (response.isSuccessful() 
+                            && response.body() != null 
+                            && response.body().getSubsonicResponse().getAlbumList2() != null 
+                            && response.body().getSubsonicResponse().getAlbumList2().getAlbums() != null) {
+                            
                             listLiveAlbums.setValue(response.body().getSubsonicResponse().getAlbumList2().getAlbums());
+                        } else {
+                            Log.e("AlbumRepository", "API Error on getAlbums. HTTP Code: " + response.code());
+                            listLiveAlbums.setValue(new ArrayList<>());
                         }
                     }
 
                     @Override
                     public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
+                        Log.e("AlbumRepository", "Network Failure on getAlbums: " + t.getMessage());
+                        listLiveAlbums.setValue(new ArrayList<>());
                     }
                 });
 

app/src/main/java/com/cappielloantonio/tempo/subsonic/RetrofitClient.kt

@@ -2,22 +2,28 @@ 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.google.gson.GsonBuilder
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.util.Date
 import java.util.concurrent.TimeUnit
 
 class RetrofitClient(subsonic: Subsonic) {
     var retrofit: Retrofit
 
     init {
+        val gson = GsonBuilder()
+            .registerTypeAdapter(Date::class.java, EmptyDateTypeAdapter())
+            .setLenient()
+            .create()
+
         retrofit = Retrofit.Builder()
             .baseUrl(subsonic.url)
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create()))
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().setLenient().create()))
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .client(getOkHttpClient())
             .build()
     }

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

@@ -4,38 +4,36 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
-import java.time.Instant
-import java.time.LocalDate
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
-open class AlbumID3 : Parcelable {
-    var id: String? = null
-    var name: String? = null
-    var artist: String? = null
-    var artistId: String? = null
+open class AlbumID3(
+    var id: String? = null,
+    var name: String? = null,
+    var artist: String? = null,
+    var artistId: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
-    var songCount: Int? = 0
-    var duration: Int? = 0
-    var playCount: Long? = 0
-    var created: Date? = null
-    var starred: Date? = null
-    var year: Int = 0
-    var genre: String? = null
-    var played: Date? = Date(0)
-    var userRating: Int? = 0
-    var recordLabels: List<RecordLabel>? = null
-    var musicBrainzId: String? = null
-    var genres: List<ItemGenre>? = null
-    var artists: List<ArtistID3>? = null
-    var displayArtist: String? = null
-    var releaseTypes: List<String>? = null
-    var moods: List<String>? = null
-    var sortName: String? = null
-    var originalReleaseDate: ItemDate? = null
-    var releaseDate: ItemDate? = null
-    var isCompilation: Boolean? = null
-    var discTitles: List<DiscTitle>? = null
-}
+    var coverArtId: String? = null,
+    var songCount: Int? = 0,
+    var duration: Int? = 0,
+    var playCount: Long? = 0,
+    var created: Date? = null,
+    var starred: Date? = null,
+    var year: Int = 0,
+    var genre: String? = null,
+    var played: Date? = Date(0),
+    var userRating: Int? = 0,
+    var recordLabels: List<RecordLabel>? = null,
+    var musicBrainzId: String? = null,
+    var genres: List<ItemGenre>? = null,
+    var artists: List<ArtistID3>? = null,
+    var displayArtist: String? = null,
+    var releaseTypes: List<String>? = null,
+    var moods: List<String>? = null,
+    var sortName: String? = null,
+    var originalReleaseDate: ItemDate? = null,
+    var releaseDate: ItemDate? = null,
+    var isCompilation: Boolean? = null,
+    var discTitles: List<DiscTitle>? = null,
+) : Parcelable

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

@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class AlbumWithSongsID3 : AlbumID3(), Parcelable {
+class AlbumWithSongsID3(
     @SerializedName("song")
-    var songs: List<Child>? = null
-}
+    var songs: List<Child>? = null,
+) : AlbumID3(), Parcelable

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

@@ -7,10 +7,10 @@ import java.util.Date
 
 @Keep
 @Parcelize
-class Artist : Parcelable {
-    var id: String? = null
-    var name: String? = null
-    var starred: Date? = null
-    var userRating: Int? = null
-    var averageRating: Double? = null
-}
+class Artist(
+    var id: String? = null,
+    var name: String? = null,
+    var starred: Date? = null,
+    var userRating: Int? = null,
+    var averageRating: Double? = null,
+) : Parcelable

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

@@ -4,15 +4,15 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
-open class ArtistID3 : Parcelable {
-    var id: String? = null
-    var name: String? = null
+open class ArtistID3(
+    var id: String? = null,
+    var name: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
-    var albumCount = 0
-    var starred: Date? = null
-}
+    var coverArtId: String? = null,
+    var albumCount: Int = 0,
+    var starred: Date? = null,
+) : Parcelable

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

@@ -7,7 +7,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class ArtistWithAlbumsID3 : ArtistID3(), Parcelable {
+class ArtistWithAlbumsID3(
     @SerializedName("album")
-    var albums: List<AlbumID3>? = null
-}
+    var albums: List<AlbumID3>? = null,
+) : ArtistID3(), Parcelable

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

@@ -8,15 +8,15 @@ import java.util.Date
 
 @Keep
 @Parcelize
-class Directory : Parcelable {
+class Directory(
     @SerializedName("child")
-    var children: List<Child>? = null
-    var id: String? = null
+    var children: List<Child>? = null,
+    var id: String? = null,
     @SerializedName("parent")
-    var parentId: String? = null
-    var name: String? = null
-    var starred: Date? = null
-    var userRating: Int? = null
-    var averageRating: Double? = null
-    var playCount: Long? = null
-}
+    var parentId: String? = null,
+    var name: String? = null,
+    var starred: Date? = null,
+    var userRating: Int? = null,
+    var averageRating: Double? = null,
+    var playCount: Long? = null,
+) : Parcelable

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

@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-open class DiscTitle : Parcelable {
-    var disc: Int? = null
-    var title: String? = null
-}
+open class DiscTitle(
+    var disc: Int? = null,
+    var title: String? = null,
+) : Parcelable

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

@@ -7,9 +7,9 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class Genre : Parcelable {
+class Genre(
     @SerializedName("value")
-    var genre: String? = null
-    var songCount = 0
-    var albumCount = 0
-}
+    var genre: String? = null,
+    var songCount: Int = 0,
+    var albumCount: Int = 0,
+) : Parcelable

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

@@ -6,9 +6,9 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class InternetRadioStation : Parcelable {
-    var id: String? = null
-    var name: String? = null
-    var streamUrl: String? = null
-    var homePageUrl: String? = null
-}
+class InternetRadioStation(
+    var id: String? = null,
+    var name: String? = null,
+    var streamUrl: String? = null,
+    var homePageUrl: String? = null,
+) : Parcelable

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

@@ -9,11 +9,11 @@ import java.util.Locale
 
 @Keep
 @Parcelize
-open class ItemDate : Parcelable {
-    var year: Int? = null
-    var month: Int? = null
-    var day: Int? = null
-
+open class ItemDate(
+    var year: Int? = null,
+    var month: Int? = null,
+    var day: Int? = null,
+) : Parcelable {
     fun getFormattedDate(): String? {
         if (year == null && month == null && day == null) return null
 
@@ -22,8 +22,7 @@ open class ItemDate : Parcelable {
             SimpleDateFormat("yyyy", Locale.getDefault())
         } else if (day == null) {
             SimpleDateFormat("MMMM yyyy", Locale.getDefault())
-        }
-        else{
+        } else {
             SimpleDateFormat("MMMM dd, yyyy", Locale.getDefault())
         }
 

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

@@ -6,6 +6,6 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-open class ItemGenre : Parcelable {
-    var name: String? = null
-}
+open class ItemGenre(
+    var name: String? = null,
+) : Parcelable

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

@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class MusicFolder : Parcelable {
-    var id: String? = null
-    var name: String? = null
-}
+class MusicFolder(
+    var id: String? = null,
+    var name: String? = null,
+) : Parcelable

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

@@ -8,10 +8,9 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 class NowPlayingEntry(
     @SerializedName("_id")
-    override val id: String
-) : Child(id) {
-    var username: String? = null
-    var minutesAgo = 0
-    var playerId = 0
-    var playerName: String? = null
-}
+    override val id: String,
+    var username: String? = null,
+    var minutesAgo: Int = 0,
+    var playerId: Int = 0,
+    var playerName: String? = null,
+) : Child(id)

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

@@ -7,8 +7,9 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
@@ -16,27 +17,56 @@ import java.util.*
 open class Playlist(
     @PrimaryKey
     @ColumnInfo(name = "id")
-    open var id: String
-) : Parcelable {
+    open var id: String,
     @ColumnInfo(name = "name")
-    var name: String? = null
+    var name: String? = null,
+    @ColumnInfo(name = "duration")
+    var duration: Long = 0,
+    @ColumnInfo(name = "coverArt")
+    var coverArtId: String? = null,
+) : Parcelable {
     @Ignore
+    @IgnoredOnParcel
     var comment: String? = null
     @Ignore
+    @IgnoredOnParcel
     var owner: String? = null
     @Ignore
+    @IgnoredOnParcel
     @SerializedName("public")
     var isUniversal: Boolean? = null
     @Ignore
+    @IgnoredOnParcel
     var songCount: Int = 0
-    @ColumnInfo(name = "duration")
-    var duration: Long = 0
     @Ignore
+    @IgnoredOnParcel
     var created: Date? = null
     @Ignore
+    @IgnoredOnParcel
     var changed: Date? = null
-    @ColumnInfo(name = "coverArt")
-    var coverArtId: String? = null
     @Ignore
+    @IgnoredOnParcel
     var allowedUsers: List<String>? = null
+    @Ignore
+    constructor(
+        id: String,
+        name: String?,
+        comment: String?,
+        owner: String?,
+        isUniversal: Boolean?,
+        songCount: Int,
+        duration: Long,
+        created: Date?,
+        changed: Date?,
+        coverArtId: String?,
+        allowedUsers: List<String>?,
+    ) : this(id, name, duration, coverArtId) {
+        this.comment = comment
+        this.owner = owner
+        this.isUniversal = isUniversal
+        this.songCount = songCount
+        this.created = created
+        this.changed = changed
+        this.allowedUsers = allowedUsers
+    }
 }

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

@@ -9,8 +9,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 class PlaylistWithSongs(
     @SerializedName("_id")
-    override var id: String
-) : Playlist(id), Parcelable {
+    override var id: String,
     @SerializedName("entry")
-    var entries: List<Child>? = null
-}
+    var entries: List<Child>? = null,
+) : Playlist(id), Parcelable

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

@@ -6,5 +6,5 @@ import com.google.gson.annotations.SerializedName
 @Keep
 class Playlists(
     @SerializedName("playlist")
-    var playlists: List<Playlist>? = null
+    var playlists: List<Playlist>? = null,
 )

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

@@ -3,20 +3,21 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-class PodcastChannel : Parcelable {
+class PodcastChannel(
     @SerializedName("episode")
-    var episodes: List<PodcastEpisode>? = null
-    var id: String? = null
-    var url: String? = null
-    var title: String? = null
-    var description: String? = null
+    var episodes: List<PodcastEpisode>? = null,
+    var id: String? = null,
+    var url: String? = null,
+    var title: String? = null,
+    var description: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
-    var originalImageUrl: String? = null
-    var status: String? = null
-    var errorMessage: String? = null
-}
+    var coverArtId: String? = null,
+    var originalImageUrl: String? = null,
+    var status: String? = null,
+    var errorMessage: String? = null,
+) : Parcelable

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

@@ -3,37 +3,38 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Keep
 @Parcelize
-class PodcastEpisode : Parcelable {
-    var id: String? = null
+class PodcastEpisode(
+    var id: String? = null,
     @SerializedName("parent")
-    var parentId: String? = null
-    var isDir = false
-    var title: String? = null
-    var album: String? = null
-    var artist: String? = null
-    var year: Int? = null
-    var genre: String? = null
+    var parentId: String? = null,
+    var isDir: Boolean = false,
+    var title: String? = null,
+    var album: String? = null,
+    var artist: String? = null,
+    var year: Int? = null,
+    var genre: String? = null,
     @SerializedName("coverArt")
-    var coverArtId: String? = null
-    var size: Long? = null
-    var contentType: String? = null
-    var suffix: String? = null
-    var duration: Int? = null
+     var coverArtId: String? = null,
+    var size: Long? = null,
+    var contentType: String? = null,
+    var suffix: String? = null,
+    var duration: Int? = null,
     @SerializedName("bitRate")
-    var bitrate: Int? = null
-    var path: String? = null
-    var isVideo: Boolean = false
-    var created: Date? = null
-    var artistId: String? = null
-    var type: String? = null
-    var streamId: String? = null
-    var channelId: String? = null
-    var description: String? = null
-    var status: String? = null
-    var publishDate: Date? = null
-}
+    var bitrate: Int? = null,
+    var path: String? = null,
+    var isVideo: Boolean = false,
+    var created: Date? = null,
+    var artistId: String? = null,
+    var type: String? = null,
+    var streamId: String? = null,
+    var channelId: String? = null,
+    var description: String? = null,
+    var status: String? = null,
+    var publishDate: Date? = null,
+) : Parcelable

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

@@ -2,10 +2,11 @@ package com.cappielloantonio.tempo.subsonic.models
 
 import android.os.Parcelable
 import androidx.annotation.Keep
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-open class RecordLabel : Parcelable {
-    var name: String? = null
-}
+open class RecordLabel(
+    var name: String? = null,
+) : Parcelable

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

@@ -3,20 +3,21 @@ package com.cappielloantonio.tempo.subsonic.models
 import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import java.util.*
+import java.util.Date
 
 @Keep
 @Parcelize
-class Share : Parcelable {
+data class Share(
     @SerializedName("entry")
-    var entries: List<Child>? = null
-    var id: String? = null
-    var url: String? = null
-    var description: String? = null
-    var username: String? = null
-    var created: Date? = null
-    var expires: Date? = null
-    var lastVisited: Date? = null
-    var visitCount = 0
-}
+    var entries: List<Child>? = null,
+    var id: String? = null,
+    var url: String? = null,
+    var description: String? = null,
+    var username: String? = null,
+    var created: Date? = null,
+    var expires: Date? = null,
+    var lastVisited: Date? = null,
+    var visitCount: Int = 0
+) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/CacheUtil.java

@@ -38,21 +38,36 @@ public class CacheUtil {
         return chain.proceed(request);
     };
 
+
     private boolean isConnected() {
         ConnectivityManager connectivityManager = (ConnectivityManager) App.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        if (connectivityManager != null) {
-            Network network = connectivityManager.getActiveNetwork();
-
-            if (network != null) {
-                NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
-
-                if (capabilities != null) {
-                    return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
-                }
-            }
+        if (connectivityManager == null) {
+            return false;
         }
 
-        return false;
+        Network network = connectivityManager.getActiveNetwork();
+        if (network == null) {
+            return false;
+        }
+
+        NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
+        if (capabilities == null) {
+            return false;
+        }
+
+        boolean hasInternet = capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+        if (!hasInternet) {
+            return false;
+        }
+
+        boolean hasAppropriateTransport = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET);
+        if (!hasAppropriateTransport) {
+            return false;
+        }
+
+        return true;
     }
+    
 }

app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/EmptyDateTypeAdapter.kt

@@ -0,0 +1,42 @@
+package com.cappielloantonio.tempo.subsonic.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+// This adapter handles Date objects, returning null if the JSON string is empty or unparsable.
+class EmptyDateTypeAdapter : JsonDeserializer<Date> {
+
+    // Define the date formats expected from the Subsonic server.
+    private val dateFormats: List<SimpleDateFormat> = listOf(
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") },
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") },
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
+    )
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Date? {
+        val jsonString = json.asString.trim()
+
+        if (jsonString.isEmpty()) {
+            return null
+        }
+
+        for (format in dateFormats) {
+            try {
+                return format.parse(jsonString)
+            } catch (e: ParseException) {
+                // Ignore and try the next format
+            }
+        }
+        
+        return null 
+    }
+}

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

@@ -20,6 +20,7 @@ import com.cappielloantonio.tempo.util.MusicUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 
 public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> implements Filterable {
@@ -151,13 +152,27 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         }
     }
 
+    public void setItemsWithoutFilter(List<AlbumID3> albums) {
+        this.albumsFull = new ArrayList<>(albums);
+        this.albums = new ArrayList<>(albums);
+        notifyDataSetChanged();
+    }
+
     public void sort(String order) {
+        if (albums == null) return;
+        
         switch (order) {
             case Constants.ALBUM_ORDER_BY_NAME:
-                albums.sort(Comparator.comparing(AlbumID3::getName));
+                albums.sort(Comparator.comparing(
+                    album -> album.getName() != null ? album.getName() : "",
+                    String.CASE_INSENSITIVE_ORDER
+                ));
                 break;
             case Constants.ALBUM_ORDER_BY_ARTIST:
-                albums.sort(Comparator.comparing(AlbumID3::getArtist, Comparator.nullsLast(Comparator.naturalOrder())));
+                albums.sort(Comparator.comparing(
+                    album -> album.getArtist() != null ? album.getArtist() : "",
+                    String.CASE_INSENSITIVE_ORDER
+                ));
                 break;
             case Constants.ALBUM_ORDER_BY_YEAR:
                 albums.sort(Comparator.comparing(AlbumID3::getYear));
@@ -166,15 +181,23 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
                 Collections.shuffle(albums);
                 break;
             case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
-                albums.sort(Comparator.comparing(AlbumID3::getCreated));
+                albums.sort(Comparator.comparing(
+                    album -> album.getCreated() != null ? album.getCreated() : new Date(0),
+                    Comparator.nullsLast(Date::compareTo)
+                ));
                 Collections.reverse(albums);
                 break;
             case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
-                albums.sort(Comparator.comparing(AlbumID3::getPlayed));
+                albums.sort(Comparator.comparing(
+                    album -> album.getPlayed() != null ? album.getPlayed() : new Date(0),
+                    Comparator.nullsLast(Date::compareTo)
+                ));
                 Collections.reverse(albums);
                 break;
             case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
-                albums.sort(Comparator.comparing(AlbumID3::getPlayCount));
+                albums.sort(Comparator.comparing(
+                    album -> album.getPlayCount() != null ? album.getPlayCount() : 0L
+                ));
                 Collections.reverse(albums);
                 break;
         }

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

@@ -3,6 +3,7 @@ package com.cappielloantonio.tempo.ui.fragment;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -32,26 +33,50 @@ import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.AlbumCatalogueAdapter;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.AlbumCatalogueViewModel;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 @OptIn(markerClass = UnstableApi.class)
 public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
-    private static final String TAG = "ArtistCatalogueFragment";
+    private static final String TAG = "AlbumCatalogueFragment";
 
     private FragmentAlbumCatalogueBinding bind;
     private MainActivity activity;
     private AlbumCatalogueViewModel albumCatalogueViewModel;
 
     private AlbumCatalogueAdapter albumAdapter;
+    private String currentSortOrder;
+    private List<com.cappielloantonio.tempo.subsonic.models.AlbumID3> originalAlbums;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        currentSortOrder = Preferences.getAlbumSortOrder();
 
         initData();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        String latestSort = Preferences.getAlbumSortOrder();
+        
+        if (!latestSort.equals(currentSortOrder)) {
+            currentSortOrder = latestSort;
+        }
+        // Re-apply sort when returning to fragment
+        if (originalAlbums != null && currentSortOrder != null) {
+            applySortToAlbums(currentSortOrder);
+        } else {
+            Log.d(TAG, "onResume - Cannot re-sort, missing data");
+        }
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -115,7 +140,12 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         albumAdapter = new AlbumCatalogueAdapter(this, true);
         albumAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
         bind.albumCatalogueRecyclerView.setAdapter(albumAdapter);
-        albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> albumAdapter.setItems(albums));
+        albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> {
+            originalAlbums = albums;
+            currentSortOrder = Preferences.getAlbumSortOrder();
+            applySortToAlbums(currentSortOrder);
+            updateSortIndicator();
+        });
 
         bind.albumCatalogueRecyclerView.setOnTouchListener((v, event) -> {
             hideKeyboard(v);
@@ -125,6 +155,16 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         bind.albumListSortImageView.setOnClickListener(view -> showPopupMenu(view, R.menu.sort_album_popup_menu));
     }
 
+    private void applySortToAlbums(String sortOrder) {
+        if (originalAlbums == null) {
+            return;
+        }
+        albumAdapter.setItemsWithoutFilter(originalAlbums);
+        if (sortOrder != null) {
+            albumAdapter.sort(sortOrder);
+        }
+    }
+
     private void initProgressLoader() {
         albumCatalogueViewModel.getLoadingStatus().observe(getViewLifecycleOwner(), isLoading -> {
             if (isLoading) {
@@ -137,6 +177,37 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         });
     }
 
+    private void updateSortIndicator() {
+        if (bind == null) return;
+
+        String sortText = getSortDisplayText(currentSortOrder);
+        bind.albumListSortTextView.setText(sortText);
+        bind.albumListSortTextView.setVisibility(View.VISIBLE);
+    }
+
+    private String getSortDisplayText(String sortOrder) {
+        if (sortOrder == null) return "";
+        
+        switch (sortOrder) {
+            case Constants.ALBUM_ORDER_BY_NAME:
+                return getString(R.string.menu_sort_name);
+            case Constants.ALBUM_ORDER_BY_ARTIST:
+                return getString(R.string.menu_group_by_artist);
+            case Constants.ALBUM_ORDER_BY_YEAR:
+                return getString(R.string.menu_sort_year);
+            case Constants.ALBUM_ORDER_BY_RANDOM:
+                return getString(R.string.menu_sort_random);
+            case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
+                return getString(R.string.menu_sort_recently_added);
+            case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
+                return getString(R.string.menu_sort_recently_played);
+            case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
+                return getString(R.string.menu_sort_most_played);
+            default:
+                return "";
+        }
+    }
+
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         inflater.inflate(R.menu.toolbar_menu, menu);
@@ -172,26 +243,29 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
         popup.getMenuInflater().inflate(menuResource, popup.getMenu());
 
         popup.setOnMenuItemClickListener(menuItem -> {
+            String newSortOrder = null;
+            
             if (menuItem.getItemId() == R.id.menu_album_sort_name) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_NAME);
-                return true;
+                newSortOrder = Constants.ALBUM_ORDER_BY_NAME;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_artist) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_ARTIST);
-                return true;
+                newSortOrder = Constants.ALBUM_ORDER_BY_ARTIST;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_year) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_YEAR);
-                return true;
+                newSortOrder = Constants.ALBUM_ORDER_BY_YEAR;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_random) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RANDOM);
-                return true;
+                newSortOrder = Constants.ALBUM_ORDER_BY_RANDOM;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_recently_added) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_ADDED);
-                return true;
+                newSortOrder = Constants.ALBUM_ORDER_BY_RECENTLY_ADDED;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_recently_played) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED);
-                return true;
+                newSortOrder = Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED;
             } else if (menuItem.getItemId() == R.id.menu_album_sort_most_played) {
-                albumAdapter.sort(Constants.ALBUM_ORDER_BY_MOST_PLAYED);
+                newSortOrder = Constants.ALBUM_ORDER_BY_MOST_PLAYED;
+            }
+
+            if (newSortOrder != null) {
+                currentSortOrder = newSortOrder;
+                Preferences.setAlbumSortOrder(newSortOrder);
+                applySortToAlbums(newSortOrder);
+                updateSortIndicator();
                 return true;
             }
 

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

@@ -248,6 +248,10 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
                 bind.albumDetailView.setVisibility(View.GONE);
             }
         });
+
+        if(Preferences.showAlbumDetail()){
+            bind.albumDetailView.setVisibility(View.VISIBLE);
+        }
     }
 
     private void initAlbumInfoTextButton() {

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

@@ -76,6 +76,9 @@ object Preferences {
     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"
+    private const val ALBUM_DETAIL = "album_detail"
+    private const val ALBUM_SORT_ORDER = "album_sort_order"
+    private const val DEFAULT_ALBUM_SORT_ORDER = Constants.ALBUM_ORDER_BY_NAME
 
     @JvmStatic
     fun getServer(): String? {
@@ -638,4 +641,19 @@ object Preferences {
         if (parts.size < bandCount) return ShortArray(bandCount.toInt())
         return ShortArray(bandCount.toInt()) { i -> parts[i].toShortOrNull() ?: 0 }
     }
+
+    @JvmStatic
+    fun showAlbumDetail(): Boolean {
+        return App.getInstance().preferences.getBoolean(ALBUM_DETAIL, false)
+    }
+    
+    @JvmStatic
+    fun getAlbumSortOrder(): String {
+        return App.getInstance().preferences.getString(ALBUM_SORT_ORDER, DEFAULT_ALBUM_SORT_ORDER) ?: DEFAULT_ALBUM_SORT_ORDER
+    }
+
+    @JvmStatic
+    fun setAlbumSortOrder(sortOrder: String) {
+        App.getInstance().preferences.edit().putString(ALBUM_SORT_ORDER, sortOrder).apply()
+    }
 }

app/src/main/java/com/cappielloantonio/tempo/widget/WidgetUpdateManager.java

@@ -27,6 +27,8 @@ import java.util.concurrent.ExecutionException;
 
 public final class WidgetUpdateManager {
 
+    private static final int WIDGET_SAFE_ART_SIZE = 512;
+
     public static void updateFromState(Context ctx,
                                        String title,
                                        String artist,
@@ -95,7 +97,7 @@ public final class WidgetUpdateManager {
             CustomGlideRequest.loadAlbumArtBitmap(
                     appCtx,
                     coverArtId,
-                    com.cappielloantonio.tempo.util.Preferences.getImageSize(),
+                    WIDGET_SAFE_ART_SIZE,
                     new CustomTarget<Bitmap>() {
                         @Override
                         public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
@@ -304,4 +306,4 @@ public final class WidgetUpdateManager {
         }
     }
 
-}
+}

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

@@ -0,0 +1,56 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.49"
+      android:scaleY="0.49"
+      android:translateX="130.56"
+      android:translateY="130.56">
+    <path
+        android:pathData="M512,437.33c0,11.78 -9.56,21.34 -21.34,21.34H21.33C9.55,458.67 0,449.11 0,437.33V96c0,-11.78 9.55,-21.33 21.33,-21.33h469.33c11.78,0 21.34,9.55 21.34,21.33L512,437.33L512,437.33z"
+        android:fillColor="#DA4453"/>
+    <path
+        android:pathData="M512,416.01c0,11.78 -9.56,21.31 -21.34,21.31H21.33C9.55,437.33 0,427.8 0,416.01V74.67c0,-11.78 9.55,-21.34 21.33,-21.34h469.33c11.78,0 21.34,9.56 21.34,21.34L512,416.01L512,416.01z"
+        android:fillColor="#ED5564"/>
+    <path
+        android:pathData="M63.99,160c-5.89,0 -10.66,4.78 -10.66,10.67v149.34c0,5.88 4.77,10.66 10.66,10.66c5.89,0 10.67,-4.78 10.67,-10.66V170.67C74.66,164.78 69.88,160 63.99,160z"
+        android:fillColor="#DA4453"/>
+    <path
+        android:pathData="M74.66,106.67c0,5.89 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.77 -10.66,-10.66S58.1,96 63.99,96C69.88,96 74.66,100.78 74.66,106.67z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M74.66,384.01c0,5.88 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.78 -10.66,-10.66c0,-5.91 4.77,-10.69 10.66,-10.69C69.88,373.33 74.66,378.11 74.66,384.01z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M448,123.73h-21.34v203.19l-40.31,50.41v0.02c-1.47,1.83 -2.34,4.14 -2.34,6.67c0,5.88 4.78,10.66 10.66,10.66c3.38,0 6.38,-1.56 8.33,-4h0.02l42.66,-53.34l0,0c1.47,-1.81 2.34,-4.13 2.34,-6.66V123.73z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M437.33,149.33c-11.77,0 -21.33,-9.56 -21.33,-21.33s9.56,-21.33 21.33,-21.33s21.33,9.56 21.33,21.33S449.09,149.33 437.33,149.33z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M437.33,96c-17.67,0 -32,14.33 -32,32s14.33,32 32,32s32,-14.33 32,-32S455,96 437.33,96zM437.33,138.67c-5.89,0 -10.67,-4.8 -10.67,-10.67c0,-5.88 4.78,-10.67 10.67,-10.67s10.67,4.8 10.67,10.67C448,133.88 443.22,138.67 437.33,138.67z"
+        android:fillColor="#CCD1D9"/>
+    <path
+        android:pathData="M405.33,245.33c0,82.48 -66.86,149.34 -149.33,149.34c-82.47,0 -149.33,-66.86 -149.33,-149.34C106.66,162.86 173.52,96 255.99,96C338.47,96 405.33,162.86 405.33,245.33z"
+        android:fillColor="#434A54"/>
+    <path
+        android:pathData="M266.66,149.33c0,-5.89 -4.77,-10.66 -10.67,-10.66c-58.91,0 -106.66,47.75 -106.66,106.65l0,0c0,5.89 4.77,10.67 10.66,10.67s10.67,-4.78 10.67,-10.67l0,0c0,-22.78 8.88,-44.22 24.99,-60.33c16.12,-16.13 37.55,-25 60.34,-25C261.89,160 266.66,155.22 266.66,149.33z"
+        android:fillColor="#656D78"/>
+    <path
+        android:pathData="M352,234.67c-5.9,0 -10.67,4.77 -10.67,10.66l0,0c0,22.8 -8.88,44.23 -24.98,60.34c-16.13,16.13 -37.56,25 -60.35,25c-5.89,0 -10.66,4.78 -10.66,10.66c0,5.91 4.77,10.69 10.66,10.69c58.91,0 106.66,-47.77 106.66,-106.69C362.65,239.44 357.89,234.67 352,234.67z"
+        android:fillColor="#656D78"/>
+    <path
+        android:pathData="M255.99,288.01c-23.52,0 -42.66,-19.16 -42.66,-42.69c0,-23.52 19.14,-42.66 42.66,-42.66c23.54,0 42.66,19.14 42.66,42.66C298.65,268.86 279.53,288.01 255.99,288.01z"
+        android:fillColor="#FFCE54"/>
+    <path
+        android:pathData="M255.99,192c-29.45,0 -53.33,23.88 -53.33,53.33s23.88,53.34 53.33,53.34c29.46,0 53.34,-23.89 53.34,-53.34S285.45,192 255.99,192zM255.99,277.34c-17.64,0 -32,-14.36 -32,-32.02c0,-17.64 14.36,-32 32,-32c17.65,0 32.01,14.36 32.01,32C288,262.98 273.64,277.34 255.99,277.34z"
+        android:fillColor="#F6BB42"/>
+    <path
+        android:pathData="M266.66,245.33c0,5.89 -4.77,10.67 -10.67,10.67c-5.89,0 -10.66,-4.78 -10.66,-10.67s4.77,-10.66 10.66,-10.66C261.89,234.67 266.66,239.44 266.66,245.33z"
+        android:fillColor="#434A54"/>
+    <path
+        android:pathData="M74.66,234.67H53.33c-5.89,0 -10.66,4.77 -10.66,10.66s4.77,10.67 10.66,10.67h21.34c5.89,0 10.66,-4.78 10.66,-10.67S80.56,234.67 74.66,234.67z"
+        android:fillColor="#434A54"/>
+  </group>
+</vector>

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

@@ -1,54 +1,56 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="288dp"
-    android:height="288dp"
-    android:viewportWidth="288"
-    android:viewportHeight="288">
-  <path
-      android:pathData="M141.67,131.18h4.67v88.93h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M132.33,138.18h4.67v65.58h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M122.99,145.18h4.67v21.01h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M94.98,145.18h4.67v21.01h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M188.35,145.18h4.67v21.01h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M113.65,138.18h4.67v35.02h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M169.68,138.18h4.67v35.02h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M104.32,131.18h4.67v49.02h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M179.02,131.18h4.67v49.02h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M160.34,145.18h4.67v21.01h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="M151,138.18h4.67v65.58h-4.67z"
-      android:fillColor="#f24b6a"/>
-  <path
-      android:pathData="m114.29,92.75v4.22h-7.13v19.62h-5.01v-19.62h-7.16v-4.22h19.31Z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="m126.32,111.41c-0.12,1.05 -0.66,2.11 -1.63,3.19 -1.51,1.71 -3.62,2.57 -6.34,2.57 -2.24,0 -4.22,-0.72 -5.94,-2.17 -1.71,-1.44 -2.57,-3.8 -2.57,-7.05 0,-3.05 0.77,-5.39 2.32,-7.02 1.55,-1.63 3.56,-2.44 6.02,-2.44 1.47,0 2.79,0.27 3.96,0.82 1.18,0.55 2.15,1.42 2.91,2.6 0.69,1.05 1.14,2.26 1.34,3.64 0.12,0.81 0.17,1.97 0.15,3.49h-12.07c0.06,1.77 0.62,3.01 1.67,3.72 0.64,0.44 1.4,0.66 2.3,0.66 0.95,0 1.72,-0.27 2.31,-0.81 0.32,-0.29 0.61,-0.7 0.86,-1.21h4.71ZM121.76,106.01c-0.08,-1.22 -0.44,-2.14 -1.11,-2.77 -0.66,-0.63 -1.49,-0.95 -2.47,-0.95 -1.07,0 -1.9,0.33 -2.48,1 -0.59,0.67 -0.96,1.57 -1.11,2.72h7.16Z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="m138.65,103.81c-0.39,-0.85 -1.15,-1.28 -2.28,-1.28 -1.32,0 -2.2,0.43 -2.65,1.28 -0.25,0.49 -0.37,1.21 -0.37,2.17v10.61h-4.67v-17.6h4.48v2.57c0.57,-0.92 1.11,-1.57 1.62,-1.96 0.89,-0.69 2.05,-1.04 3.48,-1.04 1.35,0 2.44,0.3 3.27,0.89 0.67,0.55 1.18,1.26 1.52,2.12 0.6,-1.04 1.35,-1.8 2.25,-2.28 0.95,-0.49 2.01,-0.73 3.17,-0.73 0.78,0 1.54,0.15 2.3,0.45 0.75,0.3 1.44,0.83 2.05,1.58 0.5,0.61 0.83,1.37 1,2.26 0.11,0.59 0.16,1.46 0.16,2.6l-0.03,11.11h-4.72v-11.22c0,-0.67 -0.11,-1.22 -0.32,-1.65 -0.41,-0.82 -1.16,-1.23 -2.26,-1.23 -1.27,0 -2.15,0.53 -2.64,1.58 -0.25,0.56 -0.37,1.23 -0.37,2.02v10.5h-4.64v-10.5c0,-1.05 -0.11,-1.81 -0.32,-2.28Z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="m171.26,100.85c1.42,1.52 2.13,3.75 2.13,6.7 0,3.11 -0.7,5.47 -2.09,7.1 -1.4,1.63 -3.19,2.44 -5.39,2.44 -1.4,0 -2.57,-0.35 -3.49,-1.05 -0.51,-0.39 -1,-0.95 -1.49,-1.7v9.19h-4.56v-24.57h4.42v2.6c0.5,-0.77 1.02,-1.37 1.58,-1.81 1.02,-0.79 2.24,-1.18 3.66,-1.18 2.06,0 3.81,0.76 5.24,2.28ZM168.64,107.77c0,-1.36 -0.31,-2.56 -0.93,-3.61 -0.62,-1.05 -1.63,-1.57 -3.02,-1.57 -1.67,0 -2.82,0.79 -3.44,2.38 -0.32,0.84 -0.49,1.91 -0.49,3.2 0,2.05 0.54,3.49 1.63,4.32 0.65,0.49 1.41,0.73 2.3,0.73 1.28,0 2.26,-0.5 2.94,-1.49 0.67,-0.99 1.01,-2.31 1.01,-3.96Z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="m190.79,101.19c1.49,1.87 2.23,4.07 2.23,6.61s-0.74,4.8 -2.23,6.64c-1.49,1.84 -3.75,2.76 -6.78,2.76s-5.29,-0.92 -6.78,-2.76c-1.49,-1.84 -2.23,-4.05 -2.23,-6.64s0.74,-4.75 2.23,-6.61c1.49,-1.87 3.75,-2.8 6.78,-2.8s5.29,0.93 6.78,2.8ZM184,102.29c-1.35,0 -2.39,0.48 -3.11,1.43 -0.73,0.95 -1.09,2.32 -1.09,4.08s0.36,3.13 1.09,4.09c0.73,0.96 1.77,1.44 3.11,1.44s2.38,-0.48 3.11,-1.44c0.72,-0.96 1.08,-2.32 1.08,-4.09s-0.36,-3.13 -1.08,-4.08c-0.72,-0.95 -1.76,-1.43 -3.11,-1.43Z"
-      android:fillColor="#fff"/>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group android:scaleX="0.55"
+      android:scaleY="0.55"
+      android:translateX="150.56"
+      android:translateY="150.56">
+    <path
+        android:pathData="M512,437.33c0,11.78 -9.56,21.34 -21.34,21.34H21.33C9.55,458.67 0,449.11 0,437.33V96c0,-11.78 9.55,-21.33 21.33,-21.33h469.33c11.78,0 21.34,9.55 21.34,21.33L512,437.33L512,437.33z"
+        android:fillColor="#DA4453"/>
+    <path
+        android:pathData="M512,416.01c0,11.78 -9.56,21.31 -21.34,21.31H21.33C9.55,437.33 0,427.8 0,416.01V74.67c0,-11.78 9.55,-21.34 21.33,-21.34h469.33c11.78,0 21.34,9.56 21.34,21.34L512,416.01L512,416.01z"
+        android:fillColor="#ED5564"/>
+    <path
+        android:pathData="M63.99,160c-5.89,0 -10.66,4.78 -10.66,10.67v149.34c0,5.88 4.77,10.66 10.66,10.66c5.89,0 10.67,-4.78 10.67,-10.66V170.67C74.66,164.78 69.88,160 63.99,160z"
+        android:fillColor="#DA4453"/>
+    <path
+        android:pathData="M74.66,106.67c0,5.89 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.77 -10.66,-10.66S58.1,96 63.99,96C69.88,96 74.66,100.78 74.66,106.67z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M74.66,384.01c0,5.88 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.78 -10.66,-10.66c0,-5.91 4.77,-10.69 10.66,-10.69C69.88,373.33 74.66,378.11 74.66,384.01z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M448,123.73h-21.34v203.19l-40.31,50.41v0.02c-1.47,1.83 -2.34,4.14 -2.34,6.67c0,5.88 4.78,10.66 10.66,10.66c3.38,0 6.38,-1.56 8.33,-4h0.02l42.66,-53.34l0,0c1.47,-1.81 2.34,-4.13 2.34,-6.66V123.73z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M437.33,149.33c-11.77,0 -21.33,-9.56 -21.33,-21.33s9.56,-21.33 21.33,-21.33s21.33,9.56 21.33,21.33S449.09,149.33 437.33,149.33z"
+        android:fillColor="#E6E9ED"/>
+    <path
+        android:pathData="M437.33,96c-17.67,0 -32,14.33 -32,32s14.33,32 32,32s32,-14.33 32,-32S455,96 437.33,96zM437.33,138.67c-5.89,0 -10.67,-4.8 -10.67,-10.67c0,-5.88 4.78,-10.67 10.67,-10.67s10.67,4.8 10.67,10.67C448,133.88 443.22,138.67 437.33,138.67z"
+        android:fillColor="#CCD1D9"/>
+    <path
+        android:pathData="M405.33,245.33c0,82.48 -66.86,149.34 -149.33,149.34c-82.47,0 -149.33,-66.86 -149.33,-149.34C106.66,162.86 173.52,96 255.99,96C338.47,96 405.33,162.86 405.33,245.33z"
+        android:fillColor="#434A54"/>
+    <path
+        android:pathData="M266.66,149.33c0,-5.89 -4.77,-10.66 -10.67,-10.66c-58.91,0 -106.66,47.75 -106.66,106.65l0,0c0,5.89 4.77,10.67 10.66,10.67s10.67,-4.78 10.67,-10.67l0,0c0,-22.78 8.88,-44.22 24.99,-60.33c16.12,-16.13 37.55,-25 60.34,-25C261.89,160 266.66,155.22 266.66,149.33z"
+        android:fillColor="#656D78"/>
+    <path
+        android:pathData="M352,234.67c-5.9,0 -10.67,4.77 -10.67,10.66l0,0c0,22.8 -8.88,44.23 -24.98,60.34c-16.13,16.13 -37.56,25 -60.35,25c-5.89,0 -10.66,4.78 -10.66,10.66c0,5.91 4.77,10.69 10.66,10.69c58.91,0 106.66,-47.77 106.66,-106.69C362.65,239.44 357.89,234.67 352,234.67z"
+        android:fillColor="#656D78"/>
+    <path
+        android:pathData="M255.99,288.01c-23.52,0 -42.66,-19.16 -42.66,-42.69c0,-23.52 19.14,-42.66 42.66,-42.66c23.54,0 42.66,19.14 42.66,42.66C298.65,268.86 279.53,288.01 255.99,288.01z"
+        android:fillColor="#FFCE54"/>
+    <path
+        android:pathData="M255.99,192c-29.45,0 -53.33,23.88 -53.33,53.33s23.88,53.34 53.33,53.34c29.46,0 53.34,-23.89 53.34,-53.34S285.45,192 255.99,192zM255.99,277.34c-17.64,0 -32,-14.36 -32,-32.02c0,-17.64 14.36,-32 32,-32c17.65,0 32.01,14.36 32.01,32C288,262.98 273.64,277.34 255.99,277.34z"
+        android:fillColor="#F6BB42"/>
+    <path
+        android:pathData="M266.66,245.33c0,5.89 -4.77,10.67 -10.67,10.67c-5.89,0 -10.66,-4.78 -10.66,-10.67s4.77,-10.66 10.66,-10.66C261.89,234.67 266.66,239.44 266.66,245.33z"
+        android:fillColor="#434A54"/>
+    <path
+        android:pathData="M74.66,234.67H53.33c-5.89,0 -10.66,4.77 -10.66,10.66s4.77,10.67 10.66,10.67h21.34c5.89,0 10.66,-4.78 10.66,-10.67S80.56,234.67 74.66,234.67z"
+        android:fillColor="#434A54"/>
+  </group>
 </vector>

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

@@ -1,39 +1,52 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="307.57dp"
-    android:height="278.96dp"
-    android:viewportWidth="307.57"
-    android:viewportHeight="278.96">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+
   <path
-      android:pathData="M146.46,0h14.65v278.96h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M512,437.33c0,11.78 -9.56,21.34 -21.34,21.34H21.33C9.55,458.67 0,449.11 0,437.33V96c0,-11.78 9.55,-21.33 21.33,-21.33h469.33c11.78,0 21.34,9.55 21.34,21.33L512,437.33L512,437.33z"
+      android:fillColor="#DA4453"/>
   <path
-      android:pathData="M117.17,21.97h14.65v205.73h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M512,416.01c0,11.78 -9.56,21.31 -21.34,21.31H21.33C9.55,437.33 0,427.8 0,416.01V74.67c0,-11.78 9.55,-21.34 21.33,-21.34h469.33c11.78,0 21.34,9.56 21.34,21.34L512,416.01L512,416.01z"
+      android:fillColor="#ED5564"/>
+
+  <path android:pathData="M63.99,160c-5.89,0 -10.66,4.78 -10.66,10.67v149.34c0,5.88 4.77,10.66 10.66,10.66c5.89,0 10.67,-4.78 10.67,-10.66V170.67C74.66,164.78 69.88,160 63.99,160z"
+      android:fillColor="#DA4453"/>
   <path
-      android:pathData="M87.88,43.94h14.65v65.91h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M74.66,106.67c0,5.89 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.77 -10.66,-10.66S58.1,96 63.99,96C69.88,96 74.66,100.78 74.66,106.67z"
+      android:fillColor="#E6E9ED"/>
   <path
-      android:pathData="M0,43.94h14.65v65.91h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M74.66,384.01c0,5.88 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.78 -10.66,-10.66c0,-5.91 4.77,-10.69 10.66,-10.69C69.88,373.33 74.66,378.11 74.66,384.01z"
+      android:fillColor="#E6E9ED"/>
   <path
-      android:pathData="M292.92,43.94h14.65v65.91h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M448,123.73h-21.34v203.19l-40.31,50.41v0.02c-1.47,1.83 -2.34,4.14 -2.34,6.67c0,5.88 4.78,10.66 10.66,10.66c3.38,0 6.38,-1.56 8.33,-4h0.02l42.66,-53.34l0,0c1.47,-1.81 2.34,-4.13 2.34,-6.66V123.73z"
+      android:fillColor="#E6E9ED"/>
   <path
-      android:pathData="M58.58,21.97h14.65v109.85h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M437.33,149.33c-11.77,0 -21.33,-9.56 -21.33,-21.33s9.56,-21.33 21.33,-21.33s21.33,9.56 21.33,21.33S449.09,149.33 437.33,149.33z"
+      android:fillColor="#E6E9ED"/>
   <path
-      android:pathData="M234.34,21.97h14.65v109.85h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M437.33,96c-17.67,0 -32,14.33 -32,32s14.33,32 32,32s32,-14.33 32,-32S455,96 437.33,96zM437.33,138.67c-5.89,0 -10.67,-4.8 -10.67,-10.67c0,-5.88 4.78,-10.67 10.67,-10.67s10.67,4.8 10.67,10.67C448,133.88 443.22,138.67 437.33,138.67z"
+      android:fillColor="#CCD1D9"/>
   <path
-      android:pathData="M29.29,0h14.65v153.79h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M405.33,245.33c0,82.48 -66.86,149.34 -149.33,149.34c-82.47,0 -149.33,-66.86 -149.33,-149.34C106.66,162.86 173.52,96 255.99,96C338.47,96 405.33,162.86 405.33,245.33z"
+      android:fillColor="#434A54"/>
   <path
-      android:pathData="M263.63,0h14.65v153.79h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M266.66,149.33c0,-5.89 -4.77,-10.66 -10.67,-10.66c-58.91,0 -106.66,47.75 -106.66,106.65l0,0c0,5.89 4.77,10.67 10.67,10.67s10.67,-4.78 10.67,-10.67l0,0c0,-22.78 8.88,-44.22 24.99,-60.33c16.12,-16.13 37.55,-25 60.34,-25C261.89,160 266.66,155.22 266.66,149.33z"
+      android:fillColor="#656D78"/>
   <path
-      android:pathData="M205.05,43.94h14.65v65.91h-14.65z"
-      android:fillColor="#f24b6a"/>
+      android:pathData="M352,234.67c-5.9,0 -10.67,4.77 -10.67,10.66l0,0c0,22.8 -8.88,44.23 -24.98,60.34c-16.13,16.13 -37.56,25 -60.35,25c-5.89,0 -10.66,4.78 -10.66,10.66c0,5.91 4.77,10.69 10.66,10.69c58.91,0 106.66,-47.77 106.66,-106.69C362.65,239.44 357.89,234.67 352,234.67z"
+      android:fillColor="#656D78"/>
   <path
-      android:pathData="M175.75,21.97h14.65v205.73h-14.65z"
-      android:fillColor="#f24b6a"/>
-</vector>
+      android:pathData="M255.99,288.01c-23.52,0 -42.66,-19.16 -42.66,-42.69c0,-23.52 19.14,-42.66 42.66,-42.66c23.54,0 42.66,19.14 42.66,42.66C298.65,268.86 279.53,288.01 255.99,288.01z"
+      android:fillColor="#FFCE54"/>
+  <path
+      android:pathData="M255.99,192c-29.45,0 -53.33,23.88 -53.33,53.33s23.88,53.34 53.33,53.34c29.46,0 53.34,-23.89 53.34,-53.34S285.45,192 255.99,192zM255.99,277.34c-17.64,0 -32,-14.36 -32,-32.02c0,-17.64 14.36,-32 32,-32c17.65,0 32.01,14.36 32.01,32C288,262.98 273.64,277.34 255.99,277.34z"
+      android:fillColor="#F6BB42"/>
+  <path
+      android:pathData="M266.66,245.33c0,5.89 -4.77,10.67 -10.67,10.67c-5.89,0 -10.66,-4.78 -10.66,-10.67s4.77,-10.66 10.66,-10.66C261.89,234.67 266.66,239.44 266.66,245.33z"
+      android:fillColor="#434A54"/>
+  <path
+      android:pathData="M74.66,234.67H53.33c-5.89,0 -10.66,4.77 -10.66,10.66s4.77,10.67 10.66,10.67h21.34c5.89,0 10.66,-4.78 10.66,-10.67S80.56,234.67 74.66,234.67z"
+      android:fillColor="#434A54"/>
+</vector>

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

@@ -0,0 +1,51 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M512,437.33c0,11.78 -9.56,21.34 -21.34,21.34H21.33C9.55,458.67 0,449.11 0,437.33V96c0,-11.78 9.55,-21.33 21.33,-21.33h469.33c11.78,0 21.34,9.55 21.34,21.33L512,437.33L512,437.33z"
+      android:fillColor="#DA4453"/>
+  <path
+      android:pathData="M512,416.01c0,11.78 -9.56,21.31 -21.34,21.31H21.33C9.55,437.33 0,427.8 0,416.01V74.67c0,-11.78 9.55,-21.34 21.33,-21.34h469.33c11.78,0 21.34,9.56 21.34,21.34L512,416.01L512,416.01z"
+      android:fillColor="#ED5564"/>
+  <path
+      android:pathData="M63.99,160c-5.89,0 -10.66,4.78 -10.66,10.67v149.34c0,5.88 4.77,10.66 10.66,10.66c5.89,0 10.67,-4.78 10.67,-10.66V170.67C74.66,164.78 69.88,160 63.99,160z"
+      android:fillColor="#DA4453"/>
+  <path
+      android:pathData="M74.66,106.67c0,5.89 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.77 -10.66,-10.66S58.1,96 63.99,96C69.88,96 74.66,100.78 74.66,106.67z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M74.66,384.01c0,5.88 -4.78,10.66 -10.67,10.66c-5.89,0 -10.66,-4.78 -10.66,-10.66c0,-5.91 4.77,-10.69 10.66,-10.69C69.88,373.33 74.66,378.11 74.66,384.01z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M448,123.73h-21.34v203.19l-40.31,50.41v0.02c-1.47,1.83 -2.34,4.14 -2.34,6.67c0,5.88 4.78,10.66 10.66,10.66c3.38,0 6.38,-1.56 8.33,-4h0.02l42.66,-53.34l0,0c1.47,-1.81 2.34,-4.13 2.34,-6.66V123.73z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M437.33,149.33c-11.77,0 -21.33,-9.56 -21.33,-21.33s9.56,-21.33 21.33,-21.33s21.33,9.56 21.33,21.33S449.09,149.33 437.33,149.33z"
+      android:fillColor="#E6E9ED"/>
+  <path
+      android:pathData="M437.33,96c-17.67,0 -32,14.33 -32,32s14.33,32 32,32s32,-14.33 32,-32S455,96 437.33,96zM437.33,138.67c-5.89,0 -10.67,-4.8 -10.67,-10.67c0,-5.88 4.78,-10.67 10.67,-10.67s10.67,4.8 10.67,10.67C448,133.88 443.22,138.67 437.33,138.67z"
+      android:fillColor="#CCD1D9"/>
+  <path
+      android:pathData="M405.33,245.33c0,82.48 -66.86,149.34 -149.33,149.34c-82.47,0 -149.33,-66.86 -149.33,-149.34C106.66,162.86 173.52,96 255.99,96C338.47,96 405.33,162.86 405.33,245.33z"
+      android:fillColor="#434A54"/>
+  <path
+      android:pathData="M266.66,149.33c0,-5.89 -4.77,-10.66 -10.67,-10.66c-58.91,0 -106.66,47.75 -106.66,106.65l0,0c0,5.89 4.77,10.67 10.66,10.67s10.67,-4.78 10.67,-10.67l0,0c0,-22.78 8.88,-44.22 24.99,-60.33c16.12,-16.13 37.55,-25 60.34,-25C261.89,160 266.66,155.22 266.66,149.33z"
+      android:fillColor="#656D78"/>
+  <path
+      android:pathData="M352,234.67c-5.9,0 -10.67,4.77 -10.67,10.66l0,0c0,22.8 -8.88,44.23 -24.98,60.34c-16.13,16.13 -37.56,25 -60.35,25c-5.89,0 -10.66,4.78 -10.66,10.66c0,5.91 4.77,10.69 10.66,10.69c58.91,0 106.66,-47.77 106.66,-106.69C362.65,239.44 357.89,234.67 352,234.67z"
+      android:fillColor="#656D78"/>
+  <path
+      android:pathData="M255.99,288.01c-23.52,0 -42.66,-19.16 -42.66,-42.69c0,-23.52 19.14,-42.66 42.66,-42.66c23.54,0 42.66,19.14 42.66,42.66C298.65,268.86 279.53,288.01 255.99,288.01z"
+      android:fillColor="#FFCE54"/>
+  <path
+      android:pathData="M255.99,192c-29.45,0 -53.33,23.88 -53.33,53.33s23.88,53.34 53.33,53.34c29.46,0 53.34,-23.89 53.34,-53.34S285.45,192 255.99,192zM255.99,277.34c-17.64,0 -32,-14.36 -32,-32.02c0,-17.64 14.36,-32 32,-32c17.65,0 32.01,14.36 32.01,32C288,262.98 273.64,277.34 255.99,277.34z"
+      android:fillColor="#F6BB42"/>
+  <path
+      android:pathData="M266.66,245.33c0,5.89 -4.77,10.67 -10.67,10.67c-5.89,0 -10.66,-4.78 -10.66,-10.67s4.77,-10.66 10.66,-10.66C261.89,234.67 266.66,239.44 266.66,245.33z"
+      android:fillColor="#434A54"/>
+  <path
+      android:pathData="M74.66,234.67H53.33c-5.89,0 -10.66,4.77 -10.66,10.66s4.77,10.67 10.66,10.67h21.34c5.89,0 10.66,-4.78 10.66,-10.67S80.56,234.67 74.66,234.67z"
+      android:fillColor="#434A54"/>
+</vector>

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

@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:width="288dp"
-        android:height="288dp"
-        android:drawable="@android:color/transparent"
-        android:gravity="center" />
-
-    <item
-        android:width="220dp"
-        android:height="220dp"
         android:drawable="@drawable/ic_splash_logo"
         android:gravity="center" />
 </layer-list>

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

@@ -41,23 +41,40 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent" />
 
-                <Button
-                    android:id="@+id/album_list_sort_image_view"
-                    style="@style/Widget.Material3.Button.TonalButton.Icon"
-                    android:layout_width="52dp"
-                    android:layout_height="52dp"
+                <LinearLayout
+                    android:id="@+id/sort_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="12dp"
-                    android:insetLeft="0dp"
-                    android:insetTop="0dp"
-                    android:insetRight="0dp"
-                    android:insetBottom="0dp"
-                    app:cornerRadius="30dp"
-                    app:icon="@drawable/ic_sort_list"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent">
+
+                    <TextView
+                        android:id="@+id/albumListSortTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                        android:paddingEnd="8dp"
+                        android:visibility="gone" />
+
+                    <Button
+                        android:id="@+id/album_list_sort_image_view"
+                        style="@style/Widget.Material3.Button.TonalButton.Icon"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:insetLeft="0dp"
+                        android:insetTop="0dp"
+                        android:insetRight="0dp"
+                        android:insetBottom="0dp"
+                        app:cornerRadius="30dp"
+                        app:icon="@drawable/ic_sort_list" />
+
+                </LinearLayout>
 
                 <ProgressBar
                     android:id="@+id/album_list_progress_loader"
@@ -71,7 +88,6 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
 
-
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -87,4 +103,3 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
-

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -28,7 +28,7 @@
     <string name="album_page_release_dates_label">Veröffentlicht am %1$s, ursprünglich %2$s</string>
     <string name="album_page_shuffle_button">Zufällige Wiedergabe</string>
     <string name="album_page_tracks_count_and_duration">%1$d Tracks • %2$d Minuten</string>
-    <string name="app_name">Tempo</string>
+    <string name="app_name">Tempus</string>
     <string name="artist_adapter_radio_station_starting">Suche…</string>
     <string name="artist_bottom_sheet_instant_mix">Instant mix</string>
     <string name="artist_bottom_sheet_shuffle">Mischen</string>
@@ -256,7 +256,7 @@
     <string name="server_unreachable_dialog_positive_button">Trotzdem weitermachen</string>
     <string name="server_unreachable_dialog_summary">Der angefragte Server ist nicht erreichbar. Wenn Du trotzdem weitermachst, wird dieser Dialog für eine Stunden nicht wieder erscheinen.</string>
     <string name="server_unreachable_dialog_title">Server nicht erreichbar</string>
-    <string name="settings_about_summary">Tempo ist ein nativ für Android entwickelter, leichtgewichtiger Open-Source Client für Subsonic.</string>
+    <string name="settings_about_summary">Tempus ist ein nativ für Android entwickelter, leichtgewichtiger Open-Source Client für Subsonic.</string>
     <string name="settings_about_title">Über</string>
     <string name="settings_always_on_display">Immer anzeigen</string>
     <string name="settings_audio_transcode_download_format">Transkodierungs-Format</string>
@@ -284,7 +284,7 @@
     <string name="settings_download_storage_title">Download storage</string>
     <string name="settings_system_equalizer_summary">Audio Einstellungen anpassen</string>
     <string name="settings_system_equalizer_title">System-Equalizer</string>
-    <string name="settings_github_link">https://github.com/eddyizm/tempo</string>
+    <string name="settings_github_link">https://github.com/eddyizm/tempus</string>
     <string name="settings_github_summary">Verfolge die Entwicklung</string>
     <string name="settings_github_title">Github</string>
     <string name="settings_image_size">Bilder Auflösung anpassen</string>
@@ -411,9 +411,9 @@
     <string name="track_info_path">Pfad</string>
     <string name="track_info_disc_number">Disk Nummer</string>
     <string name="track_info_summary_downloaded_file">Diese Datei wurde mit den Subsonic APIs heruntergeladen. Der Codec und die Bitrate sind unverändert zur original Datei.</string>
-    <string name="track_info_summary_server_prioritized">Die Qualität des abzuspielenden Titels wird vom Server bestimmt. Tempo stellt keinen Codec und keine Bitrate für eine potentielle Transkodierung sicher.</string>
-    <string name="track_info_summary_original_file">Tempo wird nur die original Datei, so wie sie vom Server geliefert wird, lesen. Die Anwendung wird den Server explizit nach einer nicht-transkodierten Version der Datei mit der Bitrate der original Datei fragen.</string>
-    <string name="track_info_summary_transcoding_codec">Tempo wird den Server bitten, die Datei zu transkodieren. Der vom Benutzer gewünschte Codec ist %1$s, die Bitrate wird dieselbe wie bei der original Datei sein. Die potentielle Transkodierung der Datei in das gewünschte Format ist vom Server abhängig. Dieser kann die Operation gegebenenfalls nicht unterstützen.</string>
-    <string name="track_info_summary_transcoding_bitrate">Tempo wird den Server bitten, die Bitrate der Datei zu erändern. Die vom Benutzer gewünschte Bitrate ist %1$s, der Codec der Originaldatei wird nicht verändert. Änderungen an der Bitrate der Datei werden vom Server ausgeführt, dieser kann die Operation gegebenenfalls nicht unterstützen.</string>
+    <string name="track_info_summary_server_prioritized">Die Qualität des abzuspielenden Titels wird vom Server bestimmt. Tempus stellt keinen Codec und keine Bitrate für eine potentielle Transkodierung sicher.</string>
+    <string name="track_info_summary_original_file">Tempus wird nur die original Datei, so wie sie vom Server geliefert wird, lesen. Die Anwendung wird den Server explizit nach einer nicht-transkodierten Version der Datei mit der Bitrate der original Datei fragen.</string>
+    <string name="track_info_summary_transcoding_codec">Tempus wird den Server bitten, die Datei zu transkodieren. Der vom Benutzer gewünschte Codec ist %1$s, die Bitrate wird dieselbe wie bei der original Datei sein. Die potentielle Transkodierung der Datei in das gewünschte Format ist vom Server abhängig. Dieser kann die Operation gegebenenfalls nicht unterstützen.</string>
+    <string name="track_info_summary_transcoding_bitrate">Tempus wird den Server bitten, die Bitrate der Datei zu erändern. Die vom Benutzer gewünschte Bitrate ist %1$s, der Codec der Originaldatei wird nicht verändert. Änderungen an der Bitrate der Datei werden vom Server ausgeführt, dieser kann die Operation gegebenenfalls nicht unterstützen.</string>
     <string name="track_info_summary_full_transcode">Die Anwendung wird den Server bitten die Datei zu transkodieren und die Bitrate zu verändern. Der vom Benutzer gewünschte Codec ist %1$s, mit der Bitrate %2$s. Änderungen am Codec und an der Bitrate der Datei werden vom Server ausgeführt, dieser kann die Operation gegebenenfalls nicht unterstützen.</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="album_page_tracks_count_and_duration">%1$d pistas  •  %2$d minutos</string>
-    <string name="app_name">Tempo</string>
+    <string name="app_name">Tempus</string>
     <string name="activity_battery_optimizations_conclusion">Si tienes problemas, visita https://dontkillmyapp.com. Ofrece instrucciones detalladas para desactivar características de ahorro de energía que podrían afectar al rendimiento de la app.</string>
     <string name="activity_battery_optimizations_summary">Por favor, desactive las optimizaciones de batería para continuar la reproducción multimedia mientras la pantalla está apagada.</string>
     <string name="activity_battery_optimizations_title">Optimizaciones de batería</string>
@@ -183,7 +183,7 @@
     <string name="settings_language">Idioma</string>
     <string name="settings_system_language">Idioma del sistema</string>
     <string name="settings_logout_title">Cerrar sesión</string>
-    <string name="settings_github_link">https://github.com/eddyizm/tempo</string>
+    <string name="settings_github_link">https://github.com/eddyizm/tempus</string>
     <string name="settings_github_summary">Siga el desarrollo</string>
     <string name="settings_github_title">Github</string>
     <string name="menu_group_by_genre">Género</string>
@@ -289,21 +289,21 @@
     <string name="server_unreachable_dialog_positive_button">Continuar de todas formas</string>
     <string name="server_unreachable_dialog_summary">El servidor no está disponible. Si decide continuar, este diálogo no aparecerá de nuevo durante una hora.</string>
     <string name="server_unreachable_dialog_title">No se puede conectar con el servidor</string>
-    <string name="settings_about_summary">Tempo es un cliente de música Subsonic ligero y de código abierto, diseñado nativamente para Android.</string>
+    <string name="settings_about_summary">Tempus es un cliente de música Subsonic ligero y de código abierto, diseñado nativamente para Android.</string>
     <string name="settings_about_title">Acerca de</string>
     <string name="settings_always_on_display">Pantalla siempre activa</string>
     <string name="settings_allow_playlist_duplicates_summary">Si está habilitada, no se comprobará si hay pistas repetidas cuando se añadan a la lista.</string>
     <string name="settings_audio_transcode_download_format">Formato de transcodificación</string>
-    <string name="settings_audio_transcode_download_priority_summary">Si está habilitada, Tempo no descargará la pista con las opciones de transcodificación que aparecen a continuación.</string>
+    <string name="settings_audio_transcode_download_priority_summary">Si está habilitada, Tempus no descargará la pista con las opciones de transcodificación que aparecen a continuación.</string>
     <string name="settings_audio_transcode_download_priority_title">Dar prioridad a las opciones del servidor usadas para el streaming en las descargas</string>
-    <string name="settings_audio_transcode_download_summary">Si está habilitada, Tempo descargará las pistas transcodificadas.</string>
+    <string name="settings_audio_transcode_download_summary">Si está habilitada, Tempus descargará las pistas transcodificadas.</string>
     <string name="settings_audio_transcode_download_title">Descargas pistas transcodificadas</string>
     <string name="settings_audio_transcode_estimate_content_length_summary">Si está habilitada, se pedirá al servidor la duración estimada de la pista.</string>
     <string name="settings_audio_transcode_estimate_content_length_title">Calcular la duración del contenido</string>
     <string name="settings_audio_transcode_format_download">Formato de transcodificación para las descargas</string>
     <string name="settings_audio_transcode_format_mobile">Formato de transcodificación en red de datos móviles</string>
     <string name="settings_audio_transcode_format_wifi">Formato de transcodificación en red Wi-Fi</string>
-    <string name="settings_audio_transcode_priority_summary">Si está habilitada, Tempo no reproducirá la pista con las opciones de transcodificación que aparecen a continuación.</string>
+    <string name="settings_audio_transcode_priority_summary">Si está habilitada, Tempus no reproducirá la pista con las opciones de transcodificación que aparecen a continuación.</string>
     <string name="settings_audio_transcode_priority_title">Dar prioridad a las opciones de transcodificación del servidor</string>
     <string name="settings_audio_transcode_priority_toast">Prioridad a la hora de transcodificar una pista</string>
     <string name="settings_buffering_strategy">Estrategia de buffer</string>
@@ -463,9 +463,9 @@
     <string name="settings_app_equalizer_summary">Abrir el ecualizador integrado</string>
     <string name="settings_download_folder_cleared">Se ha limpiado la carpeta de descargas.</string>
     <string name="settings_download_folder_set">Se ha establecido la carpeta de descargas</string>
-    <string name="widget_label">Widget de Tempo</string>
+    <string name="widget_label">Widget de Tempus</string>
     <string name="widget_not_playing">En pausa</string>
-    <string name="widget_placeholder_subtitle">Abrir Tempo</string>
+    <string name="widget_placeholder_subtitle">Abrir Tempus</string>
     <string name="widget_time_duration_placeholder">0:00</string>
     <string name="widget_content_desc_album_art">Portada del álbum</string>
     <string name="widget_content_desc_play_pause">Reproducir o pausar</string>

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

@@ -28,7 +28,7 @@
     <string name="album_page_release_dates_label">Sorti le %1$s, initialement %2$s</string>
     <string name="album_page_shuffle_button">Mélanger</string>
     <string name="album_page_tracks_count_and_duration">%1$d titres  •  %2$d minutes</string>
-    <string name="app_name">Tempo</string>
+    <string name="app_name">Tempus</string>
     <string name="artist_adapter_radio_station_starting">Recherche…</string>
     <string name="artist_bottom_sheet_instant_mix">Mix instantané</string>
     <string name="artist_bottom_sheet_shuffle">Mélanger</string>
@@ -270,20 +270,20 @@
     <string name="server_unreachable_dialog_positive_button">Continuer quand même</string>
     <string name="server_unreachable_dialog_summary">Le serveur est injoignable. Si vous décidez de continuer, cette fenêtre n\'apparaîtra plus pendant une heure.</string>
     <string name="server_unreachable_dialog_title">Serveur injoignable</string>
-    <string name="settings_about_summary">Tempo est un client open source et léger pour Subsonic, développé et compilé nativement pour Android.</string>
+    <string name="settings_about_summary">Tempus est un client open source et léger pour Subsonic, développé et compilé nativement pour Android.</string>
     <string name="settings_about_title">À propos</string>
     <string name="settings_always_on_display">Toujours visible</string>
     <string name="settings_audio_transcode_download_format">Format de transcodage</string>
-    <string name="settings_audio_transcode_download_priority_summary">Si activé, Tempo ne forcera pas le téléchargement de la piste avec les paramètres de transcodage ci-dessous.</string>
+    <string name="settings_audio_transcode_download_priority_summary">Si activé, Tempus ne forcera pas le téléchargement de la piste avec les paramètres de transcodage ci-dessous.</string>
     <string name="settings_audio_transcode_download_priority_title">Prioriser les paramètres du serveurs, utilisés pour le streaming, dans les téléchargements</string>
-    <string name="settings_audio_transcode_download_summary">Si activé, Tempo téléchargera les pistes transcodées.</string>
+    <string name="settings_audio_transcode_download_summary">Si activé, Tempus téléchargera les pistes transcodées.</string>
     <string name="settings_audio_transcode_download_title">Télécharger les pistes transcodées</string>
     <string name="settings_audio_transcode_estimate_content_length_summary">Si activé, une estimation de la durée de la piste sera demandée au serveur.</string>
     <string name="settings_audio_transcode_estimate_content_length_title">Estimer la durée du contenu</string>
     <string name="settings_audio_transcode_format_download">Format de transcodage pour les téléchargements</string>
     <string name="settings_audio_transcode_format_mobile">Format de transcodage (mobile)</string>
     <string name="settings_audio_transcode_format_wifi">Format de transcodage (Wi-Fi)</string>
-    <string name="settings_audio_transcode_priority_summary">Si activé, Tempo ne forcera pas le streaming des pistes avec les paramètres ci-dessous.</string>
+    <string name="settings_audio_transcode_priority_summary">Si activé, Tempus ne forcera pas le streaming des pistes avec les paramètres ci-dessous.</string>
     <string name="settings_audio_transcode_priority_title">Prioriser les paramètres de transcodage du serveur</string>
     <string name="settings_audio_transcode_priority_toast">La priorité au transcodage de la piste est donnée au serveur</string>
     <string name="settings_buffering_strategy">Stratégie de mise en mémoire tampon</string>
@@ -298,7 +298,7 @@
     <string name="settings_download_storage_title">Stockage des téléchargements</string>
     <string name="settings_system_equalizer_summary">Ajuster les paramètres audios</string>
     <string name="settings_system_equalizer_title">Égaliseur du système</string>
-    <string name="settings_github_link">https://github.com/eddyizm/tempo</string>
+    <string name="settings_github_link">https://github.com/eddyizm/tempus</string>
     <string name="settings_github_summary">Suivre le développement</string>
     <string name="settings_github_title">Github</string>
     <string name="settings_image_size">Définir la résolution des images</string>

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

@@ -28,7 +28,7 @@
 	<string name="album_page_release_dates_label">Rilasciato il %1$s, originariamente il %2$s</string>
 	<string name="album_page_shuffle_button">Riproduzione casuale</string>
 	<string name="album_page_tracks_count_and_duration">%1$d brani  •  %2$d minuti</string>
-	<string name="app_name">Tempo</string>
+	<string name="app_name">Tempus</string>
 	<string name="artist_adapter_radio_station_starting">Ricerca in corso…</string>
 	<string name="artist_bottom_sheet_instant_mix">Mix istantaneo</string>
 	<string name="artist_bottom_sheet_shuffle">Riproduzione casuale</string>
@@ -256,20 +256,20 @@
 	<string name="server_unreachable_dialog_positive_button">Continua comunque</string>
 	<string name="server_unreachable_dialog_summary">Il server richiesto non è disponibile. Se scegli di continuare, questo messaggio non apparirà per la prossima ora.</string>
 	<string name="server_unreachable_dialog_title">Server irraggiungibile</string>
-	<string name="settings_about_summary">Tempo è un client musicale open source e leggero per Subsonic, progettato e costruito nativamente per Android.</string>
+	<string name="settings_about_summary">Tempus è un client musicale open source e leggero per Subsonic, progettato e costruito nativamente per Android.</string>
 	<string name="settings_about_title">Informazioni</string>
 	<string name="settings_always_on_display">Sempre attivo</string>
 	<string name="settings_audio_transcode_download_format">Formato transcodifica</string>
-	<string name="settings_audio_transcode_download_priority_summary">Se abilitato, Tempo non forzerà il download del brano con le impostazioni di transcodifica sottostanti.</string>
+	<string name="settings_audio_transcode_download_priority_summary">Se abilitato, Tempus non forzerà il download del brano con le impostazioni di transcodifica sottostanti.</string>
 	<string name="settings_audio_transcode_download_priority_title">Dare priorità alle impostazioni del server per lo streaming nei download</string>
-	<string name="settings_audio_transcode_download_summary">Se abilitato, Tempo scaricherà i brani transcodificati.</string>
+	<string name="settings_audio_transcode_download_summary">Se abilitato, Tempus scaricherà i brani transcodificati.</string>
 	<string name="settings_audio_transcode_download_title">Scarica brani transcodificati</string>
 	<string name="settings_audio_transcode_estimate_content_length_summary">Se abilitato, verrà richiesto al server di fornire la durata stimata del brano.</string>
 	<string name="settings_audio_transcode_estimate_content_length_title">Stima della lunghezza del contenuto</string>
 	<string name="settings_audio_transcode_format_download">Formato transcodifica per download</string>
 	<string name="settings_audio_transcode_format_mobile">Formato transcodifica su mobile</string>
 	<string name="settings_audio_transcode_format_wifi">Formato transcodifica su Wi-Fi</string>
-	<string name="settings_audio_transcode_priority_summary">Se abilitato, Tempo non forzerà lo streaming del brano con le impostazioni di transcodifica sottostanti.</string>
+	<string name="settings_audio_transcode_priority_summary">Se abilitato, Tempus non forzerà lo streaming del brano con le impostazioni di transcodifica sottostanti.</string>
 	<string name="settings_audio_transcode_priority_title">Dare priorità alle impostazioni di transcodifica del server</string>
 	<string name="settings_audio_transcode_priority_toast">Priorità di transcodifica del brano assegnata al server</string>
 	<string name="settings_buffering_strategy">Strategia di buffering</string>
@@ -284,7 +284,7 @@
 	<string name="settings_download_storage_title">Archivio download</string>
 	<string name="settings_system_equalizer_summary">Regola le impostazioni audio</string>
 	<string name="settings_system_equalizer_title">Equalizzatore di sistema</string>
-	<string name="settings_github_link">https://github.com/eddyizm/tempo</string>
+	<string name="settings_github_link">https://github.com/eddyizm/tempus</string>
 	<string name="settings_github_summary">Segui lo sviluppo</string>
 	<string name="settings_github_title">Github</string>
 	<string name="settings_image_size">Imposta risoluzione delle immagini</string>