WIP theme

2019-12-01 20:57:01 +05:30 · 2019-12-01 20:57:01 +05:30 · 9f1e6cb98e
commit 9f1e6cb98e
parent bb72a16b84
87 changed files with 1694 additions and 1697 deletions
--- a/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/md_black_1000" />
-    <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-</shape>
--- a/app/src/main/res/drawable/bg_circular_top_corners.xml
+++ b/app/src/main/res/drawable/bg_circular_top_corners.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-    <solid android:color="?attr/cardBackgroundColor" />
-
-</shape>
--- a/app/src/main/res/drawable/bottom_navigation_item_background.xml
+++ b/app/src/main/res/drawable/bottom_navigation_item_background.xml
@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <corners android:radius="8dp" />
-    <solid android:color="?attr/colorSurface" />
+    <solid android:color="?android:attr/windowBackground" />
 </shape>
--- a/app/src/main/res/drawable/bottom_navigation_item_background_ripple.xml
+++ b/app/src/main/res/drawable/bottom_navigation_item_background_ripple.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="#000000" />
-            <corners android:radius="15dp" />
-        </shape>
-    </item>
-    <item android:drawable="@drawable/bottom_navigation_item_background" />
-</ripple>
--- a/app/src/main/res/drawable/option_menu_background.xml
+++ b/app/src/main/res/drawable/option_menu_background.xml
@ -27,7 +27,7 @@
            <item>
                <shape android:shape="rectangle">
                    <corners android:radius="8dp" />
-                    <solid android:color="?colorPrimary" />
+                    <solid android:color="?attr/colorControlHighlight" />
                </shape>
            </item>
        </ripple>
--- a/app/src/main/res/layout-land/activity_album.xml
+++ b/app/src/main/res/layout-land/activity_album.xml
@ -4,6 +4,7 @@
    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">

--- a/app/src/main/res/layout-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@ -4,6 +4,7 @@
    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">

--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@ -60,7 +60,7 @@
                        android:layout_height="24dp"
                        android:layout_gravity="bottom"
                        android:background="@drawable/shadow_up_full_theme"
-                        android:backgroundTint="?colorPrimary" />
+                        android:backgroundTint="?android:attr/windowBackground" />
                </FrameLayout>


@ -89,7 +89,6 @@
                        app:cardBackgroundColor="@android:color/transparent"
                        app:cardCornerRadius="8dp"
                        app:cardElevation="6dp"
-                        app:cardUseCompatPadding="true"
                        app:layout_collapseMode="pin"
                        app:layout_scrollFlags="scroll|enterAlways">

@ -116,16 +115,14 @@
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
-            android:elevation="@dimen/card_elevation"
            app:behavior_overlapTop="72dp"
            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

            <com.google.android.material.card.MaterialCardView
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-                app:cardBackgroundColor="?colorPrimary"
-                app:cardElevation="8dp"
-                app:shapeAppearanceOverlay="@style/TopCornerCardView">
+                app:cardCornerRadius="16dp"
+                app:cardElevation="8dp">

                <include layout="@layout/home_content" />
            </com.google.android.material.card.MaterialCardView>
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@ -36,8 +36,9 @@
            android:id="@+id/appBarLayout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="?colorPrimary"
-            app:liftOnScroll="true">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">

            <com.google.android.material.card.MaterialCardView
                android:id="@+id/toolbarContainer"
--- a/app/src/main/res/layout-xlarge-land/activity_album.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_album.xml
@ -60,7 +60,7 @@
        android:layout_gravity="fill_vertical"
        android:layout_marginStart="128dp"
        android:layout_marginEnd="128dp"
-        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:background="?attr/colorSurface"
        android:fillViewport="true"
        android:overScrollMode="never"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
--- a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
@ -35,9 +35,9 @@
                app:layout_collapseMode="parallax" />

            <FrameLayout
-                app:layout_collapseMode="pin"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin">

                <com.google.android.material.appbar.MaterialToolbar
                    android:id="@+id/toolbar"
@ -67,6 +67,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="6dp"
+            android:background="?attr/colorSurface"
            app:cardElevation="8dp"
            app:shapeAppearanceOverlay="@style/TopCornerCardView">

@ -75,7 +76,6 @@
                android:layout_height="match_parent"
                android:orientation="vertical">

-
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@ -27,6 +27,9 @@
        <com.google.android.material.appbar.AppBarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
            app:liftOnScroll="true">

            <com.google.android.material.appbar.CollapsingToolbarLayout
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@ -37,8 +37,9 @@
            android:id="@+id/appBarLayout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="?colorPrimary"
-            app:liftOnScroll="true">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">

            <com.google.android.material.card.MaterialCardView
                android:id="@+id/toolbarContainer"
--- a/app/src/main/res/layout-xlarge/activity_album.xml
+++ b/app/src/main/res/layout-xlarge/activity_album.xml
@ -2,9 +2,9 @@
 <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:id="@+id/root"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
    android:transitionName="@string/transition_album_art">

    <androidx.appcompat.widget.AppCompatImageView
@ -60,6 +60,7 @@
        android:layout_gravity="fill_vertical"
        android:layout_marginStart="96dp"
        android:layout_marginEnd="96dp"
+        android:background="?attr/colorSurface"
        android:fillViewport="true"
        android:overScrollMode="never"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
--- a/app/src/main/res/layout-xlarge/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@ -68,6 +68,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="6dp"
+            android:background="?attr/colorSurface"
            app:cardElevation="8dp"
            app:shapeAppearanceOverlay="@style/TopCornerCardView">

--- a/app/src/main/res/layout-xlarge/activity_user_info.xml
+++ b/app/src/main/res/layout-xlarge/activity_user_info.xml
@ -9,6 +9,7 @@
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
        android:elevation="0dp"
        app:elevation="0dp">

@ -64,8 +65,8 @@
                        android:layout_gravity="center"
                        android:background="?roundSelector"
                        android:padding="16dp"
