From 0a3a09e631ecd52e2a35a0a1608f0362f25abb5f Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Tue, 27 Apr 2021 11:05:58 +0200
Subject: [PATCH] Layouts XML cleanup

---
 app/src/main/res/layout/activity_main.xml     |  13 +-
 .../res/layout/bottom_sheet_album_dialog.xml  | 136 ++++++++---------
 .../res/layout/bottom_sheet_artist_dialog.xml |  59 ++++---
 .../res/layout/bottom_sheet_song_dialog.xml   | 144 +++++++++---------
 .../res/layout/chip_search_filter_genre.xml   |   4 +-
 .../res/layout/fragment_album_catalogue.xml   |  17 +--
 .../res/layout/fragment_artist_catalogue.xml  |  19 ++-
 app/src/main/res/layout/fragment_filter.xml   |  37 +++--
 .../res/layout/fragment_genre_catalogue.xml   |  25 ++-
 app/src/main/res/layout/fragment_landing.xml  |   3 +-
 app/src/main/res/layout/fragment_library.xml  |  45 +++---
 .../layout/fragment_player_bottom_sheet.xml   |   7 +-
 .../layout/fragment_playlist_catalogue.xml    |  19 ++-
 .../res/layout/fragment_playlist_page.xml     |  13 +-
 app/src/main/res/layout/fragment_search.xml   |  27 ++--
 app/src/main/res/layout/fragment_settings.xml |   6 +-
 .../res/layout/fragment_song_list_page.xml    |  19 ++-
 app/src/main/res/layout/fragment_sync.xml     |   4 +-
 .../res/layout/item_artist_page_album.xml     |  11 +-
 .../res/layout/item_home_discover_song.xml    |  14 +-
 app/src/main/res/layout/item_home_track.xml   |  17 +--
 app/src/main/res/layout/item_home_year.xml    |  13 +-
 .../main/res/layout/item_library_album.xml    |  18 +--
 .../main/res/layout/item_library_artist.xml   |  11 +-
 .../layout/item_library_catalogue_album.xml   |  10 +-
 .../layout/item_library_catalogue_artist.xml  |   9 +-
 .../item_library_catalogue_playlist.xml       |   3 +-
 .../main/res/layout/item_library_genre.xml    |  10 +-
 .../main/res/layout/item_library_playlist.xml |   3 +-
 .../layout/item_player_now_playing_song.xml   |   5 +-
 .../res/layout/item_player_queue_song.xml     |  48 +++---
 .../res/layout/item_search_result_song.xml    |   4 +-
 .../res/layout/player_header_bottom_sheet.xml |  35 ++---
 33 files changed, 367 insertions(+), 441 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 87ba8603..19638595 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -19,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:defaultNavHost="true"
-            app:navGraph="@navigation/nav_graph"/>
+            app:navGraph="@navigation/nav_graph" />
 
         <FrameLayout
             android:id="@+id/player_bottom_sheet"
@@ -27,7 +26,7 @@
             android:layout_height="match_parent"
             app:behavior_hideable="true"
             app:behavior_peekHeight="@dimen/bottom_sheet_peek_height"
-            app:layout_behavior="@string/bottom_sheet_behavior"/>
+            app:layout_behavior="@string/bottom_sheet_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -39,7 +38,7 @@
         android:visibility="gone"
         app:itemIconTint="@drawable/bottom_nav_selector"
         app:labelVisibilityMode="unlabeled"
-        app:menu="@menu/bottom_nav_menu"/>
+        app:menu="@menu/bottom_nav_menu" />
 
     <TextView
         android:id="@+id/offline_mode_text_view"
@@ -47,8 +46,8 @@
         android:layout_height="wrap_content"
         android:background="@color/colorAccent"
         android:gravity="center"
+        android:text="Offline mode"
         android:textColor="@android:color/white"
         android:textSize="6dp"
-        android:text="Offline mode"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_album_dialog.xml b/app/src/main/res/layout/bottom_sheet_album_dialog.xml
index fa81886e..e14c56bf 100644
--- a/app/src/main/res/layout/bottom_sheet_album_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_album_dialog.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/cardColor">
+    android:background="@color/cardColor"
+    android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
         android:paddingStart="20dp"
+        android:paddingTop="12dp"
         android:paddingEnd="20dp">
 
         <!-- Header -->
@@ -22,22 +21,22 @@
             android:layout_margin="2dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/album_title_text_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
-            android:singleLine="true"
             android:ellipsize="marquee"
