diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml
index 2a2d6d663..82f84575e 100644
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ b/app/src/main/res/layout-land/fragment_album_details.xml
@@ -5,10 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
+    android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:transitionName="@string/transition_album_art"
-    tools:ignore="UnusedAttribute"
-    android:fitsSystemWindows="true">
+    tools:ignore="UnusedAttribute">
 
     <FrameLayout
         android:id="@+id/toolbarContainer"
diff --git a/app/src/main/res/layout-land/fragment_artist_details.xml b/app/src/main/res/layout-land/fragment_artist_details.xml
index 173e52c59..22e4690e9 100644
--- a/app/src/main/res/layout-land/fragment_artist_details.xml
+++ b/app/src/main/res/layout-land/fragment_artist_details.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
-    android:orientation="vertical"
     android:fitsSystemWindows="true"
+    android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 
     <FrameLayout
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 601b7f377..44cc64f88 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -23,8 +23,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -111,11 +111,11 @@
                         android:layout_marginStart="16dp"
                         android:layout_marginBottom="8dp"
                         android:scaleType="centerCrop"
+                        android:transitionName="user_image"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:retroCornerSize="21dp"
-                        tools:srcCompat="@tools:sample/avatars"
-                        android:transitionName="user_image"/>
+                        tools:srcCompat="@tools:sample/avatars" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/text"
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 63fa6ef22..24fa9d25f 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -23,8 +23,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -81,11 +81,11 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
                 android:scaleType="centerCrop"
+                android:transitionName="user_image"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:retroCornerSize="21dp"
-                tools:srcCompat="@tools:sample/avatars"
-                android:transitionName="user_image"/>
+                tools:srcCompat="@tools:sample/avatars" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text"
diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml
index 28474ee97..30cda7a6f 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -53,20 +53,20 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
+                    android:clickable="false"
                     android:orientation="vertical"
                     android:paddingStart="16dp"
                     android:paddingTop="8dp"
                     android:paddingEnd="16dp"
-                    android:clickable="false"
                     android:paddingBottom="16dp">
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:clickable="true"
                         android:ellipsize="marquee"
                         android:focusable="true"
-                        android:clickable="true"
                         android:freezesText="true"
                         android:marqueeRepeatLimit="marquee_forever"
                         android:scrollHorizontally="true"
@@ -80,11 +80,11 @@
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:clickable="true"
                         android:ellipsize="end"
+                        android:focusable="true"
                         android:maxLines="1"
                         android:paddingTop="8dp"
-                        android:clickable="true"
-                        android:focusable="true"
                         tools:text="Text" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw600dp/item_list.xml b/app/src/main/res/layout-sw600dp/item_list.xml
index cc09a2a4c..7843e3c5e 100644
--- a/app/src/main/res/layout-sw600dp/item_list.xml
+++ b/app/src/main/res/layout-sw600dp/item_list.xml
@@ -7,12 +7,12 @@
     android:layout_marginStart="1dp"
     android:layout_marginEnd="1dp"
     android:layout_marginBottom="1dp"
-    android:paddingHorizontal="64dp"
     android:background="?rectSelector"
     android:clickable="true"
     android:focusable="true"
     android:minHeight="?attr/listPreferredItemHeight"
     android:orientation="horizontal"
+    android:paddingHorizontal="64dp"
     tools:ignore="MissingPrefix">
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout-sw600dp/item_list_big.xml b/app/src/main/res/layout-sw600dp/item_list_big.xml
index cc09a2a4c..7843e3c5e 100644
--- a/app/src/main/res/layout-sw600dp/item_list_big.xml
+++ b/app/src/main/res/layout-sw600dp/item_list_big.xml
@@ -7,12 +7,12 @@
     android:layout_marginStart="1dp"
     android:layout_marginEnd="1dp"
     android:layout_marginBottom="1dp"
-    android:paddingHorizontal="64dp"
     android:background="?rectSelector"
     android:clickable="true"
     android:focusable="true"
     android:minHeight="?attr/listPreferredItemHeight"
     android:orientation="horizontal"
+    android:paddingHorizontal="64dp"
     tools:ignore="MissingPrefix">
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 4c2060015..600e4b020 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -3,17 +3,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="UnusedAttribute"
     android:background="?attr/colorSurface"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml
index 7953d7c79..e276c7951 100644
--- a/app/src/main/res/layout/activity_donation.xml
+++ b/app/src/main/res/layout/activity_donation.xml
@@ -11,8 +11,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml
index 0fc4d2281..50d55be9c 100644
--- a/app/src/main/res/layout/activity_lyrics.xml
+++ b/app/src/main/res/layout/activity_lyrics.xml
@@ -62,12 +62,12 @@
             android:id="@+id/tabLyrics"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:elevation="@dimen/toolbar_elevation"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:tabIndicator="@drawable/tab_lyrics_indicator"
             app:tabIndicatorAnimationMode="elastic"
-            android:elevation="@dimen/toolbar_elevation"
             app:tabIndicatorFullWidth="false"
             app:tabIndicatorHeight="5dp" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml
index 3e98057f7..8a0f5bd16 100755
--- a/app/src/main/res/layout/activity_playing_queue.xml
+++ b/app/src/main/res/layout/activity_playing_queue.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
     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:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 9677b8272..04a917f0d 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/colorSurface"
     android:fitsSystemWindows="true">
 
@@ -11,8 +11,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index fd1eda118..2f9402a7e 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -3,17 +3,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
+    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
-    android:background="?attr/colorSurface">
+    android:focusable="true"
+    android:focusableInTouchMode="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -133,8 +133,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:baselineAligned="false">
+                android:baselineAligned="false"
+                android:orientation="horizontal">
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/genreContainer"
diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml
index aad2a6130..95347f882 100644
--- a/app/src/main/res/layout/activity_whats_new.xml
+++ b/app/src/main/res/layout/activity_whats_new.xml
@@ -23,9 +23,9 @@
             android:id="@+id/tgFab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:text="@string/view_on_telegram"
             app:icon="@drawable/ic_telegram_white" />
diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml
index d20f1856e..7eebc702d 100644
--- a/app/src/main/res/layout/card_social.xml
+++ b/app/src/main/res/layout/card_social.xml
@@ -38,8 +38,8 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/sb3"
             app:listItemIcon="@drawable/ic_baseline"
-            app:listItemTitle="@string/website"
-            app:listItemSummary="@string/website_summary"/>
+            app:listItemSummary="@string/website_summary"
+            app:listItemTitle="@string/website" />
 
         <code.name.monkey.retromusic.views.ListItemView
             android:id="@+id/pinterestLink"
diff --git a/app/src/main/res/layout/cast_mini_controller.xml b/app/src/main/res/layout/cast_mini_controller.xml
index a8a4f5c9b..f3b77d360 100644
--- a/app/src/main/res/layout/cast_mini_controller.xml
+++ b/app/src/main/res/layout/cast_mini_controller.xml
@@ -3,8 +3,8 @@
     android:id="@+id/container_all"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="0dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingTop="0dp">
 
     <RelativeLayout
         android:id="@+id/container_current"
@@ -13,17 +13,17 @@
 
         <View
             android:id="@+id/center"
-            android:layout_centerVertical="true"
             android:layout_width="fill_parent"
-            android:visibility="invisible"
-            android:layout_height="1dp" />
+            android:layout_height="1dp"
+            android:layout_centerVertical="true"
+            android:visibility="invisible" />
 
         <ImageView
             android:id="@+id/icon_view"
             android:layout_width="@dimen/cast_mini_controller_icon_width"
             android:layout_height="@dimen/cast_mini_controller_icon_height"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
             android:src="@drawable/default_audio_art" />
 
@@ -32,47 +32,47 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/button_1"
-            android:layout_toStartOf="@+id/button_1"
+            android:layout_marginEnd="@dimen/cast_mini_controller_control_button_margin"
             android:layout_marginRight="@dimen/cast_mini_controller_control_button_margin"
-            android:layout_marginEnd="@dimen/cast_mini_controller_control_button_margin" />
+            android:layout_toStartOf="@+id/button_1"
+            android:layout_toLeftOf="@+id/button_1" />
 
         <ImageView
             android:id="@+id/button_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/button_2"
-            android:layout_toStartOf="@+id/button_2"
+            android:layout_marginEnd="@dimen/cast_mini_controller_control_button_margin"
             android:layout_marginRight="@dimen/cast_mini_controller_control_button_margin"
-            android:layout_marginEnd="@dimen/cast_mini_controller_control_button_margin" />
+            android:layout_toStartOf="@+id/button_2"
+            android:layout_toLeftOf="@+id/button_2" />
 
         <ImageView
             android:id="@+id/button_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="8dp"
