chore: added reproducible build badge

chore: updated changelog, bumped version for release
fix: it strings needed an single quote escape
2025-11-22 09:30:01 -08:00 · 2025-11-22 09:22:13 -08:00 · 2025-11-22 09:07:49 -08:00 · 2025-11-22 08:36:21 -08:00 · 2025-11-22 08:34:17 -08:00 · 2025-11-22 08:33:07 -08:00
214 changed files with 3100 additions and 2119 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,6 +26,7 @@ Outline the steps required to reproduce the bug, including any specific actions,
 - Android device: [Device Model]
 - Android OS version: [Android Version]
 - App version: [App Version]
+ - App variant: [goole play services, degoogled]
 - Other relevant details: [e.g., specific network conditions, external dependencies]

 ## Logs or Screenshots
--- a/.github/ISSUE_TEMPLATE/crash-report.md
+++ b/.github/ISSUE_TEMPLATE/crash-report.md
@@ -23,10 +23,11 @@ Please provide the steps to reproduce the crash:
 - Android device: [Device Model]
 - Android OS version: [Android Version]
 - App version: [App Version]
+ - App variant: [goole play services, degoogled] 
 - Other relevant details: [e.g., specific network conditions, external dependencies]

 ## Crash Logs/Stack trace
-<!-- If available, please provide the crash log or stack trace related to the crash. Include it inside a code block (surround with triple backticks ```). Please use the unsigned apk (app-tempo-debug.apk), as the logs would be illegible and therefore useless for this purpose. -->
+<!-- If available, please provide the crash log or stack trace related to the crash. Include it inside a code block (surround with triple backticks ```). Please use the unsigned apk (app-tempus-debug.apk), as the logs would be illegible and therefore useless for this purpose. -->

 ## Screenshots
 <!-- If applicable, add screenshots to help explain the problem. -->
--- a/.github/workflows/github_release.yml
+++ b/.github/workflows/github_release.yml
@@ -3,7 +3,7 @@ name: Github Release Workflow
 on:
  push:
    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'

 jobs:
  build:
@@ -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
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,5 @@
 .vscode/settings.json
 # release / debug files
 tempus-release-key.jks
-app/tempo/
-app/notquitemy/
+app/tempus/
+app/degoogled/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,113 @@
 # Changelog