-            android:marqueeRepeatLimit ="marquee_forever"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:scrollHorizontally="true"
-            android:paddingTop="8dp"
+            android:fontFamily="@font/open_sans_font_family"
+            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
+            android:paddingTop="8dp"
             android:paddingEnd="12dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
             android:text="@string/label_placeholder"
             android:textColor="@color/titleTextColor"
             android:textSize="14sp"
@@ -67,122 +66,121 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
         android:paddingTop="8dp"
-        android:paddingBottom="12dp">
+        android:paddingBottom="12dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
 
         <TextView
             android:id="@+id/play_radio_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Instant mix"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
-            android:textColor="@color/titleTextColor"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
             android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="12dp"
+            android:text="Instant mix"
+            android:textColor="@color/titleTextColor"
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/play_random_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Riproduzione casuale"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true" />
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/play_next_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Riproduci dopo"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true" />
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/add_to_queue_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Aggiungi alla coda"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/download_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:text="Scarica"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
-            android:textColor="@color/titleTextColor"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            />
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="12dp"
+            android:text="Scarica"
+            android:textColor="@color/titleTextColor"
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/add_to_playlist_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Aggiungi alla playlist"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/go_to_artist_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Vai all'artista"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
index 0a5812ee..861abcda 100644
--- a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/cardColor">
+    android:background="@color/cardColor"
+    android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
         android:paddingStart="20dp"
+        android:paddingTop="12dp"
         android:paddingEnd="20dp">
 
         <!-- Header -->
@@ -22,21 +21,21 @@
             android:layout_margin="2dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/song_title_text_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
-            android:singleLine="true"
             android:ellipsize="marquee"
-            android:marqueeRepeatLimit ="marquee_forever"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:scrollHorizontally="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
             android:text="@string/label_placeholder"
             android:textColor="@color/titleTextColor"
             android:textSize="14sp"
@@ -53,41 +52,41 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
         android:paddingTop="8dp"
-        android:paddingBottom="12dp">
+        android:paddingBottom="12dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
 
         <TextView
             android:id="@+id/play_radio_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Instant mix"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
-            android:textColor="@color/titleTextColor"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
             android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="12dp"
+            android:text="Instant mix"
+            android:textColor="@color/titleTextColor"
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/play_random_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Riproduzione casuale"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true" />
+            android:textFontWeight="700"
+            android:textSize="14sp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_song_dialog.xml b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
index 1a63e5c2..84429f4c 100644
--- a/app/src/main/res/layout/bottom_sheet_song_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/cardColor">
+    android:background="@color/cardColor"
+    android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
         android:layout_marginStart="20dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
         android:clipChildren="false">
 
@@ -23,21 +22,21 @@
             android:layout_margin="2dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ToggleButton
             android:id="@+id/button_favorite"
             android:layout_width="24dp"
             android:layout_height="24dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:background="@drawable/button_favorite_selector"
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
             android:checked="false"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless"
             android:gravity="center_vertical"
             android:text=""
             android:textOff=""
             android:textOn=""
-            android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -45,16 +44,16 @@
             android:id="@+id/song_title_text_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
-            android:singleLine="true"
+            android:layout_marginTop="8dp"
             android:ellipsize="marquee"
-            android:marqueeRepeatLimit ="marquee_forever"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:scrollHorizontally="true"
-            android:layout_marginTop="8dp"
+            android:fontFamily="@font/open_sans_font_family"
+            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
             android:text="@string/label_placeholder"
             android:textColor="@color/titleTextColor"
             android:textSize="14sp"
@@ -84,10 +83,10 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:background="@drawable/ic_check_circle"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/button_favorite"
-            android:visibility="gone"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -96,123 +95,122 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
         android:paddingTop="8dp"
-        android:paddingBottom="12dp">
+        android:paddingBottom="12dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
 
         <TextView
             android:id="@+id/play_radio_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Instant mix"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
-            android:textColor="@color/titleTextColor"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
             android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="12dp"
+            android:text="Instant mix"
+            android:textColor="@color/titleTextColor"
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/play_next_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Riproduci dopo"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true" />
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/add_to_queue_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Aggiungi alla coda"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/download_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:text="Scarica"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
-            android:textColor="@color/titleTextColor"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            />
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="12dp"
+            android:text="Scarica"
+            android:textColor="@color/titleTextColor"
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/add_to_playlist_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Aggiungi alla playlist"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/go_to_album_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Vai all'album"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/go_to_artist_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:fontFamily="@font/open_sans_font_family"
+            android:paddingStart="20dp"
             android:paddingTop="12dp"