-            android:layout_marginEnd="8dp" />
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp" />
 
         <TextView
             android:id="@+id/title_view"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginEnd="8dp"
             android:layout_above="@+id/center"
-            android:layout_toLeftOf="@+id/button_0"
+            android:layout_marginStart="15dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="-3dp"
             android:layout_toStartOf="@+id/button_0"
-            android:layout_toRightOf="@+id/icon_view"
+            android:layout_toLeftOf="@+id/button_0"
             android:layout_toEndOf="@+id/icon_view"
+            android:layout_toRightOf="@+id/icon_view"
             android:ellipsize="end"
             android:maxLines="1"
-            android:layout_marginBottom="-3dp"
             android:textAppearance="?attr/castTitleTextAppearance" />
 
         <TextView
@@ -80,15 +80,15 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/center"
-            android:layout_alignLeft="@+id/title_view"
             android:layout_alignStart="@+id/title_view"
-            android:layout_alignRight="@+id/title_view"
+            android:layout_alignLeft="@+id/title_view"
             android:layout_alignEnd="@+id/title_view"
-            android:layout_toLeftOf="@+id/button_0"
-            android:layout_toStartOf="@+id/button_0"
-            android:layout_toRightOf="@+id/icon_view"
-            android:layout_toEndOf="@+id/icon_view"
+            android:layout_alignRight="@+id/title_view"
             android:layout_marginTop="3dp"
+            android:layout_toStartOf="@+id/button_0"
+            android:layout_toLeftOf="@+id/button_0"
+            android:layout_toEndOf="@+id/icon_view"
+            android:layout_toRightOf="@+id/icon_view"
             android:ellipsize="end"
             android:maxLines="1"
             android:textAppearance="?attr/castSubtitleTextAppearance" />
@@ -100,8 +100,8 @@
             android:layout_width="fill_parent"
             android:layout_height="5dp"
             android:layout_alignParentTop="true"
-            android:progressDrawable="@drawable/cast_mini_controller_progress_drawable"
-            android:layoutDirection="ltr" />
+            android:layoutDirection="ltr"
+            android:progressDrawable="@drawable/cast_mini_controller_progress_drawable" />
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml
index c31152fef..1bc237016 100644
--- a/app/src/main/res/layout/dialog_file_details.xml
+++ b/app/src/main/res/layout/dialog_file_details.xml
@@ -11,8 +11,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp"
         android:paddingTop="16dp"
+        android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp" />
diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
index 4e70d0f59..0938629a5 100644
--- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
@@ -25,9 +25,9 @@
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:maxHeight="2dp"
         android:progressDrawable="@drawable/color_progress_seek"
-        android:layout_height="wrap_content"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_artist_content.xml b/app/src/main/res/layout/fragment_artist_content.xml
index 28be0883a..a1f76d182 100644
--- a/app/src/main/res/layout/fragment_artist_content.xml
+++ b/app/src/main/res/layout/fragment_artist_content.xml
@@ -15,8 +15,8 @@
         android:layout_marginEnd="4dp"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
-        android:textAppearance="@style/TextViewButton"
         android:text="@string/action_play_all"
+        android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
         app:backgroundTint="?attr/colorSurface"
         app:cornerRadius="8dp"
@@ -35,8 +35,8 @@
         android:layout_marginEnd="16dp"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
-        android:textAppearance="@style/TextViewButton"
         android:text="@string/shuffle"
+        android:textAppearance="@style/TextViewButton"
         android:textColor="?android:attr/textColorPrimary"
         app:backgroundTint="?attr/colorSurface"
         app:cornerRadius="8dp"
diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml
index e7b55e521..4b0a4902b 100644
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ b/app/src/main/res/layout/fragment_artist_details.xml
@@ -33,9 +33,9 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:overScrollMode="never"
         android:descendantFocusability="beforeDescendants"
         android:focusableInTouchMode="true"
+        android:overScrollMode="never"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index cb01185c8..861f6c42e 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -42,7 +42,7 @@
     </FrameLayout>
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
@@ -52,7 +52,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
index 4a5aeabc9..775858d14 100644
--- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
@@ -40,9 +40,9 @@
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:splitTrack="false"
         android:maxHeight="2dp"
         android:progressDrawable="@drawable/color_progress_seek"