-***This log is for this fork to detail updates since 3.9.0 from the main repo.***
+## Pending release...
+
+## [4.2.6](https://github.com/eddyizm/tempo/releases/tag/v4.2.6) (2025-11-22)
+## What's Changed
+* fix: Fix player queue soft-lock by @shrapnelnet in https://github.com/eddyizm/tempus/pull/266
+* chore: Add Catalan i18n by @marcriera in https://github.com/eddyizm/tempus/pull/268
+* chore: Refactor MediaService by @pca006132 in https://github.com/eddyizm/tempus/pull/267
+* chore(i18n): Update Spanish translation by @jaime-grj in https://github.com/eddyizm/tempus/pull/272
+* chore(i18n): Update Italian translation by @66Bunz in https://github.com/eddyizm/tempus/pull/278
+
+## New Contributors
+* @marcriera made their first contribution in https://github.com/eddyizm/tempus/pull/268
+* @66Bunz made their first contribution in https://github.com/eddyizm/tempus/pull/278
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.2.4...v4.2.6
+
+## [4.2.4](https://github.com/eddyizm/tempo/releases/tag/v4.2.4) (2025-11-15)
+## What's Changed
+* chore: Update russian strings.xml by @Sevinfolds in https://github.com/eddyizm/tempus/pull/249
+* fix: disallow duplicate songs in queue by @eddyizm in https://github.com/eddyizm/tempus/pull/252
+* fix:github release check by @eddyizm in https://github.com/eddyizm/tempus/pull/253
+* fix: Fixed crash when viewing share by @drakeerv in https://github.com/eddyizm/tempus/pull/255
+* chore: Update Polish translation by @skajmer in https://github.com/eddyizm/tempus/pull/257
+* fix: add podcast/radio channel visible when empty podcasts/radio by @eddyizm in https://github.com/eddyizm/tempus/pull/260
+
+## New Contributors
+* @Sevinfolds made their first contribution in https://github.com/eddyizm/tempus/pull/249
+* @drakeerv made their first contribution in https://github.com/eddyizm/tempus/pull/255
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.2.0...v4.2.4
+## [4.2.0](https://github.com/eddyizm/tempo/releases/tag/v4.2.0) (2025-11-09)
+## What's Changed
+* fix: Equalizer fix in main build variant by @jaime-grj in https://github.com/eddyizm/tempus/pull/239
+* fix: Images not filling holder by @eddyizm in https://github.com/eddyizm/tempus/pull/244
+* feat: Make artist and album clickable by @eddyizm in https://github.com/eddyizm/tempus/pull/243
+* feat: implement scroll to currently playing feature by @shrapnelnet in https://github.com/eddyizm/tempus/pull/247
+* fix: shuffling genres only queuing 25 songs by @shrapnelnet in https://github.com/eddyizm/tempus/pull/246
+
+## New Contributors
+* @shrapnelnet made their first contribution in https://github.com/eddyizm/tempus/pull/247
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.1.3...v4.2.0
+
+## [4.1.3](https://github.com/eddyizm/tempo/releases/tag/v4.1.3) (2025-11-06)
+## What's Changed
+* [fix: equalizer missing referenced value](https://github.com/eddyizm/tempus/commit/923cfd5bc97ed7db28c90348e3619d0a784fc434)
+* Fix: Album track list bug by @eddyizm in https://github.com/eddyizm/tempus/pull/237
+* fix: Add listener to enable equalizer when audioSessionId changes by @jaime-grj in https://github.com/eddyizm/tempus/pull/235
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.1.0...v4.1.3
+
+## [4.1.0](https://github.com/eddyizm/tempo/releases/tag/v4.1.0) (2025-11-05)
+## What's Changed
+* chore(i18n): Update Spanish (es-ES) translation by @jaime-grj in https://github.com/eddyizm/tempus/pull/205
+* shuffle for artists without using `getTopSongs` by @pca006132 in https://github.com/eddyizm/tempus/pull/207
+* Update USAGE.md with instant mix details by @zc-devs in https://github.com/eddyizm/tempus/pull/220
+* feat: sort artists by album count by @pca006132 in https://github.com/eddyizm/tempus/pull/206
+* Fix downloaded tab performance by @pca006132 in https://github.com/eddyizm/tempus/pull/210
+* fix: remove NestedScrollViews for fragment_album_page by @pca006132 in https://github.com/eddyizm/tempus/pull/216
+* fix: playlist page should not snap by @pca006132 in https://github.com/eddyizm/tempus/pull/218
+* fix: do not override getItemViewType and getItemId by @pca006132 in https://github.com/eddyizm/tempus/pull/221
+* chore: update media3 dependencies by @pca006132 in https://github.com/eddyizm/tempus/pull/217
+* fix: update MediaItems after network change by @pca006132 in https://github.com/eddyizm/tempus/pull/222
+* fix: skip mapping downloaded item by @pca006132 in https://github.com/eddyizm/tempus/pull/228
+
+## New Contributors
+* @pca006132 made their first contribution in https://github.com/eddyizm/tempus/pull/207
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.0.7...v4.1.0
+
+## [4.0.7](https://github.com/eddyizm/tempo/releases/tag/v4.0.7) (2025-10-28)
+## What's Changed
+* chore: updated tempo references to tempus including github check by @eddyizm in https://github.com/eddyizm/tempus/pull/197
+* fix: Crash on share no expiration date or field returned from api by @eddyizm in https://github.com/eddyizm/tempus/pull/199
+
+**Full Changelog**: https://github.com/eddyizm/tempus/compare/v4.0.6...v4.0.7
+
+## [4.0.6](https://github.com/eddyizm/tempo/releases/tag/v4.0.6) (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
@@ -160,3 +267,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.***
--- a/README.md
+++ b/README.md
@@ -1,68 +1,72 @@
 <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">
  <b>Access your music library on all your android devices</b>
 </p>

+<div align="center">
+
+  <!-- Reproducible build  -->  
+[<img src="https://shields.rbtlog.dev/simple/com.eddyizm.degoogled.tempus" alt="RB Status">](https://shields.rbtlog.dev/com.eddyizm.degoogled.tempus) 
+
+</div>
+
 <p align="center">
-    <a href="https://github.com/eddyizm/tempo/releases"><img src="https://i.ibb.co/q0mdc4Z/get-it-on-github.png" width="200"></a>
+    <a href="https://github.com/eddyizm/tempus/releases"><img src="https://i.ibb.co/q0mdc4Z/get-it-on-github.png" width="200"></a>
+    <a href="https://apt.izzysoft.de/fdroid/index/apk/com.eddyizm.degoogled.tempus"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" width="200"></a>
 </p>
-<!-- <p align="center">
+<!-- 
    <a href="https://f-droid.org/packages/com.cappielloantonio.notquitemy.tempo"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="200"></a>
-    <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   
 `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.
-
 ### 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 izzyOnDroid release that goes without any of the google stuff. It is now available on izzyOnDroid (64bit) I am releasing the both 32/64bit apk's here on github for those who need a 32bit version.

-As mentioned above, I am working towards a rebrand to get into app stores with a new name an icon.
-
-Moved details to [CHANGELOG.md](CHANGELOG.md)
-
-Fork [**sponsorship here**](https://ko-fi.com/eddyizm). 
+[CHANGELOG.md](CHANGELOG.md)

 ## 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.
- **Multiple Libraries**: Tempo handles multi-library setups gracefully. They are displayed as Library folders.
-
-## 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

@@ -71,14 +75,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>
@@ -88,14 +91,14 @@ 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  
@@ -108,6 +111,16 @@ Currently there are no tests but I would love to start on some unit tests.

 Not a hard requirement but any new feature/change should ideally include an update to the nacent documention. 

+## Support
+
+[**Buy me a coffee**](https://ko-fi.com/eddyizm)  
+bitcoin: `3QVHSSCJvn6yXEcJ3A3cxYLMmbvFsrnUs5`  
+
 ## 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. 
--- a/USAGE.md
+++ b/USAGE.md
@@ -1,4 +1,4 @@
-# Tempo Usage Guide 
+# Tempus Usage Guide 
 [<- back home](README.md)

 ## Table of Contents
@@ -6,6 +6,7 @@
 - [Getting Started](#getting-started)
 - [Server Configuration](#server-configuration)
 - [Main Features](#main-features)
+
 - [Navigation](#navigation)
 - [Playback Controls](#playback-controls)
 - [Favorites](#favorites)
@@ -27,6 +28,8 @@ This app works with any service that implements the Subsonic API, including:
 - [LMS - Lightweight Music Server](https://github.com/epoupon/lms) -  *personal fave and my backend*
 - [Navidrome](https://www.navidrome.org/)
 - [Gonic](https://github.com/sentriz/gonic)
+- [Ampache](https://github.com/ampache/ampache)
+- [NextCloud Music](https://apps.nextcloud.com/apps/music)



@@ -34,7 +37,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

@@ -60,11 +63,11 @@ This app works with any service that implements the Subsonic API, including:

 **Multi-library**

-Tempo handles multi-library setups gracefully. They are displayed as Library folders. 
+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 Tempo app.
+You can create multiple users , one for each library, and save each of them in Tempus app.

 ### Now Playing Screen

@@ -78,9 +81,23 @@ On the main player control screen, tapping on the artwork will reveal a small co
 1. Downloads the track (there is a notification if the android screen but not a pop toast currently )
 2. Adds track to playlist - pops up playlist dialog.
 3. Adds tracks to the queue via instant mix function
+    * TBD: what is the _instant mix function_?
+    * Uses [getSimilarSongs](https://opensubsonic.netlify.app/docs/endpoints/getsimilarsongs/) of OpenSubsonic API.
+      Which tracks to be mixed depends on the server implementation. For example, Navidrome gets 15 similar artists from LastFM, then 20 top songs from each.
 4. Saves play queue (if the feature is enabled in the settings) 
    * if the setting is not enabled, it toggles a view of the lyrics if available (slides to the right) 

+### Podcasts  
+If your server supports it - add a podcast rss feed
+<p align="left">
+    <img src="mockup/usage/add_podcast_feed.png" width=317>
+</p>
+
+### Radio Stations
+If your server supports it - add a internet radio station feed
+<p align="left">
+    <img src="mockup/usage/add_radio_station.png" width=326>
+</p>

 ## Navigation

@@ -157,10 +174,10 @@ 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

 ---

-*Note: This app requires a pre-existing Subsonic-compatible server with music content.*
+*Note: This app requires a pre-existing Subsonic-compatible server with music content.*
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
        minSdkVersion 24
        targetSdk 35

-        versionCode 36
-        versionName '3.17.14'
+        versionCode 7
+        versionName '4.2.6'
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

        javaCompileOptions {
@@ -35,19 +35,24 @@ android {
        }
    }

-   
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles (for Google Play)
+        includeInBundle = false
+    }

    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"
        }

    }
@@ -105,12 +110,12 @@ dependencies {
    implementation 'com.github.bumptech.glide:annotations:4.16.0'

    // Media3
-    implementation 'androidx.media3:media3-session:1.5.1'
-    implementation 'androidx.media3:media3-common:1.5.1'
-    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'
+    implementation 'androidx.media3:media3-session:1.8.0'
+    implementation 'androidx.media3:media3-common:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer:1.8.0'
+    implementation 'androidx.media3:media3-ui:1.8.0'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.8.0'
+    tempusImplementation 'androidx.media3:media3-cast:1.8.0'


    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
--- a/app/src/degoogled/ic_launcher-playstore.png
+++ b/app/src/degoogled/ic_launcher-playstore.png
--- a/app/src/degoogled/java/com/cappielloantonio/tempo/service/MediaService.kt
+++ b/app/src/degoogled/java/com/cappielloantonio/tempo/service/MediaService.kt
@@ -0,0 +1,6 @@
+package com.cappielloantonio.tempo.service
+
+import androidx.media3.common.util.UnstableApi
+
+@UnstableApi
+class MediaService : BaseMediaService()
--- a/app/src/notquitemy/java/com/cappielloantonio/tempo/ui/fragment/ToolbarFragment.java
+++ b/app/src/notquitemy/java/com/cappielloantonio/tempo/ui/fragment/ToolbarFragment.java
--- a/app/src/notquitemy/java/com/cappielloantonio/tempo/util/Flavors.java
+++ b/app/src/notquitemy/java/com/cappielloantonio/tempo/util/Flavors.java
--- a/app/src/degoogled/res/drawable/ic_launcher_foreground.xml
+++ b/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>
--- a/app/src/degoogled/res/drawable/ic_splash_logo.xml
+++ b/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>
--- a/app/src/notquitemy/res/menu/main_page_menu.xml
+++ b/app/src/notquitemy/res/menu/main_page_menu.xml
--- a/app/src/degoogled/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/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>
--- a/app/src/degoogled/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/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>
--- a/app/src/degoogled/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/degoogled/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/degoogled/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/degoogled/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/degoogled/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/degoogled/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/degoogled/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/degoogled/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/degoogled/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/degoogled/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/degoogled/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/src/degoogled/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/src/degoogled/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/degoogled/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/degoogled/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/degoogled/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/src/degoogled/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/src/degoogled/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/src/degoogled/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/src/degoogled/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/src/degoogled/res/values/ic_launcher_background.xml
+++ b/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>
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/com/cappielloantonio/tempo/github/Github.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/github/Github.java
@@ -3,8 +3,8 @@ package com.cappielloantonio.tempo.github;
 import com.cappielloantonio.tempo.github.api.release.ReleaseClient;

 public class Github {
-    private static final String OWNER = "CappielloAntonio";
-    private static final String REPO = "Tempo";
+    private static final String OWNER = "eddyizm";
+    private static final String REPO = "Tempus";
    private ReleaseClient releaseClient;

    public ReleaseClient getReleaseClient() {
--- a/app/src/main/java/com/cappielloantonio/tempo/github/utils/UpdateUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/github/utils/UpdateUtil.java
@@ -7,10 +7,11 @@ public class UpdateUtil {

    public static boolean showUpdateDialog(LatestRelease release) {
        if (release.getTagName() == null) return false;
+        String remoteTag = release.getTagName().replaceAll("^\\D+", "");

        try {
            String[] local = BuildConfig.VERSION_NAME.split("\\.");
-            String[] remote = release.getTagName().split("\\.");
+            String[] remote = remoteTag.split("\\.");

            for (int i = 0; i < local.length; i++) {
                int localPart = Integer.parseInt(local[i]);
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/ArtistRepository.java
@@ -13,9 +13,11 @@ import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.IndexID3;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;

 import retrofit2.Call;
 import retrofit2.Callback;
@@ -312,24 +314,42 @@ public class ArtistRepository {

        App.getSubsonicClientInstance(false)
                .getBrowsingClient()
-                .getTopSongs(artist.getName(), count)
+                .getArtist(artist.getId())
                .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().getTopSongs() != null && response.body().getSubsonicResponse().getTopSongs().getSongs() != null) {
-                            List<Child> songs = response.body().getSubsonicResponse().getTopSongs().getSongs();
+                        if (response.isSuccessful() && response.body() != null &&
+                                response.body().getSubsonicResponse().getArtist() != null &&
+                                response.body().getSubsonicResponse().getArtist().getAlbums() != null) {

-                            if (songs != null && !songs.isEmpty()) {
-                                Collections.shuffle(songs);
+                            List<AlbumID3> albums = response.body().getSubsonicResponse().getArtist().getAlbums();
+                            Log.d("ArtistRepository", "Got albums directly: " + albums.size());
+                            if (albums.isEmpty()) {
+                                Log.d("ArtistRepository", "No albums found in artist response");
+                                return;
                            }

-                            randomSongs.setValue(songs);
+                            Collections.shuffle(albums);
+                            int[] counts = albums.stream().mapToInt(AlbumID3::getSongCount).toArray();
+                            Arrays.parallelPrefix(counts, Integer::sum);
+                            int albumLimit = 0;
+                            int multiplier = 4; // get more than the limit so we can shuffle them
+                            while (albumLimit < albums.size() && counts[albumLimit] < count * multiplier)
+                                albumLimit++;
+                            Log.d("ArtistRepository", String.format("Retaining %d/%d albums", albumLimit, albums.size()));
+
+                            fetchAllAlbumSongsWithCallback(albums.stream().limit(albumLimit).collect(Collectors.toList()), songs -> {
+                                Collections.shuffle(songs);
+                                randomSongs.setValue(songs.stream().limit(count).collect(Collectors.toList()));
+                            });
+                        } else {
+                            Log.d("ArtistRepository", "Failed to get artist info");
                        }
                    }

                    @Override
                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-
+                        Log.d("ArtistRepository", "Error getting artist info: " + t.getMessage());
                    }
                });

--- a/app/src/main/java/com/cappielloantonio/tempo/repository/QueueRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/QueueRepository.java
@@ -121,6 +121,15 @@ public class QueueRepository {
        }
    }

+    private boolean isMediaInQueue(List<Queue> queue, Child media) {
+        if (queue == null || media == null) return false;
+        
+        return queue.stream().anyMatch(queueItem -> 
+            queueItem != null && media.getId() != null && 
+            queueItem.getId().equals(media.getId())
+        );
+    }
+
    public void insertAll(List<Child> toAdd, boolean reset, int afterIndex) {
        try {
            List<Queue> media = new ArrayList<>();
@@ -134,8 +143,14 @@ public class QueueRepository {
                media = getMediaThreadSafe.getMedia();
            }

-            for (int i = 0; i < toAdd.size(); i++) {
-                Queue queueItem = new Queue(toAdd.get(i));
+            List<Child> filteredToAdd = toAdd;
+            final List<Queue> finalMedia = media;
+            filteredToAdd = toAdd.stream()
+                .filter(child -> !isMediaInQueue(finalMedia, child))
+                .collect(Collectors.toList());
+
+            for (int i = 0; i < filteredToAdd.size(); i++) {
+                Queue queueItem = new Queue(filteredToAdd.get(i));
                media.add(afterIndex + i, queueItem);
            }

--- a/app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java
@@ -100,6 +100,33 @@ public class SongRepository {
        return randomSongsSample;
    }

+    public MutableLiveData<List<Child>> getRandomSampleWithGenre(int number, Integer fromYear, Integer toYear, String genre) {
+        MutableLiveData<List<Child>> randomSongsSample = new MutableLiveData<>();
+
+        App.getSubsonicClientInstance(false)
+                .getAlbumSongListClient()
+                .getRandomSongs(number, fromYear, toYear, genre)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        List<Child> songs = new ArrayList<>();
+
+                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getRandomSongs() != null && response.body().getSubsonicResponse().getRandomSongs().getSongs() != null) {
+                            songs.addAll(response.body().getSubsonicResponse().getRandomSongs().getSongs());
+                        }
+
+                        randomSongsSample.setValue(songs);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+
+                    }
+                });
+
+        return randomSongsSample;
+    }
+
    public void scrobble(String id, boolean submission) {
        App.getSubsonicClientInstance(false)
                .getMediaAnnotationClient()
--- a/app/src/notquitemy/java/com/cappielloantonio/tempo/service/MediaService.kt
+++ b/app/src/notquitemy/java/com/cappielloantonio/tempo/service/MediaService.kt
@@ -4,69 +4,36 @@ import android.annotation.SuppressLint
 import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.TaskStackBuilder
+import android.content.Context
 import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
 import android.os.Binder
 import android.os.Bundle
 import android.os.IBinder
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 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.exoplayer.source.ShuffleOrder.DefaultShuffleOrder
 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.util.*
 import com.cappielloantonio.tempo.widget.WidgetUpdateManager
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture

-
@UnstableApi
-class MediaService : MediaLibraryService() {
-    private val librarySessionCallback = CustomMediaLibrarySessionCallback()
-
-    private lateinit var player: ExoPlayer
-    private lateinit var mediaLibrarySession: MediaLibrarySession
-    private lateinit var shuffleCommands: List<CommandButton>
-    private lateinit var repeatCommands: List<CommandButton>
-    lateinit var equalizerManager: EqualizerManager
-
-    private var customLayout = ImmutableList.of<CommandButton>()
-    private val widgetUpdateHandler = Handler(Looper.getMainLooper())
-    private var widgetUpdateScheduled = false
-    private val widgetUpdateRunnable = object : Runnable {
-        override fun run() {
-            if (!player.isPlaying) {
-                widgetUpdateScheduled = false
-                return
-            }
-            updateWidget()
-            widgetUpdateHandler.postDelayed(this, WIDGET_UPDATE_INTERVAL_MS)
-        }
-    }
-
-    inner class LocalBinder : Binder() {
-        fun getEqualizerManager(): EqualizerManager {
-            return this@MediaService.equalizerManager
-        }
-    }
-
-    private val binder = LocalBinder()
-
+open class BaseMediaService : MediaLibraryService() {
    companion object {
        private const val CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON =
            "android.media3.session.demo.SHUFFLE_ON"
@@ -79,203 +46,51 @@ class MediaService : MediaLibraryService() {
        private const val CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL =
            "android.media3.session.demo.REPEAT_ALL"
        const val ACTION_BIND_EQUALIZER = "com.cappielloantonio.tempo.service.BIND_EQUALIZER"
+        const val ACTION_EQUALIZER_UPDATED = "com.cappielloantonio.tempo.service.EQUALIZER_UPDATED"
    }

-    override fun onCreate() {
-        super.onCreate()
-
-        initializeCustomCommands()
-        initializePlayer()
-        initializeMediaLibrarySession()
-        restorePlayerFromQueue()
-        initializePlayerListener()
-        initializeEqualizerManager()
-
-        setPlayer(player)
-    }
-
-    override fun onGetSession(controllerInfo: ControllerInfo): MediaLibrarySession {
-        return mediaLibrarySession
-    }
-
-    override fun onDestroy() {
-        equalizerManager.release()
-        stopWidgetUpdates()
-        releasePlayer()
-        super.onDestroy()
-    }
-
-    override fun onBind(intent: Intent?): IBinder? {
-        // Check if the intent is for our custom equalizer binder
-        if (intent?.action == ACTION_BIND_EQUALIZER) {
-            return binder
-        }
-        // Otherwise, handle it as a normal MediaLibraryService connection
-        return super.onBind(intent)
-    }
-
-    private inner class CustomMediaLibrarySessionCallback : MediaLibrarySession.Callback {
-
-        override fun onConnect(
-            session: MediaSession,
-            controller: ControllerInfo
-        ): MediaSession.ConnectionResult {
-            val connectionResult = super.onConnect(session, controller)
-            val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
-
-            (shuffleCommands + repeatCommands).forEach { commandButton ->
-                commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
+    protected lateinit var exoplayer: ExoPlayer
+    protected lateinit var mediaLibrarySession: MediaLibrarySession
+    private lateinit var networkCallback: CustomNetworkCallback
+    private lateinit var equalizerManager: EqualizerManager
+    private val widgetUpdateHandler = Handler(Looper.getMainLooper())
+    private var widgetUpdateScheduled = false
+    private val widgetUpdateRunnable = object : Runnable {
+        override fun run() {
+            val player = mediaLibrarySession.player
+            if (!player.isPlaying) {
+                widgetUpdateScheduled = false
+                return
            }
-
-            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) {
-            if (!customLayout.isEmpty() && controller.controllerVersion != 0) {
-                ignoreFuture(mediaLibrarySession.setCustomLayout(controller, customLayout))
-            }
-        }
-
-        fun buildCustomLayout(player: Player): ImmutableList<CommandButton> {
-            val shuffle = shuffleCommands[if (player.shuffleModeEnabled) 1 else 0]
-            val repeat = when (player.repeatMode) {
-                Player.REPEAT_MODE_ONE -> repeatCommands[1]
-                Player.REPEAT_MODE_ALL -> repeatCommands[2]
-                else -> repeatCommands[0]
-            }
-            return ImmutableList.of(shuffle, repeat)
-        }
-
-        override fun onCustomCommand(
-            session: MediaSession,
-            controller: ControllerInfo,
-            customCommand: SessionCommand,
-            args: Bundle
-        ): ListenableFuture<SessionResult> {
-            when (customCommand.customAction) {
-                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON -> player.shuffleModeEnabled = true
-                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF -> player.shuffleModeEnabled = false
-                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF,
-                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL,
-                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> {
-                    val nextMode = when (player.repeatMode) {
-                        Player.REPEAT_MODE_ONE -> Player.REPEAT_MODE_ALL
-                        Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ONE
-                        else -> Player.REPEAT_MODE_OFF
-                    }
-                    player.repeatMode = nextMode
-                }
-            }
-
-            customLayout = librarySessionCallback.buildCustomLayout(player)
-            session.setCustomLayout(customLayout)
-
-            return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
-        }
-
-        override fun onAddMediaItems(
-            mediaSession: MediaSession,
-            controller: ControllerInfo,
-            mediaItems: List<MediaItem>
-        ): ListenableFuture<List<MediaItem>> {
-            val updatedMediaItems = mediaItems.map { mediaItem ->
-                val mediaMetadata = mediaItem.mediaMetadata
-
-                val newMetadata = mediaMetadata.buildUpon()
-                    .setArtist(
-                        if (mediaMetadata.artist != null) mediaMetadata.artist
-                        else mediaMetadata.extras?.getString("uri") ?: ""
-                    )
-                    .build()
-
-                mediaItem.buildUpon()
-                    .setUri(mediaItem.requestMetadata.mediaUri)
-                    .setMediaMetadata(newMetadata)
-                    .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
-                    .build()
-            }
-            return Futures.immediateFuture(updatedMediaItems)
+            updateWidget(player)
+            widgetUpdateHandler.postDelayed(this, WIDGET_UPDATE_INTERVAL_MS)
        }
    }

-    private fun initializeCustomCommands() {
-        shuffleCommands = listOf(
-            getShuffleCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON, Bundle.EMPTY)
-            ),
-            getShuffleCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF, Bundle.EMPTY)
-            )
-        )
+    private val binder = LocalBinder()

-        repeatCommands = listOf(
-            getRepeatCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF, Bundle.EMPTY)
-            ),
-            getRepeatCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE, Bundle.EMPTY)
-            ),
-            getRepeatCommandButton(
-                SessionCommand(CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL, Bundle.EMPTY)
-            )
-        )
-
-        customLayout = ImmutableList.of(shuffleCommands[0], repeatCommands[0])
+    open fun playerInitHook() {
+        initializeExoPlayer()
+        initializeMediaLibrarySession(exoplayer)
+        initializePlayerListener(exoplayer)
+        setPlayer(null, exoplayer)
    }

-    private fun initializePlayer() {
-        player = ExoPlayer.Builder(this)
-            .setRenderersFactory(getRenderersFactory())
-            .setMediaSourceFactory(getMediaSourceFactory())
-            .setAudioAttributes(AudioAttributes.DEFAULT, true)
-            .setHandleAudioBecomingNoisy(true)
-            .setWakeMode(C.WAKE_MODE_NETWORK)
-            .setLoadControl(initializeLoadControl())
-            .build()
-
-        player.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
-        player.repeatMode = Preferences.getRepeatMode()
+    open fun getMediaLibrarySessionCallback(): MediaLibrarySession.Callback {
+        return CustomMediaLibrarySessionCallback(baseContext)
    }

-    private fun initializeEqualizerManager() {
-        equalizerManager = EqualizerManager()
-        val audioSessionId = player.audioSessionId
-        if (equalizerManager.attachToSession(audioSessionId)) {
-            val enabled = Preferences.isEqualizerEnabled()
-            equalizerManager.setEnabled(enabled)
-
-            val bands = equalizerManager.getNumberOfBands()
-            val savedLevels = Preferences.getEqualizerBandLevels(bands)
-            for (i in 0 until bands) {
-                equalizerManager.setBandLevel(i.toShort(), savedLevels[i])
-            }
-        }
+    fun updateMediaItems(player: Player) {
+        Log.d(javaClass.toString(), "update items")
+        val n = player.mediaItemCount
+        val k = player.currentMediaItemIndex
+        val current = player.currentPosition
+        val items = (0..n - 1).map { MappingUtil.mapMediaItem(player.getMediaItemAt(it)) }
+        player.clearMediaItems()
+        player.setMediaItems(items, k, current)
    }

-    private fun initializeMediaLibrarySession() {
-        val sessionActivityPendingIntent =
-            TaskStackBuilder.create(this).run {
-                addNextIntent(Intent(this@MediaService, MainActivity::class.java))
-                getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
-            }
-
-        mediaLibrarySession =
-            MediaLibrarySession.Builder(this, player, librarySessionCallback)
-                .setSessionActivity(sessionActivityPendingIntent)
-                .build()
-
-        if (!customLayout.isEmpty()) {
-            mediaLibrarySession.setCustomLayout(customLayout)
-        }
-    }
-
-    private fun restorePlayerFromQueue() {
+    fun restorePlayerFromQueue(player: Player) {
        if (player.mediaItemCount > 0) return

        val queueRepository = QueueRepository()
@@ -299,32 +114,56 @@ class MediaService : MediaLibraryService() {

        player.setMediaItems(mediaItems, lastIndex, lastPosition)
        player.prepare()
-        updateWidget()
+        updateWidget(player)
    }

-    private fun initializePlayerListener() {
+    fun initializePlayerListener(player: Player) {
        player.addListener(object : Player.Listener {
            override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
+                Log.d(javaClass.toString(), "onMediaItemTransition" + player.currentMediaItemIndex)
                if (mediaItem == null) return

                if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK || reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO) {
                    MediaManager.setLastPlayedTimestamp(mediaItem)
                }
-                updateWidget()
+                updateWidget(player)
            }

            override fun onTracksChanged(tracks: Tracks) {
+                Log.d(javaClass.toString(), "onTracksChanged " + player.currentMediaItemIndex)
                ReplayGainUtil.setReplayGain(player, tracks)
                val currentMediaItem = player.currentMediaItem
-                if (currentMediaItem != null && currentMediaItem.mediaMetadata.extras != null) {
-                    MediaManager.scrobble(currentMediaItem, false)
+                if (currentMediaItem != null) {
+                    val item = MappingUtil.mapMediaItem(currentMediaItem)
+                    if (item.mediaMetadata.extras != null)
+                        MediaManager.scrobble(item, false)
+
+                    if (player.nextMediaItemIndex == C.INDEX_UNSET)
+                        MediaManager.continuousPlay(player.currentMediaItem)
                }

-                if (player.currentMediaItemIndex + 1 == player.mediaItemCount)
-                    MediaManager.continuousPlay(player.currentMediaItem)
+                if (player is ExoPlayer) {
+                    // https://stackoverflow.com/questions/56937283/exoplayer-shuffle-doesnt-reproduce-all-the-songs
+                    if (MediaManager.justStarted.get()) {
+                        Log.d(javaClass.toString(), "update shuffle order")
+                        MediaManager.justStarted.set(false)
+                        val shuffledList = IntArray(player.mediaItemCount) { i -> i }
+                        shuffledList.shuffle()
+                        val index = shuffledList.indexOf(player.currentMediaItemIndex)
+                        // swap current media index to the first index
+                        if (index > -1 && shuffledList.isNotEmpty()) {
+                            val tmp = shuffledList[0]
+                            shuffledList[0] = shuffledList[index]
+                            shuffledList[index] = tmp
+                        }
+                        player.shuffleOrder =
+                            DefaultShuffleOrder(shuffledList, kotlin.random.Random.nextLong())
+                    }
+                }
            }

            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                Log.d(javaClass.toString(), "onIsPlayingChanged " + player.currentMediaItemIndex)
                if (!isPlaying) {
                    MediaManager.setPlayingPausedTimestamp(
                        player.currentMediaItem,
@@ -338,10 +177,11 @@ class MediaService : MediaLibraryService() {
                } else {
                    stopWidgetUpdates()
                }
-                updateWidget()
+                updateWidget(player)
            }

            override fun onPlaybackStateChanged(playbackState: Int) {
+                Log.d(javaClass.toString(), "onPlaybackStateChanged")
                super.onPlaybackStateChanged(playbackState)
                if (!player.hasNextMediaItem() &&
                    playbackState == Player.STATE_ENDED &&
@@ -350,7 +190,7 @@ class MediaService : MediaLibraryService() {
                    MediaManager.scrobble(player.currentMediaItem, true)
                    MediaManager.saveChronology(player.currentMediaItem)
                }
-                updateWidget()
+                updateWidget(player)
            }

            override fun onPositionDiscontinuity(
@@ -358,6 +198,7 @@ class MediaService : MediaLibraryService() {
                newPosition: Player.PositionInfo,
                reason: Int
            ) {
+                Log.d(javaClass.toString(), "onPositionDiscontinuity")
                super.onPositionDiscontinuity(oldPosition, newPosition, reason)

                if (reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) {
@@ -374,14 +215,15 @@ class MediaService : MediaLibraryService() {

            override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
                Preferences.setShuffleModeEnabled(shuffleModeEnabled)
-                customLayout = librarySessionCallback.buildCustomLayout(player)
-                mediaLibrarySession.setCustomLayout(customLayout)
            }

            override fun onRepeatModeChanged(repeatMode: Int) {
                Preferences.setRepeatMode(repeatMode)
-                customLayout = librarySessionCallback.buildCustomLayout(player)
-                mediaLibrarySession.setCustomLayout(customLayout)
+            }
+
+            override fun onAudioSessionIdChanged(audioSessionId: Int) {
+                Log.d(javaClass.toString(), "onAudioSessionIdChanged")
+                attachEqualizerIfPossible(audioSessionId)
            }
        })
        if (player.isPlaying) {
@@ -389,51 +231,108 @@ class MediaService : MediaLibraryService() {
        }
    }

-    private fun setPlayer(player: Player) {
-        mediaLibrarySession.player = player
+    fun setPlayer(oldPlayer: Player?, newPlayer: Player) {
+        if (oldPlayer === newPlayer) return
+        if (oldPlayer != null) {
+            val currentQueue = getQueueFromPlayer(oldPlayer)
+            val currentIndex = oldPlayer.currentMediaItemIndex
+            val currentPosition = oldPlayer.currentPosition
+            val isPlaying = oldPlayer.playWhenReady
+            oldPlayer.stop()
+            newPlayer.setMediaItems(currentQueue, currentIndex, currentPosition)
+            newPlayer.playWhenReady = isPlaying
+            newPlayer.prepare()
+        }
+        mediaLibrarySession.player = newPlayer
    }

-    private fun releasePlayer() {
-        player.release()
+    open fun releasePlayers() {
+        exoplayer.release()
+    }
+
+    fun getQueueFromPlayer(player: Player): List<MediaItem> {
+        return (0..player.mediaItemCount - 1).map(player::getMediaItemAt)
+    }
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        val player = mediaLibrarySession.player
+
+        if (!player.playWhenReady || player.mediaItemCount == 0) {
+            stopSelf()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        playerInitHook()
+        initializeEqualizerManager()
+        initializeNetworkListener()
+        restorePlayerFromQueue(mediaLibrarySession.player)
+    }
+
+    override fun onGetSession(controllerInfo: ControllerInfo): MediaLibrarySession {
+        return mediaLibrarySession
+    }
+
+    override fun onDestroy() {
+        releaseNetworkCallback()
+        equalizerManager.release()
+        stopWidgetUpdates()
+        releasePlayers()
        mediaLibrarySession.release()
+        super.onDestroy()
    }

-    @SuppressLint("PrivateResource")
-    private fun getShuffleCommandButton(sessionCommand: SessionCommand): CommandButton {
-        val isOn = sessionCommand.customAction == CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON
-        return CommandButton.Builder()
-            .setDisplayName(
-                getString(
-                    if (isOn) R.string.exo_controls_shuffle_on_description
-                    else R.string.exo_controls_shuffle_off_description
-                )
-            )
-            .setSessionCommand(sessionCommand)
-            .setIconResId(if (isOn) R.drawable.exo_icon_shuffle_off else R.drawable.exo_icon_shuffle_on)
-            .build()
-    }
-
-    @SuppressLint("PrivateResource")
-    private fun getRepeatCommandButton(sessionCommand: SessionCommand): CommandButton {
-        val icon = when (sessionCommand.customAction) {
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> R.drawable.exo_icon_repeat_one
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> R.drawable.exo_icon_repeat_all
-            else -> R.drawable.exo_icon_repeat_off
+    override fun onBind(intent: Intent?): IBinder? {
+        // Check if the intent is for our custom equalizer binder
+        if (intent?.action == ACTION_BIND_EQUALIZER) {
+            return binder
        }
-        val description = when (sessionCommand.customAction) {
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> R.string.exo_controls_repeat_one_description
-            CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> R.string.exo_controls_repeat_all_description
-            else -> R.string.exo_controls_repeat_off_description
-        }
-        return CommandButton.Builder()
-            .setDisplayName(getString(description))
-            .setSessionCommand(sessionCommand)
-            .setIconResId(icon)
-            .build()
+        // Otherwise, handle it as a normal MediaLibraryService connection
+        return super.onBind(intent)
    }

-    private fun ignoreFuture(@Suppress("UNUSED_PARAMETER") customLayout: ListenableFuture<SessionResult>) {
-        /* Do nothing. */
+    private fun initializeExoPlayer() {
+        exoplayer = ExoPlayer.Builder(this)
+            .setRenderersFactory(getRenderersFactory())
+            .setMediaSourceFactory(getMediaSourceFactory())
+            .setAudioAttributes(AudioAttributes.DEFAULT, true)
+            .setHandleAudioBecomingNoisy(true)
+            .setWakeMode(C.WAKE_MODE_NETWORK)
+            .setLoadControl(initializeLoadControl())
+            .build()
+
+        exoplayer.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
+        exoplayer.repeatMode = Preferences.getRepeatMode()
+    }
+
+    private fun initializeEqualizerManager() {
+        equalizerManager = EqualizerManager()
+        val audioSessionId = exoplayer.audioSessionId
+        attachEqualizerIfPossible(audioSessionId)
+    }
+
+    private fun initializeMediaLibrarySession(player: Player) {
+        Log.d(javaClass.toString(), "initializeMediaLibrarySession")
+        val sessionActivityPendingIntent =
+            TaskStackBuilder.create(this).run {
+                addNextIntent(Intent(baseContext, MainActivity::class.java))
+                getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
+            }
+
+        mediaLibrarySession =
+            MediaLibrarySession.Builder(this, player, getMediaLibrarySessionCallback())
+                .setSessionActivity(sessionActivityPendingIntent)
+                .build()
+    }
+
+    private fun initializeNetworkListener() {
+        networkCallback = CustomNetworkCallback()
+        getSystemService(ConnectivityManager::class.java).registerDefaultNetworkCallback(
+            networkCallback
+        )
+        updateMediaItems(mediaLibrarySession.player)
    }

    private fun initializeLoadControl(): DefaultLoadControl {
@@ -447,7 +346,11 @@ class MediaService : MediaLibraryService() {
            .build()
    }

-    private fun updateWidget() {
+    private fun releaseNetworkCallback() {
+        getSystemService(ConnectivityManager::class.java).unregisterNetworkCallback(networkCallback)
+    }
+
+    private fun updateWidget(player: Player) {
        val mi = player.currentMediaItem
        val title = mi?.mediaMetadata?.title?.toString()
            ?: mi?.mediaMetadata?.extras?.getString("title")
@@ -494,10 +397,194 @@ class MediaService : MediaLibraryService() {
        widgetUpdateScheduled = false
    }

+    private fun attachEqualizerIfPossible(audioSessionId: Int): Boolean {
+        if (audioSessionId == 0 || audioSessionId == -1) return false
+        val attached = equalizerManager.attachToSession(audioSessionId)
+        if (attached) {
+            val enabled = Preferences.isEqualizerEnabled()
+            equalizerManager.setEnabled(enabled)
+            val bands = equalizerManager.getNumberOfBands()
+            val savedLevels = Preferences.getEqualizerBandLevels(bands)
+            for (i in 0 until bands) {
+                equalizerManager.setBandLevel(i.toShort(), savedLevels[i])
+            }
+            sendBroadcast(Intent(ACTION_EQUALIZER_UPDATED))
+        }
+        return attached
+    }

    private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)

    private fun getMediaSourceFactory(): MediaSource.Factory = DynamicMediaSourceFactory(this)
+
+    @UnstableApi
+    private class CustomMediaLibrarySessionCallback : MediaLibrarySession.Callback {
+        private val shuffleCommands: List<CommandButton>
+        private val repeatCommands: List<CommandButton>
+
+        constructor(ctx: Context) {
+            shuffleCommands = listOf(
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON,
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF
+            )
+                .map { getShuffleCommandButton(SessionCommand(it, Bundle.EMPTY), ctx) }
+            repeatCommands = listOf(
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL
+            )
+                .map { getRepeatCommandButton(SessionCommand(it, Bundle.EMPTY), ctx) }
+        }
+
+        override fun onConnect(
+            session: MediaSession,
+            controller: ControllerInfo
+        ): MediaSession.ConnectionResult {
+            val connectionResult = super.onConnect(session, controller)
+            val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
+
+            (shuffleCommands + repeatCommands).forEach { commandButton ->
+                commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
+            }
+
+            val result = MediaSession.ConnectionResult.AcceptedResultBuilder(session)
+                .setAvailableSessionCommands(availableSessionCommands.build())
+                .setAvailablePlayerCommands(connectionResult.availablePlayerCommands)
+                .setMediaButtonPreferences(buildCustomLayout(session.player))
+                .build()
+            return result
+        }
+
+        override fun onCustomCommand(
+            session: MediaSession,
+            controller: ControllerInfo,
+            customCommand: SessionCommand,
+            args: Bundle
+        ): ListenableFuture<SessionResult> {
+            Log.d(javaClass.toString(), "onCustomCommand")
+            when (customCommand.customAction) {
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON -> session.player.shuffleModeEnabled = true
+                CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_OFF -> session.player.shuffleModeEnabled = false
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_OFF,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL,
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> {
+                    val nextMode = when (session.player.repeatMode) {
+                        Player.REPEAT_MODE_ONE -> Player.REPEAT_MODE_ALL
+                        Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ONE
+                        else -> Player.REPEAT_MODE_OFF
+                    }
+                    session.player.repeatMode = nextMode
+                }
+            }
+
+            session.setMediaButtonPreferences(buildCustomLayout(session.player))
+            return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
+        }
+
+        override fun onAddMediaItems(
+            mediaSession: MediaSession,
+            controller: ControllerInfo,
+            mediaItems: List<MediaItem>
+        ): ListenableFuture<List<MediaItem>> {
+            Log.d(javaClass.toString(), "onAddMediaItems")
+            val updatedMediaItems = mediaItems.map { mediaItem ->
+                val mediaMetadata = mediaItem.mediaMetadata
+                val newMetadata = mediaMetadata.buildUpon()
+                    .setArtist(
+                        if (mediaMetadata.artist != null) mediaMetadata.artist
+                        else mediaMetadata.extras?.getString("uri") ?: ""
+                    )
+                    .build()
+
+                mediaItem.buildUpon()
+                    .setUri(mediaItem.requestMetadata.mediaUri)
+                    .setMediaMetadata(newMetadata)
+                    .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
+                    .build()
+            }
+            return Futures.immediateFuture(updatedMediaItems)
+        }
+
+        @SuppressLint("PrivateResource")
+        private fun getShuffleCommandButton(
+            sessionCommand: SessionCommand,
+            ctx: Context
+        ): CommandButton {
+            val isOn = sessionCommand.customAction == CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON
+            return CommandButton.Builder(if (isOn) CommandButton.ICON_SHUFFLE_OFF else CommandButton.ICON_SHUFFLE_ON)
+                .setSessionCommand(sessionCommand)
+                .setDisplayName(
+                    ctx.getString(
+                        if (isOn) R.string.exo_controls_shuffle_on_description
+                        else R.string.exo_controls_shuffle_off_description
+                    )
+                )
+                .build()
+        }
+
+        @SuppressLint("PrivateResource")
+        private fun getRepeatCommandButton(
+            sessionCommand: SessionCommand,
+            ctx: Context
+        ): CommandButton {
+            val icon = when (sessionCommand.customAction) {
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> CommandButton.ICON_REPEAT_ONE
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> CommandButton.ICON_REPEAT_ALL
+                else -> CommandButton.ICON_REPEAT_OFF
+            }
+            val description = when (sessionCommand.customAction) {
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ONE -> R.string.exo_controls_repeat_one_description
+                CUSTOM_COMMAND_TOGGLE_REPEAT_MODE_ALL -> R.string.exo_controls_repeat_all_description
+                else -> R.string.exo_controls_repeat_off_description
+            }
+            return CommandButton.Builder(icon)
+                .setSessionCommand(sessionCommand)
+                .setDisplayName(ctx.getString(description))
+                .build()
+        }
+
+        private fun buildCustomLayout(player: Player): ImmutableList<CommandButton> {
+            val shuffle = shuffleCommands[if (player.shuffleModeEnabled) 1 else 0]
+            val repeat = when (player.repeatMode) {
+                Player.REPEAT_MODE_ONE -> repeatCommands[1]
+                Player.REPEAT_MODE_ALL -> repeatCommands[2]
+                else -> repeatCommands[0]
+            }
+            return ImmutableList.of(shuffle, repeat)
+        }
+    }
+
+    private inner class CustomNetworkCallback : ConnectivityManager.NetworkCallback() {
+        var wasWifi = false
+
+        init {
+            val manager = getSystemService(ConnectivityManager::class.java)
+            val network = manager.activeNetwork
+            val capabilities = manager.getNetworkCapabilities(network)
+            if (capabilities != null)
+                wasWifi = capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+        }
+
+        override fun onCapabilitiesChanged(
+            network: Network,
+            networkCapabilities: NetworkCapabilities
+        ) {
+            val isWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+            if (isWifi != wasWifi) {
+                wasWifi = isWifi
+                widgetUpdateHandler.post {
+                    updateMediaItems(mediaLibrarySession.player)
+                }
+            }
+        }
+    }
+
+    inner class LocalBinder : Binder() {
+        fun getEqualizerManager(): EqualizerManager {
+            return equalizerManager
+        }
+    }
 }

 private const val WIDGET_UPDATE_INTERVAL_MS = 1000L
+
--- a/app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java
@@ -36,10 +36,12 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicBoolean;

 public class MediaManager {
    private static final String TAG = "MediaManager";
    private static WeakReference<MediaBrowser> attachedBrowserRef = new WeakReference<>(null);
+    public static AtomicBoolean justStarted = new AtomicBoolean(false);

    public static void registerPlaybackObserver(
            ListenableFuture<MediaBrowser> browserFuture,
@@ -179,8 +181,8 @@ public class MediaManager {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
                        MediaBrowser browser = mediaBrowserListenableFuture.get();
-                        browser.clearMediaItems();
-                        browser.setMediaItems(MappingUtil.mapMediaItems(media));
+                        justStarted.set(true);
+                        browser.setMediaItems(MappingUtil.mapMediaItems(media), startIndex, 0);
                        browser.prepare();

                        Player.Listener timelineListener = new Player.Listener() {
@@ -210,10 +212,11 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
-                        mediaBrowserListenableFuture.get().clearMediaItems();
-                        mediaBrowserListenableFuture.get().setMediaItem(MappingUtil.mapMediaItem(media));
-                        mediaBrowserListenableFuture.get().prepare();
-                        mediaBrowserListenableFuture.get().play();
+                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        justStarted.set(true);
+                        browser.setMediaItem(MappingUtil.mapMediaItem(media));
+                        browser.prepare();
+                        browser.play();
                        enqueueDatabase(media, true, 0);
                    }
                } catch (ExecutionException | InterruptedException e) {
@@ -229,7 +232,7 @@ public class MediaManager {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
                        MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
-                        mediaBrowser.clearMediaItems();
+                        justStarted.set(true);
                        mediaBrowser.setMediaItem(mediaItem);
                        mediaBrowser.prepare();
                        mediaBrowser.play();
@@ -247,10 +250,11 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
-                        mediaBrowserListenableFuture.get().clearMediaItems();
-                        mediaBrowserListenableFuture.get().setMediaItem(MappingUtil.mapInternetRadioStation(internetRadioStation));
-                        mediaBrowserListenableFuture.get().prepare();
-                        mediaBrowserListenableFuture.get().play();
+                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        justStarted.set(true);
+                        browser.setMediaItem(MappingUtil.mapInternetRadioStation(internetRadioStation));
+                        browser.prepare();
+                        browser.play();
                    }
                } catch (ExecutionException | InterruptedException e) {
                    e.printStackTrace();
@@ -264,10 +268,11 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
-                        mediaBrowserListenableFuture.get().clearMediaItems();
-                        mediaBrowserListenableFuture.get().setMediaItem(MappingUtil.mapMediaItem(podcastEpisode));
-                        mediaBrowserListenableFuture.get().prepare();
-                        mediaBrowserListenableFuture.get().play();
+                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        justStarted.set(true);
+                        browser.setMediaItem(MappingUtil.mapMediaItem(podcastEpisode));
+                        browser.prepare();
+                        browser.play();
                    }
                } catch (ExecutionException | InterruptedException e) {
                    e.printStackTrace();
@@ -281,9 +286,11 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
-                        if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
-                            enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
-                            mediaBrowserListenableFuture.get().addMediaItems(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItems(media));
+                        Log.e(TAG, "enqueue");
+                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        if (playImmediatelyAfter && browser.getNextMediaItemIndex() != -1) {
+                            enqueueDatabase(media, false, browser.getNextMediaItemIndex());
+                            browser.addMediaItems(browser.getNextMediaItemIndex(), MappingUtil.mapMediaItems(media));
                        } else {
                            enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getMediaItemCount());
                            mediaBrowserListenableFuture.get().addMediaItems(MappingUtil.mapMediaItems(media));
@@ -301,9 +308,11 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
-                        if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
-                            enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
-                            mediaBrowserListenableFuture.get().addMediaItem(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItem(media));
+                        Log.e(TAG, "enqueue");
+                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        if (playImmediatelyAfter && browser.getNextMediaItemIndex() != -1) {
+                            enqueueDatabase(media, false, browser.getNextMediaItemIndex());
+                            browser.addMediaItem(browser.getNextMediaItemIndex(), MappingUtil.mapMediaItem(media));
                        } else {
                            enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getMediaItemCount());
                            mediaBrowserListenableFuture.get().addMediaItem(MappingUtil.mapMediaItem(media));
@@ -321,8 +330,10 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
-                        mediaBrowserListenableFuture.get().removeMediaItems(startIndex, endIndex + 1);
-                        mediaBrowserListenableFuture.get().addMediaItems(MappingUtil.mapMediaItems(media).subList(startIndex, endIndex + 1));
+                        Log.e(TAG, "shuffle");
+                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                        browser.removeMediaItems(startIndex, endIndex + 1);
+                        browser.addMediaItems(MappingUtil.mapMediaItems(media).subList(startIndex, endIndex + 1));
                        swapDatabase(media);
                    }
                } catch (ExecutionException | InterruptedException e) {
@@ -337,6 +348,7 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
+                        Log.e(TAG, "swap");
                        mediaBrowserListenableFuture.get().moveMediaItem(from, to);
                        swapDatabase(media);
                    }
@@ -352,6 +364,7 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
+                        Log.e(TAG, "remove");
                        if (mediaBrowserListenableFuture.get().getMediaItemCount() > 1 && mediaBrowserListenableFuture.get().getCurrentMediaItemIndex() != toRemove) {
                            mediaBrowserListenableFuture.get().removeMediaItem(toRemove);
                            removeDatabase(media, toRemove);
@@ -371,6 +384,7 @@ public class MediaManager {
            mediaBrowserListenableFuture.addListener(() -> {
                try {
                    if (mediaBrowserListenableFuture.isDone()) {
+                        Log.e(TAG, "remove range");
                        mediaBrowserListenableFuture.get().removeMediaItems(fromItem, toItem);
                        removeRangeDatabase(media, fromItem, toItem);
                    }
@@ -420,6 +434,7 @@ public class MediaManager {
                @Override
                public void onChanged(List<Child> media) {
                    if (media != null) {
+                        Log.e(TAG, "continuous play");
                        ListenableFuture<MediaBrowser> mediaBrowserListenableFuture = new MediaBrowser.Builder(
                                App.getContext(),
                                new SessionToken(App.getContext(), new ComponentName(App.getContext(), MediaService.class))
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/SubsonicPreferences.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/SubsonicPreferences.java
@@ -7,7 +7,7 @@ import java.util.UUID;
 public class SubsonicPreferences {
    private String serverUrl;
    private String username;
-    private String clientName = "Tempo";
+    private String clientName = "Tempus";
    private SubsonicAuthentication authentication;

    public String getServerUrl() {
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/albumsonglist/AlbumSongListClient.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/albumsonglist/AlbumSongListClient.java
@@ -34,6 +34,11 @@ public class AlbumSongListClient {
        return albumSongListService.getRandomSongs(subsonic.getParams(), size, fromYear, toYear);
    }

+    public Call<ApiResponse> getRandomSongs(int size, Integer fromYear, Integer toYear, String genre) {
+        Log.d(TAG, "getRandomSongs()");
+        return albumSongListService.getRandomSongs(subsonic.getParams(), size, fromYear, toYear, genre);
+    }
+
    public Call<ApiResponse> getSongsByGenre(String genre, int count, int offset) {
        Log.d(TAG, "getSongsByGenre()");
        return albumSongListService.getSongsByGenre(subsonic.getParams(), genre, count, offset);
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/albumsonglist/AlbumSongListService.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/albumsonglist/AlbumSongListService.java
@@ -19,6 +19,9 @@ public interface AlbumSongListService {
    @GET("getRandomSongs")
    Call<ApiResponse> getRandomSongs(@QueryMap Map<String, String> params, @Query("size") int size, @Query("fromYear") Integer fromYear, @Query("toYear") Integer toYear);

+    @GET("getRandomSongs")
+    Call<ApiResponse> getRandomSongs(@QueryMap Map<String, String> params, @Query("size") int size, @Query("fromYear") Integer fromYear, @Query("toYear") Integer toYear, @Query("genre") String genre);
+
    @GET("getSongsByGenre")
    Call<ApiResponse> getSongsByGenre(@QueryMap Map<String, String> params, @Query("genre") String genre, @Query("count") int count, @Query("offset") int offset);

--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/utils/CacheUtil.java
+++ b/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;
    }
+    
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/activity/MainActivity.java
@@ -438,7 +438,7 @@ public class MainActivity extends BaseActivity {
    }

    private void checkTempoUpdate() {
-        if (BuildConfig.FLAVOR.equals("tempo") && Preferences.showTempoUpdateDialog()) {
+        if (BuildConfig.FLAVOR.equals("tempus") && Preferences.isGithubUpdateEnabled() && Preferences.showTempusUpdateDialog()) {
            mainViewModel.checkTempoUpdate().observe(this, latestRelease -> {
                if (latestRelease != null && UpdateUtil.showUpdateDialog(latestRelease)) {
                    GithubTempoUpdateDialog dialog = new GithubTempoUpdateDialog(latestRelease);
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
@@ -152,6 +152,12 @@ 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;
        
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
@@ -151,6 +151,9 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
            case Constants.ARTIST_ORDER_BY_RANDOM:
                Collections.shuffle(artists);
                break;
+            case Constants.ARTIST_ORDER_BY_ALBUM_COUNT:
+                artists.sort(Comparator.comparing(ArtistID3::getAlbumCount).reversed());
+                break;
        }

        notifyDataSetChanged();
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/DiscoverSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/DiscoverSongAdapter.java
@@ -73,6 +73,11 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
            this.item = item;

            itemView.setOnClickListener(v -> onClick());
+
+            itemView.setOnLongClickListener(v -> {
+                onLongClick();
+                return true;
+            });
        }

        public void onClick() {
@@ -82,6 +87,13 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte

            click.onMediaClick(bundle);
        }
+
+        private boolean onLongClick() {
+            Bundle bundle = new Bundle();
+            bundle.putParcelable(Constants.TRACK_OBJECT, songs.get(getBindingAdapterPosition()));
+            click.onMediaLongClick(bundle);
+            return true;
+        }
    }

    private void startAnimation(ViewHolder holder) {
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/GithubTempoUpdateDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/GithubTempoUpdateDialog.java
@@ -55,7 +55,7 @@ public class GithubTempoUpdateDialog extends DialogFragment {
        });

        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
-            Preferences.setTempoUpdateReminder();
+            Preferences.setTempusUpdateReminder();
            Objects.requireNonNull(getDialog()).dismiss();
        });

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java
+++ b/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;
@@ -35,6 +36,10 @@ 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 = "AlbumCatalogueFragment";
@@ -45,15 +50,33 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {

    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();
@@ -118,8 +141,10 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
        albumAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
        bind.albumCatalogueRecyclerView.setAdapter(albumAdapter);
        albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> {
-            albumAdapter.setItems(albums);
-            applySavedSortOrder();
+            originalAlbums = albums;
+            currentSortOrder = Preferences.getAlbumSortOrder();
+            applySortToAlbums(currentSortOrder);
+            updateSortIndicator();
        });

        bind.albumCatalogueRecyclerView.setOnTouchListener((v, event) -> {
@@ -130,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) {
@@ -142,13 +177,6 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
        });
    }

-    private void applySavedSortOrder() {
-        String savedSortOrder = Preferences.getAlbumSortOrder();
-        currentSortOrder = savedSortOrder;
-        albumAdapter.sort(savedSortOrder);
-        updateSortIndicator();
-    }
-
    private void updateSortIndicator() {
        if (bind == null) return;

@@ -235,8 +263,8 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {

            if (newSortOrder != null) {
                currentSortOrder = newSortOrder;
-                albumAdapter.sort(newSortOrder);
                Preferences.setAlbumSortOrder(newSortOrder);
+                applySortToAlbums(newSortOrder);
                updateSortIndicator();
                return true;
            }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumPageFragment.java
+++ b/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() {
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistCatalogueFragment.java
@@ -34,6 +34,7 @@ import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.ui.activity.MainActivity;
 import com.cappielloantonio.tempo.ui.adapter.ArtistCatalogueAdapter;
 import com.cappielloantonio.tempo.util.Constants;
+import com.cappielloantonio.tempo.util.Preferences;
 import com.cappielloantonio.tempo.viewmodel.ArtistCatalogueViewModel;
 import com.cappielloantonio.tempo.subsonic.models.ArtistID3;

@@ -114,7 +115,10 @@ public class ArtistCatalogueFragment extends Fragment implements ClickCallback {
        artistAdapter = new ArtistCatalogueAdapter(this);
        artistAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
        bind.artistCatalogueRecyclerView.setAdapter(artistAdapter);
-        artistCatalogueViewModel.getArtistList().observe(getViewLifecycleOwner(), artistList -> artistAdapter.setItems(artistList));
+        artistCatalogueViewModel.getArtistList().observe(getViewLifecycleOwner(), artistList -> {
+            artistAdapter.setItems(artistList);
+            artistAdapter.sort(Preferences.getArtistSortOrder());
+        });

        bind.artistCatalogueRecyclerView.setOnTouchListener((v, event) -> {
            hideKeyboard(v);
@@ -192,6 +196,9 @@ public class ArtistCatalogueFragment extends Fragment implements ClickCallback {
            } else if (menuItem.getItemId() == R.id.menu_artist_sort_random) {
                artistAdapter.sort(Constants.ARTIST_ORDER_BY_RANDOM);
                return true;
+            } else if (menuItem.getItemId() == R.id.menu_artist_sort_album_count) {
+                artistAdapter.sort(Constants.ARTIST_ORDER_BY_ALBUM_COUNT);
+                return true;
            }

            return false;
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/ArtistPageFragment.java
@@ -188,8 +188,6 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
            } else {
                if (bind != null)
                    bind.artistPageTopSongsSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
-                if (bind != null)
-                    bind.artistPageShuffleButton.setEnabled(!songs.isEmpty());
                songHorizontalAdapter.setItems(songs);
                reapplyPlayback();
            }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/DownloadFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/DownloadFragment.java
@@ -117,14 +117,12 @@ public class DownloadFragment extends Fragment implements ClickCallback {
                if (songs.isEmpty()) {
                    if (bind != null) {
                        bind.emptyDownloadLayout.setVisibility(View.VISIBLE);
-                        bind.fragmentDownloadNestedScrollView.setVisibility(View.GONE);
                        bind.downloadDownloadedSector.setVisibility(View.GONE);
                        bind.downloadedGroupByImageView.setVisibility(View.GONE);
                    }
                } else {
                    if (bind != null) {
                        bind.emptyDownloadLayout.setVisibility(View.GONE);
-                        bind.fragmentDownloadNestedScrollView.setVisibility(View.VISIBLE);
                        bind.downloadDownloadedSector.setVisibility(View.VISIBLE);
                        bind.downloadedGroupByImageView.setVisibility(View.VISIBLE);

--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/EqualizerFragment.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/EqualizerFragment.kt
@@ -3,7 +3,9 @@ package com.cappielloantonio.tempo.ui.fragment
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.content.ServiceConnection
+import android.content.BroadcastReceiver
 import android.os.Bundle
 import android.os.IBinder
 import android.view.Gravity
@@ -12,10 +14,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.annotation.OptIn
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.media3.common.util.UnstableApi
 import com.cappielloantonio.tempo.R
 import com.cappielloantonio.tempo.service.EqualizerManager
+import com.cappielloantonio.tempo.service.BaseMediaService
 import com.cappielloantonio.tempo.service.MediaService
 import com.cappielloantonio.tempo.util.Preferences

@@ -28,10 +32,21 @@ class EqualizerFragment : Fragment() {
    private lateinit var safeSpace: Space
    private val bandSeekBars = mutableListOf<SeekBar>()

+    private var receiverRegistered = false
+    private val equalizerUpdatedReceiver = object : BroadcastReceiver() {
+        @OptIn(UnstableApi::class)
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action == BaseMediaService.ACTION_EQUALIZER_UPDATED) {
+                initUI()
+                restoreEqualizerPreferences()
+            }
+        }
+    }
+
    private val connection = object : ServiceConnection {
        @OptIn(UnstableApi::class)
        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as MediaService.LocalBinder
+            val binder = service as BaseMediaService.LocalBinder
            equalizerManager = binder.getEqualizerManager()
            initUI()
            restoreEqualizerPreferences()
@@ -46,15 +61,32 @@ class EqualizerFragment : Fragment() {
    override fun onStart() {
        super.onStart()
        Intent(requireContext(), MediaService::class.java).also { intent ->
-            intent.action = MediaService.ACTION_BIND_EQUALIZER
+            intent.action = BaseMediaService.ACTION_BIND_EQUALIZER
            requireActivity().bindService(intent, connection, Context.BIND_AUTO_CREATE)
        }
+        if (!receiverRegistered) {
+            ContextCompat.registerReceiver(
+                requireContext(),
+                equalizerUpdatedReceiver,
+                IntentFilter(BaseMediaService.ACTION_EQUALIZER_UPDATED),
+                ContextCompat.RECEIVER_NOT_EXPORTED
+            )
+            receiverRegistered = true
+        }
    }

    override fun onStop() {
        super.onStop()
        requireActivity().unbindService(connection)
        equalizerManager = null
+        if (receiverRegistered) {
+            try {
+                requireContext().unregisterReceiver(equalizerUpdatedReceiver)
+            } catch (_: Exception) {
+                // ignore if not registered
+            }
+            receiverRegistered = false
+        }
    }

    override fun onCreateView(
@@ -234,4 +266,4 @@ class EqualizerFragment : Fragment() {
 }

 private fun Int.dpToPx(context: Context): Int =
-    (this * context.resources.displayMetrics.density).toInt()
+    (this * context.resources.displayMetrics.density).toInt()
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java
@@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.ui.fragment;

 import android.content.ComponentName;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -72,6 +73,16 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
        super.onResume();
        setMediaBrowserListenableFuture();
        updateNowPlayingItem();
+        mediaBrowserListenableFuture.addListener(() -> {
+            try {
+                long position = mediaBrowserListenableFuture.get().getCurrentMediaItemIndex();
+                requireActivity().runOnUiThread(() -> {
+                    bind.playerQueueRecyclerView.scrollToPosition((int) position);
+                });
+            } catch (Exception e) {
+                Log.e("PlayerQueueFragment", "Failed to get mediaBrowserListenableFuture in onResume", e);
+            }
+        }, MoreExecutors.directExecutor());
    }

    @Override
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
@@ -29,6 +29,7 @@ import androidx.navigation.NavOptions;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreference;

@@ -77,6 +78,13 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                result -> {}
        );

+        if (!BuildConfig.FLAVOR.equals("tempus")) {
+            PreferenceCategory githubUpdateCategory = findPreference("settings_github_update_category_key");
+            if (githubUpdateCategory != null) {
+                getPreferenceScreen().removePreference(githubUpdateCategory);
+            }
+        }
+
        directoryPickerLauncher = registerForActivityResult(
                new ActivityResultContracts.StartActivityForResult(),
                result -> {
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SongListPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SongListPageFragment.java
@@ -189,7 +189,7 @@ public class SongListPageFragment extends Fragment implements ClickCallback {

                bind.songListShuffleImageView.setOnClickListener(v -> {
                    Collections.shuffle(songs);
-                    MediaManager.startQueue(mediaBrowserListenableFuture, songs.subList(0, Math.min(25, songs.size())), 0);
+                    MediaManager.startQueue(mediaBrowserListenableFuture, songs.subList(0, Math.min(500, songs.size())), 0);
                    activity.setBottomSheetInPeek(true);
                });
            }
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
@@ -89,6 +89,9 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
            ArtistRepository artistRepository = new ArtistRepository();

            artistRepository.getInstantMix(artist, 20).observe(getViewLifecycleOwner(), songs -> {
+                // navidrome may return null for this
+                if (songs == null)
+                    return;
                MusicUtil.ratingFilter(songs);

                if (!songs.isEmpty()) {
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ShareBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ShareBottomSheetDialog.java
@@ -17,6 +17,7 @@ import androidx.media3.common.util.UnstableApi;
 import com.cappielloantonio.tempo.R;
 import com.cappielloantonio.tempo.glide.CustomGlideRequest;
 import com.cappielloantonio.tempo.subsonic.models.Share;
+import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.ui.dialog.ShareUpdateDialog;
 import com.cappielloantonio.tempo.util.Constants;
 import com.cappielloantonio.tempo.util.UIUtil;
@@ -24,6 +25,8 @@ import com.cappielloantonio.tempo.viewmodel.HomeViewModel;
 import com.cappielloantonio.tempo.viewmodel.ShareBottomSheetViewModel;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;

+import java.util.List;
+
@UnstableApi
 public class ShareBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener {

@@ -50,8 +53,15 @@ public class ShareBottomSheetDialog extends BottomSheetDialogFragment implements
    private void init(View view) {
        ImageView shareCover = view.findViewById(R.id.share_cover_image_view);

+        String coverArtId = null;
+        List<Child> entries = shareBottomSheetViewModel.getShare().getEntries();
+
+        if (entries != null && !entries.isEmpty()) {
+            coverArtId = entries.get(0).getCoverArtId();
+        }
+
        CustomGlideRequest.Builder
-                .from(requireContext(), shareBottomSheetViewModel.getShare().getEntries().get(0).getCoverArtId(), CustomGlideRequest.ResourceType.Unknown)
+                .from(requireContext(), coverArtId, CustomGlideRequest.ResourceType.Unknown)
                .build()
                .into(shareCover);

--- a/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
@@ -40,6 +40,7 @@ object Constants {
    const val ARTIST_STARRED = "ARTIST_STARRED"
    const val ARTIST_ORDER_BY_NAME = "ARTIST_ORDER_BY_NAME"
    const val ARTIST_ORDER_BY_RANDOM = "ARTIST_ORDER_BY_RANDOM"
+    const val ARTIST_ORDER_BY_ALBUM_COUNT = "ARTIST_ORDER_BY_ALBUM_COUNT"
    const val ARTIST_ORDER_BY_MOST_RECENTLY_STARRED = "ARTIST_ORDER_BY_MOST_RECENTLY_STARRED"
    const val ARTIST_ORDER_BY_LEAST_RECENTLY_STARRED = "ARTIST_ORDER_BY_LEAST_RECENTLY_STARRED"

--- a/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java
@@ -115,6 +115,29 @@ public class MappingUtil {
                .build();
    }

+    public static MediaItem mapMediaItem(MediaItem old) {
+        String mediaId = null;
+        if (old.requestMetadata.extras != null)
+            mediaId = old.requestMetadata.extras.getString("id");
+
+        if (mediaId != null && DownloadUtil.getDownloadTracker(App.getContext()).isDownloaded(mediaId)) {
+            return old;
+        }
+        Uri uri = old.requestMetadata.mediaUri == null ? null : MusicUtil.updateStreamUri(old.requestMetadata.mediaUri);
+        return new MediaItem.Builder()
+                .setMediaId(old.mediaId)
+                .setMediaMetadata(old.mediaMetadata)
+                .setRequestMetadata(
+                        new MediaItem.RequestMetadata.Builder()
+                                .setMediaUri(uri)
+                                .setExtras(old.requestMetadata.extras)
+                                .build()
+                )
+                .setMimeType(MimeTypes.BASE_TYPE_AUDIO)
+                .setUri(uri)
+                .build();
+    }
+
    public static List<MediaItem> mapDownloads(List<Child> items) {
        ArrayList<MediaItem> downloads = new ArrayList<>();

--- a/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java
@@ -21,11 +21,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 public class MusicUtil {
    private static final String TAG = "MusicUtil";

+    private static final Pattern BITRATE_PATTERN = Pattern.compile("&maxBitRate=\\d+");
+    private static final Pattern FORMAT_PATTERN = Pattern.compile("&format=\\w+");
+
    public static Uri getStreamUri(String id) {
        Map<String, String> params = App.getSubsonicClientInstance(false).getParams();

@@ -61,6 +66,24 @@ public class MusicUtil {
        return Uri.parse(uri.toString());
    }

+    public static Uri updateStreamUri(Uri uri) {
+        String s = uri.toString();
+        Matcher m1 = BITRATE_PATTERN.matcher(s);
+        s = m1.replaceAll("");
+        Matcher m2 = FORMAT_PATTERN.matcher(s);
+        s = m2.replaceAll("");
+        s = s.replace("&estimateContentLength=true", "");
+
+        if (!Preferences.isServerPrioritized())
+            s += "&maxBitRate=" + getBitratePreference();
+        if (!Preferences.isServerPrioritized())
+            s += "&format=" + getTranscodingFormatPreference();
+        if (Preferences.askForEstimateContentLength())
+            s += "&estimateContentLength=true";
+
+        return Uri.parse(s);
+    }
+
    public static Uri getDownloadUri(String id) {
        StringBuilder uri = new StringBuilder();

--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -70,14 +70,17 @@ object Preferences {
    private const val SONG_RATING_PER_ITEM = "song_rating_per_item"
    private const val RATING_PER_ITEM = "rating_per_item"
    private const val NEXT_UPDATE_CHECK = "next_update_check"
+    private const val GITHUB_UPDATE_CHECK = "github_update_check"
    private const val CONTINUOUS_PLAY = "continuous_play"
    private const val LAST_INSTANT_MIX = "last_instant_mix"
    private const val ALLOW_PLAYLIST_DUPLICATES = "allow_playlist_duplicates"
    private const val 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
+    private const val ARTIST_SORT_BY_ALBUM_COUNT= "artist_sort_by_album_count"

    @JvmStatic
    fun getServer(): String? {
@@ -572,15 +575,21 @@ object Preferences {
        return App.getInstance().preferences.getBoolean(RATING_PER_ITEM, false)
    }

+    
    @JvmStatic
-    fun showTempoUpdateDialog(): Boolean {
+    fun isGithubUpdateEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(GITHUB_UPDATE_CHECK, true)
+    }
+
+    @JvmStatic
+    fun showTempusUpdateDialog(): Boolean {
        return App.getInstance().preferences.getLong(
                NEXT_UPDATE_CHECK, 0
        ) + 86400000 < System.currentTimeMillis()
    }

    @JvmStatic
-    fun setTempoUpdateReminder() {
+    fun setTempusUpdateReminder() {
        App.getInstance().preferences.edit().putLong(NEXT_UPDATE_CHECK, System.currentTimeMillis()).apply()
    }

@@ -641,6 +650,11 @@ object Preferences {
        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
@@ -650,4 +664,14 @@ object Preferences {
    fun setAlbumSortOrder(sortOrder: String) {
        App.getInstance().preferences.edit().putString(ALBUM_SORT_ORDER, sortOrder).apply()
    }
+
+    @JvmStatic
+    fun getArtistSortOrder(): String {
+        val sort_by_album_count = App.getInstance().preferences.getBoolean(ARTIST_SORT_BY_ALBUM_COUNT, false)
+        Log.d("Preferences", "getSortOrder")
+        if (sort_by_album_count)
+            return Constants.ARTIST_ORDER_BY_ALBUM_COUNT
+        else
+            return Constants.ARTIST_ORDER_BY_NAME
+    }
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/util/ReplayGainUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/ReplayGainUtil.java
@@ -1,11 +1,12 @@
 package com.cappielloantonio.tempo.util;

 import androidx.annotation.OptIn;
+import androidx.media3.common.C;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.exoplayer.ExoPlayer;
+import androidx.media3.common.Player;

 import com.cappielloantonio.tempo.model.ReplayGain;

@@ -17,7 +18,7 @@ import java.util.Objects;
 public class ReplayGainUtil {
    private static final String[] tags = {"REPLAYGAIN_TRACK_GAIN", "REPLAYGAIN_ALBUM_GAIN", "R128_TRACK_GAIN", "R128_ALBUM_GAIN"};

-    public static void setReplayGain(ExoPlayer player, Tracks tracks) {
+    public static void setReplayGain(Player player, Tracks tracks) {
        List<Metadata> metadata = getMetadata(tracks);
        List<ReplayGain> gains = getReplayGains(metadata);

@@ -62,7 +63,7 @@ public class ReplayGainUtil {
            }
        }

-        if (gains.size() == 0) gains.add(0, new ReplayGain());
+        if (gains.isEmpty()) gains.add(0, new ReplayGain());
        if (gains.size() == 1) gains.add(1, new ReplayGain());

        return gains;
@@ -108,7 +109,7 @@ public class ReplayGainUtil {
        }
    }

-    private static void applyReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void applyReplayGain(Player player, List<ReplayGain> gains) {
        if (Objects.equals(Preferences.getReplayGainMode(), "disabled") || gains == null || gains.isEmpty()) {
            setNoReplayGain(player);
            return;
@@ -137,33 +138,33 @@ public class ReplayGainUtil {
        setNoReplayGain(player);
    }

-    private static void setNoReplayGain(ExoPlayer player) {
+    private static void setNoReplayGain(Player player) {
        setReplayGain(player, 0f);
    }

-    private static void setTrackReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void setTrackReplayGain(Player player, List<ReplayGain> gains) {
        float trackGain = gains.get(0).getTrackGain() != 0f ? gains.get(0).getTrackGain() : gains.get(1).getTrackGain();

        setReplayGain(player, trackGain != 0f ? trackGain : 0f);
    }

-    private static void setAlbumReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void setAlbumReplayGain(Player player, List<ReplayGain> gains) {
        float albumGain = gains.get(0).getAlbumGain() != 0f ? gains.get(0).getAlbumGain() : gains.get(1).getAlbumGain();

        setReplayGain(player, albumGain != 0f ? albumGain : 0f);
    }

-    private static void setAutoReplayGain(ExoPlayer player, List<ReplayGain> gains) {
+    private static void setAutoReplayGain(Player player, List<ReplayGain> gains) {
        float albumGain = gains.get(0).getAlbumGain() != 0f ? gains.get(0).getAlbumGain() : gains.get(1).getAlbumGain();
        float trackGain = gains.get(0).getTrackGain() != 0f ? gains.get(0).getTrackGain() : gains.get(1).getTrackGain();

        setReplayGain(player, albumGain != 0f ? albumGain : trackGain);
    }

-    private static boolean areTracksConsecutive(ExoPlayer player) {
+    private static boolean areTracksConsecutive(Player player) {
        MediaItem currentMediaItem = player.getCurrentMediaItem();
-        int currentMediaItemIndex = player.getCurrentMediaItemIndex();
-        MediaItem pastMediaItem = currentMediaItemIndex > 0 ? player.getMediaItemAt(currentMediaItemIndex - 1) : null;
+        int prevMediaItemIndex = player.getPreviousMediaItemIndex();
+        MediaItem pastMediaItem = prevMediaItemIndex == C.INDEX_UNSET ? null : player.getMediaItemAt(prevMediaItemIndex);

        return currentMediaItem != null &&
                pastMediaItem != null &&
@@ -172,7 +173,7 @@ public class ReplayGainUtil {
                pastMediaItem.mediaMetadata.albumTitle.toString().equals(currentMediaItem.mediaMetadata.albumTitle.toString());
    }

-    private static void setReplayGain(ExoPlayer player, float gain) {
+    private static void setReplayGain(Player player, float gain) {
        player.setVolume((float) Math.pow(10f, gain / 20f));
    }
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/util/UIUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/UIUtil.java
@@ -105,7 +105,11 @@ public class UIUtil {
    }

    public static String getReadableDate(Date date) {
+        if (date == null) {
+            return App.getContext().getString(R.string.share_no_expiration); 
+        }
        SimpleDateFormat formatter = new SimpleDateFormat("dd MMM, yyyy", Locale.getDefault());
        return formatter.format(date);
    }
+
 }
--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SongListPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/SongListPageViewModel.java
@@ -37,7 +37,7 @@ public class SongListPageViewModel extends AndroidViewModel {

    public int year = 0;
    public int maxNumberByYear = 500;
-    public int maxNumberByGenre = 100;
+    public int maxNumberByGenre = 500;

    public SongListPageViewModel(@NonNull Application application) {
        super(application);
@@ -51,7 +51,7 @@ public class SongListPageViewModel extends AndroidViewModel {

        switch (title) {
            case Constants.MEDIA_BY_GENRE:
-                songList = songRepository.getSongsByGenre(genre.getGenre(), 0);
+                songList = songRepository.getRandomSampleWithGenre(maxNumberByGenre, 0, 3000, genre.getGenre());
                break;
            case Constants.MEDIA_BY_ARTIST:
                songList = artistRepository.getTopSongs(artist.getName(), 50);
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_splash_logo.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_toolbar_tempo.xml
+++ b/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>
--- a/app/src/main/res/drawable/logo.xml
+++ b/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>
--- a/app/src/main/res/drawable/ui_splash_screen.xml
+++ b/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>
--- a/app/src/main/res/layout/fragment_album_page.xml
+++ b/app/src/main/res/layout/fragment_album_page.xml
@@ -14,22 +14,21 @@
        app:layout_collapseMode="pin"
        app:navigationIcon="@drawable/ic_arrow_back" />

-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/fragment_album_page_nested_scroll_view"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
+        android:layout_height="match_parent">
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="wrap_content">

            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/album_info_sector"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:clipChildren="false"
-                android:paddingTop="8dp">
+                android:paddingTop="8dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">

                <ImageView
                    android:id="@+id/album_cover_image_view"
@@ -252,53 +251,15 @@
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout" />
            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>

-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="@dimen/global_padding_bottom"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/song_recycler_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:clipToPadding="false"
-                    android:nestedScrollingEnabled="false"
-                    android:paddingTop="8dp" />
-
-                <LinearLayout
-                    android:id="@+id/similar_album_sector"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <TextView
-                        style="@style/TitleLarge"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingStart="16dp"
-                        android:paddingTop="32dp"
-                        android:paddingEnd="20dp"
-                        android:text="@string/album_page_extra_info_button" />
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/similar_albums_recycler_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
-                        android:clipToPadding="false"
-                        android:nestedScrollingEnabled="false"
-                        android:paddingStart="16dp"
-                        android:paddingTop="8dp"
-                        android:paddingEnd="8dp"
-                        android:paddingBottom="8dp" />
-
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/song_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingTop="8dp"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">

    <fragment
        android:id="@+id/toolbar_fragment"
@@ -26,6 +27,7 @@
        android:layout_height="match_parent"
        android:gravity="center"
        android:orientation="vertical"
+        android:paddingBottom="@dimen/global_padding_bottom"
        android:visibility="gone">

        <ImageView
@@ -57,92 +59,78 @@
            android:text="@string/download_info_empty_subtitle" />
    </LinearLayout>

-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/fragment_download_nested_scroll_view"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/download_downloaded_sector"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="16dp"
        android:visibility="gone"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        tools:visibility="visible">

-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/download_downloaded_sector"
+        <TextView
+            android:id="@+id/downloaded_text_view_refreshable"
+            style="@style/TitleLarge"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/download_title_section"
+            app:layout_constraintEnd_toStartOf="@+id/downloaded_refresh_image_view"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/shuffle_downloaded_text_view_clickable"
+            style="@style/TitleMedium"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:paddingHorizontal="16dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="@dimen/global_padding_bottom"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:text="@string/download_shuffle_all_subtitle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/downloaded_text_view_refreshable" />

-            <TextView
-                android:id="@+id/downloaded_text_view_refreshable"
-                style="@style/TitleLarge"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:text="@string/download_title_section"
-                app:layout_constraintEnd_toStartOf="@+id/downloaded_refresh_image_view"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <ImageView
+            android:id="@+id/downloaded_refresh_image_view"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/ic_refresh"
+            android:contentDescription="@string/download_refresh_button_content_description"
+            app:layout_constraintBottom_toBottomOf="@+id/downloaded_text_view_refreshable"
+            app:layout_constraintEnd_toStartOf="@id/downloaded_go_back_image_view"
+            app:layout_constraintStart_toEndOf="@id/downloaded_text_view_refreshable"
+            app:layout_constraintTop_toTopOf="@+id/downloaded_text_view_refreshable" />

-            <TextView
-                android:id="@+id/shuffle_downloaded_text_view_clickable"
-                style="@style/TitleMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/download_shuffle_all_subtitle"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/downloaded_text_view_refreshable"/>
+        <ImageView
+            android:id="@+id/downloaded_go_back_image_view"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="12dp"
+            android:background="@drawable/ic_arrow_back"
+            app:layout_constraintBottom_toBottomOf="@+id/downloaded_text_view_refreshable"
+            app:layout_constraintEnd_toStartOf="@id/downloaded_group_by_image_view"
+            app:layout_constraintStart_toEndOf="@id/downloaded_refresh_image_view"
+            app:layout_constraintTop_toTopOf="@+id/downloaded_text_view_refreshable" />

-            <ImageView
-                android:id="@+id/downloaded_refresh_image_view"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:background="@drawable/ic_refresh"
-                android:contentDescription="@string/download_refresh_button_content_description"
-                app:layout_constraintBottom_toBottomOf="@+id/downloaded_text_view_refreshable"
-                app:layout_constraintEnd_toStartOf="@id/downloaded_go_back_image_view"
-                app:layout_constraintStart_toEndOf="@id/downloaded_text_view_refreshable"
-                app:layout_constraintTop_toTopOf="@+id/downloaded_text_view_refreshable" />
+        <ImageView
+            android:id="@+id/downloaded_group_by_image_view"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:background="@drawable/ic_filter_list"
+            app:layout_constraintBottom_toBottomOf="@+id/downloaded_text_view_refreshable"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/downloaded_text_view_refreshable" />
+    </androidx.constraintlayout.widget.ConstraintLayout>

-            <ImageView
-                android:id="@+id/downloaded_go_back_image_view"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginHorizontal="12dp"
-                android:layout_gravity="center"
-                android:background="@drawable/ic_arrow_back"
-                app:layout_constraintBottom_toBottomOf="@+id/downloaded_text_view_refreshable"
-                app:layout_constraintEnd_toStartOf="@id/downloaded_group_by_image_view"
-                app:layout_constraintStart_toEndOf="@id/downloaded_refresh_image_view"
-                app:layout_constraintTop_toTopOf="@+id/downloaded_text_view_refreshable" />
-
-            <ImageView
-                android:id="@+id/downloaded_group_by_image_view"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_gravity="center"
-                android:background="@drawable/ic_filter_list"
-                app:layout_constraintBottom_toBottomOf="@+id/downloaded_text_view_refreshable"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/downloaded_text_view_refreshable" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/downloaded_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipToPadding="false"
-                android:nestedScrollingEnabled="false"
-                android:paddingTop="12dp"
-                android:paddingBottom="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/shuffle_downloaded_text_view_clickable" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/downloaded_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:nestedScrollingEnabled="false"
+        android:paddingHorizontal="12dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="@dimen/global_padding_bottom" />
+</LinearLayout>

--- a/app/src/main/res/layout/fragment_home_tab_podcast.xml
+++ b/app/src/main/res/layout/fragment_home_tab_podcast.xml
@@ -20,6 +20,20 @@
            android:orientation="vertical"
            android:paddingBottom="@dimen/global_padding_bottom">

+            <TextView
+                android:id="@+id/podcast_channels_pre_text_view"
+                style="@style/TitleMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="16dp"
+                android:paddingEnd="16dp"
+                android:text="@string/home_subtitle_new_podcast_channel"
+                android:textAllCaps="true"
+                android:textColor="?attr/colorPrimary"
+                android:textStyle="bold" />
+
            <LinearLayout
                android:id="@+id/home_podcast_channels_sector"
                android:layout_width="match_parent"
@@ -29,17 +43,6 @@
                android:visibility="gone"
                tools:visibility="visible">

-                <TextView
-                    android:id="@+id/podcast_channels_pre_text_view"
-                    style="@style/TitleMedium"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="16dp"
-                    android:paddingTop="16dp"
-                    android:paddingEnd="16dp"
-                    android:text="@string/home_subtitle_new_podcast_channel"
-                    android:textAllCaps="true" />
-
                <!--  Label and button  -->
                <LinearLayout
                    android:layout_width="match_parent"
@@ -169,4 +172,4 @@
            android:gravity="center"
            android:text="@string/podcast_info_empty_button" />
    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/fragment_home_tab_radio.xml
+++ b/app/src/main/res/layout/fragment_home_tab_radio.xml
@@ -1,44 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

+    <TextView
+        android:id="@+id/internet_radio_station_pre_text_view"
+        style="@style/TitleMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/home_subtitle_new_internet_radio_station"
+        android:textAllCaps="true"
+        android:textColor="?attr/colorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <TextView
+        android:id="@+id/internet_radio_station_title_text_view"
+        style="@style/TitleLarge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/home_title_internet_radio_station"
+        app:layout_constraintTop_toBottomOf="@id/internet_radio_station_pre_text_view"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
    <androidx.core.widget.NestedScrollView
        android:id="@+id/home_radio_station_sector"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/internet_radio_station_title_text_view">

        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:paddingBottom="@dimen/global_padding_bottom">

-            <TextView
-                android:id="@+id/internet_radio_station_pre_text_view"
-                style="@style/TitleMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="16dp"
-                android:text="@string/home_subtitle_new_internet_radio_station"
-                android:textAllCaps="true" />
-
-            <TextView
-                android:id="@+id/internet_radio_station_title_text_view"
-                style="@style/TitleLarge"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:text="@string/home_title_internet_radio_station" />
-
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/internet_radio_station_recycler_view"
                android:layout_width="match_parent"
@@ -61,7 +71,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/internet_radio_station_title_text_view">

        <ImageView
            android:id="@+id/empty_description_image_view"
@@ -105,7 +115,4 @@
            android:gravity="center"
            android:text="@string/radio_station_info_empty_button" />
    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/fragment_playlist_page.xml
+++ b/app/src/main/res/layout/fragment_playlist_page.xml
@@ -27,7 +27,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="?attr/colorSurface"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">

                <ImageView
                    android:id="@+id/playlist_cover_image_view_top_left"
--- a/app/src/main/res/layout/item_home_discover_song.xml
+++ b/app/src/main/res/layout/item_home_discover_song.xml
@@ -7,7 +7,10 @@
    <ImageView
        android:id="@+id/discover_song_cover_image_view"
        android:layout_width="match_parent"
-        android:layout_height="196dp"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:pivotX="50%"
+        android:pivotY="50%"
        android:background="?attr/colorSurfaceContainerHighest"
        android:foreground="@drawable/gradient_discover_background_image" />

--- a/app/src/main/res/menu/sort_artist_popup_menu.xml
+++ b/app/src/main/res/menu/sort_artist_popup_menu.xml
@@ -6,4 +6,7 @@
    <item
        android:id="@+id/menu_artist_sort_random"
        android:title="@string/menu_sort_random" />
+    <item
+        android:id="@+id/menu_artist_sort_album_count"
+        android:title="@string/menu_sort_album_count" />
 </menu>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/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>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/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>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
eddyizm	8aaa6b207e	chore: added reproducible build badge	2025-11-22 09:30:01 -08:00
eddyizm	72d560e4eb	chore: updated changelog, bumped version for release	2025-11-22 09:22:13 -08:00
eddyizm	31219ea754	fix: it strings needed an single quote escape	2025-11-22 09:07:49 -08:00
eddyizm	52c411ead0	chore(i18n): Update Italian translation (#278 )	2025-11-22 08:36:21 -08:00
eddyizm	0edbd15d47	chore(i18n): Update Spanish translation (#272 )	2025-11-22 08:34:17 -08:00
eddyizm	342241963a	Refactor MediaService (#267 )	2025-11-22 08:33:07 -08:00
bunz	f5b381eb35	chore(i18n): Update Italian translation	2025-11-21 13:36:44 +01:00
eddyizm	c415db0cc5	chore: pending release update	2025-11-16 09:35:53 -08:00
eddyizm	35576c3d6f	feat: Add Catalan i18n (#268 )	2025-11-16 09:23:06 -08:00
Jaime García	a11fbfa829	chore(i18n): Update Spanish translation	2025-11-16 17:50:45 +01:00
Jaime García	26d1b144e4	chore(i18n): Update Spanish translation	2025-11-16 17:48:51 +01:00
pca006132	16b63bf13c	Merge branch 'development' into refactor-mediaservice	2025-11-16 20:33:48 +08:00
Marc Riera	52434f3aa9	feat: Add Catalan i18n	2025-11-16 10:36:14 +01:00
pca006132	7aa325f914	refactor MediaService	2025-11-16 17:22:22 +08:00
pca006132	5a8a631449	fix shuffle	2025-11-16 14:19:58 +08:00
eddyizm	e6bbd7b2bf	Fix player queue soft-lock (#266 )	2025-11-15 22:11:37 -08:00
observer	3721484dff	Fix player queue soft-lock	2025-11-16 00:13:36 +00:00
eddyizm	6698052ba5	chore: updated change log	2025-11-15 10:34:38 -08:00
eddyizm	f6f24acfdf	chore: bumped version	2025-11-15 09:31:52 -08:00
eddyizm	ca8bcba0d7	fix: add podcast channel visible when empty podcasts (#260 )	2025-11-14 21:55:13 -08:00
eddyizm	9a36f8541f	chore: added tested backends to docs as well as podcast/radio feed screenshots	2025-11-14 21:47:46 -08:00
eddyizm	0026dc287f	Update Polish translation (#257 )	2025-11-14 06:16:30 -08:00
skajmer	c65077172d	Update strings.xml	2025-11-14 13:38:19 +01:00
skajmer	6e6c261f35	Update strings.xml	2025-11-14 13:35:05 +01:00
skajmer	130cbbd7dd	Missing strings sort albums by count stuff I missed	2025-11-14 13:28:21 +01:00
eddyizm	63668f5a8c	fix: made sure the empty graphic was there when list was empty	2025-11-13 21:37:48 -08:00
eddyizm	193b551773	fix: home radio add station missing from view	2025-11-13 19:07:45 -08:00
eddyizm	76a0e12222	fix: add podcast channel visible when empty podcasts	2025-11-13 16:07:10 -08:00
skajmer	887d8c85ee	Accidental typo	2025-11-13 10:38:03 +01:00
skajmer	6a90f06084	Added #253	2025-11-13 10:34:52 +01:00
skajmer	f7a21cbb52	Merge branch 'eddyizm:development' into development	2025-11-13 10:23:43 +01:00
eddyizm	3c6c240b9d	chore: more pending release updates	2025-11-12 21:53:35 -08:00
eddyizm	2553c06a9f	Fixed crash when viewing share (#255 )	2025-11-12 07:01:43 -08:00
eddyizm	62a10d142e	fix:github release check (#253 )	2025-11-12 06:59:05 -08:00
drakeerv	955dc1b015	Fixed crash when viewing share	2025-11-12 09:45:07 -05:00
eddyizm	6124ec66f3	feat: added setting to disable github check and completely disable/hide when using the degoogled version	2025-11-11 18:06:01 -08:00
eddyizm	2c6287405e	fix:github release check	2025-11-11 12:00:05 -08:00
eddyizm	0be309fb22	chore: updated pending release notes	2025-11-11 11:12:54 -08:00
eddyizm	a79543569d	fix: disallow duplicate songs in queue (#252 )	2025-11-11 11:08:26 -08:00
eddyizm	e3d7120193	chore: Update russian lang strings.xml (#249 )	2025-11-11 11:08:02 -08:00
eddyizm	80a3a54476	Merge branch 'development' into patch-1	2025-11-11 11:05:25 -08:00
eddyizm	6448cc598d	fix: disallow duplicate songs in queue	2025-11-10 10:53:16 -08:00
skajmer	c4bd30d512	Merge branch 'eddyizm:development' into development	2025-11-10 11:41:33 +01:00
eddyizm	b2e3596d87	chore: updated change log	2025-11-09 17:07:07 -08:00
eddyizm	ccfe74a6ea	chore: bump version for release	2025-11-09 16:49:17 -08:00
eddyizm	f4ffdc985e	chore: updating pending release and typo in settings	2025-11-09 16:48:16 -08:00
eddyizm	33981f9885	Fix shuffling genres only queuing 25 songs (#246 )	2025-11-09 16:41:17 -08:00
observer	1bc93cce0e	use overloads instead of new methods	2025-11-09 22:01:33 +00:00
eddyizm	ec0eee9d3f	implement scroll to currently playing feature (#247 )	2025-11-09 13:49:29 -08:00
observer	140546ca4d	log in catch statement in PlayerQueueFragment:onResume	2025-11-09 21:27:17 +00:00
eddyizm	fd075a02c5	chore: updating change log and pending changes	2025-11-09 09:33:23 -08:00
observer	4d1d953a3a	implement scroll to currently playing feature	2025-11-09 16:03:02 +00:00
eddyizm	9dd509be22	feat: Make artist and album clickable (#243 )	2025-11-09 07:06:41 -08:00
observer	efaae35976	uncap mediamanager queue previously at 25 at 500	2025-11-09 15:05:49 +00:00
observer	35784216bc	use getRandomSampleWithGenre() rather than getSongsByGenre()	2025-11-09 15:05:05 +00:00
observer	8ce0a82506	getRandomSongs2(): use new subsonic getRandomSongs param 'genre' instead of getSongsByGenre	2025-11-09 15:02:54 +00:00
skajmer	51883cd82b	Merge branch 'eddyizm:development' into development	2025-11-09 13:06:27 +01:00
eddyizm	829c5d85f6	fix: Images not filling holder (#244 )	2025-11-08 19:31:36 -08:00
eddyizm	748a19ef44	fix: discovery image fills holder at start	2025-11-08 09:34:25 -08:00
eddyizm	e987226954	feat: makes discovery media item clickable on home page #53	2025-11-08 09:09:09 -08:00
Max	59e2f4a7fa	Update strings.xml Adding new translation strings	2025-11-07 15:04:56 +03:00
eddyizm	817b53efaa	fix: Equalizer fix in main build variant (#239 )	2025-11-06 17:22:56 -08:00
Jaime García	12c7ec86a9	fix: Add listener to enable equalizer when audioSessionId changes (main build variant)	2025-11-07 02:06:08 +01:00
eddyizm	611b5001be	chore: bumped version for new tag	2025-11-06 16:08:55 -08:00
eddyizm	923cfd5bc9	fix: equalizer missing referenced value	2025-11-06 16:08:07 -08:00
eddyizm	36d2320e70	chore: bump version and changelog for release	2025-11-06 15:44:46 -08:00
eddyizm	17713ee400	fix: Add listener to enable equalizer when audioSessionId changes (#235 )	2025-11-06 15:40:39 -08:00
eddyizm	ee3465868e	Album track list bug (#237 )	2025-11-06 15:40:14 -08:00
eddyizm	9e8141a8d9	chore: name version	2025-11-06 14:49:19 -08:00
eddyizm	043e1b39b0	Revert "fix: do not override itemType and itemId" This reverts commit `d35146dba3`.	2025-11-06 14:35:29 -08:00
Jaime García	938c1de906	chore: Remove comment	2025-11-06 04:48:24 +01:00
Jaime García	a0dfe63660	fix: Add listener to enable equalizer when audioSessionId changes	2025-11-06 03:18:39 +01:00
skajmer	42b7441467	Merge branch 'eddyizm:development' into development	2025-11-05 22:20:18 +01:00
eddyizm	28c2f87b26	chore: updated change log	2025-11-05 09:15:11 -08:00
eddyizm	9ab22bfede	chore: bump version	2025-11-05 07:51:55 -08:00
eddyizm	20900fb557	chore: pre release prep	2025-11-04 22:11:02 -08:00
eddyizm	7457c5b6e3	fix: skip mapping downloaded item (#228 )	2025-11-04 15:43:04 -08:00
pca006132	e5a928ec0f	fix: skip mapping downloaded item	2025-11-05 00:35:27 +08:00
eddyizm	147c8360a6	Revert "improve battery consumption" (#227 )	2025-11-04 07:02:50 -08:00
eddyizm	d5d504fc64	Revert "improve battery consumption"	2025-11-04 07:02:19 -08:00
eddyizm	24eead2d0a	improve battery consumption (#223 )	2025-11-03 21:20:06 -08:00
pca006132	2644fa52b6	enable offload	2025-11-03 22:33:42 +08:00
pca006132	38c144c073	avoid rebuffering after track change	2025-11-03 22:33:21 +08:00
pca006132	1dca1ef68d	avoid updating player bottom sheet when not visible	2025-11-03 16:16:06 +08:00
pca006132	ba94d7e5cc	fix null	2025-11-03 16:01:15 +08:00
pca006132	0028872e3f	update one media item only	2025-11-03 15:07:29 +08:00
pca006132	be9eec625a	avoid full updates	2025-11-03 14:50:06 +08:00
pca006132	b335ddec01	cache artwork bitmap	2025-11-03 13:33:22 +08:00
skajmer	8ad35ce83a	Merge branch 'eddyizm:development' into development	2025-11-02 18:15:01 +01:00
eddyizm	eb5c4721d1	fix: update MediaItems after network change (#222 )	2025-11-02 08:01:43 -08:00
eddyizm	b0e8fa75ca	chore: update media3 dependencies (#217 )	2025-11-02 08:00:55 -08:00
eddyizm	27d7288ee9	fix: do not override getItemViewType and getItemId (#221 )	2025-11-02 08:00:37 -08:00
eddyizm	287921de09	fix: playlist page should not snap (#218 )	2025-11-02 07:59:51 -08:00
eddyizm	e5cb8793b0	fix: remove NestedScrollViews for fragment_album_page (#216 )	2025-11-02 07:59:34 -08:00
eddyizm	f25e7f250a	Fix downloaded tab performance (#210 )	2025-11-02 07:59:10 -08:00
eddyizm	911acc3c2d	feat: sort artists by album count (#206 )	2025-11-02 07:58:46 -08:00
pca006132	4b7f60bb8c	fix: update MediaItems after network change	2025-11-02 16:44:15 +08:00
pca006132	d35146dba3	fix: do not override itemType and itemId	2025-11-02 14:54:32 +08:00
eddyizm	6c3897a400	Update USAGE.md with instant mix details (#220 )	2025-11-01 16:50:47 -07:00
Thomas Anderson	1002499d92	Update USAGE.md with instant mix details Follow up of https://github.com/eddyizm/tempus/issues/184#issuecomment-3475333928	2025-11-01 22:43:09 +03:00
skajmer	4464b5b34d	Merge branch 'eddyizm:development' into development	2025-11-01 09:52:55 +01:00
pca006132	77c0b86dac	fix: playlist page should not snap	2025-11-01 13:34:47 +08:00
pca006132	0abdfc6b19	fix: remove NestedScrollViews for fragment_album_page	2025-11-01 13:31:05 +08:00
pca006132	52b2ca8fa7	chore: update media3 dependencies	2025-11-01 11:44:40 +08:00
pca006132	7f66124614	fix: download tab performance	2025-10-31 20:16:01 +08:00
eddyizm	9930537486	shuffle for artists without using `getTopSongs` (#207 )	2025-10-30 18:54:19 -07:00
pca006132	5d51132921	feat: add preference to sort artists by album count	2025-10-30 20:01:47 +08:00
pca006132	4b2e963a81	fix: shuffle for artists without using getTopSongs	2025-10-30 20:01:28 +08:00
pca006132	4c865e199d	feat: sort artists by album count	2025-10-30 18:01:07 +08:00
eddyizm	fc58869354	chore(i18n): Update Spanish (es-ES) translation (#205 )	2025-10-29 17:47:03 -07:00
Jaime García	5e1a2b41e9	chore(i18n): Update Spanish (es-ES) translation	2025-10-29 22:06:13 +01:00
eddyizm	77bdd71d79	chore: updated bug issue	2025-10-29 09:29:36 -07:00
skajmer	7267c13ee0	Add #199	2025-10-29 12:38:15 +01:00
eddyizm	4ab1f034d8	chore: bumped version for release, added changelogs	2025-10-28 18:53:45 -07:00
eddyizm	4bd8bbfa4c	chore: removed build badge since its not live yet	2025-10-28 18:39:41 -07:00
eddyizm	3fc03114e2	chore: updated github url	2025-10-28 18:37:45 -07:00
eddyizm	576c93e6cb	Crash on share no expiration date or field returned from api (#199 )	2025-10-27 20:57:36 -07:00
eddyizm	ac674d937a	fix: handle null or no expiry field being sent back from server	2025-10-27 20:47:46 -07:00
eddyizm	0ed329022e	fix: gradle updated to exclude offending blobs, change log link fixed, removed old screenshots.	2025-10-27 19:55:29 -07:00
eddyizm	b8b4a77349	chore: updated tempo references to tempus including github check (#197 )	2025-10-27 09:08:13 -07:00
eddyizm	de14663b25	chore: updated tempo references to tempus including github check	2025-10-27 09:06:57 -07:00
eddyizm	747af0d81c	fix: updated crash report and degoogled icon for izzydroid #195	2025-10-27 07:39:07 -07:00
eddyizm	c95e7cc5e0	fix: disabled workflow, manual build	2025-10-26 12:01:51 -07:00
eddyizm	0c3b43c5dc	fix: build paths	2025-10-26 11:49:08 -07:00
eddyizm	830e9076f1	never surrender	2025-10-26 11:32:23 -07:00
eddyizm	cd9ae97bc7	fix: bumped version, update path from build error logs	2025-10-26 11:17:59 -07:00
eddyizm	1b59a8e8ef	chore: bumped build version	2025-10-26 10:59:22 -07:00
eddyizm	391405fc76	fix: workflow broken, taking another approach	2025-10-26 10:58:18 -07:00
eddyizm	4bdcbacf62	chore: bumped version for new workflow build	2025-10-26 10:15:22 -07:00
eddyizm	6cbae700bf	fix: type in the workflow yaml	2025-10-26 10:02:59 -07:00
eddyizm	e7555119f0	chore: bumped version, updated ignore file	2025-10-26 09:35:12 -07:00
eddyizm	e228e74e6a	Update Polish translation (#188 )	2025-10-26 07:27:11 -07:00
skajmer	062f4db2cf	Merge branch 'eddyizm:development' into development	2025-10-26 09:53:04 +01:00
eddyizm	cb75e34b92	fix: updated work flow for new tempus release	2025-10-25 19:51:12 -07:00
eddyizm	36005c5f51	Tempus rebrand (#183 )	2025-10-25 13:12:49 -07:00
eddyizm	8ae0900269	Merge branch 'development' into tempus-rebrand	2025-10-25 13:12:32 -07:00
eddyizm	f286c7b1b9	fix: readme update for new screenshot size	2025-10-25 13:10:58 -07:00
eddyizm	c5d0af67a7	chore: added a few more screenshots	2025-10-25 13:06:24 -07:00
skajmer	3fb4ccd791	Update strings.xml #158, #161	2025-10-24 23:10:57 +02:00
eddyizm	577b50a85b	chore: bumped to alpha to release debug apks	2025-10-22 21:45:03 -07:00
eddyizm	e6a56ba1d2	chore: update readme and usage references to tempus. added new banner… (#182 )	2025-10-22 08:27:57 -07:00
eddyizm	2740b6da29	feat: added green launcher to degoogled variant	2025-10-22 07:55:13 -07:00
eddyizm	21c4ae77ba	fix: splash logo sized to not crop anymore	2025-10-21 11:25:01 -07:00
eddyizm	7a83a03a90	feat: first pass swapping new icon, build config and rename folder structure	2025-10-21 09:23:25 -07:00
eddyizm	be0480538e	Merge branch 'development' into tempus-readme-update	2025-10-20 12:22:25 -07:00
eddyizm	b48057b4a2	fix: persist album sorting on resume (#181 )	2025-10-20 12:18:41 -07:00
eddyizm	fa430eaac4	Unhide genre from album details view (#161 )	2025-10-20 12:18:11 -07:00
eddyizm	82ee9b4639	chore: reset changelog to 1 since its a new app	2025-10-20 09:27:31 -07:00
eddyizm	9b807fde31	fix: typo in spanish/port language, fixing capitalizion in git url	2025-10-19 18:25:34 -07:00
eddyizm	c7ba4235b3	chore: updated strings with tempus and updated screenshots.	2025-10-19 17:37:55 -07:00
eddyizm	d27e431f73	fix: typo in readme link	2025-10-19 11:18:19 -07:00
eddyizm	d23eea4f27	chore: updated fastlane docs, icon, and reset changelogs to start initial release	2025-10-19 10:08:23 -07:00
eddyizm	430e7105eb	fix: updated html for banner	2025-10-19 08:19:48 -07:00
eddyizm	024c4e6118	chore: update readme and usage references to tempus. added new banner logo	2025-10-18 22:19:03 -07:00
eddyizm	7b2ee9da3a	fix: updated workflow for 32/64 bit apks (#176 )	2025-10-18 17:27:00 -07:00
eddyizm	c3cce18600	fix: persist album sorting on resume	2025-10-18 17:16:11 -07:00
sebaFlame	442fe1ea01	Merge branch 'development' into main	2025-10-18 01:48:47 +02:00
cba	cb0874dca4	Added setting to make album detail visible	2025-10-18 01:00:00 +02:00
cba	079149c1d5	Revert "removed dropdown for album info" This reverts commit `ceaffa254b`.	2025-10-18 00:37:06 +02:00
eddyizm	118f742cb6	Check also underlying transport (#90 )	2025-10-17 06:46:56 -07:00
Thomas Anderson	c028c52576	Merge branch 'main' into patch-1	2025-10-17 12:26:42 +03:00
eddyizm	96c5d0fca8	fix: updated workflow for 32/64 bit apks	2025-10-16 21:54:53 -07:00
eddyizm	e39a5e2d5c	chore: updated changelog	2025-10-16 17:19:49 -07:00
cba	ceaffa254b	removed dropdown for album info	2025-10-09 23:03:25 +02:00
Thomas Anderson	ffcfd81c28	Check also underlaying transport	2025-09-05 15:45:00 +03:00