Merge branch 'dev' of https://github.com/h4h13/RetroMusicPlayer into dev

Conflicts: README.md app/build.gradle app/release/output-metadata.json app/src/main/java/code/name/monkey/retromusic/Result.kt app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt app/src/main/java/code/name/monkey/retromusic/deezer/DeezerApiService.kt app/src/main/java/code/name/monkey/retromusic/deezer/DeezerResponse.kt app/src/main/java/io/github/muntashirakon/music/MainModule.kt app/src/main/java/io/github/muntashirakon/music/Result.kt app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt app/src/main/java/io/github/muntashirakon/music/adapter/album/HorizontalAlbumAdapter.kt app/src/main/java/io/github/muntashirakon/music/adapter/playlist/PlaylistAdapter.kt app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt app/src/main/java/io/github/muntashirakon/music/adapter/song/PlayingQueueAdapter.kt app/src/main/java/io/github/muntashirakon/music/deezer/DeezerApiService.kt app/src/main/java/io/github/muntashirakon/music/deezer/DeezerResponse.kt app/src/main/java/io/github/muntashirakon/music/dialogs/AddToPlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/CreatePlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/DeletePlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsAsyncTask.java app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveFromPlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/RenamePlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/RetroSingleCheckedListAdapter.kt app/src/main/java/io/github/muntashirakon/music/extensions/ActivityEx.kt app/src/main/java/io/github/muntashirakon/music/fragments/DetailListFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/MiniPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/library/LibraryFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/player/classic/ClassicPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitPlaybackControlsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/player/gradient/GradientPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/queue/PlayingQueueFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/settings/MainSettingsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/settings/OtherSettingsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/songs/SongsFragment.kt app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageLoader.kt app/src/main/java/io/github/muntashirakon/music/helper/M3UWriter.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/GenreMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/PlaylistMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/SongMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/SongsMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.java app/src/main/java/io/github/muntashirakon/music/model/DeezerResponse.kt app/src/main/java/io/github/muntashirakon/music/model/Home.kt app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.java app/src/main/java/io/github/muntashirakon/music/network/DeezerService.kt app/src/main/java/io/github/muntashirakon/music/network/Result.kt app/src/main/java/io/github/muntashirakon/music/network/RetrofitClient.kt app/src/main/java/io/github/muntashirakon/music/repository/GenreRepository.kt app/src/main/java/io/github/muntashirakon/music/repository/PlaylistRepository.kt app/src/main/java/io/github/muntashirakon/music/repository/PlaylistSongsLoader.kt app/src/main/java/io/github/muntashirakon/music/repository/Repository.kt app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt app/src/main/java/io/github/muntashirakon/music/service/MusicService.java app/src/main/java/io/github/muntashirakon/music/util/AppRater.kt app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt app/src/main/java/io/github/muntashirakon/music/util/PlaylistsUtil.java app/src/main/res/font/pacifico.xml app/src/main/res/layout/fragment_gradient_player.xml app/src/main/res/layout/fragment_library.xml app/src/main/res/layout/fragment_main.xml app/src/main/res/layout/fragment_main_settings.xml app/src/main/res/navigation/library_graph.xml app/src/main/res/navigation/main_graph.xml
2020-09-22 11:14:00 +06:00 · 2020-09-22 11:14:00 +06:00 · 6df00b3e3a
commit 6df00b3e3a
parent 3c3cbf08a9 c3ddb066b7
244 changed files with 4912 additions and 2578 deletions
--- a/app/src/main/res/drawable/ic_account.xml
+++ b/app/src/main/res/drawable/ic_account.xml
@ -19,6 +19,6 @@
    android:viewportHeight="24">

    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22 0.03 -1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z" />
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z" />
 </vector>