+        android:splitTrack="false"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent" />
@@ -62,41 +62,38 @@
         tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toTopOf="@+id/text"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-            android:layout_gravity="center"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:clickable="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingHorizontal="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem" />
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:freezesText="true"
+        android:gravity="center"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:paddingHorizontal="16dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textAppearance="@style/TextViewHeadline6"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
+        tools:text="@tools:sample/lorem" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         android:layout_gravity="center"
+        android:clickable="true"
         android:ellipsize="marquee"
         android:focusable="true"
-        android:clickable="true"
         android:freezesText="true"
         android:gravity="center"
         android:marqueeRepeatLimit="marquee_forever"
@@ -106,6 +103,9 @@
         android:singleLine="true"
         android:textAppearance="@style/TextViewBody1"
         android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintBottom_toTopOf="@+id/songInfo"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title"
         tools:text="@tools:sample/lorem" />
 
diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
index b00dcdfd5..c0b591a21 100644
--- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
@@ -57,11 +57,11 @@
         <androidx.appcompat.widget.AppCompatSeekBar
             android:id="@+id/progressSlider"
             android:layout_width="match_parent"
-            android:maxHeight="2dp"
-            android:progressDrawable="@drawable/color_progress_seek"
             android:layout_height="wrap_content"
+            android:maxHeight="2dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
+            android:progressDrawable="@drawable/color_progress_seek"
             tools:progress="20" />
 
         <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 9a3c9a84a..3862f8834 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -88,8 +88,8 @@
             android:layout_marginTop="12dp"
             android:layout_marginBottom="12dp"
             android:layout_weight="1.0"
-            android:orientation="vertical"
             android:clickable="false"
+            android:orientation="vertical"
             android:paddingStart="0dp"
             android:paddingEnd="16dp">
 
@@ -97,9 +97,9 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:clickable="true"
                 android:ellipsize="marquee"
                 android:focusable="true"
-                android:clickable="true"
                 android:freezesText="true"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:scrollHorizontally="true"
@@ -112,8 +112,8 @@
                 android:id="@+id/text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:ellipsize="marquee"
                 android:clickable="true"
+                android:ellipsize="marquee"
                 android:focusable="true"
                 android:freezesText="true"
                 android:marqueeRepeatLimit="marquee_forever"
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index bc2dfc3dc..e1c681895 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -95,9 +95,9 @@
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:clickable="true"
                 android:ellipsize="marquee"
                 android:focusable="true"
-                android:clickable="true"
                 android:freezesText="true"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:paddingHorizontal="16dp"
@@ -113,10 +113,10 @@
                 android:id="@+id/text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:clickable="true"
+                android:ellipsize="end"
                 android:focusable="true"
+                android:maxLines="1"
                 android:paddingHorizontal="16dp"
                 android:textAppearance="@style/TextViewBody1"
                 android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 9c5440448..8bb06719e 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -31,7 +31,7 @@
     </FrameLayout>
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
@@ -41,7 +41,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
index f6cb771eb..789231669 100644
--- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
@@ -66,9 +66,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
-            android:clickable="true"
             android:freezesText="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index fe7c0546f..b9b42ea01 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-             <androidx.fragment.app.FragmentContainerView
+            <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-             <androidx.fragment.app.FragmentContainerView
+            <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playbackControlsFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml
index 2bd9ef037..982c5945b 100644
--- a/app/src/main/res/layout/fragment_fit_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml
@@ -63,10 +63,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:clickable="false"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:clickable="false"
         app:layout_constraintTop_toBottomOf="@+id/progressContainer">
 
         <com.google.android.material.textview.MaterialTextView
@@ -74,9 +74,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
-            android:clickable="true"
             android:freezesText="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index f05cce524..64294137f 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -43,7 +43,7 @@
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
@@ -55,7 +55,7 @@
         tools:layout="@layout/fragment_album_flat_cover" />
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index 1916ee793..283b1868e 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -100,13 +100,13 @@
         android:id="@+id/titleContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clickable="false"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        android:clickable="false">
