Merge branch 'RetroMusicPlayer:dev' into feat/audio_focus_2

app/src/main/res/layout-land/activity_album_tag_editor.xml

@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:transitionGroup="true">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout-land/activity_drive_mode.xml

@@ -24,11 +24,9 @@
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="?attr/colorSurface"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="UnusedAttribute" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"

app/src/main/res/layout-land/fragment_album_details.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:transitionName="@string/transition_album_art"

app/src/main/res/layout-land/fragment_artist_details.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">

app/src/main/res/layout-land/fragment_blur.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -12,7 +11,6 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
         android:scaleType="centerCrop"
         app:srcCompat="@color/black_color" />
 

app/src/main/res/layout-land/fragment_card_blur_player.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -12,7 +11,6 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
         android:scaleType="centerCrop"
         app:srcCompat="@color/black_color" />
 

app/src/main/res/layout-sw600dp/fragment_playing_queue.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 

app/src/main/res/layout-xlarge-land/fragment_blur.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -12,7 +11,6 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
         android:scaleType="centerCrop"
         app:srcCompat="@color/black_color" />
 

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

@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
@@ -69,7 +69,6 @@
                     android:id="@+id/albumText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@null"
                     android:hint="@string/album"
                     android:inputType="text|textCapWords"
                     android:maxLines="1" />
@@ -89,7 +88,6 @@
                     android:id="@+id/albumArtistText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@null"
                     android:hint="@string/album_artist"
                     android:inputType="text|textCapWords"
                     android:maxLines="1" />
@@ -109,7 +107,6 @@
                     android:id="@+id/genreTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@null"
                     android:hint="@string/genre"
                     android:inputType="text|textCapWords"
                     android:maxLines="1" />
@@ -129,7 +126,6 @@
                     android:id="@+id/yearTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@null"
                     android:hint="@string/year"
                     android:inputType="text|number"
                     android:maxLines="1" />

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -20,8 +19,7 @@
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/support_development"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
-            tools:ignore="UnusedAttribute" />
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -11,7 +11,6 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -19,7 +18,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-
     <code.name.monkey.retromusic.views.StatusBarView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
@@ -27,8 +25,7 @@
         android:background="?attr/colorSurface"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="UnusedAttribute" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
@@ -180,13 +177,11 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="8"
         android:maxHeight="3dp"
         android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
@@ -196,7 +191,6 @@
         app:layout_constraintBottom_toTopOf="@id/songCurrentProgress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
         tools:progress="20" />
 
     <com.google.android.material.textview.MaterialTextView

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

@@ -1,48 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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:orientation="vertical">
+    android:fitsSystemWindows="true">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:layout_collapseMode="pin"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
+            app:title="@string/licenses"
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
-        android:fitsSystemWindows="true">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appBarLayout"
+        <code.name.monkey.retromusic.views.LollipopFixedWebView
+            android:id="@+id/license"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            app:liftOnScroll="true">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
-                style="@style/Toolbar"
-                app:layout_collapseMode="pin"
-                app:navigationIcon="@drawable/ic_keyboard_backspace_black"
-                app:title="@string/licenses"
-                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
-                tools:ignore="UnusedAttribute" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-            <code.name.monkey.retromusic.views.LollipopFixedWebView
-                android:id="@+id/license"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:fitsSystemWindows="true"
-                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-        </androidx.core.widget.NestedScrollView>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</LinearLayout>
+            android:scrollbars="none"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:orientation="vertical">
 
     <FrameLayout

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true">
 
     <code.name.monkey.retromusic.views.BaselineGridTextView

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <code.name.monkey.retromusic.views.insets.InsetsConstraintLayout 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:background="@color/md_black_1000"
@@ -24,8 +23,7 @@
         android:background="?attr/colorSurface"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="UnusedAttribute" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
@@ -46,8 +44,7 @@
             app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/retro_music_pro"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
-            app:titleTextColor="@color/md_white_1000"
-            tools:ignore="UnusedAttribute" />
+            app:titleTextColor="@color/md_white_1000" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -34,7 +34,7 @@
         android:text="@string/action_settings" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/check_databases"
+        android:id="@+id/check_playlists"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="48dp"

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

@@ -4,13 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true">
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/contentFrame"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
         app:defaultNavHost="true"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         app:navGraph="@navigation/settings_graph" />