-                        app:tint="@color/md_white_1000"
-                        app:srcCompat="@drawable/ic_add_photo_white_24dp" />
+                        app:srcCompat="@drawable/ic_add_photo_white_24dp"
+                        app:tint="@color/md_white_1000" />

                    <FrameLayout
                        android:layout_width="wrap_content"
--- a/app/src/main/res/layout-xlarge/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
@ -21,13 +21,14 @@

    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?colorPrimary">
+        android:layout_height="match_parent">

        <com.google.android.material.appbar.AppBarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            app:liftOnScroll="true">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">

            <com.google.android.material.appbar.CollapsingToolbarLayout
                android:layout_width="match_parent"
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@ -38,8 +38,9 @@
            android:id="@+id/appBarLayout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="?colorPrimary"
-            app:liftOnScroll="true">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">

            <com.google.android.material.card.MaterialCardView
                android:id="@+id/toolbarContainer"
--- a/app/src/main/res/layout-xlarge/fragment_mini_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_mini_player.xml
@ -5,7 +5,7 @@
    android:id="@+id/miniPlayerContent"
    android:layout_width="match_parent"
    android:layout_height="48dp"
-    android:background="?colorSecondary"
+    android:background="?android:attr/background"
    android:clickable="true"
    android:focusable="false"
    android:transitionName="@string/transition_mini_player"
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@ -8,54 +8,16 @@
    android:paddingBottom="12dp">


-    <code.name.monkey.retromusic.views.CircularImageView
-        android:id="@+id/userImage"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        app:civ_border="false"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars" />
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:ellipsize="end"
-        android:text="@string/welcome"
-        android:textColor="?colorOnBackground"
-        app:layout_constraintStart_toEndOf="@+id/userImage"
-        app:layout_constraintTop_toTopOf="@+id/userImage" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/titleWelcome"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:padding="0dp"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textColor="?colorOnPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/userImage"
-        app:layout_constraintStart_toEndOf="@+id/userImage"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@string/app_name" />
-
-
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/history"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginTop="24dp"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
        app:layout_constraintEnd_toStartOf="@+id/lastAdded"
        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleWelcome">
+        app:layout_constraintTop_toTopOf="parent">

        <code.name.monkey.retromusic.views.ColorIconsImageView
            android:id="@+id/v1"
@ -80,7 +42,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/v1"
-            tools:text="Hemanth savarala kumar dai" />
+            tools:text="@tools:sample/lorem" />

    </androidx.constraintlayout.widget.ConstraintLayout>

@ -117,7 +79,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/v2"
-            tools:text="Hemanth savarala" />
+            tools:text="@tools:sample/lorem" />

    </androidx.constraintlayout.widget.ConstraintLayout>

@ -154,7 +116,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/v3"
-            tools:text="Hemanth savarala" />
+            tools:text="@tools:sample/lorem" />

    </androidx.constraintlayout.widget.ConstraintLayout>

@ -191,7 +153,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/v4"
-            tools:text="Hemanth savarala" />
+            tools:text="@tools:sample/lorem" />

    </androidx.constraintlayout.widget.ConstraintLayout>

--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@ -16,7 +16,8 @@

    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">

        <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/appBarLayout"
@ -49,16 +50,18 @@
            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+
                android:orientation="vertical">

                <code.name.monkey.retromusic.views.WidthFitSquareCardView
                    android:id="@+id/albumCoverContainer"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                    android:transitionName="@string/transition_album_art"
                    app:cardCornerRadius="24dp"
                    app:cardElevation="8dp"
-                    app:cardUseCompatPadding="true"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent">
--- a/app/src/main/res/layout/activity_artist_details.xml
+++ b/app/src/main/res/layout/activity_artist_details.xml
@ -16,7 +16,8 @@

    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">

        <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/appBarLayout"
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@ -27,42 +27,36 @@
        android:layout_height="wrap_content"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

-        <FrameLayout
+        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:orientation="vertical">

-            <LinearLayout
+            <include
+                layout="@layout/bug_report_card_report"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:clipToPadding="false"
-                android:orientation="vertical">
+                android:layout_marginBottom="8dp" />

-                <include
-                    layout="@layout/bug_report_card_report"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp" />
+            <include
+                layout="@layout/bug_report_card_device_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />

-                <include
-                    layout="@layout/bug_report_card_device_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:layout_margin="16dp" />

-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:layout_margin="16dp" />
+        </LinearLayout>

-            </LinearLayout>
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/sendFab"
-                style="@style/Fab"
-                android:layout_gravity="bottom|end"
-                android:layout_margin="16dp"
-                app:srcCompat="@drawable/ic_send_white_24dp" />
-
-        </FrameLayout>
    </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/sendFab"
+        style="@style/Fab"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        app:srcCompat="@drawable/ic_send_white_24dp" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_lyrics.xml
+++ b/app/src/main/res/layout/activity_lyrics.xml
@ -9,7 +9,10 @@
    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
@ -19,7 +22,7 @@
            app:contentInsetStart="0dp"
            app:contentInsetStartWithNavigation="0dp"
            app:layout_scrollFlags="scroll|enterAlways"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
            app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
            app:titleMargin="0dp"
            app:titleMarginStart="0dp"
--- a/app/src/main/res/layout/activity_playing_queue.xml
+++ b/app/src/main/res/layout/activity_playing_queue.xml
@ -10,6 +10,7 @@
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
        app:liftOnScroll="true">

        <com.google.android.material.appbar.CollapsingToolbarLayout
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@ -4,6 +4,7 @@
    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">

@ -20,9 +21,11 @@

        <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/appBarLayout"
-            android:background="?attr/colorPrimary"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
            app:liftOnScroll="true">

            <FrameLayout
@ -33,7 +36,6 @@
                <com.google.android.material.appbar.MaterialToolbar
                    android:id="@+id/toolbar"
                    style="@style/Toolbar"