+        app:layout_constraintTop_toBottomOf="@+id/text">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
@@ -115,9 +115,9 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:background="@color/md_red_500"
+            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
-            android:clickable="true"
             android:fontFeatureSettings="smcp"
             android:freezesText="true"
             android:gravity="center"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index dc8acf184..2cda67541 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionGroup="true"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index bef864bf0..f1382aa4c 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -8,7 +8,7 @@
     android:focusable="true">
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
@@ -31,7 +31,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml
index 5c91265dd..9baa5c70c 100644
--- a/app/src/main/res/layout/fragment_full_player_controls.xml
+++ b/app/src/main/res/layout/fragment_full_player_controls.xml
@@ -22,26 +22,26 @@
         android:id="@+id/titleContainer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:clickable="false"
         android:orientation="vertical"
         app:layout_constraintBottom_toTopOf="@+id/progressSlider"
         app:layout_constraintEnd_toStartOf="@+id/playerMenu"
         app:layout_constraintStart_toEndOf="@+id/songFavourite"
-        android:clickable="false"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clickable="true"
             android:ellipsize="marquee"
+            android:focusable="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
             android:textAppearance="@style/TextViewHeadline6"
             android:textColor="@color/md_white_1000"
             android:textStyle="bold"
-            android:clickable="true"
-            android:focusable="true"
             tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -49,7 +49,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="0.75"
+            android:clickable="true"
             android:ellipsize="end"
+            android:focusable="true"
             android:gravity="center"
             android:maxLines="1"
             android:paddingTop="6dp"
@@ -59,8 +61,6 @@
             app:layout_constraintStart_toEndOf="@+id/songFavourite"
             app:layout_constraintTop_toBottomOf="@+id/title"
             tools:layout_editor_absoluteX="48dp"
-            android:clickable="true"
-            android:focusable="true"
             tools:text="@tools:sample/lorem/random" />
 
     </LinearLayout>
@@ -96,10 +96,10 @@
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
-        android:maxHeight="2dp"
-        android:progressDrawable="@drawable/color_progress_seek"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:maxHeight="2dp"
+        android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toBottomOf="@id/titleContainer"
diff --git a/app/src/main/res/layout/fragment_gradient_controls.xml b/app/src/main/res/layout/fragment_gradient_controls.xml
index 5ea5a52cc..ae6b98ee7 100644
--- a/app/src/main/res/layout/fragment_gradient_controls.xml
+++ b/app/src/main/res/layout/fragment_gradient_controls.xml
@@ -22,18 +22,20 @@
         android:id="@+id/titleContainer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:clickable="false"
         android:orientation="vertical"
         app:layout_constraintBottom_toTopOf="@+id/progressSlider"
         app:layout_constraintEnd_toStartOf="@+id/playerMenu"
         app:layout_constraintStart_toEndOf="@+id/songFavourite"
-        android:clickable="false"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clickable="true"
             android:ellipsize="marquee"
+            android:focusable="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
@@ -41,8 +43,6 @@
             android:textColor="@color/md_white_1000"
             android:textStyle="bold"
             tools:text="@tools:sample/lorem/random"
-            android:clickable="true"
-            android:focusable="true"
             tools:textColor="@color/md_black_1000" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -50,7 +50,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="0.75"
+            android:clickable="true"
             android:ellipsize="end"
+            android:focusable="true"
             android:gravity="center"
             android:maxLines="1"
             android:paddingTop="6dp"
@@ -61,8 +63,6 @@
             app:layout_constraintTop_toBottomOf="@+id/title"
             tools:layout_editor_absoluteX="48dp"
             tools:text="@tools:sample/lorem/random"
-            android:clickable="true"
-            android:focusable="true"
             tools:textColor="@color/md_black_1000" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e4100c679..60e3cbd4f 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -23,8 +23,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -78,11 +78,11 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
                 android:scaleType="centerCrop"
+                android:transitionName="user_image"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:retroCornerSize="21dp"
-                tools:srcCompat="@tools:sample/avatars"
-                android:transitionName="user_image" />
+                tools:srcCompat="@tools:sample/avatars" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text"
diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml
index 3f7874c75..653b005ee 100644
--- a/app/src/main/res/layout/fragment_home_player.xml
+++ b/app/src/main/res/layout/fragment_home_player.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index 917719268..1eedab69b 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -27,9 +27,9 @@
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:maxHeight="2dp"
         android:progressDrawable="@drawable/color_progress_seek"
-        android:layout_height="wrap_content"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index 8356b9241..f7ff1068f 100644
--- 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,8 +12,8 @@
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:overScrollMode="never"
-        android:transitionGroup="true"
         android:scrollbars="none"