+            android:paddingEnd="20dp"
             android:paddingBottom="12dp"
             android:text="Vai all'artista"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:fontFamily="@font/open_sans_font_family"
-            android:textFontWeight="700"
-            android:textSize="14sp"
             android:textColor="@color/titleTextColor"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"/>
+            android:textFontWeight="700"
+            android:textSize="14sp" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chip_search_filter_genre.xml b/app/src/main/res/layout/chip_search_filter_genre.xml
index 3fa21c23..2cbdf161 100644
--- a/app/src/main/res/layout/chip_search_filter_genre.xml
+++ b/app/src/main/res/layout/chip_search_filter_genre.xml
@@ -4,6 +4,7 @@
     style="@style/Widget.MaterialComponents.Chip.Choice"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:checkable="true"
     android:fontFamily="@font/open_sans_font_family"
     android:gravity="center"
     android:paddingLeft="8dp"
@@ -12,5 +13,4 @@
     android:textColor="@color/titleTextColor"
     app:chipBackgroundColor="@color/color_chip_status"
     app:chipStrokeColor="@color/chipBorderColor"
-    app:chipStrokeWidth="1.5dp"
-    android:checkable="true"/>
\ No newline at end of file
+    app:chipStrokeWidth="1.5dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_catalogue.xml b/app/src/main/res/layout/fragment_album_catalogue.xml
index 8835f55c..266fc6e2 100644
--- a/app/src/main/res/layout/fragment_album_catalogue.xml
+++ b/app/src/main/res/layout/fragment_album_catalogue.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,9 +9,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:theme="@style/SearchViewStyle"
         app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        android:theme="@style/SearchViewStyle" />
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -32,17 +31,17 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/HeadlineTextView"
-                    android:text="Browse Albums"
-                    android:paddingTop="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="16dp"
                     android:paddingEnd="16dp"
                     android:paddingBottom="24dp"
+                    android:text="Browse Albums"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    app:layout_constraintStart_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_artist_catalogue.xml b/app/src/main/res/layout/fragment_artist_catalogue.xml
index 4a0c478d..73fc0e7b 100644
--- a/app/src/main/res/layout/fragment_artist_catalogue.xml
+++ b/app/src/main/res/layout/fragment_artist_catalogue.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,11 +9,11 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:theme="@style/SearchViewStyle"
         app:layout_collapseMode="pin"
         app:navigationIcon="@drawable/ic_arrow_back"
-        app:titleTextColor="@color/titleTextColor"
         app:queryBackground="@android:color/transparent"
-        android:theme="@style/SearchViewStyle" />
+        app:titleTextColor="@color/titleTextColor" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -34,17 +33,17 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/HeadlineTextView"
-                    android:text="Browse Artists"
-                    android:paddingTop="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="16dp"
                     android:paddingEnd="16dp"
                     android:paddingBottom="24dp"
+                    android:text="Browse Artists"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    app:layout_constraintStart_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -56,7 +55,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:paddingBottom="@dimen/global_padding_bottom"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml
index f0576cf4..e48a9eb7 100644
--- a/app/src/main/res/layout/fragment_filter.xml
+++ b/app/src/main/res/layout/fragment_filter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,9 +9,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:theme="@style/SearchViewStyle"
         app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        android:theme="@style/SearchViewStyle" />
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -33,29 +32,29 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/HeadlineTextView"
-                    android:text="Filter Genres"
-                    android:paddingTop="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="16dp"
                     android:paddingEnd="16dp"
                     android:paddingBottom="24dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    android:text="Filter Genres"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <ImageView
                     android:id="@+id/finish_filtering_text_view_clickable"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginTop="16dp"
                     android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="30dp"
                     android:background="@drawable/ic_done"
                     android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -64,27 +63,27 @@
             style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:indeterminate="true"
-            android:minWidth="128dp"
-            android:layout_gravity="center" />
+            android:minWidth="128dp" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/filter_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fillViewport="true"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:visibility="gone">
+            android:visibility="gone"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <com.google.android.material.chip.ChipGroup
                 android:id="@+id/filters_chips_group"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:singleSelection="false"
-                android:paddingTop="8dp"
                 android:paddingStart="16dp"
+                android:paddingTop="8dp"
                 android:paddingEnd="16dp"
-                android:paddingBottom="@dimen/global_padding_bottom"/>
+                android:paddingBottom="@dimen/global_padding_bottom"
+                app:singleSelection="false" />
         </androidx.core.widget.NestedScrollView>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_genre_catalogue.xml b/app/src/main/res/layout/fragment_genre_catalogue.xml