-                    android:background="?attr/colorPrimary"
                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
                    app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />

@ -49,6 +51,7 @@
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+
            android:clipToPadding="false"
            android:scrollbars="none"
            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
--- a/app/src/main/res/layout/activity_pro_version.xml
+++ b/app/src/main/res/layout/activity_pro_version.xml
@ -25,6 +25,7 @@
            android:id="@+id/appBarLayout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
            android:elevation="0dp"
            app:elevation="0dp">

--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@ -5,13 +5,14 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
+    android:background="?attr/colorSurface"
    android:orientation="vertical">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="?colorPrimary"
+        android:background="@android:color/transparent"
        android:fitsSystemWindows="true"
        app:liftOnScroll="true">

@ -77,9 +78,9 @@
                        android:layout_height="wrap_content"
                        android:background="?roundSelector"
                        android:padding="12dp"
+                        android:visibility="gone"
                        app:srcCompat="@drawable/ic_close_white_24dp"
                        app:tint="?colorOnSurface"
-                        android:visibility="gone"
                        tools:visibility="visible" />
                </FrameLayout>
            </LinearLayout>
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@ -10,6 +10,7 @@
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
        app:liftOnScroll="true">

        <com.google.android.material.appbar.MaterialToolbar
--- a/app/src/main/res/layout/bug_report_card_device_info.xml
+++ b/app/src/main/res/layout/bug_report_card_device_info.xml
@ -4,7 +4,6 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    app:cardBackgroundColor="?cardBackgroundColor"
    app:cardCornerRadius="8dp"
    app:cardUseCompatPadding="true">

@ -33,7 +32,7 @@
            android:padding="16dp"
            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
            android:textColor="?android:textColorSecondary"
-            tools:text="@string/donate_summary" />
+            tools:text="@tools:sample/lorem/random" />

    </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@ -34,22 +34,6 @@
            app:statusBarScrim="@color/md_black_1000"
            app:titleEnabled="false">

-            <FrameLayout
-                android:id="@+id/imageContainer"
-                android:layout_width="match_parent"
-                android:layout_height="228dp"
-                app:layout_collapseMode="parallax">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/bannerImage"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    app:layout_collapseMode="parallax"
-                    tools:background="@color/md_red_400"
-                    tools:ignore="ContentDescription"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
-            </FrameLayout>

            <LinearLayout
                android:layout_width="match_parent"
@ -66,33 +50,6 @@
                </FrameLayout>


-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/toolbarContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/toolbar_margin_horizontal"
-                    android:layout_marginTop="@dimen/toolbar_margin_vertical"
-                    android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
-                    android:layout_marginBottom="@dimen/toolbar_margin_vertical"
-                    app:cardBackgroundColor="@android:color/transparent"
-                    app:cardCornerRadius="8dp"
-                    app:cardUseCompatPadding="true"
-                    app:layout_scrollFlags="scroll|enterAlways"
-                    app:shapeAppearance="@style/ToolbarCornerCardView">
-
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/toolbar_height"
-                        android:background="?colorSurface"
-                        app:contentInsetStart="0dp"
-                        app:contentInsetStartWithNavigation="0dp"
-                        app:popupTheme="?toolbarPopupTheme"
-                        app:title="@string/search_hint"
-                        app:titleMarginStart="0dp"
-                        app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
-                        tools:ignore="UnusedAttribute" />
-                </com.google.android.material.card.MaterialCardView>
            </LinearLayout>
        </com.google.android.material.appbar.CollapsingToolbarLayout>
    </com.google.android.material.appbar.AppBarLayout>
@ -100,17 +57,112 @@
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:behavior_overlapTop="24dp"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

-        <com.google.android.material.card.MaterialCardView
+        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            app:cardBackgroundColor="?colorPrimary"
-            app:cardElevation="8dp"
-            app:shapeAppearanceOverlay="@style/TopCornerCardView">
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
+                android:layout_height="228dp"
+                app:cardCornerRadius="24dp"
+                app:cardUseCompatPadding="true">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:layout_collapseMode="parallax"
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
+
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/toolbarContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                        app:cardBackgroundColor="@android:color/transparent"
+                        app:cardCornerRadius="8dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_scrollFlags="scroll|enterAlways"
+                        app:shapeAppearance="@style/ToolbarCornerCardView">
+
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            android:background="?attr/colorSurface"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:background="@drawable/shadow_up"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/userImage"
+                        android:layout_width="42dp"
+                        android:layout_height="42dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginBottom="8dp"
+                        app:civ_border="false"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        tools:srcCompat="@tools:sample/avatars" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:ellipsize="end"
+                        android:text="@string/welcome"
+                        android:textColor="@color/md_white_1000"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toTopOf="@+id/userImage" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/titleWelcome"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:padding="0dp"
+                        android:textAppearance="@style/TextViewHeadline5"
+                        android:textColor="@color/md_white_1000"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toBottomOf="@+id/text"
+                        tools:text="@string/app_name" />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>

            <include layout="@layout/home_content" />
-        </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@ -16,7 +16,6 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:background="?colorPrimary"
    android:layout_height="match_parent"
    android:orientation="vertical">

@ -35,7 +34,7 @@
            android:id="@+id/appBarLayout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="?colorPrimary"
+            android:background="@android:color/transparent"
            app:liftOnScroll="true">

            <com.google.android.material.card.MaterialCardView
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@ -7,7 +7,6 @@
    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

    <com.google.android.material.textview.MaterialTextView
-        android:textColor="?colorOnSecondary"
        android:id="@+id/offlineLyrics"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@ -18,5 +17,6 @@
        android:paddingEnd="16dp"
        android:paddingBottom="128dp"
        android:text="@string/no_lyrics_found"