@@ -27,11 +28,11 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+            app:collapsedTitleTextAppearance="@style/TextViewHeadline6"
             app:expandedTitleMarginBottom="24dp"
             app:expandedTitleMarginEnd="24dp"
             app:expandedTitleMarginStart="24dp"
             app:expandedTitleTextAppearance="@style/TextViewHeadline4"
-            app:collapsedTitleTextAppearance="@style/TextViewHeadline6"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlwaysCollapsed">
 
             <com.google.android.material.appbar.MaterialToolbar

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

@@ -18,7 +18,6 @@
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/castMiniController"
-    class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />

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

@@ -6,7 +6,6 @@
     android:orientation="vertical"
     android:padding="16dp">
 
-
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/actionNewPlaylistContainer"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"

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

@@ -59,7 +59,7 @@
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
                     android:transitionName="@string/transition_artist_image"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic" />
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
 
             </com.google.android.material.card.MaterialCardView>
 
@@ -77,7 +77,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/artistCoverContainer"
-                tools:ignore="MissingPrefix"
                 tools:text="@tools:sample/full_names" />
 
             <code.name.monkey.retromusic.views.BaselineGridTextView
@@ -91,7 +90,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/artistTitle"
-                tools:ignore="MissingPrefix"
                 tools:text="@tools:sample/full_names" />
 
             <include

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -12,7 +11,6 @@
         android:id="@+id/colorBackground"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?attr/colorSurface"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -82,7 +82,7 @@
         android:theme="@style/TopCornerCardView"
         app:behavior_hideable="false"
         app:cardElevation="24dp"
-        app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         tools:peekHeight="0dp">
 
         <LinearLayout

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

@@ -80,7 +80,7 @@
         android:layout_height="match_parent"
         app:behavior_hideable="false"
         app:gestureInsetBottomIgnored="true"
-        app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <LinearLayout
             android:id="@+id/container"

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

@@ -5,7 +5,6 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
     android:paddingBottom="@dimen/mini_player_height">
 
@@ -43,7 +42,6 @@
                 android:id="@+id/tabLyrics"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/colorSurface"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"

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

@@ -6,14 +6,6 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:theme="@style/CenteredCheckBoxTheme" />
-
     <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
@@ -25,6 +17,14 @@
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_list" />
 
+    <code.name.monkey.retromusic.views.TopAppBarLayout
+        android:id="@+id/appBarLayout"
+        style="?appBarLayoutStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:theme="@style/CenteredCheckBoxTheme" />
+
     <LinearLayout
         android:id="@android:id/empty"
         android:layout_width="wrap_content"

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true">
 
     <code.name.monkey.retromusic.views.TopAppBarLayout

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionName="search"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 

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

@@ -3,26 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
-    android:fitsSystemWindows="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
-            app:title="@string/whats_new"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-    </com.google.android.material.appbar.AppBarLayout>
+    android:fitsSystemWindows="true"
+    android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
@@ -43,8 +25,6 @@
         android:id="@+id/tgFab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:text="@string/view_on_telegram"

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

@@ -15,7 +15,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
     android:focusableInTouchMode="true"

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

@@ -8,13 +8,13 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
-        tools:layout="@layout/fragment_home"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?colorSurface"
         app:defaultNavHost="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+        android:background="?attr/colorSurface"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        tools:layout="@layout/fragment_home" />
 
     <FrameLayout
         android:id="@+id/slidingPanel"
@@ -23,9 +23,9 @@
         android:layout_height="wrap_content"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp"
-        app:gestureInsetBottomIgnored="true"
         app:enableEdgeToEdge="true"
-        app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
+        app:gestureInsetBottomIgnored="true"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <FrameLayout
             android:id="@+id/playerFragmentContainer"
@@ -39,11 +39,11 @@
             android:layout_height="@dimen/mini_player_height"
             tools:layout="@layout/fragment_mini_player" />
 
-        <ViewStub
-            android:id="@+id/cast_stub"
+        <fragment
+            android:id="@+id/castMiniController"
+            class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout="@layout/cast_controller_layout" />
+            android:layout_height="wrap_content" />
 
     </FrameLayout>
 

app/src/main/res/navigation/library_graph.xml

@@ -38,7 +38,7 @@
         android:id="@+id/action_home"
         android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
         android:label=""
-        tools:layout="@layout/fragment_banner_home" />
+        tools:layout="@layout/fragment_home" />
 
 
 </navigation>