index 1c51ed0a..f32cd83a 100644
--- a/app/src/main/res/layout/fragment_genre_catalogue.xml
+++ b/app/src/main/res/layout/fragment_genre_catalogue.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,9 +9,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:theme="@style/SearchViewStyle"
         app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        android:theme="@style/SearchViewStyle" />
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -33,29 +32,29 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/HeadlineTextView"
-                    android:text="Browse Genres"
-                    android:paddingTop="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="16dp"
                     android:paddingEnd="16dp"
                     android:paddingBottom="24dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    android:text="Browse Genres"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <ImageView
                     android:id="@+id/filter_genres_text_view_clickable"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginTop="16dp"
                     android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="30dp"
                     android:background="@drawable/ic_filter_list"
                     android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -67,7 +66,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:paddingBottom="@dimen/global_padding_bottom"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_landing.xml b/app/src/main/res/layout/fragment_landing.xml
index a667e6e0..3be63ee7 100644
--- a/app/src/main/res/layout/fragment_landing.xml
+++ b/app/src/main/res/layout/fragment_landing.xml
@@ -3,5 +3,4 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragment.LandingFragment">
-</FrameLayout>
\ No newline at end of file
+    tools:context=".ui.fragment.LandingFragment" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 4ffcc40f..6d105305 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -34,27 +33,25 @@
                     android:paddingEnd="8dp">
 
                     <TextView
+                        style="@style/HeadlineTextView"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="Albums"
-
-                        style="@style/HeadlineTextView"/>
+                        android:text="Albums" />
 
 
                     <TextView
                         android:id="@+id/album_catalogue_text_view_clickable"
+                        style="@style/SubheadTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="See all"
-
-                        style="@style/SubheadTextView"/>
+                        android:text="See all" />
 
                 </LinearLayout>
 
@@ -94,27 +91,25 @@
                     android:paddingEnd="8dp">
 
                     <TextView
+                        style="@style/HeadlineTextView"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="Artists"
-
-                        style="@style/HeadlineTextView"/>
+                        android:text="Artists" />
 
 
                     <TextView
                         android:id="@+id/artist_catalogue_text_view_clickable"
+                        style="@style/SubheadTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="See all"
-
-                        style="@style/SubheadTextView"/>
+                        android:text="See all" />
 
                 </LinearLayout>
 
@@ -155,27 +150,25 @@
                     android:paddingEnd="8dp">
 
                     <TextView
+                        style="@style/HeadlineTextView"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="Genres"
-
-                        style="@style/HeadlineTextView"/>
+                        android:text="Genres" />
 
 
                     <TextView
                         android:id="@+id/genre_catalogue_text_view_clickable"
+                        style="@style/SubheadTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="See all"
-
-                        style="@style/SubheadTextView"/>
+                        android:text="See all" />
                 </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -187,7 +180,7 @@
                     android:clipToPadding="false"
                     android:paddingStart="16dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="8dp"/>
+                    android:paddingEnd="8dp" />
 
             </LinearLayout>
         </LinearLayout>
@@ -215,27 +208,25 @@
                     android:paddingEnd="8dp">
 
                     <TextView
+                        style="@style/HeadlineTextView"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="Playlists"
-
-                        style="@style/HeadlineTextView"/>
+                        android:text="Playlists" />
 
 
                     <TextView
                         android:id="@+id/playlist_catalogue_text_view_clickable"
+                        style="@style/SubheadTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
-                        android:text="See all"
-
-                        style="@style/SubheadTextView"/>
+                        android:text="See all" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_player_bottom_sheet.xml b/app/src/main/res/layout/fragment_player_bottom_sheet.xml
index 3cd95fbd..c4026c15 100644
--- a/app/src/main/res/layout/fragment_player_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_player_bottom_sheet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/player_nested_scroll_view"
     android:layout_width="match_parent"
@@ -19,7 +18,7 @@
             android:layout_height="@dimen/bottom_sheet_peek_height"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <include
             android:id="@+id/player_body_layout"
@@ -28,6 +27,6 @@
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
     </FrameLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlist_catalogue.xml b/app/src/main/res/layout/fragment_playlist_catalogue.xml
index 4abc0d1a..9c612a8d 100644
--- a/app/src/main/res/layout/fragment_playlist_catalogue.xml
+++ b/app/src/main/res/layout/fragment_playlist_catalogue.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,9 +9,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:theme="@style/SearchViewStyle"
         app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        android:theme="@style/SearchViewStyle" />
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -32,17 +31,17 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/HeadlineTextView"
-                    android:text="Browse Playlists"
-                    android:paddingTop="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="16dp"
                     android:paddingEnd="16dp"
                     android:paddingBottom="24dp"