-        android:textAppearance="@style/TextViewBody1" />
+        android:textAppearance="@style/TextViewBody1"
+        android:textColor="?android:attr/textColorPrimary" />
 </ScrollView>
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@ -49,7 +49,6 @@
                    android:paddingEnd="16dp"
                    android:text="@string/retro_music_pro"
                    android:textAppearance="@style/TextViewSubtitle1"
-                    android:textColor="?colorOnPrimary"
                    android:textStyle="bold"
                    app:layout_constraintTop_toBottomOf="@id/diamondIcon" />

@ -83,6 +82,7 @@
                    android:textAllCaps="false"
                    android:textColor="?colorAccent"
                    android:textStyle="bold"
+                    app:backgroundTint="?attr/colorSurface"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
@ -122,7 +122,6 @@
                    android:singleLine="true"
                    android:text="@string/general_settings_title"
                    android:textAppearance="@style/TextViewSubtitle1"
-                    android:textColor="?colorOnPrimary"
                    android:textStyle="bold" />

                <com.google.android.material.textview.MaterialTextView
--- a/app/src/main/res/layout/home_content.xml
+++ b/app/src/main/res/layout/home_content.xml
@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright (c) 2019 Hemanth Savarala.
  ~
  ~ Licensed under the GNU General Public License v3
@ -20,6 +17,7 @@
    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"
@ -53,16 +51,17 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
+            android:layout_margin="24dp"
            android:gravity="center_horizontal"
            android:orientation="vertical"
            android:visibility="gone"
            tools:visibility="visible">

            <androidx.appcompat.widget.AppCompatImageView
-                app:tint="?colorOnSecondary"
                android:layout_width="96dp"
                android:layout_height="96dp"
-                app:srcCompat="@drawable/ic_play_arrow_white_64dp" />
+                app:srcCompat="@drawable/ic_play_arrow_white_64dp"
+                app:tint="?colorOnSecondary" />

            <com.google.android.material.textview.MaterialTextView
                android:id="@+id/emptyText"
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@ -33,7 +33,7 @@
        android:paddingEnd="8dp"
        android:paddingBottom="4dp"
        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?attr/colorOnPrimary"
+        android:textColor="?android:attr/textColorPrimary"
        tools:ignore="MissingPrefix"
        tools:text="My top tracks" />
 </LinearLayout>
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@ -28,6 +28,6 @@
        android:gravity="center"
        android:maxLines="1"
        android:paddingTop="12dp"
-        android:textColor="?attr/colorOnPrimary"
+        android:textColor="?android:attr/textColorPrimary"
        tools:text="Name" />
 </LinearLayout>
--- a/app/src/main/res/layout/item_option_menu.xml
+++ b/app/src/main/res/layout/item_option_menu.xml
@ -41,6 +41,6 @@
        android:layout_weight="1"
        android:text="@string/folders"
        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?attr/colorOnPrimary"
+        android:textColor="?android:attr/textColorPrimary"
        android:textSize="16sp" />
 </LinearLayout>
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@ -42,9 +42,7 @@
        android:paddingStart="16dp"
        android:paddingTop="6dp"
        android:paddingEnd="8dp"
-        android:paddingBottom="4dp"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnBackground"
+        android:paddingBottom="4dp" 
        tools:ignore="MissingPrefix"
        tools:text="My top tracks" />

--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@ -51,10 +51,9 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom"
-        android:background="?attr/colorSurface"
        android:elevation="0dp"
        android:visibility="gone"
-        app:itemBackground="@drawable/bottom_navigation_item_background"
+        app:backgroundTint="?android:attr/windowBackground"
        app:itemHorizontalTranslationEnabled="false"
        app:itemIconTint="@drawable/bottom_navigation_item_colors"
        app:itemTextAppearanceActive="@style/BottomSheetItemTextAppearanceActive"
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -158,7 +158,6 @@
    <string name="error">Hiba</string>
    <string name="faq">GYIK</string>
    <string name="favorites">Kedvencek</string>
-    <string name="favorites_songs">Te vagy a legkedvencebb dal</string>
    <string name="finish_last_song">Fejezze be az utolsó dalt</string>
    <string name="fit">Fit</string>
    <string name="flat">Lapos</string>
@ -216,8 +215,6 @@
    <string name="material">Materiál</string>
    <string name="md_error_label">Hiba</string>
    <string name="md_storage_perm_error">Engedély hiba</string>
-    <string name="most_played_albums">A legtöbb játszott albumok</string>
-    <string name="most_played_artists">A legtöbb játszott művész</string>
    <string name="my_name">Név</string>
    <string name="my_top_tracks">Legjobb számok</string>
    <string name="never">Soha</string>
@ -361,8 +358,6 @@
    <string name="queue">Sorban áll</string>
    <string name="rate_app">Értékeld az alkalmazást</string>
    <string name="rate_on_google_play_summary">Szereted ezt az app-ot a Google Play áruházban, hogy jobb élményt nyújtsunk</string>
-    <string name="recent_added_albums">Nemrégiben hozzáadott albumok</string>
-    <string name="recent_added_artists">Nemrégiben hozzáadott művészek</string>
    <string name="recent_albums">Legutóbbi albumok</string>
    <string name="recent_artists">Legújabb előadók</string>
    <string name="remove_action">Eltávolítás</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -272,8 +272,6 @@ https://play.google.com/store/apps/details?id=%s</string>

    <string name="favorites">Preferiti</string>

-    <string name="favorites_songs">I tuoi brani preferiti</string>
-
    <string name="finish_last_song">Termina ultimo brano</string>

    <string name="fit">Adatta</string>
@ -376,9 +374,6 @@ https://play.google.com/store/apps/details?id=%s</string>

    <string name="md_storage_perm_error">Errore di autorizzazione</string>

-    <string name="most_played_albums">Album più ascoltati</string>
-    <string name="most_played_artists">Artisti più ascoltati</string>
-
    <string name="my_name">Nome</string>

    <string name="my_top_tracks">I più riprodotti</string>