app/src/main/res/navigation/main_graph.xml

@@ -120,7 +120,7 @@
         android:id="@+id/action_home"
         android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
         android:label=""
-        tools:layout="@layout/fragment_banner_home" />
+        tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/user_info_fragment"

app/src/main/res/values-ar-rSA/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">إضافة</string>
     <string name="add_playlist_title">"إضافة الى قائمة التشغيل"</string>
     <string name="add_time_framed_lryics">أضف وقت كلمات الأغاني</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"إضافة ١ من العناوين الى قائمة التشغيل الحالية"</string>
     <string name="added_x_titles_to_playing_queue">إضافة %1$d من العناوين الى قائمة التشغيل الحالية</string>
     <string name="album">البوم</string>

app/src/main/res/values-b+es+419/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Agregar</string>
     <string name="add_playlist_title">"Agregar a playlist"</string>
     <string name="add_time_framed_lryics">Agregar letras de marcos de tiempo</string>
-    <string name="added_song_count_to_playlist">%d Cancion(es) añadidas a %s</string>
+    <string name="added_song_count_to_playlist">%1$d Canción(es) añadidas a %2$s</string>
     <string name="added_title_to_playing_queue">"Se agregó 1 canción a la cola de reproducción."</string>
     <string name="added_x_titles_to_playing_queue">Se agregó %1$d canción a la cola de reproducción.</string>
     <string name="album">Álbum</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Přidat</string>
     <string name="add_playlist_title">"Přidat do seznamu skladeb"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Přidán 1 titul do fronty přehrávání."</string>
     <string name="added_x_titles_to_playing_queue">Přidány %1$d tituly do fronty přehrávání.</string>
     <string name="album">Album</string>

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

@@ -54,7 +54,7 @@
     <string name="add_action">Hinzufügen</string>
     <string name="add_playlist_title">"Zur Playlist hinzufügen"</string>
     <string name="add_time_framed_lryics">Synchronisierten Songtext hinzufügen</string>
-    <string name="added_song_count_to_playlist">%d Titel(e) zu %s hinzugefügt</string>
+    <string name="added_song_count_to_playlist">%1$d Titel(e) zu %2$s hinzugefügt</string>
     <string name="added_title_to_playing_queue">"1 Titel wurde zur Wiedergabeliste hinzugefügt."</string>
     <string name="added_x_titles_to_playing_queue">%1$d Titel wurden zur Wiedergabeliste hinzugefügt.</string>
     <string name="album">Album</string>

app/src/main/res/values-el-rGR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Προσθήκη</string>
     <string name="add_playlist_title">"Προσθήκη στη λίστα αναπαραγωγής"</string>
     <string name="add_time_framed_lryics">Προσθήκη Στίχων Με Χρονικό Πλαίσιο</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Προστέθηκε 1 κομμάτι στην ουρά αναπαραγωγής."</string>
     <string name="added_x_titles_to_playing_queue">Προστέθηκαν %1$d κομμάτια στην ουρά αναπαραγωγής.</string>
     <string name="album">Άλμπουμ</string>

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

@@ -54,7 +54,7 @@
     <string name="add_action">Agregar</string>
     <string name="add_playlist_title">"Agregar a lista de reproducción"</string>
     <string name="add_time_framed_lryics">Añadir letras sincronizadas</string>
-    <string name="added_song_count_to_playlist">%d Canción(es) añadidas a %s</string>
+    <string name="added_song_count_to_playlist">%1$d Canción(es) añadidas a %2$s</string>
     <string name="added_title_to_playing_queue">"Se ha agregado 1 canción a la cola de reproducción."</string>
     <string name="added_x_titles_to_playing_queue">%1$d canciones agregadas a la cola de reproducción.</string>
     <string name="album">Álbum</string>

app/src/main/res/values-fa-rIR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">ﺍﻓﺰﻭﺩﻥ</string>
     <string name="add_playlist_title">"افزودن به لیست پخش"</string>
     <string name="add_time_framed_lryics">اضافه کردن متون دارای زمان</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"یک‌ مورد به لیست پخش اهنگ ها اضافه شد."</string>
     <string name="added_x_titles_to_playing_queue">مورد خاص به لیست پخش اهنگ اضافه شد.</string>
     <string name="album">آلبوم</string>