+                    android:text="Browse Playlists"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    app:layout_constraintStart_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -54,7 +53,7 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:paddingBottom="@dimen/global_padding_bottom"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_playlist_page.xml b/app/src/main/res/layout/fragment_playlist_page.xml
index 273be5ef..0a0de2f1 100644
--- a/app/src/main/res/layout/fragment_playlist_page.xml
+++ b/app/src/main/res/layout/fragment_playlist_page.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -33,16 +32,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/appbar_header_height"
                 android:layout_gravity="top"
-                android:fitsSystemWindows="true"
-                android:background="@drawable/gradient_backdrop_background_image"/>
+                android:background="@drawable/gradient_backdrop_background_image"
+                android:fitsSystemWindows="true" />
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/anim_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                app:titleTextColor="@color/titleTextColor"
                 app:layout_collapseMode="pin"
-                app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
+                app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"
+                app:titleTextColor="@color/titleTextColor" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -54,6 +53,6 @@
         android:clipToPadding="false"
         android:paddingTop="18dp"
         android:paddingBottom="@dimen/global_padding_bottom"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index ca5cfa7c..4b7da67d 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -29,18 +29,17 @@
         app:queryInputHintColor="@color/hintTextColor"
         app:queryInputTextColor="@color/hintTextColor"
         app:shouldDimBehind="true"
-
         app:suggestionIconColor="@color/suggestionIconColor"
         app:suggestionRecentSearchIconColor="@color/suggestionIconColor"
         app:suggestionSearchSuggestionIconColor="@color/suggestionIconColor"
-        app:suggestionTextColor="@color/suggestionTextColor"
-        app:suggestionSelectedTextColor="@color/suggestionSelectedTextColor" />
+        app:suggestionSelectedTextColor="@color/suggestionSelectedTextColor"
+        app:suggestionTextColor="@color/suggestionTextColor" />
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/search_result_nested_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/persistentSearchView" >
+        android:layout_below="@id/persistentSearchView">
 
         <!-- Search result -->
         <LinearLayout
@@ -60,14 +59,13 @@
                 android:visibility="gone">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
-                    android:text="Songs"
-
-                    style="@style/HeadlineTextView"/>
+                    android:text="Songs" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_tracks_recycler_view"
@@ -90,14 +88,13 @@
                 android:visibility="gone">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
-                    android:text="Albums"
-
-                    style="@style/HeadlineTextView"/>
+                    android:text="Albums" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_album_recycler_view"
@@ -122,14 +119,13 @@
                 android:visibility="gone">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
-                    android:text="Artists"
-
-                    style="@style/HeadlineTextView"/>
+                    android:text="Artists" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_artist_recycler_view"
@@ -154,14 +150,13 @@
                 android:visibility="gone">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
-                    android:text="Genres"
-
-                    style="@style/HeadlineTextView"/>
+                    android:text="Genres" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_genre_recycler_view"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 206d045d..3e8d9930 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="20dp"
-    android:paddingBottom="@dimen/global_padding_bottom">
-</RelativeLayout>
\ No newline at end of file
+    android:paddingBottom="@dimen/global_padding_bottom" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_song_list_page.xml b/app/src/main/res/layout/fragment_song_list_page.xml
index 1901bd08..011a07fa 100644
--- a/app/src/main/res/layout/fragment_song_list_page.xml
+++ b/app/src/main/res/layout/fragment_song_list_page.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,9 +9,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:theme="@style/SearchViewStyle"
         app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        android:theme="@style/SearchViewStyle" />
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -33,17 +32,17 @@
 
                 <TextView
                     android:id="@+id/page_title_label"
+                    style="@style/HeadlineTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/HeadlineTextView"
-                    android:text="@string/label_placeholder"
-                    android:paddingTop="16dp"
                     android:paddingStart="16dp"
+                    android:paddingTop="16dp"
                     android:paddingEnd="16dp"
                     android:paddingBottom="24dp"
+                    android:text="@string/label_placeholder"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    app:layout_constraintStart_toEndOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -55,7 +54,7 @@
             android:layout_marginBottom="8dp"
             android:clipToPadding="false"
             android:paddingBottom="@dimen/global_padding_bottom"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_sync.xml b/app/src/main/res/layout/fragment_sync.xml