@ -584,9 +579,6 @@ https://play.google.com/store/apps/details?id=%s</string>

    <string name="rate_on_google_play_summary">Adori quest\'app? Facci sapere sul Play Store come possiamo renderla ancora migliore</string>

-    <string name="recent_added_albums">Album aggiunti di recente</string>
-    <string name="recent_added_artists">Artisti aggiunti di recente</string>
-
    <string name="recent_albums">Album recenti</string>

    <string name="recent_artists">Artisti recenti</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -158,7 +158,6 @@
    <string name="error">Hata</string>
    <string name="faq">SSS</string>
    <string name="favorites">Gözdeler</string>
-    <string name="favorites_songs">Favori Şarkıların</string>
    <string name="finish_last_song">Son şarkıyı bitir</string>
    <string name="fit">Fit</string>
    <string name="flat">Düz</string>
@ -216,8 +215,6 @@
    <string name="material">Materyal</string>
    <string name="md_error_label">Hata</string>
    <string name="md_storage_perm_error">İzin hatası</string>
-    <string name="most_played_albums">En çok çalınan albümler</string>
-    <string name="most_played_artists">En çok çalınan sanatçılar</string>
    <string name="my_name">İsim</string>
    <string name="my_top_tracks">Sık oynatılanlar</string>
    <string name="never">Asla</string>
@ -361,8 +358,6 @@
    <string name="queue">Kuyruk</string>
    <string name="rate_app">Uygulamayı Değerlendir</string>
    <string name="rate_on_google_play_summary">Bu uygulamayı sevdin mi? Daha iyi bir gelişim için lütfen Google Play\'de nasıl daha iyi yapabileceğimizi bildir.</string>
-    <string name="recent_added_albums">Son eklenen albümler</string>
-    <string name="recent_added_artists">Son eklenen sanatçılar</string>
    <string name="recent_albums">Son albümler</string>
    <string name="recent_artists">Son sanatçılar</string>
    <string name="remove_action">Kaldır</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -158,7 +158,6 @@
    <string name="error">錯誤</string>
    <string name="faq">常見問題</string>
    <string name="favorites">我的最愛</string>
-    <string name="favorites_songs">你最喜愛的歌曲</string>
    <string name="finish_last_song">最後一首已經結束播放</string>
    <string name="fit">Fit</string>
    <string name="flat">平面</string>
@ -216,8 +215,6 @@
    <string name="material">物質</string>
    <string name="md_error_label">錯誤</string>
    <string name="md_storage_perm_error">權限錯誤</string>
-    <string name="most_played_albums">最常播放的專輯</string>
-    <string name="most_played_artists">最常播放的歌手</string>
    <string name="my_name">名字</string>
    <string name="my_top_tracks">最常播放</string>
    <string name="never">永不</string>
@ -361,8 +358,6 @@
    <string name="queue">播放列表</string>
    <string name="rate_app">為這個App評分</string>
    <string name="rate_on_google_play_summary">喜歡這個App嗎?請讓我們知道如何提供更好的體驗</string>
-    <string name="recent_added_albums">最近新增的專輯</string>
-    <string name="recent_added_artists">最近新增的歌手</string>
    <string name="recent_albums">近期專輯</string>
    <string name="recent_artists">近期歌手</string>
    <string name="remove_action">移除</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -6,73 +6,105 @@
    <string name="accent_color_desc">The theme accent color, defaults to purple</string>

    <string name="action_about">About</string>
+
    <string name="action_add_to_favorites">Add to favorites</string>
    <string name="action_add_to_playing_queue">Add to playing queue</string>
    <string name="action_add_to_playlist">Add to playlist</string>
+
    <string name="action_clear_playing_queue">Clear playing queue</string>
    <string name="action_clear_playlist">Clear playlist</string>
+
    <string name="action_cycle_repeat">Cycle repeat mode</string>
+
    <string name="action_delete">Delete</string>
    <string name="action_delete_from_device">Delete from device</string>
+
    <string name="action_details">Details</string>
+
    <string name="action_go_to_album">Go to album</string>
    <string name="action_go_to_artist">Go to artist</string>
    <string name="action_go_to_genre">Go to genre</string>
    <string name="action_go_to_start_directory">Go to start directory</string>
+
    <string name="action_grant">Grant</string>
+
    <string name="action_grid_size">Grid size</string>
    <string name="action_grid_size_land">Grid size (land)</string>
+
    <string name="action_new_playlist">New playlist</string>
+
    <string name="action_next">Next</string>
+
    <string name="action_play">Play</string>
    <string name="action_play_all">Play all</string>
    <string name="action_play_next">Play next</string>
    <string name="action_play_pause">Play/Pause</string>
+
    <string name="action_previous">Previous</string>
+
    <string name="action_remove_from_favorites">Remove from favorites</string>
    <string name="action_remove_from_playing_queue">Remove from playing queue</string>
    <string name="action_remove_from_playlist">Remove from playlist</string>
+
    <string name="action_rename">Rename</string>
+
    <string name="action_save_playing_queue">Save playing queue</string>
+
    <string name="action_scan">Scan</string>
+
    <string name="action_search">Search</string>
+
    <string name="action_set">Start</string>
    <string name="action_set_as_ringtone">Set as ringtone</string>
    <string name="action_set_as_start_directory">Set as start directory</string>
+
    <string name="action_settings">"Settings"</string>
+
    <string name="action_share">Share</string>
+
    <string name="action_shuffle_all">Shuffle all</string>
    <string name="action_shuffle_playlist">Shuffle playlist</string>
+
    <string name="action_sleep_timer">Sleep timer</string>
+
    <string name="action_sort_order">Sort order</string>
+
    <string name="action_tag_editor">Tag editor</string>
+
    <string name="action_toggle_favorite">Toggle favorite</string>
    <string name="action_toggle_shuffle">Toggle shuffle mode</string>

    <string name="adaptive">Adaptive</string>

    <string name="add_action">Add</string>
