From 1ffe52b8a069c8808f1ce08b83446343e40bd18e Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Sat, 24 Apr 2021 11:45:53 +0200
Subject: [PATCH] Graphic restyling of the interface

---
 .../play/adapter/RecentSearchAdapter.java     |  83 --------------
 .../play/adapter/SongResultSearchAdapter.java |  17 ++-
 .../play/ui/fragment/AlbumPageFragment.java   |   2 +-
 .../play/ui/fragment/SearchFragment.java      |   6 -
 .../gradient_backdrop_background_image.xml    |   2 +-
 app/src/main/res/drawable/ic_more_vert.xml    |   9 ++
 .../main/res/layout/fragment_album_page.xml   | 103 ++++++++----------
 .../main/res/layout/fragment_artist_page.xml  |  49 ++++-----
 app/src/main/res/layout/fragment_home.xml     |  69 ++++--------
 app/src/main/res/layout/fragment_library.xml  |  44 +++-----
 app/src/main/res/layout/fragment_search.xml   |  24 ++--
 .../res/layout/item_artist_page_album.xml     |   7 +-
 .../res/layout/item_home_discover_song.xml    |  14 ++-
 app/src/main/res/layout/item_home_track.xml   |  13 +--
 app/src/main/res/layout/item_home_year.xml    |   7 +-
 .../main/res/layout/item_library_album.xml    |  14 +--
 .../main/res/layout/item_library_artist.xml   |   7 +-
 .../layout/item_library_catalogue_album.xml   |  13 +--
 .../layout/item_library_catalogue_artist.xml  |   7 +-
 .../layout/item_library_catalogue_genre.xml   |   7 +-
 .../main/res/layout/item_library_genre.xml    |   8 +-
 .../res/layout/item_player_queue_song.xml     |  22 ++--
 .../layout/item_search_recent_searches.xml    |  20 ----
 .../res/layout/item_search_result_song.xml    |  87 +++++++++------
 .../res/layout/player_body_bottom_sheet.xml   |  51 ++++-----
 .../res/layout/player_header_bottom_sheet.xml |  11 +-
 app/src/main/res/values/styles.xml            |  77 +++++++++++++
 27 files changed, 352 insertions(+), 421 deletions(-)
 delete mode 100644 app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java
 create mode 100644 app/src/main/res/drawable/ic_more_vert.xml
 delete mode 100644 app/src/main/res/layout/item_search_recent_searches.xml

diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java
deleted file mode 100644
index e4840b2f..00000000
--- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.cappielloantonio.play.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.cappielloantonio.play.R;
-import com.cappielloantonio.play.model.RecentSearch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RecentSearchAdapter extends RecyclerView.Adapter<RecentSearchAdapter.ViewHolder> {
-    private static final String TAG = "RecentSearchAdapter";
-
-    private List<RecentSearch> searches;
-    private LayoutInflater mInflater;
-    private Context context;
-    private ItemClickListener itemClickListener;
-
-    public RecentSearchAdapter(Context context) {
-        this.context = context;
-        this.mInflater = LayoutInflater.from(context);
-        this.searches = new ArrayList<>();
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = mInflater.inflate(R.layout.item_search_recent_searches, parent, false);
-        return new ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
-        RecentSearch search = searches.get(position);
-
-        holder.recentSearch.setText(search.getSearch());
-    }
-
-    @Override
-    public int getItemCount() {
-        return searches.size();
-    }
-
-    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        TextView recentSearch;
-
-        ViewHolder(View itemView) {
-            super(itemView);
-
-            recentSearch = itemView.findViewById(R.id.recent_search_text_view);
-
-            itemView.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View view) {
-            if (itemClickListener != null)
-                itemClickListener.onItemClick(view, getBindingAdapterPosition());
-        }
-    }
-
-    public void setItems(List<RecentSearch> searches) {
-        this.searches = searches;
-        notifyDataSetChanged();
-    }
-
-    public RecentSearch getItem(int id) {
-        return searches.get(id);
-    }
-
-    public void setClickListener(ItemClickListener itemClickListener) {
-        this.itemClickListener = itemClickListener;
-    }
-
-    public interface ItemClickListener {
-        void onItemClick(View view, int position);
-    }
-}
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
index 28ce7d1b..c26f58ed 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java
@@ -75,6 +75,7 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
         TextView songTitle;
         TextView songArtist;
         TextView songDuration;