index 985dc34e..062b9315 100644
--- a/app/src/main/res/layout/fragment_sync.xml
+++ b/app/src/main/res/layout/fragment_sync.xml
@@ -12,9 +12,9 @@
         android:layout_gravity="center"
         android:indeterminate="false"
         android:minWidth="128dp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"/>
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist_page_album.xml b/app/src/main/res/layout/item_artist_page_album.xml
index e1e7ad33..323b145b 100644
--- a/app/src/main/res/layout/item_artist_page_album.xml
+++ b/app/src/main/res/layout/item_artist_page_album.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,21 +12,21 @@
         android:layout_gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/album_name_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxWidth="256dp"
         android:maxLines="2"
         android:paddingTop="8dp"
-        android:singleLine="false"
 
-        style="@style/ItemTitleTextView"
+        android:singleLine="false"
 
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/artist_page_album_cover_image_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/artist_page_album_cover_image_view" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_discover_song.xml b/app/src/main/res/layout/item_home_discover_song.xml
index 7f73ec7c..37d250f9 100644
--- a/app/src/main/res/layout/item_home_discover_song.xml
+++ b/app/src/main/res/layout/item_home_discover_song.xml
@@ -32,12 +32,11 @@
             android:layout_marginTop="18dp"
             android:layout_marginRight="16dp"
             android:ellipsize="end"
-            android:maxLines="2"
-
             android:fontFamily="@font/inter"
-            android:textSize="20sp"
+            android:maxLines="2"
+            android:textColor="@color/gradientTitleColor"
             android:textFontWeight="400"
-            android:textColor="@color/gradientTitleColor"/>
+            android:textSize="20sp" />
 
         <TextView
             android:id="@+id/album_discover_song_label"
@@ -48,12 +47,11 @@
             android:layout_marginRight="16dp"
             android:drawablePadding="10dp"
             android:ellipsize="end"
-            android:maxLines="1"
-
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:maxLines="1"
+            android:textColor="@color/gradientSubtitleColor"
             android:textFontWeight="400"
-            android:textColor="@color/gradientSubtitleColor"/>
+            android:textSize="14sp" />
 
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_track.xml b/app/src/main/res/layout/item_home_track.xml
index 9451a4f7..d3acd33c 100644
--- a/app/src/main/res/layout/item_home_track.xml
+++ b/app/src/main/res/layout/item_home_track.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,33 +12,29 @@
         android:layout_gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/title_track_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-
-        style="@style/ItemTitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/track_cover_image_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/track_cover_image_view" />
 
     <TextView
         android:id="@+id/album_track_label"
+        style="@style/ItemSubtitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-
-        style="@style/ItemSubtitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title_track_label"/>
+        app:layout_constraintTop_toBottomOf="@+id/title_track_label" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_year.xml b/app/src/main/res/layout/item_home_year.xml
index ee4d23b5..b4db722d 100644
--- a/app/src/main/res/layout/item_home_year.xml
+++ b/app/src/main/res/layout/item_home_year.xml
@@ -6,8 +6,7 @@
     android:paddingEnd="12dp"
     android:paddingBottom="8dp">
 
-    <androidx.cardview.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/card_view"
         android:layout_width="172dp"
         android:layout_height="72dp"
@@ -26,20 +25,18 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="@color/colorAccent"/>
+                android:background="@color/colorAccent" />
 
             <TextView
                 android:id="@+id/year_label"
+                style="@style/ItemTitleTextView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center"
                 android:layout_gravity="center"
+                android:gravity="center"
                 android:paddingStart="8dp"
                 android:text="@string/label_placeholder"
-
-                style="@style/ItemTitleTextView"
-
-                android:textAlignment="gravity"/>
+                android:textAlignment="gravity" />
 
         </LinearLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_library_album.xml b/app/src/main/res/layout/item_library_album.xml
index ae51cd77..3b37a5f9 100644
--- a/app/src/main/res/layout/item_library_album.xml
+++ b/app/src/main/res/layout/item_library_album.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,34 +12,29 @@
         android:layout_gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/album_name_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-
-        style="@style/ItemTitleTextView"
-
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view" />
 
     <TextView
         android:id="@+id/artist_name_label"
+        style="@style/ItemSubtitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-
-        style="@style/ItemSubtitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/album_name_label"/>
+        app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_library_artist.xml b/app/src/main/res/layout/item_library_artist.xml
index 2bb1a1e6..3a3909a8 100644
--- a/app/src/main/res/layout/item_library_artist.xml
+++ b/app/src/main/res/layout/item_library_artist.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -13,10 +12,11 @@
         android:layout_gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/artist_name_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -24,10 +24,7 @@
         android:maxLines="1"
         android:paddingTop="8dp"
         android:singleLine="false"