+
    <string name="add_lyrics">Add lyrics</string>
+
    <string name="add_photo">Add \nphoto</string>
+
    <string name="add_playlist_title">"Add to playlist"</string>
+
    <string name="add_time_framed_lryics">Add time frame lyrics</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>
+
    <string name="album_artist">Album artist</string>
+
    <string name="album_or_artist_empty">The title or artist is empty.</string>

    <string name="albums">Albums</string>

-
    <string name="always">Always</string>

    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>

    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
+
    <string name="app_widget_big_name">Retro music - Big</string>
    <string name="app_widget_card_name">Retro music - Card</string>
    <string name="app_widget_classic_name">Retro music - Classic</string>
@ -84,6 +116,7 @@
    <string name="artists">Artists</string>

    <string name="audio_focus_denied">Audio focus denied.</string>
+
    <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>

    <string name="auto">Auto</string>
@ -101,6 +134,7 @@
    <string name="blacklist">Blacklist</string>

    <string name="blur">Blur</string>
+
    <string name="blur_card">Blur Card</string>

    <string name="bug_report_failed">Unable to send report</string>
@ -123,11 +157,15 @@
    <string name="cancel_current_timer">Cancel</string>

    <string name="card">Card</string>
+
    <string name="card_circular_style">Circular</string>
+
    <string name="card_color_style">Colored Card</string>
+
    <string name="card_style">Card</string>

    <string name="carousal">Carousel</string>
+
    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>

    <string name="cascading">Cascading</string>
@ -135,6 +173,7 @@
    <string name="cast">Cast</string>

    <string name="changelog">Changelog</string>
+
    <string name="changelog_summary">Changelog maintained on the Telegram channel</string>

    <string name="circular">Circular</string>
@ -142,15 +181,20 @@
    <string name="classic">Classic</string>

    <string name="clear_action">Clear</string>
+
    <string name="clear_app_data">Clear app data</string>
+
    <string name="clear_blacklist">Clear blacklist</string>
+
    <string name="clear_playing_queue">Clear queue</string>
+
    <string name="clear_playlist_title">Clear playlist</string>
    <string name="clear_playlist_x"><![CDATA[Clear the playlist <b>%1$s</b>? This can\u2019t be undone!]]></string>

    <string name="close_notification">Close</string>

    <string name="color">Color</string>
+
    <string name="color_theme_name">Color</string>

    <string name="colors">Colors</string>
@ -178,13 +222,16 @@

    <string name="delete_playlist_title">Delete playlist</string>
    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
+
    <string name="delete_playlists_title">Delete playlists</string>
+
    <string name="delete_song_title">Delete song</string>
    <string name="delete_song_x"><![CDATA[Delete the song <b>%1$s</b>?]]></string>
+
    <string name="delete_songs_title">Delete songs</string>
+
    <string name="delete_x_playlists"><![CDATA[Delete <b>%1$d</b> playlists?]]></string>
    <string name="delete_x_songs"><![CDATA[Delete <b>%1$d</b> songs?]]></string>
-
    <string name="deleted_x_songs">Deleted %1$d songs.</string>

    <string name="deleting_songs">Deleting songs</string>
@ -196,12 +243,14 @@
    <string name="device_info">Device info</string>

    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
+
    <string name="dialog_title_set_ringtone">Set ringtone</string>

    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>

    <string name="donate">Donate</string>
+
    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>

    <string name="donation_header">Buy me a:</string>
@ -209,6 +258,7 @@
    <string name="download_from_last_fm">Download from Last.fm</string>

    <string name="edit">Edit</string>
+
    <string name="edit_cover">Edit cover</string>

    <string name="empty">Empty</string>
@ -220,7 +270,6 @@
    <string name="faq">FAQ</string>

    <string name="favorites">Favorites</string>
-    <string name="favorites_songs">You\'re  most favorites songs</string>

    <string name="finish_last_song">Finish last song</string>

@ -235,6 +284,7 @@
    <string name="for_you">For you</string>

    <string name="full">Full</string>
+
    <string name="full_card">Full card</string>

    <string name="general_settings_summary">Change the theme and colors of the app</string>
@ -256,6 +306,7 @@
    <string name="grid_size_6">6</string>
    <string name="grid_size_7">7</string>
    <string name="grid_size_8">8</string>
+
    <string name="grid_style_label"><![CDATA[Grids & Style]]></string>

    <string name="hinge">Hinge</string>
@ -267,7 +318,9 @@
    <string name="horizontal_flip">Horizontal flip</string>

    <string name="image">Image</string>
+
    <string name="image_gradient">Gradient image</string>
+
    <string name="image_settings_summary">Change artist image download settings</string>

    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
@ -278,21 +331,28 @@
    <string name="keyboard">Keyboard</string>

    <string name="label_bit_rate">Bitrate</string>
+
    <string name="label_file_format">Format</string>
    <string name="label_file_name">File name</string>
    <string name="label_file_path">File path</string>
    <string name="label_file_size">Size</string>
+
+    <string name="label_more_from">More from %s</string>
+
    <string name="label_sampling_rate">Sampling rate</string>
+
    <string name="label_track_length">Length</string>

    <string name="labeled">Labeled</string>

    <string name="last_added">Last added</string>
+
    <string name="last_song">Last song</string>

    <string name="lets_play_something">Let\'s play some music</string>

    <string name="library">Library</string>
+
    <string name="library_categories">Library categories</string>

    <string name="licenses">Licenses</string>
@ -312,36 +372,49 @@
    <string name="material">Material</string>

    <string name="md_error_label">Error</string>
+
    <string name="md_storage_perm_error">Permission error</string>

-    <string name="most_played_albums">Most played albums</string>
-    <string name="most_played_artists">Most played artists</string>
-
    <string name="my_name">Name</string>