app/src/main/res/values-fil-rPH/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Magdagdag</string>
     <string name="add_playlist_title">"Idagdag sa playlist"</string>
     <string name="add_time_framed_lryics">Mag-dagdag ng Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Nadagdag ang 1 title sa playing queue."</string>
     <string name="added_x_titles_to_playing_queue">Nadagdag ang %1$d titles sa playing queue.</string>
     <string name="album">Album</string>

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

@@ -54,7 +54,7 @@
     <string name="add_action">Ajouter</string>
     <string name="add_playlist_title">"Ajouter à la liste de lecture"</string>
     <string name="add_time_framed_lryics">Ajouter des paroles synchronisées</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$d</string>
     <string name="added_title_to_playing_queue">"1 titre a été ajouté à la file d'attente."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titres ont été ajoutés à la file d\'attente.</string>
     <string name="album">Album</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">जोड़ें</string>
     <string name="add_playlist_title">"प्लेलिस्ट में जोड़ें"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"कतार मे 1 शीर्षक जोड़ा गया है।"</string>
     <string name="added_x_titles_to_playing_queue">कतार मे %1$d शीर्षक जोड़ा गया है।</string>
     <string name="album">एल्बम</string>

app/src/main/res/values-hr-rHR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Dodaj</string>
     <string name="add_playlist_title">"Dodaj na popis"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
     <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
     <string name="album">Album</string>

app/src/main/res/values-hu-rHU/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Hozzáad</string>
     <string name="add_playlist_title">"Hozzáadás lejátszási listához"</string>
     <string name="add_time_framed_lryics">Időzített dalszöveg hozzáadása</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"1 cím lett hozzáadva a lejátszási sorhoz."</string>
     <string name="added_x_titles_to_playing_queue">%1$d cím hozzáadva a lejátszási sorhoz.</string>
     <string name="album">Album</string>

app/src/main/res/values-in-rID/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Tambah</string>
     <string name="add_playlist_title">"Tambah ke daftar putar"</string>
     <string name="add_time_framed_lryics">Tambah kerangka waktu pada lirik</string>
-    <string name="added_song_count_to_playlist">Menambah %d lagu ke %s</string>
+    <string name="added_song_count_to_playlist">Menambah %1$d lagu ke %2$s</string>
     <string name="added_title_to_playing_queue">"1 lagu ditambah ke antrean."</string>
     <string name="added_x_titles_to_playing_queue">%1$d lagu telah ditambah ke antrean.</string>
     <string name="album">Album</string>

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

@@ -54,7 +54,7 @@
     <string name="add_action">Aggiungi</string>
     <string name="add_playlist_title">"Aggiungi alla playlist"</string>
     <string name="add_time_framed_lryics">Aggiungi testi sincronizzati</string>
-    <string name="added_song_count_to_playlist">Aggiunta/e %d canzone/i a %s</string>
+    <string name="added_song_count_to_playlist">Aggiunta/e %1$d canzone/i a %2$s</string>
     <string name="added_title_to_playing_queue">"Aggiunto un brano alla coda."</string>
     <string name="added_x_titles_to_playing_queue">Aggiunti %1$d brani alla coda.</string>
     <string name="album">Album</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">追加</string>
     <string name="add_playlist_title">"プレイリストに追加"</string>
     <string name="add_time_framed_lryics">時間指定の歌詞を追加</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"1曲が再生キューに追加されました"</string>
     <string name="added_x_titles_to_playing_queue">%1$d 曲が再生キューに追加されました</string>
     <string name="album">アルバム</string>

app/src/main/res/values-kmr-rTR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Tevlî bike</string>
     <string name="add_playlist_title">"Tevlî rêzoka lêdanê bike"</string>
     <string name="add_time_framed_lryics">Dema peyvên stranê têxe</string>
-    <string name="added_song_count_to_playlist">%d stran tevlî %s bû</string>
+    <string name="added_song_count_to_playlist">%1$d stran tevlî %2$s bû</string>
     <string name="added_title_to_playing_queue">"1 sernav li rêzeya lêdanê hate tevlîkirin."</string>
     <string name="added_x_titles_to_playing_queue">%1$d sernav li rêzeya lêdanê hate tevlîkirin.</string>
     <string name="album">Album</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">추가</string>
     <string name="add_playlist_title">"재생목록에 추가"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"재생 대기열에 1곡이 추가되었습니다."</string>
     <string name="added_x_titles_to_playing_queue">재생 대기열에 %1$d곡이 추가되었습니다.</string>
     <string name="album">앨범</string>