-
-        style="@style/ItemTitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/artist_cover_image_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/artist_cover_image_view" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_library_catalogue_album.xml b/app/src/main/res/layout/item_library_catalogue_album.xml
index bc1b40da..1d5dc65a 100644
--- a/app/src/main/res/layout/item_library_catalogue_album.xml
+++ b/app/src/main/res/layout/item_library_catalogue_album.xml
@@ -11,33 +11,29 @@
         app:layout_constraintDimensionRatio="W, 1:1"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/album_name_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-
-        style="@style/ItemTitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_catalogue_cover_image_view" />
 
     <TextView
         android:id="@+id/artist_name_label"
+        style="@style/ItemSubtitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingBottom="16dp"
-
-        style="@style/ItemSubtitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
diff --git a/app/src/main/res/layout/item_library_catalogue_artist.xml b/app/src/main/res/layout/item_library_catalogue_artist.xml
index 3542142c..bef4bc7e 100644
--- a/app/src/main/res/layout/item_library_catalogue_artist.xml
+++ b/app/src/main/res/layout/item_library_catalogue_artist.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -12,10 +11,11 @@
         app:layout_constraintDimensionRatio="W, 1:1"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/artist_name_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -23,9 +23,6 @@
         android:paddingTop="8dp"
         android:paddingBottom="16dp"
         android:singleLine="false"
-
-        style="@style/ItemTitleTextView"
-
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/artist_catalogue_cover_image_view" />
diff --git a/app/src/main/res/layout/item_library_catalogue_playlist.xml b/app/src/main/res/layout/item_library_catalogue_playlist.xml
index a52b268c..0f7711ad 100644
--- a/app/src/main/res/layout/item_library_catalogue_playlist.xml
+++ b/app/src/main/res/layout/item_library_catalogue_playlist.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/playlist_card_view"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_library_genre.xml b/app/src/main/res/layout/item_library_genre.xml
index 033c806a..f630bca2 100644
--- a/app/src/main/res/layout/item_library_genre.xml
+++ b/app/src/main/res/layout/item_library_genre.xml
@@ -6,8 +6,7 @@
     android:paddingEnd="8dp"
     android:paddingBottom="4dp">
 
-    <androidx.cardview.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/card_view"
         android:layout_width="196dp"
         android:layout_height="54dp"
@@ -26,18 +25,17 @@
             <View
                 android:layout_width="6dp"
                 android:layout_height="match_parent"
-                android:background="@color/colorAccent"/>
+                android:background="@color/colorAccent" />
 
             <TextView
                 android:id="@+id/genre_label"
+                style="@style/ItemTitleTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
                 android:paddingStart="8dp"
                 android:text="@string/label_placeholder"
-                android:textAlignment="gravity"
-
-                style="@style/ItemTitleTextView" />
+                android:textAlignment="gravity" />
 
         </LinearLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_library_playlist.xml b/app/src/main/res/layout/item_library_playlist.xml
index 0fa976e2..8d00972f 100644
--- a/app/src/main/res/layout/item_library_playlist.xml
+++ b/app/src/main/res/layout/item_library_playlist.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/playlist_card_view"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_player_now_playing_song.xml b/app/src/main/res/layout/item_player_now_playing_song.xml
index 1fc8a241..7486677c 100644
--- a/app/src/main/res/layout/item_player_now_playing_song.xml
+++ b/app/src/main/res/layout/item_player_now_playing_song.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/now_playing_song_cover_image_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="24dp"
-    android:foreground="?android:attr/selectableItemBackground"/>
\ No newline at end of file
+    android:foreground="?android:attr/selectableItemBackground" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_player_queue_song.xml b/app/src/main/res/layout/item_player_queue_song.xml
index f1bde45c..b24705d5 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -1,15 +1,14 @@
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/cardColor"
+    android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
     android:paddingStart="24dp"
     android:paddingTop="3dp"
     android:paddingEnd="24dp"
-    android:paddingBottom="3dp"
-    android:background="@color/cardColor"
-    android:foreground="?attr/selectableItemBackground">
+    android:paddingBottom="3dp">
 
     <ImageView
         android:id="@+id/queue_song_cover_image_view"
@@ -19,76 +18,71 @@
         android:layout_margin="2dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/queue_song_title_text_view"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:singleLine="true"
         android:ellipsize="marquee"