--- a/app/src/main/res/drawable/ic_phonelink_ring.xml
+++ b/app/src/main/res/drawable/ic_phonelink_ring.xml
@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M14,1L4,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L16,3c0,-1.1 -0.9,-2 -2,-2zM14,20L4,20L4,4h10v16zM20.63,8.26c-0.26,-0.32 -0.74,-0.36 -1.04,-0.06l-0.03,0.03c-0.25,0.25 -0.26,0.65 -0.05,0.93 1.26,1.64 1.25,3.87 -0.02,5.57 -0.21,0.28 -0.19,0.67 0.05,0.92l0.05,0.05c0.29,0.29 0.76,0.26 1.03,-0.05 1.8,-2.13 1.8,-5.19 0.01,-7.39zM17.42,10.37l-0.06,0.06c-0.2,0.2 -0.26,0.5 -0.15,0.76 0.21,0.49 0.21,1.03 0,1.52 -0.11,0.26 -0.05,0.56 0.15,0.76l0.08,0.08c0.32,0.32 0.87,0.25 1.09,-0.15 0.49,-0.89 0.49,-1.94 -0.01,-2.86 -0.22,-0.42 -0.77,-0.5 -1.1,-0.17z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_sd_storage.xml
+++ b/app/src/main/res/drawable/ic_sd_storage.xml
@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,2h-7.17c-0.53,0 -1.04,0.21 -1.42,0.59L4.6,7.42c-0.37,0.37 -0.6,0.88 -0.6,1.4L4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM11,8c-0.55,0 -1,-0.45 -1,-1L10,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM14,8c-0.55,0 -1,-0.45 -1,-1L13,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM17,8c-0.55,0 -1,-0.45 -1,-1L16,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1z"/>
+</vector>
--- a/app/src/main/res/font/pacifico.xml
+++ b/app/src/main/res/font/pacifico.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:fontProviderAuthority="com.google.android.gms.fonts"
-    app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
-    app:fontProviderPackage="com.google.android.gms"
-    app:fontProviderQuery="Pacifico"></font-family>
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ b/app/src/main/res/layout-land/fragment_album_details.xml
@ -6,6 +6,7 @@
    android:layout_height="match_parent"
    android:background="?attr/colorSurface"
    android:orientation="vertical"
+    android:transitionName="@string/transition_album_art"
    tools:ignore="UnusedAttribute">

    <FrameLayout
@ -46,9 +47,7 @@
        android:layout_marginStart="16dp"
        android:layout_marginTop="8dp"
        android:layout_marginEnd="16dp"
-        android:transitionName="@string/transition_album_art"
        app:cardCornerRadius="24dp"
-
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/container"
        app:layout_constraintHorizontal_bias="0.5"
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@ -87,7 +87,7 @@
                    android:layout_height="wrap_content"
                    android:layout_marginStart="16dp"
                    android:padding="0dp"
-                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textAppearance="@style/TextViewHeadline6"
                    android:textColor="@color/md_white_1000"
                    android:textStyle="bold"
                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@ -57,7 +57,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="16dp"
            android:padding="0dp"
-            android:textAppearance="@style/TextViewHeadline5"
+            android:textAppearance="@style/TextViewHeadline6"
            android:textColor="?android:attr/textColorPrimary"
            android:textStyle="bold"
            app:layout_constraintBottom_toBottomOf="@+id/userImage"
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@ -6,7 +6,6 @@
    android:orientation="vertical"
    android:paddingBottom="12dp">

-
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/history"
        android:layout_width="0dp"
--- a/app/src/main/res/layout/activity_lyrics.xml
+++ b/app/src/main/res/layout/activity_lyrics.xml
@ -12,10 +12,10 @@
        android:layout_height="match_parent"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
        app:lrcLabel="@string/no_lyrics_found"
-        app:lrcNormalTextSize="32sp"
-        app:lrcPadding="16dp"
+        app:lrcNormalTextSize="24sp"
+        app:lrcPadding="24dp"
        app:lrcTextGravity="left"
-        app:lrcTextSize="32sp" />
+        app:lrcTextSize="28sp" />

    <com.google.android.material.bottomappbar.BottomAppBar
        android:id="@+id/appBarLayout"
--- a/app/src/main/res/layout/activity_permission.xml
+++ b/app/src/main/res/layout/activity_permission.xml
@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface">
+
+    <code.name.monkey.retromusic.views.BaselineGridTextView
+        android:id="@+id/appNameText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="32dp"
+        android:text="@string/app_name"
+        android:textAppearance="@style/TextViewHeadline5"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lineHeightHint="32sp" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?attr/dividerHorizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appNameText" />
+
+    <code.name.monkey.retromusic.views.PermissionItem
+        android:id="@+id/storagePermission"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/divider"
+        app:permissionButtonTitle="Grant access"
+        app:permissionIcon="@drawable/ic_sd_storage"
+        app:permissionTitle="Storage Access"
+        app:permissionTitleNumber="1"
+        app:permissionTitleSubTitle="The app needs permission to access your device storage for music files playing music" />
+
+    <code.name.monkey.retromusic.views.PermissionItem
+        android:id="@+id/audioPermission"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/storagePermission"
+        app:permissionButtonTitle="Grant access"
+        app:permissionIcon="@drawable/ic_phonelink_ring"
+        app:permissionTitle="Ringtone"
+        app:permissionTitleNumber="2"
+        app:permissionTitleSubTitle="The app needs permission to access your device settings in order to set music as Ringtone"
+        tools:visibility="visible" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/finish"
+        style="@style/Widget.MaterialComponents.Button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:paddingVertical="12dp"
+        android:text="Let's go"
+        android:textAppearance="@style/TextViewButton"
+        app:cornerRadius="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/bug_report_card_device_info.xml
+++ b/app/src/main/res/layout/bug_report_card_device_info.xml
@ -2,6 +2,7 @@
 <com.google.android.material.card.MaterialCardView 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"