+        ImageView more;
         ImageView cover;
 
         ViewHolder(View itemView) {
@@ -83,11 +84,16 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
             songTitle = itemView.findViewById(R.id.search_result_song_title_text_view);
             songArtist = itemView.findViewById(R.id.search_result_song_artist_text_view);
             songDuration = itemView.findViewById(R.id.search_result_song_duration_text_view);
+            more = itemView.findViewById(R.id.search_result_song_more_button);
             cover = itemView.findViewById(R.id.song_cover_image_view);
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
 
+            more.setOnClickListener(v -> {
+                openMore(v);
+            });
+
             songTitle.setSelected(true);
         }
 
@@ -104,11 +110,16 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
 
         @Override
         public boolean onLongClick(View v) {
-            Bundle bundle = new Bundle();
-            bundle.putParcelable("song_object", songs.get(getBindingAdapterPosition()));
-            Navigation.findNavController(v).navigate(R.id.songBottomSheetDialog, bundle);
+            openMore(v);
             return true;
         }
+
+        private void openMore(View view) {
+            Bundle bundle = new Bundle();
+            bundle.putParcelable("song_object", songs.get(getBindingAdapterPosition()));
+            Navigation.findNavController(view).navigate(R.id.songBottomSheetDialog, bundle);
+        }
+
     }
 
     public void setItems(List<Song> songs) {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
index 86dd9cd9..468e6fb6 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
@@ -88,7 +88,7 @@ public class AlbumPageFragment extends Fragment {
 
         bind.albumNameLabel.setText(albumPageViewModel.getAlbum().getTitle());
         bind.albumArtistLabel.setText(albumPageViewModel.getAlbum().getArtistName());
-        bind.albumReleaseYearLabel.setText(String.valueOf(albumPageViewModel.getAlbum().getYear()));
+        bind.albumReleaseYearLabel.setText(albumPageViewModel.getAlbum().getYear() != 0 ? String.valueOf(albumPageViewModel.getAlbum().getYear()) : "");
 
         albumPageViewModel.getAlbumSongList().observe(requireActivity(), songs -> {
             if(bind != null) {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
index b5f119fd..e944214f 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
@@ -16,15 +16,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.adapter.AlbumAdapter;
-import com.cappielloantonio.play.adapter.AlbumCatalogueAdapter;
 import com.cappielloantonio.play.adapter.ArtistAdapter;
-import com.cappielloantonio.play.adapter.ArtistCatalogueAdapter;
 import com.cappielloantonio.play.adapter.GenreCatalogueAdapter;
-import com.cappielloantonio.play.adapter.RecentSearchAdapter;
 import com.cappielloantonio.play.adapter.SongResultSearchAdapter;
 import com.cappielloantonio.play.databinding.FragmentSearchBinding;
 import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration;
-import com.cappielloantonio.play.model.RecentSearch;
 import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.ui.activities.MainActivity;
 import com.cappielloantonio.play.util.PreferenceUtil;
@@ -33,8 +29,6 @@ import com.paulrybitskyi.persistentsearchview.adapters.model.SuggestionItem;
 import com.paulrybitskyi.persistentsearchview.listeners.OnSuggestionChangeListener;
 import com.paulrybitskyi.persistentsearchview.utils.SuggestionCreationUtil;
 
-import java.util.ArrayList;
-
 public class SearchFragment extends Fragment {
     private static final String TAG = "SearchFragment";
 
diff --git a/app/src/main/res/drawable/gradient_backdrop_background_image.xml b/app/src/main/res/drawable/gradient_backdrop_background_image.xml
index 7d92f503..ef1747d5 100644
--- a/app/src/main/res/drawable/gradient_backdrop_background_image.xml
+++ b/app/src/main/res/drawable/gradient_backdrop_background_image.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:startColor="#00000000"
-        android:endColor="#FF000000"
+        android:endColor="#FF121212"
         android:angle="270"
         android:dither="true" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml
new file mode 100644
index 00000000..23f95efa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_album_page.xml b/app/src/main/res/layout/fragment_album_page.xml
index 75fe44a7..dc27100e 100644
--- a/app/src/main/res/layout/fragment_album_page.xml
+++ b/app/src/main/res/layout/fragment_album_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,10 +9,10 @@
         android:id="@+id/anim_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        app:titleTextColor="@color/titleTextColor"
         app:layout_collapseMode="pin"
         app:navigationIcon="@drawable/ic_arrow_back"
-        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
+        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light"
+        app:titleTextColor="@color/titleTextColor" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -30,88 +29,80 @@
                 android:id="@+id/album_info_sector"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-                android:clipChildren="false">
+                android:clipChildren="false"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
                 <ImageView
                     android:id="@+id/album_cover_image_view"
-                    android:layout_width="172dp"
-                    android:layout_height="172dp"
+                    android:layout_width="164dp"
+                    android:layout_height="164dp"
                     android:layout_marginStart="16dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/album_name_label"
+                    style="@style/ShowcaseTitleTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:maxLines="2"
                     android:layout_marginStart="12dp"
                     android:layout_marginEnd="16dp"
+                    android:ellipsize="end"
+                    android:maxLines="2"
                     android:singleLine="false"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="14sp"
-                    android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-                    app:layout_constraintTop_toTopOf="@+id/album_cover_image_view"/>
+                    app:layout_constraintTop_toTopOf="@+id/album_cover_image_view" />
 
                 <TextView
                     android:id="@+id/album_artist_label"
+                    style="@style/ShowcaseSubtitleTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:maxLines="1"
                     android:layout_marginStart="12dp"
                     android:layout_marginEnd="16dp"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-                    app:layout_constraintTop_toBottomOf="@+id/album_name_label"/>
+                    app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
 
                 <TextView
                     android:id="@+id/album_release_year_label"
+                    style="@style/ShowcaseExtraTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
-                    android:paddingTop="4dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginEnd="16dp"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-                    app:layout_constraintTop_toBottomOf="@+id/album_artist_label"/>
+                    app:layout_constraintTop_toBottomOf="@+id/album_artist_label" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/download_icon_button"
-                    style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                    style="@style/SecondaryButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
+                    android:backgroundTint="@color/buttonBackgroundColor"
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="Download"
-                    android:textColor="@color/darkIconColor"
                     android:textAllCaps="false"
-                    android:backgroundTint="@color/buttonBackgroundColor"
-                    app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
                     app:cornerRadius="18dp"
-                    app:elevation="0dp"/>
+                    app:elevation="0dp"
+                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover_image_view" />
 
-                <View style="@style/Divider"
+                <View
                     android:id="@+id/upper_button_divider"
+                    style="@style/Divider"
                     android:layout_marginStart="18dp"
-                    android:layout_marginEnd="18dp"
                     android:layout_marginTop="18dp"
-                    app:layout_constraintStart_toStartOf="parent"
+                    android:layout_marginEnd="18dp"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view" />
 
                 <LinearLayout
                     android:id="@+id/album_page_button_layout"
@@ -120,57 +111,54 @@
                     android:orientation="horizontal"
                     android:paddingTop="4dp"
                     android:paddingBottom="4dp"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/upper_button_divider">
 
                     <Button
                         android:id="@+id/album_page_play_button"
-                        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                        style="@style/MainButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:backgroundTint="@color/buttonBackgroundColor"
                         android:padding="10dp"
                         android:text="Play"
-                        android:textColor="@color/darkIconColor"
                         android:textAllCaps="false"
-                        android:backgroundTint="@color/buttonBackgroundColor"
+                        app:icon="@drawable/ic_play"
                         app:iconGravity="textStart"
                         app:iconPadding="18dp"
-                        app:icon="@drawable/ic_play"
-                        app:iconTint="@color/darkIconColor"/>
+                        app:iconTint="@color/darkIconColor" />
 
                     <Button
                         android:id="@+id/album_page_shuffle_button"
-                        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                        style="@style/MainButton"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="16dp"
+                        android:layout_weight="1"
+                        android:backgroundTint="@color/buttonBackgroundColor"
                         android:padding="10dp"
                         android:text="Shuffle"
-                        android:textColor="@color/darkIconColor"
                         android:textAllCaps="false"
-                        android:backgroundTint="@color/buttonBackgroundColor"
+                        app:icon="@drawable/ic_shuffle"
                         app:iconGravity="textStart"
                         app:iconPadding="18dp"
-                        app:icon="@drawable/ic_shuffle"
-                        app:iconTint="@color/darkIconColor"/>
-
+                        app:iconTint="@color/darkIconColor" />
                 </LinearLayout>
 
-                <View style="@style/Divider"
+                <View
                     android:id="@+id/bottom_button_divider"
+                    style="@style/Divider"
                     android:layout_marginStart="18dp"
                     android:layout_marginEnd="18dp"
                     android:layout_marginBottom="18dp"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout"/>
-
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -181,7 +169,6 @@
             android:clipToPadding="false"
             android:paddingTop="8dp"
             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_artist_page.xml b/app/src/main/res/layout/fragment_artist_page.xml
index cc087d7f..0ad88a8f 100644
--- a/app/src/main/res/layout/fragment_artist_page.xml
+++ b/app/src/main/res/layout/fragment_artist_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">
@@ -29,29 +28,37 @@
                 android:scaleType="centerCrop"
                 app:layout_collapseMode="parallax" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/appbar_header_height"
+                android:layout_gravity="top"
+                android:background="@drawable/gradient_backdrop_background_image"
+                android:fitsSystemWindows="true" />
+
+
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/artist_page_fab_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_gravity="bottom|end"
+                android:layout_margin="16dp"
                 android:layout_marginLeft="16dp"
+                android:contentDescription="Shuffle"
                 android:src="@drawable/ic_shuffle"
                 app:backgroundTint="@color/colorAccent"
-                app:tint="@android:color/white"
                 app:fabSize="mini"
                 app:layout_anchor="@id/app_bar_layout"
                 app:layout_anchorGravity="bottom|end"
-                android:layout_margin="16dp"
-                android:layout_alignParentEnd="true"
-                android:contentDescription="Shuffle"/>
+                app:tint="@android:color/white" />
 
             <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>
@@ -67,37 +74,32 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
-            android:paddingTop="18dp"
             android:orientation="vertical"
+            android:paddingTop="18dp"
             android:paddingBottom="@dimen/global_padding_bottom">
 
             <!--  Label and button  -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="16dp"
                     android:paddingEnd="8dp"
-                    android:text="Most Streamed Songs"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+                    android:text="Most Streamed Songs" />
 
                 <TextView
                     android:id="@+id/most_streamed_song_text_view_clickable"
+                    style="@style/SubheadTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingEnd="16dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
+                    android:text="See all" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
@@ -111,16 +113,13 @@
                 android:paddingBottom="16dp" />
 
             <TextView
+                style="@style/HeadlineTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/open_sans_font_family"
-                android:paddingTop="8dp"
                 android:paddingStart="16dp"
+                android:paddingTop="8dp"
                 android:paddingEnd="20dp"
-                android:text="Albums"
-                android:textColor="@color/titleTextColor"
-                android:textSize="22sp"
-                android:textStyle="bold" />
+                android:text="Albums" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/albums_recycler_view"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 1f764c68..3474bbb3 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.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"
@@ -21,16 +20,13 @@
             android:orientation="vertical">
 
             <TextView
+                style="@style/HeadlineTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/open_sans_font_family"
                 android:paddingStart="16dp"
                 android:paddingTop="20dp"
                 android:paddingEnd="16dp"
-                android:text="Music discovery"
-                android:textColor="@color/titleTextColor"
-                android:textSize="22sp"
-                android:textStyle="bold" />
+                android:text="Music discovery" />
 
             <!--  slideview  -->
             <androidx.viewpager2.widget.ViewPager2
@@ -59,30 +55,25 @@
                 android:paddingEnd="8dp">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="Most played"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+                    android:text="Most played" />
 
 
                 <TextView
                     android:id="@+id/most_played_tracks_text_view_clickable"
+                    style="@style/SubheadTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
+                    android:text="See all" />
 
             </LinearLayout>
 
@@ -116,30 +107,25 @@
                 android:paddingEnd="8dp">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="Last played"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+                    android:text="Last played" />
 
 
                 <TextView
                     android:id="@+id/recently_played_tracks_text_view_clickable"
+                    style="@style/SubheadTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
+                    android:text="See all" />
 
             </LinearLayout>
 
@@ -165,16 +151,13 @@
 
             <!--  Label and button  -->
             <TextView
+                style="@style/HeadlineTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/open_sans_font_family"
                 android:paddingStart="16dp"
                 android:paddingTop="20dp"
                 android:paddingEnd="16dp"
-                android:text="Flashback"
-                android:textColor="@color/titleTextColor"
-                android:textSize="22sp"
-                android:textStyle="bold" />
+                android:text="Flashback" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/years_recycler_view"
@@ -206,30 +189,25 @@
                 android:paddingEnd="8dp">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="Favorites"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+                    android:text="Favorites" />
 
 
                 <TextView
                     android:id="@+id/favorites_tracks_text_view_clickable"
+                    style="@style/SubheadTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
+                    android:text="See all" />
 
             </LinearLayout>
 
@@ -261,30 +239,25 @@
                 android:paddingEnd="8dp">
 
                 <TextView
+                    style="@style/HeadlineTextView"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="Recently added"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+                    android:text="Recently added" />
 
 
                 <TextView
                     android:id="@+id/recently_added_tracks_text_view_clickable"
+                    style="@style/SubheadTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="8dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="8dp"
-                    android:text="See all"
-                    android:textColor="@color/subtitleTextColor"
-                    android:textSize="14sp" />
+                    android:text="See all" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index e790161d..4ffcc40f 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -37,27 +37,24 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="Albums"
-                        android:textColor="@color/titleTextColor"
-                        android:textSize="22sp"
-                        android:textStyle="bold" />
+
+                        style="@style/HeadlineTextView"/>
 
 
                     <TextView
                         android:id="@+id/album_catalogue_text_view_clickable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="See all"
-                        android:textColor="@color/subtitleTextColor"
-                        android:textSize="14sp" />
+
+                        style="@style/SubheadTextView"/>
 
                 </LinearLayout>
 
@@ -100,27 +97,24 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="Artists"
-                        android:textColor="@color/titleTextColor"
-                        android:textSize="22sp"
-                        android:textStyle="bold" />
+
+                        style="@style/HeadlineTextView"/>
 
 
                     <TextView
                         android:id="@+id/artist_catalogue_text_view_clickable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="See all"
-                        android:textColor="@color/subtitleTextColor"
-                        android:textSize="14sp" />
+
+                        style="@style/SubheadTextView"/>
 
                 </LinearLayout>
 
@@ -164,27 +158,24 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="Genres"
-                        android:textColor="@color/titleTextColor"
-                        android:textSize="22sp"
-                        android:textStyle="bold" />
+
+                        style="@style/HeadlineTextView"/>
 
 
                     <TextView
                         android:id="@+id/genre_catalogue_text_view_clickable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="See all"
-                        android:textColor="@color/subtitleTextColor"
-                        android:textSize="14sp" />
+
+                        style="@style/SubheadTextView"/>
                 </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -227,27 +218,24 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="Playlists"
-                        android:textColor="@color/titleTextColor"
-                        android:textSize="22sp"
-                        android:textStyle="bold" />
+
+                        style="@style/HeadlineTextView"/>
 
 
                     <TextView
                         android:id="@+id/playlist_catalogue_text_view_clickable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:fontFamily="@font/open_sans_font_family"
                         android:paddingStart="8dp"
                         android:paddingTop="12dp"
                         android:paddingEnd="8dp"
                         android:text="See all"
-                        android:textColor="@color/subtitleTextColor"
-                        android:textSize="14sp" />
+
+                        style="@style/SubheadTextView"/>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index d7a9d65b..ca5cfa7c 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -62,14 +62,12 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
                     android:text="Songs"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+
+                    style="@style/HeadlineTextView"/>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_tracks_recycler_view"
@@ -94,14 +92,12 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
                     android:text="Albums"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+
+                    style="@style/HeadlineTextView"/>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_album_recycler_view"
@@ -128,14 +124,12 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
                     android:text="Artists"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+
+                    style="@style/HeadlineTextView"/>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_artist_recycler_view"
@@ -162,14 +156,12 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
                     android:paddingStart="16dp"
                     android:paddingTop="20dp"
                     android:paddingEnd="16dp"
                     android:text="Genres"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
+
+                    style="@style/HeadlineTextView"/>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/search_result_genre_recycler_view"
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 4621d7a0..e1e7ad33 100644
--- a/app/src/main/res/layout/item_artist_page_album.xml
+++ b/app/src/main/res/layout/item_artist_page_album.xml
@@ -20,14 +20,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxWidth="256dp"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-        android:textColor="@color/titleTextColor"
-        android:textSize="16sp"
-        android:textStyle="bold"
+
+        style="@style/ItemTitleTextView"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/artist_page_album_cover_image_view"/>
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 d979bdf5..7f73ec7c 100644
--- a/app/src/main/res/layout/item_home_discover_song.xml
+++ b/app/src/main/res/layout/item_home_discover_song.xml
@@ -33,8 +33,11 @@
             android:layout_marginRight="16dp"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textColor="@color/gradientTitleColor"
-            android:textSize="20sp" />
+
+            android:fontFamily="@font/inter"
+            android:textSize="20sp"
+            android:textFontWeight="400"
+            android:textColor="@color/gradientTitleColor"/>
 
         <TextView
             android:id="@+id/album_discover_song_label"
@@ -46,8 +49,11 @@
             android:drawablePadding="10dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@color/gradientSubtitleColor"
-            android:textSize="14sp" />
+
+            android:fontFamily="@font/inter"
+            android:textSize="14sp"
+            android:textFontWeight="400"
+            android:textColor="@color/gradientSubtitleColor"/>
 
     </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 c78b6667..9451a4f7 100644
--- a/app/src/main/res/layout/item_home_track.xml
+++ b/app/src/main/res/layout/item_home_track.xml
@@ -20,13 +20,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        style="@style/ItemTitleTextView"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/track_cover_image_view"/>
@@ -36,10 +35,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="1"
-        android:textColor="@color/titleTextColor"
-        android:textSize="12sp"
+
+        style="@style/ItemSubtitleTextView"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title_track_label"/>
diff --git a/app/src/main/res/layout/item_home_year.xml b/app/src/main/res/layout/item_home_year.xml
index f8cdda6b..ee4d23b5 100644
--- a/app/src/main/res/layout/item_home_year.xml
+++ b/app/src/main/res/layout/item_home_year.xml
@@ -34,12 +34,11 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:layout_gravity="center"
-                android:fontFamily="@font/open_sans_font_family"
                 android:paddingStart="8dp"
                 android:text="@string/label_placeholder"
-                android:textColor="@color/titleTextColor"
-                android:textSize="14sp"
-                android:textStyle="bold"
+
+                style="@style/ItemTitleTextView"
+
                 android:textAlignment="gravity"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_library_album.xml b/app/src/main/res/layout/item_library_album.xml
index 38f534de..ae51cd77 100644
--- a/app/src/main/res/layout/item_library_album.xml
+++ b/app/src/main/res/layout/item_library_album.xml
@@ -20,13 +20,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        style="@style/ItemTitleTextView"
+
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view"/>
@@ -36,10 +36,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="1"
-        android:textColor="@color/titleTextColor"
-        android:textSize="12sp"
+
+        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_artist.xml b/app/src/main/res/layout/item_library_artist.xml
index 693c3eed..2bb1a1e6 100644
--- a/app/src/main/res/layout/item_library_artist.xml
+++ b/app/src/main/res/layout/item_library_artist.xml
@@ -20,14 +20,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxWidth="172dp"
         android:maxLines="1"
         android:paddingTop="8dp"
         android:singleLine="false"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        style="@style/ItemTitleTextView"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/artist_cover_image_view"/>
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 c8b50774..bc1b40da 100644
--- a/app/src/main/res/layout/item_library_catalogue_album.xml
+++ b/app/src/main/res/layout/item_library_catalogue_album.xml
@@ -18,13 +18,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:singleLine="false"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        style="@style/ItemTitleTextView"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_catalogue_cover_image_view" />
@@ -34,11 +33,11 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="1"
         android:paddingBottom="16dp"
-        android:textColor="@color/subtitleTextColor"
-        android:textSize="12sp"
+
+        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 40cda393..3542142c 100644
--- a/app/src/main/res/layout/item_library_catalogue_artist.xml
+++ b/app/src/main/res/layout/item_library_catalogue_artist.xml
@@ -19,14 +19,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:fontFamily="@font/open_sans_font_family"
         android:maxLines="2"
         android:paddingTop="8dp"
         android:paddingBottom="16dp"
         android:singleLine="false"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        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_genre.xml b/app/src/main/res/layout/item_library_catalogue_genre.xml
index 0173b7d4..7529f7f7 100644
--- a/app/src/main/res/layout/item_library_catalogue_genre.xml
+++ b/app/src/main/res/layout/item_library_catalogue_genre.xml
@@ -27,16 +27,13 @@
 
             <TextView
                 android:id="@+id/genre_label"
+                style="@style/ItemTitleTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:fontFamily="@font/open_sans_font_family"
                 android:gravity="center"
                 android:paddingStart="8dp"
                 android:text="@string/label_placeholder"
-                android:textAlignment="gravity"
-                android:textColor="@color/titleTextColor"
-                android:textSize="14sp"
-                android:textStyle="bold" />
+                android:textAlignment="gravity" />
 
         </LinearLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_library_genre.xml b/app/src/main/res/layout/item_library_genre.xml
index 6fe97b27..033c806a 100644
--- a/app/src/main/res/layout/item_library_genre.xml
+++ b/app/src/main/res/layout/item_library_genre.xml
@@ -33,13 +33,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:fontFamily="@font/open_sans_font_family"
                 android:paddingStart="8dp"
                 android:text="@string/label_placeholder"
-                android:textColor="@color/titleTextColor"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:textAlignment="gravity"/>
+                android:textAlignment="gravity"
+
+                style="@style/ItemTitleTextView" />
 
         </LinearLayout>
     </androidx.cardview.widget.CardView>
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 0640369a..f1bde45c 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -31,14 +31,13 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:scrollHorizontally="true"
-        android:fontFamily="@font/open_sans_font_family"
         android:paddingStart="12dp"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
         android:text="@string/label_placeholder"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        style="@style/ItemTitleTextView"
+
         app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"/>
@@ -56,32 +55,29 @@
             android:id="@+id/queue_song_artist_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
             android:paddingStart="12dp"
             android:paddingEnd="4dp"
             android:text="@string/label_placeholder"
-            android:textColor="@color/subtitleTextColor"
-            android:textSize="12sp" />
+
+            style="@style/ItemSubtitleTextView"/>
 
         <TextView
             android:id="@+id/queue_separator_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
             android:text="@string/label_dot_separator"
-            android:textColor="@color/subtitleTextColor"
-            android:textSize="12sp" />
+
+            style="@style/ItemSubtitleTextView"/>
 
         <TextView
             android:id="@+id/queue_song_duration_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/open_sans_font_family"
             android:paddingStart="4dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder"
-            android:textColor="@color/subtitleTextColor"
-            android:textSize="12sp" />
+
+            style="@style/ItemSubtitleTextView"/>
     </LinearLayout>
 
     <ImageView
diff --git a/app/src/main/res/layout/item_search_recent_searches.xml b/app/src/main/res/layout/item_search_recent_searches.xml
deleted file mode 100644
index 87979a2a..00000000
--- a/app/src/main/res/layout/item_search_recent_searches.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="4dp"
-    android:paddingEnd="4dp">
-
-    <TextView
-        android:id="@+id/recent_search_text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fontFamily="@font/open_sans_font_family"
-        android:paddingStart="8dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="12dp"
-        android:paddingEnd="8dp"
-        android:text="@string/label_placeholder"
-        android:textColor="@color/subtitleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"  />
-</RelativeLayout>
\ 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 91160100..c2a83e59 100644
--- a/app/src/main/res/layout/item_search_result_song.xml
+++ b/app/src/main/res/layout/item_search_result_song.xml
@@ -1,14 +1,13 @@
-<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="?attr/selectableItemBackground"
+    android:clipChildren="false"
     android:orientation="horizontal"
     android:paddingStart="16dp"
     android:paddingTop="3dp"
-    android:paddingEnd="12dp"
-    android:paddingBottom="3dp"
-    android:background="?attr/selectableItemBackground">
+    android:paddingBottom="3dp">
 
     <ImageView
         android:id="@+id/song_cover_image_view"
@@ -18,55 +17,73 @@
         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/search_result_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:fontFamily="@font/open_sans_font_family"
+        android:marqueeRepeatLimit="marquee_forever"
         android:paddingStart="12dp"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
         android:text="@string/label_placeholder"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/search_result_song_more_button"
         app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/search_result_song_duration_text_view"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/search_result_song_artist_text_view"
+
+    <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/open_sans_font_family"
-        android:paddingStart="12dp"
-        android:text="@string/label_placeholder"
-        android:textColor="@color/subtitleTextColor"
-        android:textSize="12sp"
-        app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view"
+        android:orientation="horizontal"
+        android:paddingEnd="12dp"
+        app:layout_constraintEnd_toStartOf="@+id/search_result_song_more_button"
         app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
-        app:layout_constraintEnd_toStartOf="@+id/search_result_song_duration_text_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view">
 
-    <TextView
-        android:id="@+id/search_result_song_duration_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:fontFamily="@font/open_sans_font_family"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        <TextView
+            android:id="@+id/search_result_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" />
+
+        <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" />
+
+        <TextView
+            android:id="@+id/search_result_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" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/search_result_song_more_button"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:background="@drawable/ic_more_vert"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:gravity="center_vertical"
-        android:text="@string/label_placeholder"
-        android:textColor="@color/subtitleTextColor"
-        android:textSize="12sp"
         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/player_body_bottom_sheet.xml b/app/src/main/res/layout/player_body_bottom_sheet.xml
index 3964ee0f..81a4ccbb 100644
--- a/app/src/main/res/layout/player_body_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_body_bottom_sheet.xml
@@ -1,26 +1,23 @@
 <?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"
+    android:clipChildren="false"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    android:clipChildren="false">
+    app:layout_constraintTop_toTopOf="parent">
 
     <TextView
         android:id="@+id/collapse_bottom_sheet_button"
+        style="@style/HeadlineTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
         android:layout_marginBottom="-4dp"
+        android:background="@android:color/transparent"
         android:paddingStart="24dp"
         android:paddingTop="20dp"
         android:text="Now playing"
-        android:textColor="@color/titleTextColor"
-        android:textSize="22sp"
-        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -31,7 +28,7 @@
         app:layout_constraintDimensionRatio="H,1:1"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/collapse_bottom_sheet_button"/>
+        app:layout_constraintTop_toBottomOf="@+id/collapse_bottom_sheet_button" />
 
     <LinearLayout
         android:id="@+id/player_big_timer"
@@ -58,13 +55,13 @@
             android:id="@+id/player_big_seek_bar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_gravity="center"
-            android:paddingRight="12dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
+            android:layout_weight="1"
             android:paddingLeft="12dp"
-            android:progressBackgroundTint="@color/colorAccentLight"/>
+            android:paddingRight="12dp"
+            android:progressBackgroundTint="@color/colorAccentLight" />
 
         <TextView
             android:id="@+id/player_big_song_duration"
@@ -72,8 +69,8 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
             android:layout_marginRight="24dp"
+            android:layout_marginBottom="10dp"
             android:text="@string/label_placeholder"
             android:textColor="@color/titleTextColor"
             android:textSize="12sp" />
@@ -81,15 +78,13 @@
 
     <TextView
         android:id="@+id/player_song_title_label"
+        style="@style/HeadlineTextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:text="@string/label_placeholder"
-        android:textColor="@color/titleTextColor"
-        android:textSize="22sp"
-        android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/button_favorite"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/player_big_timer" />
@@ -98,38 +93,38 @@
         android:id="@+id/button_favorite"
         android:layout_width="26dp"
         android:layout_height="26dp"
-        android:background="@drawable/button_favorite_selector"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:checked="false"
-        android:gravity="center_vertical"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="24dp"
+        android:background="@drawable/button_favorite_selector"
+        android:checked="false"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:gravity="center_vertical"
         android:text=""
         android:textOff=""
         android:textOn=""
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/player_big_timer"/>
+        app:layout_constraintTop_toBottomOf="@+id/player_big_timer" />
 
     <TextView
         android:id="@+id/player_artist_name_label"
+        style="@style/SubheadTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:paddingBottom="18dp"
         android:text="@string/label_placeholder"
-        android:textColor="@color/subtitleTextColor"
-        android:textSize="14sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/player_song_title_label" />
 
-    <View style="@style/Divider"
+    <View
         android:id="@+id/player_divider"
+        style="@style/Divider"
         android:layout_marginStart="18dp"
         android:layout_marginEnd="18dp"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/player_artist_name_label"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/player_artist_name_label" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/player_queue_recycler_view"
@@ -138,7 +133,7 @@
         android:clipToPadding="false"
         android:paddingTop="18dp"
         android:paddingBottom="18dp"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/player_divider"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/player_divider" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 ace57566..751da06a 100644
--- a/app/src/main/res/layout/player_header_bottom_sheet.xml
+++ b/app/src/main/res/layout/player_header_bottom_sheet.xml
@@ -27,9 +27,9 @@
         android:layout_marginTop="10dp"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:textColor="@color/titleTextColor"
-        android:textSize="14sp"
-        android:textStyle="bold"
+
+        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" />
@@ -41,8 +41,9 @@
         android:fontFamily="@font/open_sans_font_family"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
-        android:textColor="@color/subtitleTextColor"
-        android:textSize="12sp"
+
+        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" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4ec45e4a..081cbe3d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -27,4 +28,80 @@
         <item name="android:layout_height">0.5dp</item>
         <item name="android:background">@color/dividerColor</item>
     </style>
+
+    <!-- FONT STYLE -->
+
+    <style name="InterFontFamily">
+        <item name="android:fontFamily">@font/inter</item>
+    </style>
+
+    <!-- Font di tutti i titoli grossi.
+    Questi comprendono i titoli nelle schermate principali, nel bottom_sheet_player
+    il titolo della canzone e la stringa in alto  -->
+    <style name="HeadlineTextView" parent="InterFontFamily">
+        <item name="android:textSize">24sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <!-- Font delle stringhe piccole come il see all e il nome dell'artista nel player
+    Da accompagnre all'Headline-->
+    <style name="SubheadTextView" parent="InterFontFamily">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+    <!-- I seguenti due font vanno insieme e sono utilizzati per titolo e sottotitolo
+     degli oggetti come canzoni (ricerca e coda), album (home, cataloghi, e album artista)
+     e artista (home, catalogo). Usato anche per le card dei generi (catalogo e non) e degli anni-->
+    <style name="ItemTitleTextView" parent="InterFontFamily">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">500</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="ItemSubtitleTextView" parent="InterFontFamily">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+    <!-- I seguenti tre font sono destinati a situazioni come la vetrina dell'album
+    Il primo font indica il titolo o il nome dell'album, il secondo il sottotitolo o il
+    nome dell'artista, mentre il terzo indica l'informazione agiuntiva che può esserci o meno
+    come l'anno di pubblicazione dell'album. Eventualmente potrà essere definito un quarto font
+    per un testo di informazioni sull'elemento in vetrina-->
+    <style name="ShowcaseTitleTextView" parent="InterFontFamily">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/titleTextColor</item>
+    </style>
+
+    <style name="ShowcaseSubtitleTextView" parent="InterFontFamily">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+    <style name="ShowcaseExtraTextView" parent="InterFontFamily">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/subtitleTextColor</item>
+    </style>
+
+    <!-- Font dei pulsanti vari presenti nell'applicazione -->
+    <style name="MainButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textFontWeight">700</item>
+        <item name="android:textColor">@color/darkIconColor</item>
+    </style>
+
+    <style name="SecondaryButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textFontWeight">400</item>
+        <item name="android:textColor">@color/darkIconColor</item>
+    </style>
 </resources>
\ No newline at end of file