+        android:transitionGroup="true"
         app:layout_dodgeInsetEdges="bottom"
         tools:listitem="@layout/item_list" />
 
diff --git a/app/src/main/res/layout/fragment_main_recycler.xml b/app/src/main/res/layout/fragment_main_recycler.xml
index 9ffa424ca..d4af55c90 100644
--- a/app/src/main/res/layout/fragment_main_recycler.xml
+++ b/app/src/main/res/layout/fragment_main_recycler.xml
@@ -38,7 +38,7 @@
             <ViewStub
                 android:id="@+id/cab_stub"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/toolbar_height"/>
+                android:layout_height="@dimen/toolbar_height" />
         </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml
index b954f3973..3b9dc78ce 100644
--- a/app/src/main/res/layout/fragment_peak_player.xml
+++ b/app/src/main/res/layout/fragment_peak_player.xml
@@ -47,7 +47,7 @@
         </FrameLayout>
 
 
-         <androidx.fragment.app.FragmentContainerView
+        <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playerAlbumCoverFragment"
             android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
             android:layout_width="72dp"
@@ -57,24 +57,24 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/toolbarContainer" />
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toTopOf="@+id/text"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
-                app:layout_constraintTop_toBottomOf="@+id/toolbarContainer"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:freezesText="true"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewSubtitle1"
-                tools:text="@tools:sample/lorem/random" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:freezesText="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewSubtitle1"
+            app:layout_constraintBottom_toTopOf="@+id/text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
+            app:layout_constraintTop_toBottomOf="@+id/toolbarContainer"
+            tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text"
@@ -107,7 +107,7 @@
             app:layout_constraintTop_toBottomOf="@+id/text"
             tools:text="@tools:sample/lorem/random" />
 
-         <androidx.fragment.app.FragmentContainerView
+        <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playbackControlsFragment"
             android:name="code.name.monkey.retromusic.fragments.player.peak.PeakPlayerControlFragment"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index 80ad6b8ec..7cc0a06ee 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -25,18 +25,19 @@
         android:id="@+id/titleContainer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:clickable="false"
         android:orientation="vertical"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:clickable="false"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
             android:freezesText="true"
@@ -47,22 +48,21 @@
             android:textAppearance="@style/TextViewHeadline6"
             android:textStyle="bold"
             tools:ignore="MissingPrefix"
-            android:clickable="true"
             tools:text="Title" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clickable="true"
             android:ellipsize="end"
+            android:focusable="true"
             android:maxLines="1"
             android:paddingTop="8dp"
-            android:clickable="true"
-            android:focusable="true"
             tools:text="Text" />
     </LinearLayout>
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
@@ -72,7 +72,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/titleContainer" />
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 2e20ee3c1..2b443c336 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -38,9 +38,9 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
-        app:layout_constraintHeight_percent="0.5" />
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml
index e88308964..523e7a2ba 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -49,27 +49,27 @@
         tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toTopOf="@+id/text"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-            android:layout_gravity="center"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingHorizontal="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:freezesText="true"
+        android:gravity="center"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:paddingHorizontal="16dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textAppearance="@style/TextViewHeadline6"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
+        tools:text="@tools:sample/lorem/random" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
diff --git a/app/src/main/res/layout/fragment_playlist_detail.xml b/app/src/main/res/layout/fragment_playlist_detail.xml
index 64ab05fb4..dc1d92be5 100644
--- a/app/src/main/res/layout/fragment_playlist_detail.xml
+++ b/app/src/main/res/layout/fragment_playlist_detail.xml
@@ -5,8 +5,8 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionGroup="true"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index ed0ba1848..3c6285f93 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
index cdcd2afa6..a002f9baf 100644
--- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
@@ -10,20 +10,20 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         android:layout_gravity="center"
         android:ellipsize="marquee"
         android:focusable="true"
         android:freezesText="true"
         android:gravity="center"
         android:marqueeRepeatLimit="marquee_forever"
+        android:paddingHorizontal="16dp"
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem/random" />
 
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index a7a8a1393..ff6892a2b 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -25,7 +25,7 @@
     </FrameLayout>
 
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
@@ -35,7 +35,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
         android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index 3a2b52652..d3de24334 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-     <androidx.fragment.app.FragmentContainerView
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="wrap_content"
@@ -105,7 +105,7 @@
         app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
         app:layout_constraintEnd_toEndOf="parent">
 