-        android:marqueeRepeatLimit ="marquee_forever"
         android:focusable="true"
         android:focusableInTouchMode="true"
-        android:scrollHorizontally="true"
+        android:marqueeRepeatLimit="marquee_forever"
         android:paddingStart="12dp"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
         android:text="@string/label_placeholder"
-
-        style="@style/ItemTitleTextView"
-
+        app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
         app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
-        app:layout_constraintTop_toBottomOf="@+id/queue_song_title_text_view"
+        app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
         app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
-        app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image">
+        app:layout_constraintTop_toBottomOf="@+id/queue_song_title_text_view">
 
         <TextView
             android:id="@+id/queue_song_artist_text_view"
+            style="@style/ItemSubtitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="12dp"
             android:paddingEnd="4dp"
-            android:text="@string/label_placeholder"
-
-            style="@style/ItemSubtitleTextView"/>
+            android:text="@string/label_placeholder" />
 
         <TextView
             android:id="@+id/queue_separator_text_view"
+            style="@style/ItemSubtitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/label_dot_separator"
-
-            style="@style/ItemSubtitleTextView"/>
+            android:text="@string/label_dot_separator" />
 
         <TextView
             android:id="@+id/queue_song_duration_text_view"
+            style="@style/ItemSubtitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="4dp"
             android:paddingEnd="12dp"
-            android:text="@string/label_placeholder"
-
-            style="@style/ItemSubtitleTextView"/>
+            android:text="@string/label_placeholder" />
     </LinearLayout>
 
     <ImageView
         android:id="@+id/queue_song_holder_image"
         android:layout_width="36dp"
         android:layout_height="match_parent"
+        android:gravity="center_vertical"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:gravity="center_vertical"
         android:src="@drawable/ic_drag_handle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result_song.xml b/app/src/main/res/layout/item_search_result_song.xml
index f7304282..da493a6d 100644
--- a/app/src/main/res/layout/item_search_result_song.xml
+++ b/app/src/main/res/layout/item_search_result_song.xml
@@ -81,10 +81,10 @@
         android:layout_gravity="center"
         android:layout_margin="8dp"
         android:background="@drawable/ic_check_circle"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/search_result_song_more_button"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/search_result_song_more_button"
diff --git a/app/src/main/res/layout/player_header_bottom_sheet.xml b/app/src/main/res/layout/player_header_bottom_sheet.xml
index 751da06a..2f155035 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -1,49 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/bottom_sheet_peek_height"
-    android:elevation="2dp"
     android:background="@color/almostCardColor"
-    android:clipChildren="false">
+    android:clipChildren="false"
+    android:elevation="2dp">
 
     <ImageView
         android:id="@+id/player_header_song_cover_image"
         android:layout_width="42dp"
         android:layout_height="42dp"
-        android:layout_marginStart="12dp"
         android:layout_gravity="center"
+        android:layout_marginStart="12dp"
         app:layout_constraintBottom_toTopOf="@+id/player_header_seek_bar"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/player_header_song_title_label"
+        style="@style/ItemTitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:maxLines="1"
-        android:ellipsize="end"
         android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-
-        style="@style/ItemTitleTextView"
-
         app:layout_constraintEnd_toStartOf="@+id/player_header_button"
         app:layout_constraintStart_toEndOf="@+id/player_header_song_cover_image"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/player_header_song_artist_label"
+        style="@style/ItemSubtitleTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:fontFamily="@font/open_sans_font_family"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-
-        style="@style/ItemSubtitleTextView"
-
         app:layout_constraintEnd_toStartOf="@+id/player_header_button"
         app:layout_constraintStart_toEndOf="@+id/player_header_song_cover_image"
         app:layout_constraintTop_toBottomOf="@+id/player_header_song_title_label" />
@@ -55,8 +50,8 @@
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
         android:background="@drawable/button_play_pause_selector"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:checked="true"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:text=""
         android:textOff=""
         android:textOn=""
@@ -74,19 +69,19 @@
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toTopOf="@+id/player_header_seek_bar"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <SeekBar
         android:id="@+id/player_header_seek_bar"
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:progressBackgroundTint="@color/colorAccentLight"
         android:clickable="false"
-        android:thumb="@android:color/transparent"
         android:paddingStart="0dp"
         android:paddingEnd="0dp"
-        app:layout_constraintStart_toStartOf="parent"
+        android:progressBackgroundTint="@color/colorAccentLight"
+        android:thumb="@android:color/transparent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file