+
    <string name="my_top_tracks">Most played</string>

    <string name="never">Never</string>

    <string name="new_banner_photo">New banner photo</string>
+
    <string name="new_playlist_title">New playlist</string>
+
    <string name="new_profile_photo">New profile photo</string>
+
    <string name="new_start_directory">%s is the new start directory.</string>

    <string name="next_song">Next Song</string>

    <string name="no_albums">You have no albums</string>
+
    <string name="no_artists">You have no artists</string>
+
    <string name="no_audio_ID">"Play a song first, then try again."</string>
+
    <string name="no_equalizer">No equalizer found</string>
+
    <string name="no_genres">You have no genres</string>
+
    <string name="no_lyrics_found">No lyrics found</string>
+
    <string name="no_playlists">You have no playlists</string>
+
    <string name="no_purchase_found">No purchase found.</string>
+
    <string name="no_results">No results</string>
+
    <string name="no_songs">You have no songs</string>

    <string name="normal">Normal</string>
+
    <string name="normal_lyrics">Normal lyrics</string>
+
    <string name="normal_style">Normal</string>

    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
@ -349,6 +422,7 @@
    <string name="nothing_to_scan">Nothing to scan.</string>

    <string name="notification">Notification</string>
+
    <string name="notification_settings_summary">Customize the notification style</string>

    <string name="now_playing">Now playing</string>
@ -375,9 +449,11 @@
    <string name="permissions_denied">Permissions denied.</string>

    <string name="personalize">Personalize</string>
+
    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>

    <string name="pick_from_local_storage">Pick from local storage</string>
+
    <string name="pick_image_intent_text">Pick image</string>

    <string name="pinterest_page">Pinterest</string>
@ -389,16 +465,24 @@
    <string name="playing_notification_name">Playing notification</string>

    <string name="playlist_empty_text">Empty playlist</string>
+
    <string name="playlist_is_empty">Playlist is empty</string>
+
    <string name="playlist_name_empty">Playlist name</string>

    <string name="playlists">Playlists</string>

    <string name="pref_album_detail_style">Album detail style</string>
+
    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
    <string name="pref_blur_amount_title">Blur amount</string>
+
+    <string name="pref_dialog_corner_summary">Adjust the bottom sheet dialog corners</string>
    <string name="pref_dialog_corner_title">Dialog corner</string>
+
+    <string name="pref_filter_song_summary">Filter songs by length</string>
    <string name="pref_filter_song_title">Filter song duration</string>
+
    <string name="pref_header_album">Album style</string>
    <string name="pref_header_audio">Audio</string>
    <string name="pref_header_controls">Controls</string>
@ -407,14 +491,17 @@
    <string name="pref_header_library">Library</string>
    <string name="pref_header_lockscreen">Lockscreen</string>
    <string name="pref_header_playlists">Playlists</string>
+
    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
    <string name="pref_keep_screen_on_title">Keep the screen on</string>
+
    <string name="pref_now_playing_screen_summary">Click to open with or slide to without transparent navigation of now playing screen</string>
    <string name="pref_now_playing_screen_title">Click or Slide</string>

    <string name="pref_snow_fall_title">Snow fall effect</string>
+
    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
@ -441,6 +528,7 @@
    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
    <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
    <string name="pref_summary_toggle_volume">If enough space is available, show volume controls in the now playing screen</string>
+
    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
    <string name="pref_title_album_cover_style">Album cover theme</string>
    <string name="pref_title_album_cover_transform">Album cover skip</string>
@ -487,34 +575,44 @@
    <string name="profile">Profile</string>

    <string name="purchase">Purchase</string>
+
    <string name="purchase_summary">*Think before buying, don\'t ask for refund.</string>

    <string name="queue">Queue</string>

    <string name="rate_app">Rate the app</string>
+
    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>

-    <string name="recent_added_albums">Recently added albums</string>
-    <string name="recent_added_artists">Recently added artists</string>
    <string name="recent_albums">Recent albums</string>
+
    <string name="recent_artists">Recent artists</string>

    <string name="remove_action">Remove</string>
+
    <string name="remove_banner_photo">Remove banner photo</string>
+
    <string name="remove_cover">Remove cover</string>
+
    <string name="remove_from_blacklist">Remove from blacklist</string>
+
    <string name="remove_profile_photo">Remove profile photo</string>
+
    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
+
    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
+
    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>

    <string name="rename_playlist_title">Rename playlist</string>

    <string name="report_an_issue">Report an issue</string>
+
    <string name="report_bug">Report bug</string>

    <string name="reset_action">Reset</string>
+
    <string name="reset_artist_image">Reset artist image</string>

    <string name="restore">Restore</string>
@ -525,11 +623,14 @@
    <string name="restoring_purchase">Restoring purchase…</string>

    <string name="retro_equalizer">Retro Music Equalizer</string>
+
    <string name="retro_music_pro">Retro Music Pro</string>

    <string name="saf_delete_failed">File delete failed: %s</string>
+
    <!-- SAF -->
    <string name="saf_error_uri">Can\'t get SAF URI</string>
+
    <string name="saf_guide_slide1_description">Open navigation drawer</string>
    <string name="saf_guide_slide1_description_before_o">Enable \'Show SD card\' in overflow menu</string>
    <!-- SAF guide -->
@ -538,12 +639,15 @@
    <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
    <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
+
    <string name="saf_write_failed">File write failed: %s</string>

    <string name="save">Save</string>
+
    <!-- SAF -->
    <!-- SAF guide -->
    <string name="save_playlist_title">Save as file</string>
+
    <string name="save_playlists_title">Save as files</string>

    <string name="saved_playlist_to">Saved playlist to %s.</string>
@ -557,6 +661,7 @@
    <string name="search_hint">Search your library…</string>

    <string name="select_all">Select all</string>
+
    <string name="select_banner_photo">Select banner photo</string>

    <string name="selected">Selected</string>