+    style="@style/MaterialCardViewStroke"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    app:cardCornerRadius="8dp"
@ -30,8 +31,7 @@
            android:background="?rectSelector"
            android:lineSpacingExtra="8dp"
            android:padding="16dp"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-            android:textColor="?android:textColorSecondary"
+            android:textAppearance="@style/TextViewBody1"
            tools:text="@tools:sample/lorem/random" />

    </LinearLayout>
--- a/app/src/main/res/layout/card_credit.xml
+++ b/app/src/main/res/layout/card_credit.xml
@ -2,9 +2,9 @@
 <com.google.android.material.card.MaterialCardView 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"
+    style="@style/MaterialCardViewStroke"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
    app:cardCornerRadius="@dimen/about_card_radius">

    <androidx.constraintlayout.widget.ConstraintLayout
--- a/app/src/main/res/layout/card_other.xml
+++ b/app/src/main/res/layout/card_other.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/MaterialCardViewStroke"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_margin="4dp"
--- a/app/src/main/res/layout/card_retro_info.xml
+++ b/app/src/main/res/layout/card_retro_info.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/MaterialCardViewStroke"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
    app:cardCornerRadius="@dimen/about_card_radius">

    <androidx.constraintlayout.widget.ConstraintLayout
--- a/app/src/main/res/layout/card_social.xml
+++ b/app/src/main/res/layout/card_social.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/MaterialCardViewStroke"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
    app:cardCornerRadius="@dimen/about_card_radius">

    <androidx.constraintlayout.widget.ConstraintLayout
--- a/app/src/main/res/layout/fragment_album_content.xml
+++ b/app/src/main/res/layout/fragment_album_content.xml
@ -8,14 +8,17 @@

    <com.google.android.material.button.MaterialButton
        android:id="@+id/playAction"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="16dp"
        android:layout_marginEnd="4dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
        android:text="@string/action_play_all"
        android:textColor="?android:attr/textColorPrimary"
        app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_play_arrow"
+        app:cornerRadius="8dp"
        app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toStartOf="parent"
@ -23,14 +26,17 @@

    <com.google.android.material.button.MaterialButton
        android:id="@+id/shuffleAction"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="4dp"
        android:layout_marginEnd="16dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
        android:text="@string/shuffle"
        android:textColor="?android:attr/textColorPrimary"
        app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_shuffle"
+        app:cornerRadius="8dp"
        app:layout_constraintBottom_toBottomOf="@+id/playAction"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
--- a/app/src/main/res/layout/fragment_album_details.xml
+++ b/app/src/main/res/layout/fragment_album_details.xml
@ -3,7 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:transitionName="@string/transition_album_art">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/appBarLayout"
@ -48,7 +49,6 @@
                android:layout_marginStart="16dp"
                android:layout_marginTop="8dp"
                android:layout_marginEnd="16dp"
-                android:transitionName="@string/transition_album_art"
                app:cardCornerRadius="24dp"
                app:layout_constraintDimensionRatio="1:1"
                app:layout_constraintEnd_toEndOf="parent"
@ -69,7 +69,7 @@
                android:layout_width="52dp"
                android:layout_height="52dp"
                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="24dp"
                android:scaleType="centerCrop"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/albumCoverContainer"
@ -83,7 +83,7 @@
                android:layout_marginStart="16dp"
                android:layout_marginEnd="16dp"
                android:maxLines="3"
-                android:textAppearance="@style/TextViewHeadline5"
+                android:textAppearance="@style/TextViewHeadline4.Compress"
                android:textColor="?android:attr/textColorPrimary"
                android:textStyle="bold"
                app:layout_constrainedWidth="true"
@ -91,17 +91,16 @@
                app:layout_constraintStart_toEndOf="@id/artistImage"
                app:layout_constraintTop_toTopOf="@id/artistImage"
                tools:ignore="MissingPrefix"
-                tools:text="@tools:sample/lorem/random" />
+                tools:text="@tools:sample/full_names" />

            <io.github.muntashirakon.music.views.BaselineGridTextView
                android:id="@+id/albumText"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_marginStart="16dp"
-                android:layout_marginTop="4dp"
                android:layout_marginEnd="16dp"
                android:singleLine="true"
