Merge back from release

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

@@ -0,0 +1,9 @@
+### Features
+- Added custom buttons for shuffling the current queue and setting repeat mode (Android Auto)
+- Properly handling nested directory structures (Android Auto)
+- Add a toast when adding tracks to the playlist
+- Allow pinning when offline
+
+### Dependencies
+- Update koin
+- Update media3 to v1.1.0

ultrasonic/build.gradle

@@ -12,8 +12,8 @@ android {
 
     defaultConfig {
         applicationId "org.moire.ultrasonic"
-        versionCode 126
+        versionCode 128
-        versionName "4.6.3"
+        versionName "4.7.0"
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk

ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/AutoMediaBrowserCallback.kt

@@ -276,7 +276,7 @@ class AutoMediaBrowserCallback : MediaLibraryService.MediaLibrarySession.Callbac
 
     private fun getPlaceholderButton() = CommandButton.Builder()
         .setDisplayName("Placeholder")
-        .setIconResId(R.drawable.empty)
+        .setIconResId(android.R.color.transparent)
         .setSessionCommand(
             SessionCommand(
                 PlaybackService.CUSTOM_COMMAND_PLACEHOLDER,

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt

@@ -460,7 +460,7 @@ class MediaPlayerManager(
         // We can't just use play(0,0) then all random playlists will start with the first track.
         // Additionally the shuffle order becomes clear on after some time, so we need to wait for
         // the right event, and can start playback only then.
-        if (autoPlay) {
+        if (autoPlay && controller?.isPlaying != true) {
             if (isShufflePlayEnabled) {
                 deferredPlay = {
                     val start = controller?.currentTimeline

ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt

@@ -169,7 +169,7 @@ class DownloadHandler(
         )
 
         if (Settings.shouldTransitionOnPlayback &&
-            (insertionMode == MediaPlayerManager.InsertionMode.CLEAR || autoPlay)
+            insertionMode == MediaPlayerManager.InsertionMode.CLEAR
         ) {
             fragment.findNavController().popBackStack(R.id.playerFragment, true)
             fragment.findNavController().navigate(R.id.playerFragment)

ultrasonic/src/main/res/drawable/empty.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="120dp"
-        android:height="120dp"/>
-</shape>