app/src/main/res/values-ml-rIN/strings.xml

@@ -54,9 +54,9 @@
     <string name="add_action">Add</string>
     <string name="add_playlist_title">"പ്ലേലിസ്റ്റിലേക്ക് ആഡ് ചെയ്യുക"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
+    <string name="added_x_titles_to_playing_queue">Added %d titles to the playing queue.</string>
     <string name="album">Album</string>
     <plurals name="albumSongs">
         <item quantity="one">Song</item>

app/src/main/res/values-my-rMM/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">ထည့်မည်</string>
     <string name="add_playlist_title">"အောက်ပါ Playlist သို့ထည့်မည်"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"နားထောင်နေသည့်စာရင်းထဲသို့ ၁ ပုဒ်ပေါင်းထည့်ခဲ့သည်"</string>
     <string name="added_x_titles_to_playing_queue">နားထောင်နေသည့်စာရင်းထဲသို့ %1$d ပုဒ်ပေါင်းထည့်ခဲ့သည်</string>
     <string name="album">Album</string>

app/src/main/res/values-night-v31/styles.xml

@@ -1,4 +1,8 @@
 <resources>
+    <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3">
+        <item name="colorSurface">@color/blackColorSurface</item>
+    </style>
+
     <style name="Theme.AppWidget" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="colorSurface">@android:color/system_accent2_800</item>
     </style>

app/src/main/res/values-nl-rNL/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Toevoegen</string>
     <string name="add_playlist_title">"Toevogen aan afspeellijst"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"1 titel aan afspeel wachtrij toegevoegd."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan afspeel wachtrij</string>
     <string name="album">Album</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Dodaj</string>
     <string name="add_playlist_title">"Dodaj do playlisty"</string>
     <string name="add_time_framed_lryics">Dodaj tekst z ramką czasową</string>
-    <string name="added_song_count_to_playlist">Dodano %d utwór(y/ów) do %s</string>
+    <string name="added_song_count_to_playlist">Dodano %1$d utwór(y/ów) do %2$s</string>
     <string name="added_title_to_playing_queue">"Dodano tytuł do kolejki odtwarzania"</string>
     <string name="added_x_titles_to_playing_queue">Dodano %1$d tytułów do kolejki</string>
     <string name="album">Album</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Adicionar</string>
     <string name="add_playlist_title">"Adicionar à playlist"</string>
     <string name="add_time_framed_lryics">Adicionar Letras Sincronizadas</string>
-    <string name="added_song_count_to_playlist">%d música(s) adicionada(s) para %s</string>
+    <string name="added_song_count_to_playlist">%1$d música(s) adicionada(s) para %2$s</string>
     <string name="added_title_to_playing_queue">"1 música foi adicionada à fila."</string>
     <string name="added_x_titles_to_playing_queue">%1$d músicas foram adicionadas à fila.</string>
     <string name="album">Álbum</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Adicionar</string>
     <string name="add_playlist_title">"Adicionar à lista"</string>
     <string name="add_time_framed_lryics">Adicionar letras do cronograma</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Adicionada 1 música à fila."</string>
     <string name="added_x_titles_to_playing_queue">Adicionadas %1$d músicas à fila.</string>
     <string name="album">Álbum</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Adaugă</string>
     <string name="add_playlist_title">"Adaugă la playlist"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Adăugat 1 titlu la coada de redare."</string>
     <string name="added_x_titles_to_playing_queue">Adăugate %1$d titluri la coada de redare</string>
     <string name="album">Album</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Добавить</string>
     <string name="add_playlist_title">"Добавить в плейлист"</string>
     <string name="add_time_framed_lryics">Добавить синхронизированный текст</string>
-    <string name="added_song_count_to_playlist">Добавлено %d песни в %s</string>
+    <string name="added_song_count_to_playlist">Добавлено %1$d песни в %2$s</string>
     <string name="added_title_to_playing_queue">"В очередь добавлен 1 трек"</string>
     <string name="added_x_titles_to_playing_queue">В очередь добавлено  %1$d треков.</string>
     <string name="album">Альбом</string>

app/src/main/res/values-sr-rSP/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Dodaj</string>
     <string name="add_playlist_title">"Dodaj na plejlistu"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Dodata je 1 pesma na plejlistu"</string>
     <string name="added_x_titles_to_playing_queue">Dodato %1$d pesama na plejlistu</string>
     <string name="album">Album</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Lägg till</string>
     <string name="add_playlist_title">"Lägg till i spellista"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Lade till en titel i spelkön."</string>
     <string name="added_x_titles_to_playing_queue">Lade till %1$d titlar i spelkön.</string>
     <string name="album">Album</string>