-                android:textAppearance="@style/TextViewSubtitle2"
+                android:textAppearance="@style/TextViewSubtitle1"
                android:textColor="?android:attr/textColorSecondary"
                app:layout_constrainedWidth="true"
                app:layout_constraintEnd_toEndOf="parent"
@ -109,7 +108,7 @@
                app:layout_constraintTop_toBottomOf="@id/albumTitle"
                app:lineHeightHint="24sp"
                tools:ignore="MissingPrefix"
-                tools:text="@tools:sample/lorem/random" />
+                tools:text="@tools:sample/full_names" />

            <include
                layout="@layout/fragment_album_content"
--- a/app/src/main/res/layout/fragment_artist_content.xml
+++ b/app/src/main/res/layout/fragment_artist_content.xml
@ -8,13 +8,17 @@

    <com.google.android.material.button.MaterialButton
        android:id="@+id/playAction"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="16dp"
        android:layout_marginEnd="4dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
        android:text="@string/action_play_all"
+        android:textColor="?android:attr/textColorPrimary"
        app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_play_arrow"
+        app:cornerRadius="8dp"
        app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toStartOf="parent"
@ -22,13 +26,17 @@

    <com.google.android.material.button.MaterialButton
        android:id="@+id/shuffleAction"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="4dp"
        android:layout_marginEnd="16dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
        android:text="@string/shuffle"
+        android:textColor="?android:attr/textColorPrimary"
        app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_shuffle"
+        app:cornerRadius="8dp"
        app:layout_constraintBottom_toBottomOf="@+id/playAction"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ b/app/src/main/res/layout/fragment_artist_details.xml
@ -71,7 +71,7 @@
                android:layout_marginTop="24dp"
                android:layout_marginEnd="16dp"
                android:maxLines="2"
-                android:textAppearance="@style/TextViewHeadline5"
+                android:textAppearance="@style/TextViewHeadline4.Compress"
                android:textColor="?android:attr/textColorPrimary"
                android:textStyle="bold"
                app:layout_constraintEnd_toEndOf="parent"
@ -85,9 +85,8 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_marginStart="16dp"
-                android:layout_marginTop="4dp"
                android:layout_marginEnd="16dp"
-                android:textAppearance="@style/TextViewSubtitle2"
+                android:textAppearance="@style/TextViewSubtitle1"
                android:textColor="?android:attr/textColorSecondary"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@ -85,7 +85,7 @@
                    android:layout_height="wrap_content"
                    android:layout_marginStart="16dp"
                    android:padding="0dp"
-                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textAppearance="@style/TextViewHeadline6"
                    android:textColor="@color/md_white_1000"
                    android:textStyle="bold"
                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
--- a/app/src/main/res/layout/fragment_gradient_player.xml
+++ b/app/src/main/res/layout/fragment_gradient_player.xml
@ -12,7 +12,7 @@
        android:layout_height="match_parent"
        android:paddingBottom="48dp">

-         <fragment
+        <fragment
             android:id="@+id/playerAlbumCoverFragment"
             android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
             android:layout_width="0dp"
@ -74,7 +74,8 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_default="spread">
+            app:layout_constraintWidth_default="spread"
+            tools:background="@color/md_red_500">

            <androidx.appcompat.widget.AppCompatImageView
                android:id="@+id/queueIcon"
@ -100,8 +101,7 @@
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintHeight_default="wrap"
                app:layout_constraintStart_toEndOf="@id/queueIcon"
-                app:layout_constraintTop_toTopOf="@id/queueIcon"
-                tools:text="@tools:sample/lorem/random" />
+                app:layout_constraintTop_toTopOf="@id/queueIcon" />

            <androidx.appcompat.widget.AppCompatImageButton
                android:id="@+id/repeatButton"
@ -150,4 +150,4 @@
            tools:listitem="@layout/item_list" />
    </androidx.constraintlayout.widget.ConstraintLayout>

-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@ -54,7 +54,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="16dp"
            android:padding="0dp"