@ -564,7 +669,9 @@
    <string name="send_crash_log">Send crash log</string>

    <string name="set">Set</string>
+
    <string name="set_artist_image">Set artist image</string>
+
    <string name="set_photo">Set a profile photo</string>

    <string name="share_app">Share app</string>
@ -583,6 +690,7 @@
    <string name="social">Social</string>

    <string name="song">Song</string>
+
    <string name="song_duration">Song duration</string>

    <string name="songs">Songs</string>
@ -597,6 +705,7 @@
    <string name="sort_order_z_a">Descending</string>

    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
+
    <string name="speech_prompt">Search your library</string>

    <string name="stack">Stack</string>
@ -624,29 +733,37 @@
    <string name="the_audio_file">The audio file</string>

    <string name="this_month">This month</string>
+
    <string name="this_week">This week</string>
+
    <string name="this_year">This year</string>

    <string name="tiny">Tiny</string>

    <string name="title">Title</string>
+
    <string name="title_dashboard">Dashboard</string>
+
    <string name="title_good_afternoon">Good afternoon</string>
    <string name="title_good_day">Good day</string>
    <string name="title_good_evening">Good evening</string>
    <string name="title_good_morning">Good morning</string>
    <string name="title_good_night">Good night</string>
+
    <string name="title_user_info">What\'s Your Name</string>

    <string name="today">Today</string>

    <string name="top_albums">Top albums</string>
+
    <string name="top_artists">Top artists</string>

    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
+
    <string name="track_list">Track number</string>

    <string name="translate">Translate</string>
+
    <string name="translate_community">Help us translate the app to your language</string>

    <string name="twitter_page">Twitter</string>
@ -679,19 +796,20 @@
    <string name="whats_new">What\'s New</string>

    <string name="window">Window</string>
+
    <string name="window_corner_edges">Rounded corners</string>

    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
+
    <string name="x_selected">%1$d selected</string>

    <string name="year">Year</string>

    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
+
    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>

    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-
-    <string name="label_more_from">More from %s</string>
-    <string name="pref_dialog_corner_summary" >Adjust the bottom sheet dialog corners</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
+    <string name="pref_header_advanced">Advanced</string>
+    <string name="pref_header_blacklist">Blacklist</string>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -48,6 +48,7 @@
        <item name="android:textAllCaps">false</item>
        <item name="android:textSize">20sp</item>
        <item name="android:letterSpacing">0.0125</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>

    <style name="BigTitleTextAppearanceToolbar">
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@ -20,6 +20,7 @@
        <item name="roundSelector">@drawable/round_selector</item>
        <item name="rectSelector">@drawable/rect_selector</item>
        <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
+
    </style>

    <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@ -3,15 +3,45 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
        android:layout="@layout/preference_category_title"
-        android:title="Advanced">
+        android:title="@string/pref_header_blacklist">
+
+        <code.name.monkey.retromusic.preferences.BlacklistPreference
+            android:key="blacklist"
+            android:layout="@layout/list_item_view"
+            android:summary="@string/pref_summary_blacklist"
+            android:title="@string/pref_title_blacklist"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_music_note_off_white_24dp" />
+
+    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
+        android:layout="@layout/preference_category_title"
+        android:title="@string/pref_header_playlists">
+
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
+            android:defaultValue="this_month"
+            android:entries="@array/pref_playlists_last_added_interval_titles"
+            android:entryValues="@array/pref_playlists_last_added_interval_values"
+            android:key="last_added_interval"
+            android:layout="@layout/list_item_view"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_last_added_interval"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_playlist_add_white_24dp" />
+
+    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
+        android:layout="@layout/preference_category_title"
+        android:title="@string/pref_header_advanced">

        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
            android:defaultValue="30"
            android:key="filter_song"
            android:layout="@layout/list_item_view_seekbar"
            android:max="60"
-            android:title="@string/pref_filter_song_title"
            android:summary="@string/pref_filter_song_summary"
+            android:title="@string/pref_filter_song_title"
            app:enableCopying="true"
            app:icon="@drawable/ic_filter_song_white_24dp"
            app:showSeekBarValue="true" />
--- a/app/src/main/res/xml/pref_blacklist.xml
+++ b/app/src/main/res/xml/pref_blacklist.xml
@ -1,16 +0,0 @@
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
-        android:layout="@layout/preference_category_title"
-        android:title="Blacklist">
-
-        <code.name.monkey.retromusic.preferences.BlacklistPreference
-            android:key="blacklist"
-            android:layout="@layout/list_item_view"
-            android:summary="@string/pref_summary_blacklist"
-            android:title="@string/pref_title_blacklist"
-            app:enableCopying="true"
-            app:icon="@drawable/ic_music_note_off_white_24dp" />
-
-    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-</androidx.preference.PreferenceScreen>
--- a/app/src/main/res/xml/pref_lockscreen.xml
+++ b/app/src/main/res/xml/pref_lockscreen.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-</androidx.preference.PreferenceScreen>
--- a/app/src/main/res/xml/pref_playlists.xml
+++ b/app/src/main/res/xml/pref_playlists.xml
@ -1,22 +0,0 @@
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
-        android:layout="@layout/preference_category_title"
-        android:title="@string/pref_header_playlists">
-
-        <code.name.monkey.retromusic.preferences.MaterialListPreference
-            android:defaultValue="this_month"
-            android:entries="@array/pref_playlists_last_added_interval_titles"
-            android:entryValues="@array/pref_playlists_last_added_interval_values"
-            android:key="last_added_interval"
-            android:layout="@layout/list_item_view"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_last_added_interval"
-            app:enableCopying="true"
-            app:icon="@drawable/ic_playlist_add_white_24dp" />
-
-    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-
-</androidx.preference.PreferenceScreen>
--- a/app/src/main/res/xml/pref_window.xml
+++ b/app/src/main/res/xml/pref_window.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-</androidx.preference.PreferenceScreen>