Merge branch 'eddyizm:development' into development

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) 
 

app/build.gradle

@@ -110,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-session:1.8.0'
-    implementation 'androidx.media3:media3-common:1.5.1'
+    implementation 'androidx.media3:media3-common:1.8.0'
-    implementation 'androidx.media3:media3-exoplayer:1.5.1'
+    implementation 'androidx.media3:media3-exoplayer:1.8.0'
-    implementation 'androidx.media3:media3-ui:1.5.1'
+    implementation 'androidx.media3:media3-ui:1.8.0'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.5.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.8.0'
-    tempusImplementation 'androidx.media3:media3-cast:1.5.1'
+    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/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/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/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,22 @@ public class MappingUtil {
                 .build();
     }
 
+    public static MediaItem mapMediaItem(MediaItem 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/res/layout/fragment_album_page.xml

@@ -14,22 +14,21 @@
         app:layout_collapseMode="pin"
         app:navigationIcon="@drawable/ic_arrow_back" />
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/fragment_album_page_nested_scroll_view"
+        android:layout_width="match_parent"
+        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">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
             <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="@dimen/global_padding_bottom"
-                        android:paddingBottom="8dp" />
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
 </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,20 +59,11 @@
             android:text="@string/download_info_empty_subtitle" />
     </LinearLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/fragment_download_nested_scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/download_downloaded_sector"
         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">
 
@@ -111,8 +104,8 @@
             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: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"
@@ -128,6 +121,7 @@
             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>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/downloaded_recycler_view"
@@ -135,14 +129,8 @@
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:nestedScrollingEnabled="false"
+        android:paddingHorizontal="12dp"
         android:paddingTop="12dp"
-                android:paddingBottom="8dp"
+        android:paddingBottom="@dimen/global_padding_bottom" />
-                app:layout_constraintBottom_toBottomOf="parent"
+</LinearLayout>
-                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>
 

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/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>
@@ -527,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() {