-            android:textAppearance="@style/TextViewHeadline5"
+            android:textAppearance="@style/TextViewHeadline6"
            android:textColor="?android:attr/textColorPrimary"
            android:textStyle="bold"
            app:layout_constraintBottom_toBottomOf="@+id/userImage"
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@ -31,7 +31,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center"
-                    android:text="@string/app_name"
+                    android:id="@+id/appNameText"
                    android:textAppearance="@style/TextViewHeadline6"
                    android:textStyle="bold" />
            </androidx.appcompat.widget.Toolbar>
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?colorSurface"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        tools:ignore="UnusedAttribute">
-
-        <include layout="@layout/status_bar" />
-
-    </FrameLayout>
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/mainContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appBarLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:liftOnScroll="true">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|enterAlways">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/colorSurface"
-                    app:popupTheme="?attr/toolbarPopupTheme"
-                    app:title="@string/app_name"
-                    app:titleTextAppearance="@style/ToolbarTextAppearanceNormal.Library"
-                    app:titleTextColor="?attr/colorControlNormal"
-                    tools:ignore="UnusedAttribute" />
-
-                <ViewStub
-                    android:id="@+id/cab_stub"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/toolbar_height" />
-            </FrameLayout>
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/fragment_container"
-            android:name="io.github.muntashirakon.music.fragments.main.MainFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:defaultNavHost="true"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-            app:navGraph="@navigation/main_graph" />
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</LinearLayout>
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@ -12,6 +12,7 @@
        android:layout_height="wrap_content"
        android:clipToPadding="false"
        android:overScrollMode="never"
+        android:transitionGroup="true"
        android:scrollbars="none"
        app:layout_dodgeInsetEdges="bottom"
        tools:listitem="@layout/item_list" />
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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/scrollView"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
--- a/app/src/main/res/layout/fragment_playlist_detail.xml
+++ b/app/src/main/res/layout/fragment_playlist_detail.xml
@ -38,6 +38,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:clipToPadding="false"
+        android:layoutAnimation="@anim/layout_animation_fall_down"
        android:overScrollMode="never"
        android:scrollbars="none"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
@ -70,4 +71,12 @@
            android:textColor="?android:attr/textColorSecondary"
            tools:visibility="visible" />
    </LinearLayout>
+
+    <com.google.android.material.progressindicator.ProgressIndicator
+        android:id="@+id/progressIndicator"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:indeterminate="true" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/home_content.xml
+++ b/app/src/main/res/layout/home_content.xml
@ -28,27 +28,6 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nestedScrollingEnabled="false"
-                android:overScrollMode="never"
-                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                app:spanCount="3"
-                tools:itemCount="3"
-                tools:listitem="@layout/item_album_card" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="112dp" />
-        </LinearLayout>
-
        <LinearLayout
            android:id="@+id/emptyContainer"
            android:layout_width="wrap_content"
@ -75,5 +54,26 @@
                android:textAppearance="@style/TextViewNormal"
                android:textColor="?android:attr/textColorPrimary" />
        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false"
+                android:overScrollMode="never"
+                tools:itemCount="10"
+                tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                tools:listitem="@layout/item_album_card"
+                tools:spanCount="3" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="112dp" />
+        </LinearLayout>
    </FrameLayout>
 </LinearLayout>
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
+    android:padding="2dp"
    android:background="?attr/rectSelector"
    android:orientation="vertical">

--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@ -2,7 +2,7 @@
 <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"
-    android:layout_width="126dp"
+    android:layout_width="156dp"
    android:layout_height="wrap_content"
    android:background="?attr/rectSelector"
    android:orientation="vertical"
@ -10,13 +10,13 @@

    <io.github.muntashirakon.music.views.RetroShapeableImageView
        android:id="@+id/image"
-        android:layout_width="112dp"
-        android:layout_height="112dp"
+        android:layout_width="144dp"
+        android:layout_height="144dp"
        android:background="@android:color/transparent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        app:retroCornerSize="56dp"
+        app:retroCornerSize="72dp"
        tools:src="@tools:sample/avatars" />

    <com.google.android.material.textview.MaterialTextView
@ -26,8 +26,8 @@
        android:ellipsize="end"
        android:gravity="center"
        android:maxLines="2"
+        android:textAppearance="@style/TextViewBody1"
        android:paddingTop="12dp"
-        android:textAppearance="@style/TextViewNormal"
        android:textColor="?android:attr/textColorPrimary"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_contributor.xml
@ -32,6 +32,7 @@
        android:scaleType="centerCrop"
        app:civ_border="false"
        app:civ_shadow="false"
+        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:retroCornerSize="21dp"
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@ -33,13 +33,12 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:ellipsize="end"
-        android:maxLines="1"
-        android:padding="8dp"
+        android:maxLines="2"
+        android:padding="12dp"
        android:textAppearance="@style/TextViewBody1"
        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/imageContainer"
-        tools:text="Song name" />
+        tools:text="@tools:sample/full_names" />
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@ -89,6 +89,7 @@
            android:layout_height="wrap_content"
            android:ellipsize="end"
            android:maxLines="1"
+            android:textAppearance="@style/TextViewBody2"
            android:textColor="?android:attr/textColorSecondary"
            tools:text="@tools:sample/full_names" />
    </LinearLayout>