app/src/main/res/values-ta-rIN/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">சேர்</string>
     <string name="add_playlist_title">"பாடல் வரிசையில் சேர்"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
     <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
     <string name="album">Album</string>

app/src/main/res/values-te-rIN/strings.xml

@@ -114,7 +114,7 @@
     <string name="create_action">సృష్టించు</string>
     <string name="created_playlist_x">ప్లేజాబితా%1$sసృష్టించబడింది.</string>
     <string name="credit_title">సభ్యులు మరియు సహాయకులు</string>
-    <string name="currently_listening_to_x_by_x">ప్రస్తుతం% 2 by s ద్వారా%1$sవింటున్నారు.</string>
+    <string name="currently_listening_to_x_by_x">ప్రస్తుతం %2$s ద్వారా %1$d వింటున్నారు.</string>
     <string name="dark_theme_name">కైండా డార్క్</string>
     <string name="delete_playlist_title">ప్లేజాబితాను తొలగించండి</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> ప్లేజాబితాను తొలగించాలా?]]></string>

app/src/main/res/values-th-rTH/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">เพิ่ม</string>
     <string name="add_playlist_title">"เพิ่มชื่อเพลย์ลิสต์"</string>
     <string name="add_time_framed_lryics">เพิ่มเนื้อเพลงในกรอบเวลา</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"เพิ่ม 1 ชื่อเข้าคิวเพลง"</string>
     <string name="added_x_titles_to_playing_queue">เพิ่ม %1$d ชื่อเข้าคิวเพลง</string>
     <string name="album">อัลบัม</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Ekle</string>
     <string name="add_playlist_title">"Oynatma listesine ekle"</string>
     <string name="add_time_framed_lryics">Zaman Dilimli Sözleri Ekle</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Kuyruğa 1 parça eklendi."</string>
     <string name="added_x_titles_to_playing_queue">%1$d şarkı kuyruğuna eklendi.</string>
     <string name="album">Albüm</string>

app/src/main/res/values-uk-rUA/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Додати</string>
     <string name="add_playlist_title">"Додати до списку відтворення"</string>
     <string name="add_time_framed_lryics">Додати часові розмежування тексту</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Додано 1 композицію до черги відтворення."</string>
     <string name="added_x_titles_to_playing_queue">Додано %1$d композицій до черги відтворення.</string>
     <string name="album">Альбом</string>

app/src/main/res/values-v27/styles_parents.xml

@@ -35,7 +35,7 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="android:windowBackground">@color/window_color_dark</item>
+        <item name="android:windowBackground">?colorSurface</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
@@ -45,7 +45,7 @@
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="android:windowBackground">@color/md_white_1000</item>
+        <item name="android:windowBackground">?colorSurface</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>

app/src/main/res/values-v31/styles.xml

@@ -8,8 +8,11 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
+        <item name="android:windowBackground">?attr/colorSurface</item>
     </style>
 
+    <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3" />
+
     <style name="Theme.AppWidget" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="colorSurface">@android:color/system_accent1_50</item>
     </style>

app/src/main/res/values-vi-rVN/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">Thêm</string>
     <string name="add_playlist_title">"Thêm vào danh sách phát"</string>
     <string name="add_time_framed_lryics">Thêm lời theo thời gian</string>
-    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Đã thêm 1 bài vào danh sách chờ phát."</string>
     <string name="added_x_titles_to_playing_queue">Đã thêm %1$d bài vào danh sách chờ phát.</string>
     <string name="album">Album</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -54,7 +54,7 @@
     <string name="add_action">添加</string>
     <string name="add_playlist_title">"加入播放列表"</string>
     <string name="add_time_framed_lryics">添加同步歌词</string>
-    <string name="added_song_count_to_playlist">已将 %d 首歌添加到 %s</string>
+    <string name="added_song_count_to_playlist">已将 %1$d 首歌添加到 %2$s</string>
     <string name="added_title_to_playing_queue">"已添加 1 首歌到播放队列。"</string>
     <string name="added_x_titles_to_playing_queue">已添加 %1$d 首歌到播放队列。</string>
     <string name="album">专辑</string>