chore: bump version

Follow up of https://github.com/eddyizm/tempus/issues/184#issuecomment-3475333928

.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

.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. -->

.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,17 +35,17 @@ 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
+          # Only build release variants (removed debug builds)
           bash ./gradlew assembleTempusRelease
           bash ./gradlew assembleDegoogledRelease
-          # Build debug variants  
-          bash ./gradlew assembleTempusDebug
-          bash ./gradlew assembleDegoogledDebug
 
-      - name: Sign All Tempus Release APKs
+      - 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:
@@ -54,11 +54,30 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS_GITHUB }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD_GITHUB }}
-          apkPath: "**/*.apk"
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
-      - name: Sign All Degoogled Release APKs
+      - 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:
@@ -67,104 +86,44 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS_GITHUB }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD_GITHUB }}
-          apkPath: "**/*.apk"
         env:
           BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
 
-      - name: Rename and Prepare APK Files
+      - name: Prepare Signed Degoogled APKs for Release
         run: |
-          # Copy and rename tempus APKs
-          for file in app/build/outputs/apk/tempus/release/*.apk; do
-            if [[ $file == *"arm64-v8a"* ]]; then
-              cp "$file" "./app-tempus-arm64-v8a-release.apk"
-              echo "Created: app-tempus-arm64-v8a-release.apk"
-            elif [[ $file == *"armeabi-v7a"* ]]; then
-              cp "$file" "./app-tempus-armeabi-v7a-release.apk"
-              echo "Created: app-tempus-armeabi-v7a-release.apk"
-            fi
-          done
+          DEGOOGLED_PATH=app/build/outputs/apk/degoogled/release
           
-          # Copy and rename degoogled APKs
-          for file in app/build/outputs/apk/degoogled/release/*.apk; do
-            if [[ $file == *"arm64-v8a"* ]]; then
-              cp "$file" "./app-degoogled-arm64-v8a-release.apk"
-              echo "Created: app-degoogled-arm64-v8a-release.apk"
-            elif [[ $file == *"armeabi-v7a"* ]]; then
-              cp "$file" "./app-degoogled-armeabi-v7a-release.apk"
-              echo "Created: app-degoogled-armeabi-v7a-release.apk"
-            fi
-          done
+          echo "--- Degoogled Files BEFORE Move ---"
+          ls -la $DEGOOGLED_PATH
+          echo "--------------------------------"
           
-          # List the created files for verification
-          echo "Final APK files:"
-          ls -la *.apk
+          # 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 Tempus 64-bit Release APK
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./app-tempus-arm64-v8a-release.apk
-          asset_name: app-tempus-arm64-v8a-release.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Tempus 32-bit Release APK
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./app-tempus-armeabi-v7a-release.apk
-          asset_name: app-tempus-armeabi-v7a-release.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Degoogled 64-bit Release APK
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./app-degoogled-arm64-v8a-release.apk
-          asset_name: app-degoogled-arm64-v8a-release.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Degoogled 32-bit Release APK
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./app-degoogled-armeabi-v7a-release.apk
-          asset_name: app-degoogled-armeabi-v7a-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/tempus/debug/
-            app/build/outputs/apk/degoogled/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: |
-            ./app-tempus-arm64-v8a-release.apk
-            ./app-tempus-armeabi-v7a-release.apk
-            ./app-degoogled-arm64-v8a-release.apk
-            ./app-degoogled-armeabi-v7a-release.apk
-          retention-days: 30
+          path: ./release-artifacts/*.apk
+          retention-days: 30

CHANGELOG.md

@@ -1,6 +1,48 @@
 # Changelog
 
-***This log is for this fork to detail updates since 3.9.0 from the main repo.***
+
+## Pending release..
+* chore(i18n): Update Spanish (es-ES) translation by @jaime-grj in https://github.com/eddyizm/tempus/pull/205
+* feat: shuffle for artists without using `getTopSongs` by @pca006132 in https://github.com/eddyizm/tempus/pull/207
+* chore: 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
+
+---
+
+## [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
@@ -170,3 +212,5 @@
  [\#400](https://github.com/CappielloAntonio/tempo/pull/400)
 - [Chore] Spanish translation [\#374](https://github.com/CappielloAntonio/tempo/pull/374)
 - [Chore] Polish translation [\#378](https://github.com/CappielloAntonio/tempo/pull/378)
+
+***This log is for this fork to detail updates since 3.9.0 from the main repo.***

README.md

@@ -2,17 +2,27 @@
   <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> -->
+-->
+  
 
 **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. 
 
@@ -33,11 +43,9 @@ Please note the two variants in the release assets include release/debug and 32/
 
 `app-tempus` <- The github release with all the android auto/chromecast features 
 
-`app-degoogled*` <- The f-droid release that goes without any of the google stuff. It was last released at 3.8.1 from the original repo. Since I don't have access to that original repo, I am releasing the apk's here on github.
+`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.
 
-Moved details to [CHANGELOG.md](CHANGELOG.md)
-
-Fork [**sponsorship here**](https://ko-fi.com/eddyizm). 
+[CHANGELOG.md](CHANGELOG.md)
 
 ## Usage
 
@@ -103,6 +111,11 @@ 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
 
 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. 

USAGE.md

@@ -78,6 +78,9 @@ 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) 
 
@@ -163,4 +166,4 @@ For additional help:
 
 ---
 
-*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.*

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 24
         targetSdk 35
 
-        versionCode 1
-        versionName '4.0.1'
+        versionCode 3
+        versionName '4.1.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         javaCompileOptions {
@@ -35,7 +35,12 @@ 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"
 
@@ -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'
-    tempusImplementation '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'

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

@@ -5,18 +5,20 @@ import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.TaskStackBuilder
 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.session.*
 import androidx.media3.session.MediaSession.ControllerInfo
 import com.cappielloantonio.tempo.R
@@ -43,6 +45,7 @@ class MediaService : MediaLibraryService() {
     private lateinit var mediaLibrarySession: MediaLibrarySession
     private lateinit var shuffleCommands: List<CommandButton>
     private lateinit var repeatCommands: List<CommandButton>
+    private lateinit var networkCallback: CustomNetworkCallback
     lateinit var equalizerManager: EqualizerManager
 
     private var customLayout = ImmutableList.of<CommandButton>()
@@ -81,6 +84,38 @@ class MediaService : MediaLibraryService() {
         const val ACTION_BIND_EQUALIZER = "com.cappielloantonio.tempo.service.BIND_EQUALIZER"
     }
 
+    fun updateMediaItems() {
+        Log.d("MediaService", "update items");
+        val n = player.mediaItemCount
+        val k = player.currentMediaItemIndex
+        val current = player.currentPosition
+        val items = (0 .. n-1).map{i -> MappingUtil.mapMediaItem(player.getMediaItemAt(i))}
+        player.clearMediaItems()
+        player.setMediaItems(items, k, current)
+    }
+
+    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(Runnable {
+                    updateMediaItems()
+                })
+            }
+        }
+    }
+
     override fun onCreate() {
         super.onCreate()
 
@@ -90,6 +125,7 @@ class MediaService : MediaLibraryService() {
         restorePlayerFromQueue()
         initializePlayerListener()
         initializeEqualizerManager()
+        initializeNetworkListener()
 
         setPlayer(player)
     }
@@ -99,6 +135,7 @@ class MediaService : MediaLibraryService() {
     }
 
     override fun onDestroy() {
+        releaseNetworkCallback()
         equalizerManager.release()
         stopWidgetUpdates()
         releasePlayer()
@@ -275,6 +312,12 @@ class MediaService : MediaLibraryService() {
         }
     }
 
+    private fun initializeNetworkListener() {
+        networkCallback = CustomNetworkCallback()
+        getSystemService(ConnectivityManager::class.java).registerDefaultNetworkCallback(networkCallback)
+        updateMediaItems()
+    }
+
     private fun restorePlayerFromQueue() {
         if (player.mediaItemCount > 0) return
 
@@ -398,6 +441,10 @@ class MediaService : MediaLibraryService() {
         mediaLibrarySession.release()
     }
 
+    private fun releaseNetworkCallback() {
+        getSystemService(ConnectivityManager::class.java).unregisterNetworkCallback(networkCallback)
+    }
+
     @SuppressLint("PrivateResource")
     private fun getShuffleCommandButton(sessionCommand: SessionCommand): CommandButton {
         val isOn = sessionCommand.customAction == CUSTOM_COMMAND_TOGGLE_SHUFFLE_MODE_ON

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() {

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());
                     }
                 });
 

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() {

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.showTempoUpdateDialog()) {
             mainViewModel.checkTempoUpdate().observe(this, latestRelease -> {
                 if (latestRelease != null && UpdateUtil.showUpdateDialog(latestRelease)) {
                     GithubTempoUpdateDialog dialog = new GithubTempoUpdateDialog(latestRelease);

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

@@ -105,16 +105,6 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         filtering.filter(currentFilter);
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     @Override
     public Filter getFilter() {
         return filtering;

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

@@ -66,16 +66,6 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         ItemLibraryArtistBinding item;
 

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

@@ -97,16 +97,6 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     @Override
     public Filter getFilter() {
         return filtering;
@@ -151,6 +141,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();

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

@@ -113,16 +113,6 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
         return artists.get(id);
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         ItemHorizontalArtistBinding item;
 

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

@@ -60,16 +60,6 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         ItemLibrarySimilarArtistBinding item;
 

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

@@ -96,16 +96,6 @@ public class DownloadHorizontalAdapter extends RecyclerView.Adapter<DownloadHori
         return shuffling;
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     private List<Child> groupSong(List<Child> songs) {
         switch (view) {
             case Constants.DOWNLOAD_TYPE_TRACK:

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

@@ -95,16 +95,6 @@ public class PodcastChannelCatalogueAdapter extends RecyclerView.Adapter<Podcast
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     @Override
     public Filter getFilter() {
         return filtering;

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

@@ -71,16 +71,6 @@ public class PodcastEpisodeAdapter extends RecyclerView.Adapter<PodcastEpisodeAd
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         ItemHomePodcastEpisodeBinding item;
 

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

@@ -252,16 +252,6 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
     public void setPlaybackState(String mediaId, boolean playing) {
         String oldId = this.currentPlayingId;
         boolean oldPlaying = this.isPlaying;

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;

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();
             }

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);
 

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()) {

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"
 

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<>();
 

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();
 

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

@@ -79,6 +79,7 @@ object Preferences {
     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? {
@@ -656,4 +657,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
+    }
 }

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);
     }
+
 }

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>

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>
 

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"

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>

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

@@ -413,7 +413,9 @@
     <string name="share_bottom_sheet_delete">Eliminar compartición</string>
     <string name="share_bottom_sheet_update">Actualizar compartición</string>
     <string name="share_subtitle_item">Fecha de caducidad: %1$s</string>
+    <string name="share_no_expiration">Nunca</string>
     <string name="share_unsupported_error">El uso compartido no está soportado o no está habilitado</string>
+    <string name="asset_link_debug_toast">Enlace de recurso: %1$s</string>
     <string name="share_update_dialog_hint_description">Descripción</string>
     <string name="share_update_dialog_hint_expiration_date">Fecha de caducidad</string>
     <string name="song_bottom_sheet_add_to_queue">Añadir a la cola</string>
@@ -486,4 +488,21 @@
     <string name="settings_sync_starred_artists_for_offline_use_summary">Si está habilitada, los artistas destacados se descargarán para uso sin conexión.</string>
     <string name="widget_time_elapsed_placeholder">0:00</string>
     <string name="exo_controls_heart_off_description">Eliminar de favoritos</string>
+    <string name="asset_link_chip_text">%1$s • %2$s</string>
+    <string name="asset_link_copied_toast">Copiado %1$s al portapapeles</string>
+    <string name="settings_album_detail">Mostrar los detalles del álbum</string>
+    <string name="settings_album_detail_summary">Si está habilitada, muestra los detalles del álbum, como el género, el número de pistas, etc. en la página de álbum</string>
+    <string name="asset_link_clipboard_label">Enlace de recurso de Tempus</string>
+    <string name="asset_link_label_song">UID de la pista</string>
+    <string name="asset_link_label_album">UID del álbum</string>
+    <string name="asset_link_label_artist">UID del artista</string>
+    <string name="asset_link_label_playlist">UID de la lista de reproducción</string>
+    <string name="asset_link_label_genre">UID del género</string>
+    <string name="asset_link_label_year">UID del año</string>
+    <string name="asset_link_label_unknown">UID del recurso</string>
+    <string name="asset_link_error_unsupported">Enlace de recurso no válido</string>
+    <string name="asset_link_error_song">No se ha podido abrir la pista</string>
+    <string name="asset_link_error_album">No se ha podido abrir el álbum</string>
+    <string name="asset_link_error_artist">No se ha podido abrir el artista</string>
+    <string name="asset_link_error_playlist">No se ha podido abrir la lista de reproducción</string>
 </resources>

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

@@ -200,6 +200,7 @@
     <string name="menu_sort_artist">Artist</string>
     <string name="menu_sort_name">Name</string>
     <string name="menu_sort_random">Random</string>
+    <string name="menu_sort_album_count">Album Count</string>
     <string name="menu_sort_recently_added">Recently added</string>
     <string name="menu_sort_recently_played">Recently played</string>
     <string name="menu_sort_most_played">Most played</string>
@@ -409,6 +410,7 @@
     <string name="share_bottom_sheet_delete">Delete share</string>
     <string name="share_bottom_sheet_update">Update share</string>
     <string name="share_subtitle_item">Expiration date: %1$s</string>
+    <string name="share_no_expiration">Never</string>
     <string name="share_unsupported_error">Sharing is not supported or not enabled</string>
     <string name="asset_link_clipboard_label">Tempus asset link</string>
     <string name="asset_link_label_song">Song UID</string>
@@ -526,4 +528,6 @@
 
     <string name="settings_album_detail">Show album detail</string>
     <string name="settings_album_detail_summary">If enabled, show the album details like genre, song count etc. on the album page</string>
+    <string name="settings_artist_sort_by_album_count">Sort artists by album count</string>
+    <string name="settings_artist_sort_by_album_count_summary">If enabled, sort the artists by album count. Sort by name if disabled.</string>
 </resources>

app/src/main/res/xml/global_preferences.xml

@@ -116,6 +116,12 @@
             android:summary="@string/settings_album_detail_summary"
             android:key="album_detail" />
 
+        <SwitchPreference
+            android:title="@string/settings_artist_sort_by_album_count"
+            android:defaultValue="false"
+            android:summary="@string/settings_artist_sort_by_album_count_summary"
+            android:key="artist_sort_by_album_count" />
+
     </PreferenceCategory>
 
      <PreferenceCategory app:title="@string/settings_title_playlist">

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

@@ -4,10 +4,14 @@ import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.TaskStackBuilder
 import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
 import android.os.Binder
 import android.os.IBinder
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import androidx.core.content.ContextCompat
 import androidx.media3.cast.CastPlayer
 import androidx.media3.cast.SessionAvailabilityListener
@@ -43,6 +47,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
     private lateinit var castPlayer: CastPlayer
     private lateinit var mediaLibrarySession: MediaLibrarySession
     private lateinit var librarySessionCallback: MediaLibrarySessionCallback
+    private lateinit var networkCallback: CustomNetworkCallback
     lateinit var equalizerManager: EqualizerManager
 
     inner class LocalBinder : Binder() {
@@ -69,6 +74,38 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
         }
     }
 
+    fun updateMediaItems() {
+        Log.d("MediaService", "update items");
+        val n = player.mediaItemCount
+        val k = player.currentMediaItemIndex
+        val current = player.currentPosition
+        val items = (0 .. n-1).map{i -> MappingUtil.mapMediaItem(player.getMediaItemAt(i))}
+        player.clearMediaItems()
+        player.setMediaItems(items, k, current)
+    }
+
+    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(Runnable {
+                    updateMediaItems()
+                })
+            }
+        }
+    }
+
     override fun onCreate() {
         super.onCreate()
 
@@ -79,6 +116,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
         initializePlayerListener()
         initializeCastPlayer()
         initializeEqualizerManager()
+        initializeNetworkListener()
 
         setPlayer(
             null,
@@ -99,6 +137,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
     }
 
     override fun onDestroy() {
+        releaseNetworkCallback()
         equalizerManager.release()
         stopWidgetUpdates()
         releasePlayer()
@@ -178,6 +217,12 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
                 .build()
     }
 
+    private fun initializeNetworkListener() {
+        networkCallback = CustomNetworkCallback()
+        getSystemService(ConnectivityManager::class.java).registerDefaultNetworkCallback(networkCallback)
+        updateMediaItems()
+    }
+
     private fun restorePlayerFromQueue() {
         if (player.mediaItemCount > 0) return
 
@@ -374,6 +419,10 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
         automotiveRepository.deleteMetadata()
     }
 
+    private fun releaseNetworkCallback() {
+        getSystemService(ConnectivityManager::class.java).unregisterNetworkCallback(networkCallback)
+    }
+
     private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
 
     override fun onCastSessionAvailable() {

fastlane/metadata/android/en-US/changelogs/2.txt

@@ -0,0 +1,2 @@
+chore: updated tempo references to tempus  
+fix: Crash on share no expiration date or field returned from api

fastlane/metadata/android/en-US/changelogs/3.txt

@@ -0,0 +1,10 @@
+Update Spanish (es-ES) translation
+Shuffle for artists without using `getTopSongs` 
+Update USAGE.md with instant mix detils 
+Sort artists by album count 
+Fix downloaded tab performance 
+Remove NestedScrollViews for fragment_album_page 
+Playlist page should not snap 
+Do not override getItemViewType and getItemId
+Update media3 dependencies
+Update MediaItems after network change

fastlane/metadata/android/en-US/full_description.txt

@@ -9,7 +9,7 @@ Features
 - 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 Tempus with Last.fm to scrobble your played tracks, gather music insights, and further personalize your music recommendations, if supported by your Subsonic server.
+- 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.
 - Multiple Libraries: Tempus handles multi-library setups gracefully. They are displayed as Library folders.

mockup/svg/horizontal_logo.svg

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Livello_2" data-name="Livello 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 958.83 227.02">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #f24b6a;
-      }
-    </style>
-  </defs>
-  <g id="Livello_1-2" data-name="Livello 1">
-    <g>
-      <g>
-        <path d="m127.84,23.28v27.94h-47.22v129.87h-33.19V51.22H0v-27.94h127.84Z"/>
-        <path d="m207.46,146.83c-.79,6.92-4.39,13.96-10.81,21.09-9.99,11.35-23.98,17.02-41.97,17.02-14.85,0-27.94-4.78-39.29-14.35-11.35-9.56-17.02-25.12-17.02-46.68,0-20.2,5.12-35.69,15.36-46.47,10.24-10.78,23.54-16.17,39.88-16.17,9.71,0,18.45,1.82,26.23,5.46,7.78,3.64,14.2,9.39,19.27,17.24,4.57,6.92,7.53,14.95,8.89,24.09.78,5.35,1.11,13.06.96,23.13h-79.87c.43,11.71,4.1,19.91,11.03,24.62,4.21,2.93,9.28,4.39,15.2,4.39,6.28,0,11.38-1.78,15.31-5.35,2.14-1.93,4.03-4.6,5.67-8.03h31.16Zm-30.19-35.76c-.5-8.06-2.94-14.19-7.33-18.36-4.39-4.18-9.83-6.26-16.33-6.26-7.07,0-12.55,2.21-16.43,6.64-3.89,4.43-6.34,10.42-7.33,17.99h47.43Z"/>
-        <path d="m289.12,96.51c-2.57-5.64-7.6-8.46-15.1-8.46-8.71,0-14.56,2.82-17.56,8.46-1.64,3.21-2.46,8-2.46,14.35v70.23h-30.94v-116.49h29.66v17.02c3.78-6.07,7.35-10.39,10.71-12.96,5.92-4.57,13.6-6.85,23.02-6.85,8.92,0,16.13,1.96,21.63,5.89,4.42,3.64,7.78,8.32,10.06,14.03,4-6.85,8.96-11.88,14.88-15.1,6.28-3.21,13.28-4.82,20.98-4.82,5.14,0,10.21,1,15.2,3,5,2,9.53,5.5,13.6,10.49,3.28,4.07,5.5,9.07,6.64,14.99.71,3.93,1.07,9.67,1.07,17.24l-.21,73.55h-31.26v-74.3c0-4.42-.71-8.06-2.14-10.92-2.71-5.42-7.71-8.14-14.99-8.14-8.42,0-14.24,3.5-17.45,10.49-1.64,3.71-2.46,8.17-2.46,13.38v69.49h-30.73v-69.49c0-6.92-.71-11.95-2.14-15.1Z"/>
-        <path d="m504.99,76.92c9.42,10.06,14.13,24.84,14.13,44.33,0,20.56-4.62,36.22-13.86,47-9.24,10.78-21.15,16.17-35.71,16.17-9.28,0-16.99-2.32-23.13-6.96-3.36-2.57-6.64-6.32-9.85-11.24v60.81h-30.19V64.39h29.23v17.24c3.28-5.07,6.78-9.06,10.49-11.99,6.78-5.21,14.85-7.82,24.2-7.82,13.63,0,25.2,5.03,34.69,15.1Zm-17.34,45.82c0-8.99-2.05-16.95-6.16-23.88-4.11-6.92-10.76-10.39-19.97-10.39-11.06,0-18.67,5.25-22.8,15.74-2.14,5.57-3.21,12.63-3.21,21.2,0,13.56,3.6,23.09,10.81,28.59,4.28,3.21,9.35,4.82,15.2,4.82,8.49,0,14.97-3.28,19.43-9.85,4.46-6.57,6.69-15.31,6.69-26.23Z"/>
-        <path d="m634.28,79.17c9.85,12.35,14.78,26.95,14.78,43.79s-4.93,31.78-14.78,43.95c-9.85,12.17-24.8,18.25-44.86,18.25s-35.01-6.08-44.86-18.25c-9.85-12.17-14.77-26.82-14.77-43.95s4.92-31.44,14.77-43.79c9.85-12.35,24.8-18.52,44.86-18.52s35.01,6.17,44.86,18.52Zm-44.97,7.28c-8.92,0-15.79,3.16-20.61,9.48-4.82,6.32-7.23,15.33-7.23,27.03s2.41,20.74,7.23,27.09c4.82,6.35,11.69,9.53,20.61,9.53s15.77-3.18,20.56-9.53c4.78-6.35,7.17-15.38,7.17-27.09s-2.39-20.72-7.17-27.03c-4.78-6.32-11.63-9.48-20.56-9.48Z"/>
-      </g>
-      <g>
-        <rect class="cls-1" x="827.72" width="11.92" height="227.02"/>
-        <rect class="cls-1" x="803.88" y="17.88" width="11.92" height="167.43"/>
-        <rect class="cls-1" x="780.05" y="35.76" width="11.92" height="53.64"/>
-        <rect class="cls-1" x="708.53" y="35.76" width="11.92" height="53.64"/>
-        <rect class="cls-1" x="946.92" y="35.76" width="11.92" height="53.64"/>
-        <rect class="cls-1" x="756.21" y="17.88" width="11.92" height="89.39"/>
-        <rect class="cls-1" x="899.24" y="17.88" width="11.92" height="89.39"/>
-        <rect class="cls-1" x="732.37" width="11.92" height="125.15"/>
-        <rect class="cls-1" x="923.08" width="11.92" height="125.15"/>
-        <rect class="cls-1" x="875.4" y="35.76" width="11.92" height="53.64"/>
-        <rect class="cls-1" x="851.56" y="17.88" width="11.92" height="167.43"/>
-      </g>
-    </g>
-  </g>
-</svg>