--- a/app/src/main/res/layout/item_list_no_image.xml
+++ b/app/src/main/res/layout/item_list_no_image.xml
@ -18,7 +18,7 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_margin="2dp"
-    android:background="?rectSelector"
+    android:background="?attr/rectSelector"
    android:minHeight="64dp"
    android:padding="14dp"
    tools:ignore="UnusedAttribute">
@ -40,6 +40,7 @@
        android:layout_height="wrap_content"
        android:singleLine="true"
        android:textAppearance="@style/TextViewBody2"
+        android:textColor="?android:textColorSecondary"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/title"
--- a/app/src/main/res/layout/item_permission.xml
+++ b/app/src/main/res/layout/item_permission.xml
@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/rectSelector"
+    android:minHeight="?attr/listPreferredItemHeight"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingTop="16dp"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+    android:paddingBottom="16dp">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/number"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginStart="16dp"
+        android:background="@drawable/color_circle_gradient"
+        android:gravity="center"
+        android:maxLines="3"
+        tools:text="1"
+        android:textAppearance="@style/TextViewButton"
+        app:layout_constraintBottom_toBottomOf="@id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/title" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextViewSubtitle1"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:maxLines="@string/grid_size_1"
+        tools:text="@tools:sample/lorem/random" />
+
+    <code.name.monkey.retromusic.views.BaselineGridTextView
+        android:id="@+id/summary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textAppearance="@style/TextViewNormal"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:maxLines="2"
+        tools:text="@tools:sample/lorem/random" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="0dp"
+        app:cornerRadius="8dp"
+        android:layout_height="wrap_content"
+        android:paddingVertical="10dp"
+        android:textAppearance="@style/TextViewButton"
+        app:icon="@drawable/ic_history"
+        app:iconGravity="start"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/guideline_front_margin"
+        app:layout_constraintTop_toBottomOf="@id/summary"
+        tools:text="@tools:sample/full_names" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_front_margin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/loading.xml
+++ b/app/src/main/res/layout/loading.xml
@ -20,7 +20,7 @@
    android:padding="14dp">

    <ProgressBar
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        style="@style/Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:indeterminate="true" />
--- a/app/src/main/res/layout/lyrics_dialog.xml
+++ b/app/src/main/res/layout/lyrics_dialog.xml
@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:padding="8dp">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/dialogTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:textAppearance="@style/TextViewHeadline6"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/full_names" />
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:paddingHorizontal="16dp"
+        app:layout_constraintBottom_toTopOf="@id/syncedLyrics"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dialogTitle">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/lyricsText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextViewBody1"
+                tools:text="@tools:sample/lorem/random" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="16dp" />
+        </FrameLayout>
+    </ScrollView>
+
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/syncedLyrics"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/synced_lyrics"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@ -5,8 +5,7 @@
    android:id="@+id/recentArtistContainer"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="12dp">
+    android:orientation="vertical" >

    <LinearLayout
        android:id="@+id/clickable_area"
@ -14,7 +13,7 @@
        android:layout_height="wrap_content"
        android:clickable="true"
        android:focusable="true"
-        android:foreground="?attr/rectSelector"
+        android:background="?attr/rectSelector"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@ -30,13 +29,12 @@
            android:textStyle="bold"
            tools:text="@tools:sample/full_names" />

-        <androidx.appcompat.widget.AppCompatImageView
+        <code.name.monkey.retromusic.views.AccentIcon
            android:id="@+id/arrow"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:padding="16dp"
-            app:srcCompat="@drawable/ic_arrow_forward"
-            app:tint="?attr/colorControlNormal" />
+            app:srcCompat="@drawable/ic_arrow_forward" />
    </LinearLayout>

    <androidx.recyclerview.widget.RecyclerView
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@ -11,19 +11,12 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

-    <View
-        android:id="@+id/dimBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone" />

    <FrameLayout
        android:id="@+id/slidingPanel"