-         <androidx.fragment.app.FragmentContainerView
+        <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playbackControlsFragment"
             android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml
index fcc88bb41..4a5477415 100644
--- a/app/src/main/res/layout/fragment_user_info.xml
+++ b/app/src/main/res/layout/fragment_user_info.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index e8503a7b3..8ec97715b 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -26,8 +26,8 @@
         android:ellipsize="end"
         android:gravity="center"
         android:maxLines="2"
-        android:textAppearance="@style/TextViewBody1"
         android:paddingTop="12dp"
+        android:textAppearance="@style/TextViewBody1"
         android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_genre.xml b/app/src/main/res/layout/item_genre.xml
index a391b1290..620042efe 100644
--- a/app/src/main/res/layout/item_genre.xml
+++ b/app/src/main/res/layout/item_genre.xml
@@ -47,8 +47,8 @@
                 android:gravity="center_vertical"
                 android:orientation="vertical"
                 android:paddingStart="8dp"
-                android:paddingEnd="0dp"
                 android:paddingTop="8dp"
+                android:paddingEnd="0dp"
                 app:layout_constraintEnd_toStartOf="@+id/image"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/item_permission.xml b/app/src/main/res/layout/item_permission.xml
index 17d806842..b4be1a715 100644
--- a/app/src/main/res/layout/item_permission.xml
+++ b/app/src/main/res/layout/item_permission.xml
@@ -15,16 +15,16 @@
         android:id="@+id/number"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginTop="4dp"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="4dp"
         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" />
+        app:layout_constraintTop_toTopOf="@id/title"
+        tools:text="1" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
@@ -56,10 +56,10 @@
         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:cornerRadius="8dp"
         app:icon="@drawable/ic_history"
         app:iconGravity="start"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_storage.xml b/app/src/main/res/layout/item_storage.xml
index 1f1d88c71..28cbebf45 100644
--- a/app/src/main/res/layout/item_storage.xml
+++ b/app/src/main/res/layout/item_storage.xml
@@ -29,8 +29,8 @@
         android:id="@+id/icon"
         android:layout_width="42dp"
         android:layout_height="42dp"
-        android:scaleType="centerCrop"
         android:padding="10dp"
+        android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_suggestions.xml b/app/src/main/res/layout/item_suggestions.xml
index 0d346dc57..bd3d115ee 100644
--- a/app/src/main/res/layout/item_suggestions.xml
+++ b/app/src/main/res/layout/item_suggestions.xml
@@ -144,8 +144,8 @@
             android:padding="8dp"
             android:text="New music mix"
             android:textAppearance="@style/TextViewNormal"
-            android:textStyle="bold"
             android:textSize="32sp"
+            android:textStyle="bold"
             app:autoSizeMaxTextSize="32sp"
             app:autoSizeMinTextSize="24sp"
             app:autoSizeStepGranularity="1sp" />
diff --git a/app/src/main/res/layout/list_item_view_no_card.xml b/app/src/main/res/layout/list_item_view_no_card.xml
index df7a98788..f7ab4c2e2 100644
--- a/app/src/main/res/layout/list_item_view_no_card.xml
+++ b/app/src/main/res/layout/list_item_view_no_card.xml
@@ -55,12 +55,12 @@
         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="@android:id/title"
-        android:textAppearance="@style/TextViewNormal"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />
 
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index 1b9b26e77..9ec8eee7d 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -4,15 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/clickable_area"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:background="?attr/rectSelector"
         android:clickable="true"
         android:focusable="true"
-        android:background="?attr/rectSelector"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 375b8e734..d55f3437a 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -48,7 +48,7 @@
             android:id="@+id/cast_stub"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout="@layout/cast_controller_layout"/>
+            android:layout="@layout/cast_controller_layout" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/sub_header.xml b/app/src/main/res/layout/sub_header.xml
index 5b066f07f..18e3dc581 100644
--- a/app/src/main/res/layout/sub_header.xml
+++ b/app/src/main/res/layout/sub_header.xml
@@ -5,9 +5,9 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="start"
-    android:gravity="start"
     android:layout_marginStart="@dimen/toolbar_margin_horizontal"
     android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+    android:gravity="start"
     android:paddingVertical="12dp"
     android:textAppearance="@style/TextViewOverline"
     android:textStyle="bold"