+        style="@style/Widget.BottomSheet"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
        app:behavior_hideable="true"
        app:behavior_peekHeight="0dp"
        app:layout_behavior="io.github.muntashirakon.music.RetroBottomSheetBehavior">
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@ -16,10 +16,82 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    tools:context=".DrawerActivity">
-
+    <item
+        android:id="@+id/action_grid_size"
+        android:icon="@drawable/ic_grid_size"
+        android:title="@string/action_grid_size"
+        app:showAsAction="never">
+        <menu>
+            <group
+                android:id="@+id/group_grid_size"
+                android:checkableBehavior="single">
+                <item
+                    android:id="@+id/action_grid_size_1"
+                    android:title="@string/grid_size_1" />
+                <item
+                    android:id="@+id/action_grid_size_2"
+                    android:title="@string/grid_size_2" />
+                <item
+                    android:id="@+id/action_grid_size_3"
+                    android:title="@string/grid_size_3" />
+                <item
+                    android:id="@+id/action_grid_size_4"
+                    android:title="@string/grid_size_4" />
+                <item
+                    android:id="@+id/action_grid_size_5"
+                    android:title="@string/grid_size_5" />
+                <item
+                    android:id="@+id/action_grid_size_6"
+                    android:title="@string/grid_size_6" />
+                <item
+                    android:id="@+id/action_grid_size_7"
+                    android:title="@string/grid_size_7" />
+                <item
+                    android:id="@+id/action_grid_size_8"
+                    android:title="@string/grid_size_8" />
+            </group>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/action_layout_type"
+        android:icon="@drawable/ic_dashboard"
+        android:title="@string/grid_style_label"
+        app:showAsAction="never">
+        <menu>
+            <group
+                android:id="@+id/group_layout_type"
+                android:checkableBehavior="single">
+                <item
+                    android:id="@+id/action_layout_normal"
+                    android:title="@string/normal" />
+                <item
+                    android:id="@+id/action_layout_card"
+                    android:title="@string/card" />
+                <item
+                    android:id="@+id/action_layout_colored_card"
+                    android:title="@string/card_color_style" />
+                <item
+                    android:id="@+id/action_layout_circular"
+                    android:title="@string/circular" />
+                <item
+                    android:id="@+id/action_layout_image"
+                    android:title="@string/image" />
+                <item
+                    android:id="@+id/action_layout_gradient_image"
+                    android:title="@string/image_gradient" />
+            </group>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/action_sort_order"
+        android:icon="@drawable/ic_sort"
+        android:title="@string/action_sort_order"
+        app:showAsAction="never">
+        <menu></menu>
+    </item>
    <item
        android:id="@+id/action_settings"
        android:icon="@drawable/ic_settings"
        android:title="@string/action_settings"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 </menu>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/navigation/library_graph.xml
+++ b/app/src/main/res/navigation/library_graph.xml
@ -30,11 +30,6 @@
        android:name="io.github.muntashirakon.music.fragments.playlists.PlaylistsFragment"
        tools:layout="@layout/fragment_main_activity_recycler_view" />

-    <fragment
-        android:id="@+id/action_playing_queue"
-        android:name="io.github.muntashirakon.music.fragments.queue.PlayingQueueFragment"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
-
    <fragment
        android:id="@+id/action_folder"
        android:name="io.github.muntashirakon.music.fragments.folder.FoldersFragment"
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@ -5,10 +5,6 @@
    android:id="@+id/retro_graph"
    app:startDestination="@id/libraryFragment">

-    <include app:graph="@navigation/settings_graph" />
-
-    <include app:graph="@navigation/library_graph" />
-
    <fragment
        android:id="@+id/genreDetailsFragment"
        android:name="io.github.muntashirakon.music.fragments.genres.GenreDetailsFragment"
@ -26,7 +22,7 @@
        tools:layout="@layout/fragment_playlist_detail">
        <argument
            android:name="extra_playlist"
-            app:argType="io.github.muntashirakon.music.model.Playlist" />
+            app:argType="io.github.muntashirakon.music.db.PlaylistWithSongs" />
    </fragment>

    <fragment
@ -36,7 +32,7 @@
        tools:layout="@layout/fragment_album_details">
        <argument
            android:name="extra_album_id"
-            app:argType="integer" />
+            app:argType="long" />
    </fragment>

    <fragment
@ -46,21 +42,14 @@
        tools:layout="@layout/fragment_artist_details">
        <argument
            android:name="extra_artist_id"
-            app:argType="integer" />
+            app:argType="long" />
    </fragment>

    <fragment
        android:id="@+id/libraryFragment"
        android:name="io.github.muntashirakon.music.fragments.library.LibraryFragment"
        android:label=""
-        tools:layout="@layout/fragment_library">
-        <action
-            android:id="@+id/action_main_to_library"
-            app:destination="@id/library_graph" />
-        <action
-            android:id="@+id/action_main_to_settings"
-            app:destination="@id/settings_graph" />
-    </fragment>
+        tools:layout="@layout/fragment_library" />

    <fragment
        android:id="@+id/detailListFragment"
@ -82,5 +71,9 @@
        android:name="io.github.muntashirakon.music.activities.SettingsActivity"
        android:label="SettingsActivity" />

-
+    <activity
+        android:id="@+id/permissionFragment"
+        android:name="io.github.muntashirakon.music.activities.PermissionActivity"
+        android:label="PermissionFragment"
+        tools:layout="@layout/activity_permission" />
 </navigation>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@ -19,5 +19,5 @@
    <string name="app_shortcut_shuffle_all_long" translatable="false">@string/action_shuffle_all</string>
    <string name="app_shortcut_top_tracks_long" translatable="false">@string/my_top_tracks</string>

-    <string name="empty_text_emoji" translatable="false">&#129300;</string>
+    <string name="empty_text_emoji" translatable="false">&#128561;</string>
 </resources>
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@ -11,6 +11,7 @@
    <item name="action_album_sort_order_desc" type="id" />
    <item name="action_album_sort_order_artist" type="id" />
    <item name="action_album_sort_order_year" type="id" />
+    <item name="action_import_playlist" type="id" />
    <item name="action_artist_sort_order_asc" type="id" />
    <item name="action_artist_sort_order_desc" type="id" />
    <item name="action_song_sort_order_asc" type="id" />
--- a/app/src/main/res/values/permission_item.xml
+++ b/app/src/main/res/values/permission_item.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="PermissionItem">
+        <attr name="permissionTitle" format="string" />
+        <attr name="permissionTitleSubTitle" format="string" />
+        <attr name="permissionTitleNumber" format="string" />
+        <attr name="permissionIcon" format="integer" />
+        <attr name="permissionButtonTitle" format="string" />
+    </declare-styleable>
+</resources>
--- a/app/src/main/res/values/preloaded_fonts.xml
+++ b/app/src/main/res/values/preloaded_fonts.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <array name="preloaded_fonts" translatable="false">
-        <item>@font/pacifico</item>
-    </array>
-</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -883,4 +883,7 @@
    <!-- TODO: Remove or change this placeholder text -->
    <string name="hello_blank_fragment">Hello blank fragment</string>
    <string name="done">Done</string>
+    <string name="import_playlist">Import playlist</string>
+    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
+    <string name="import_label">Import</string>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -63,12 +63,6 @@
        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>

-    <style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
-        <item name="android:textAppearance">@style/TextViewHeadline6</item>
-        <item name="fontFamily">@font/pacifico</item>
-        <item name="android:fontFamily">@font/pacifico</item>
-    </style>
-
    <style name="BigTitleTextAppearanceToolbar">
        <item name="android:textAppearance">@style/TextViewHeadline6</item>
        <item name="android:layout_width">wrap_content</item>
@ -115,6 +109,10 @@
        <item name="android:textSize">14sp</item>
    </style>

+    <style name="TextViewHeadline4.Compress" parent="TextAppearance.MaterialComponents.Headline4">
+        <item name="android:textSize">32sp</item>
+    </style>
+
    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4" />

    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5" />
@ -216,14 +214,17 @@

    <style name="AppTextAppearance.MaterialAlertDialog.Button" parent="Widget.MaterialComponents.Button.TextButton">
        <item name="android:textSize">16sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:padding">0dp</item>
    </style>

    <style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
-        <item name="android:textSize">14sp</item>
+        <item name="android:textAppearance">@style/TextViewBody1</item>
+        <item name="android:paddingTop">16dp</item>
    </style>

    <style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textSize">20sp</item>
+        <item name="android:textAppearance">@style/TextViewHeadline6</item>
        <item name="android:textStyle">bold</item>
    </style>

@ -237,4 +238,16 @@
        <item name="android:paddingTop">@dimen/button_padding_vertical</item>
        <item name="android:paddingBottom">@dimen/button_padding_vertical</item>
    </style>
+
+
+    <style name="Widget.BottomSheet" parent="Widget.MaterialComponents.BottomSheet">
+
+    </style>
+
+    <style name="MaterialCardViewStroke">
+        <item name="cardUseCompatPadding">true</item>
+        <item name="strokeWidth">1dp</item>
+        <item name="strokeColor">?android:attr/colorButtonNormal</item>
+        <item name="cardElevation">0dp</item>
+    </style>
 </resources>
--- a/app/src/main/res/xml/pref_images.xml
+++ b/app/src/main/res/xml/pref_images.xml
@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
        android:key="ignore_media_store_artwork"
        android:layout="@layout/list_item_view_switch"
        android:summary="@string/pref_summary_ignore_media_store_artwork"
@ -11,7 +11,7 @@
        app:icon="@drawable/ic_image" />

    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-        android:defaultValue="only_wifi"
+        android:defaultValue="always"
        android:entries="@array/pref_auto_download_images_titles"
        android:entryValues="@array/pref_auto_download_images_values"
        android:key="auto_download_images_policy"