Graphic restyling of the interface

app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java

@@ -5,6 +5,9 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -14,19 +17,23 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.model.Album;
+import com.cappielloantonio.play.ui.activities.MainActivity;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> {
+public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> implements Filterable {
     private static final String TAG = "AlbumCatalogueAdapter";
 
     private List<Album> albums;
+    private List<Album> albumsFull;
     private LayoutInflater inflater;
+    private MainActivity activity;
     private Context context;
 
-    public AlbumCatalogueAdapter(Context context) {
+    public AlbumCatalogueAdapter(MainActivity activity, Context context) {
+        this.activity = activity;
         this.context = context;
         this.inflater = LayoutInflater.from(context);
         this.albums = new ArrayList<>();
@@ -87,6 +94,9 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
             else if(Objects.requireNonNull(Navigation.findNavController(view).getCurrentDestination()).getId() == R.id.albumCatalogueFragment) {
                 Navigation.findNavController(view).navigate(R.id.action_albumCatalogueFragment_to_albumPageFragment, bundle);
             }
+
+            InputMethodManager imm = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
         }
 
         @Override
@@ -104,6 +114,43 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
 
     public void setItems(List<Album> albums) {
         this.albums = albums;
+        this.albumsFull = new ArrayList<>(albums);
         notifyDataSetChanged();
     }
+
+    @Override
+    public Filter getFilter() {
+        return filtering;
+    }
+
+    private Filter filtering = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Album> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(albumsFull);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Album item : albumsFull) {
+                    if (item.getTitle().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            albums.clear();
+            albums.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
 }

app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java

@@ -5,6 +5,9 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -13,20 +16,25 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
+import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Artist;
+import com.cappielloantonio.play.ui.activities.MainActivity;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogueAdapter.ViewHolder> {
+public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogueAdapter.ViewHolder> implements Filterable {
     private static final String TAG = "ArtistCatalogueAdapter";
 
     private List<Artist> artists;
+    private List<Artist> artistFull;
     private LayoutInflater inflater;
+    private MainActivity activity;
     private Context context;
 
-    public ArtistCatalogueAdapter(Context context) {
+    public ArtistCatalogueAdapter(MainActivity activity, Context context) {
+        this.activity = activity;
         this.context = context;
         this.inflater = LayoutInflater.from(context);
         this.artists = new ArrayList<>();
@@ -83,6 +91,9 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
             else if(Objects.requireNonNull(Navigation.findNavController(view).getCurrentDestination()).getId() == R.id.artistCatalogueFragment) {
                 Navigation.findNavController(view).navigate(R.id.action_artistCatalogueFragment_to_artistPageFragment, bundle);
             }
+
+            InputMethodManager imm = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
         }
 
         @Override
@@ -100,6 +111,43 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
 
     public void setItems(List<Artist> artists) {
         this.artists = artists;
+        this.artistFull = new ArrayList<>(artists);
         notifyDataSetChanged();
     }
+
+    @Override
+    public Filter getFilter() {
+        return filtering;
+    }
+
+    private Filter filtering = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Artist> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(artistFull);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Artist item : artistFull) {
+                    if (item.getName().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            artists.clear();
+            artists.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
 }

app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java

@@ -4,25 +4,33 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
+import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Genre;
+import com.cappielloantonio.play.ui.activities.MainActivity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAdapter.ViewHolder> {
+public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAdapter.ViewHolder> implements Filterable {
     private static final String TAG = "GenreCatalogueAdapter";
 
     private List<Genre> genres;
+    private List<Genre> genresFull;
     private LayoutInflater mInflater;
+    private MainActivity activity;
     private Context context;
     private ItemClickListener itemClickListener;
 
-    public GenreCatalogueAdapter(Context context) {
+    public GenreCatalogueAdapter(MainActivity activity, Context context) {
+        this.activity = activity;
         this.context = context;
         this.mInflater = LayoutInflater.from(context);
         this.genres = new ArrayList<>();
@@ -60,7 +68,12 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
 
         @Override
         public void onClick(View view) {
-            if (itemClickListener != null) itemClickListener.onItemClick(view, getBindingAdapterPosition());
+            if (itemClickListener != null) {
+                itemClickListener.onItemClick(view, getBindingAdapterPosition());
+
+                InputMethodManager imm = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+            }
         }
     }
 
@@ -70,6 +83,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
 
     public void setItems(List<Genre> genres) {
         this.genres = genres;
+        this.genresFull = new ArrayList<>(genres);
         notifyDataSetChanged();
     }
 
@@ -80,4 +94,40 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
     public interface ItemClickListener {
         void onItemClick(View view, int position);
     }
+
+    @Override
+    public Filter getFilter() {
+        return filtering;
+    }
+
+    private Filter filtering = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Genre> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(genresFull);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Genre item : genresFull) {
+                    if (item.getName().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            genres.clear();
+            genres.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
 }

app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java

@@ -5,6 +5,9 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -13,19 +16,24 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
+import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.model.Playlist;
+import com.cappielloantonio.play.ui.activities.MainActivity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class PlaylistCatalogueAdapter extends RecyclerView.Adapter<PlaylistCatalogueAdapter.ViewHolder> {
+public class PlaylistCatalogueAdapter extends RecyclerView.Adapter<PlaylistCatalogueAdapter.ViewHolder> implements Filterable {
 
     private List<Playlist> playlists;
+    private List<Playlist> playlistsFull;
     private LayoutInflater mInflater;
+    private MainActivity activity;
     private Context context;
 
-    public PlaylistCatalogueAdapter(Context context) {
+    public PlaylistCatalogueAdapter(MainActivity activity, Context context) {
+        this.activity = activity;
         this.context = context;
         this.mInflater = LayoutInflater.from(context);
         this.playlists = new ArrayList<>();
@@ -73,6 +81,8 @@ public class PlaylistCatalogueAdapter extends RecyclerView.Adapter<PlaylistCatal
             bundle.putParcelable("playlist_object", playlists.get(getBindingAdapterPosition()));
             Navigation.findNavController(view).navigate(R.id.action_playlistCatalogueFragment_to_playlistPageFragment, bundle);
 
+            InputMethodManager imm = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
         }
     }
 
@@ -82,6 +92,43 @@ public class PlaylistCatalogueAdapter extends RecyclerView.Adapter<PlaylistCatal
 
     public void setItems(List<Playlist> playlists) {
         this.playlists = playlists;
+        this.playlistsFull = new ArrayList<>(playlists);
         notifyDataSetChanged();
     }
+
+    @Override
+    public Filter getFilter() {
+        return filtering;
+    }
+
+    private Filter filtering = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Playlist> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(playlistsFull);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Playlist item : playlistsFull) {
+                    if (item.getName().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            playlists.clear();
+            playlists.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
 }

app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java

@@ -1,21 +1,44 @@
 package com.cappielloantonio.play.ui.fragment;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.BlendMode;
+import android.graphics.BlendModeColorFilter;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.LinearLayout;
+import android.widget.SearchView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.cappielloantonio.play.App;
+import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.adapter.AlbumCatalogueAdapter;
 import com.cappielloantonio.play.databinding.FragmentAlbumCatalogueBinding;
+import com.cappielloantonio.play.helper.MusicPlayerRemote;
 import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration;
+import com.cappielloantonio.play.repository.QueueRepository;
 import com.cappielloantonio.play.ui.activities.MainActivity;
 import com.cappielloantonio.play.viewmodel.AlbumCatalogueViewModel;
 
+import java.util.Collections;
+
 public class AlbumCatalogueFragment extends Fragment {
     private static final String TAG = "ArtistCatalogueFragment";
 
@@ -25,6 +48,12 @@ public class AlbumCatalogueFragment extends Fragment {
 
     private AlbumCatalogueAdapter albumAdapter;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         activity = (MainActivity) getActivity();
@@ -33,6 +62,7 @@ public class AlbumCatalogueFragment extends Fragment {
         View view = bind.getRoot();
         albumCatalogueViewModel = new ViewModelProvider(requireActivity()).get(AlbumCatalogueViewModel.class);
 
+        initAppBar();
         initAlbumCatalogueView();
 
         return view;
@@ -50,17 +80,75 @@ public class AlbumCatalogueFragment extends Fragment {
         bind = null;
     }
 
+    private void initAppBar() {
+        activity.setSupportActionBar(bind.toolbar);
+
+        if (activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        bind.toolbar.setNavigationOnClickListener(v -> {
+            hideKeyboard(v);
+            activity.navController.navigateUp();
+        });
+
+
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
+                bind.toolbar.setTitle("Album Catalogue");
+            } else {
+                bind.toolbar.setTitle("");
+            }
+        });
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
     private void initAlbumCatalogueView() {
         bind.albumCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
         bind.albumCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(2, 20, false));
         bind.albumCatalogueRecyclerView.setHasFixedSize(true);
 
-        albumAdapter = new AlbumCatalogueAdapter(requireContext());
+        albumAdapter = new AlbumCatalogueAdapter(activity, requireContext());
         albumAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
         bind.albumCatalogueRecyclerView.setAdapter(albumAdapter);
         albumCatalogueViewModel.getAlbumList().observe(requireActivity(), albums -> {
-            bind.loadingProgressBar.setVisibility(View.GONE);
             albumAdapter.setItems(albums);
         });
+
+        bind.albumCatalogueRecyclerView.setOnTouchListener((v, event) -> {
+            hideKeyboard(v);
+            return false;
+        });
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        inflater.inflate(R.menu.album_catalogue_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+
+        SearchView searchView = (SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searchView.clearFocus();
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                albumAdapter.getFilter().filter(newText);
+                return false;
+            }
+        });
+
+        searchView.setPadding(-32, 0, 0, 0);
+    }
+
+    private void hideKeyboard(View view) {
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 }

app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java

@@ -1,16 +1,28 @@
 package com.cappielloantonio.play.ui.fragment;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.SearchView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.adapter.ArtistCatalogueAdapter;
 import com.cappielloantonio.play.databinding.FragmentArtistCatalogueBinding;
 import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration;
@@ -26,6 +38,12 @@ public class ArtistCatalogueFragment extends Fragment {
 
     private ArtistCatalogueAdapter artistAdapter;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         activity = (MainActivity) getActivity();
@@ -34,6 +52,7 @@ public class ArtistCatalogueFragment extends Fragment {
         View view = bind.getRoot();
         artistCatalogueViewModel = new ViewModelProvider(requireActivity()).get(ArtistCatalogueViewModel.class);
 
+        initAppBar();
         initArtistCatalogueView();
 
         return view;
@@ -51,17 +70,75 @@ public class ArtistCatalogueFragment extends Fragment {
         bind = null;
     }
 
+    private void initAppBar() {
+        activity.setSupportActionBar(bind.toolbar);
+
+        if (activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        bind.toolbar.setNavigationOnClickListener(v -> {
+            hideKeyboard(v);
+            activity.navController.navigateUp();
+        });
+
+
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.artistInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
+                bind.toolbar.setTitle("Artist Catalogue");
+            } else {
+                bind.toolbar.setTitle("");
+            }
+        });
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
     private void initArtistCatalogueView() {
         bind.artistCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
         bind.artistCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(2, 20, false));
         bind.artistCatalogueRecyclerView.setHasFixedSize(true);
 
-        artistAdapter = new ArtistCatalogueAdapter(requireContext());
+        artistAdapter = new ArtistCatalogueAdapter(activity, requireContext());
         artistAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
         bind.artistCatalogueRecyclerView.setAdapter(artistAdapter);
         artistCatalogueViewModel.getArtistList().observe(requireActivity(), artistList -> {
-            bind.loadingProgressBar.setVisibility(View.GONE);
             artistAdapter.setItems(artistList);
         });
+
+        bind.artistCatalogueRecyclerView.setOnTouchListener((v, event) -> {
+            hideKeyboard(v);
+            return false;
+        });
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        inflater.inflate(R.menu.album_catalogue_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+
+        SearchView searchView = (SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searchView.clearFocus();
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                artistAdapter.getFilter().filter(newText);
+                return false;
+            }
+        });
+
+        searchView.setPadding(-32, 0, 0, 0);
+    }
+
+    private void hideKeyboard(View view) {
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 }

app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java

@@ -8,6 +8,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -36,6 +37,7 @@ public class FilterFragment extends Fragment {
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
         init();
+        initAppBar();
         setFilterChips();
         return view;
     }
@@ -63,6 +65,28 @@ public class FilterFragment extends Fragment {
         });
     }
 
+    private void initAppBar() {
+        activity.setSupportActionBar(bind.toolbar);
+
+        if (activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        bind.toolbar.setNavigationOnClickListener(v -> {
+            activity.navController.navigateUp();
+        });
+
+
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.genreFilterInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
+                bind.toolbar.setTitle("Filter");
+            } else {
+                bind.toolbar.setTitle("");
+            }
+        });
+    }
+
     private void setFilterChips() {
         filterViewModel.getGenreList().observe(requireActivity(), genres -> {
             bind.loadingProgressBar.setVisibility(View.GONE);

app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java

@@ -1,13 +1,25 @@
 package com.cappielloantonio.play.ui.fragment;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.SearchView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.adapter.GenreCatalogueAdapter;
@@ -26,6 +38,12 @@ public class GenreCatalogueFragment extends Fragment {
 
     private GenreCatalogueAdapter genreCatalogueAdapter;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         activity = (MainActivity) getActivity();
@@ -35,6 +53,7 @@ public class GenreCatalogueFragment extends Fragment {
         genreCatalogueViewModel = new ViewModelProvider(requireActivity()).get(GenreCatalogueViewModel.class);
 
         init();
+        initAppBar();
         initArtistCatalogueView();
 
         return view;
@@ -56,24 +75,82 @@ public class GenreCatalogueFragment extends Fragment {
         bind.filterGenresTextViewClickable.setOnClickListener(v -> activity.navController.navigate(R.id.action_genreCatalogueFragment_to_filterFragment));
     }
 
+    private void initAppBar() {
+        activity.setSupportActionBar(bind.toolbar);
+
+        if (activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        bind.toolbar.setNavigationOnClickListener(v -> {
+            hideKeyboard(v);
+            activity.navController.navigateUp();
+        });
+
+
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.genreInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
+                bind.toolbar.setTitle("Genre Catalogue");
+            } else {
+                bind.toolbar.setTitle("");
+            }
+        });
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
     private void initArtistCatalogueView() {
         bind.genreCatalogueRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2));
         bind.genreCatalogueRecyclerView.addItemDecoration(new GridItemDecoration(2, 16, false));
         bind.genreCatalogueRecyclerView.setHasFixedSize(true);
 
-        genreCatalogueAdapter = new GenreCatalogueAdapter(requireContext());
+        genreCatalogueAdapter = new GenreCatalogueAdapter(activity, requireContext());
+        genreCatalogueAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
+        bind.genreCatalogueRecyclerView.setAdapter(genreCatalogueAdapter);
         genreCatalogueAdapter.setClickListener((view, position) -> {
             Bundle bundle = new Bundle();
             bundle.putString(Song.BY_GENRE, Song.BY_GENRE);
             bundle.putParcelable("genre_object", genreCatalogueAdapter.getItem(position));
             activity.navController.navigate(R.id.action_genreCatalogueFragment_to_songListPageFragment, bundle);
         });
-        bind.genreCatalogueRecyclerView.setAdapter(genreCatalogueAdapter);
 
         genreCatalogueViewModel.getGenreList().observe(requireActivity(), genres -> {
-            bind.loadingProgressBar.setVisibility(View.GONE);
-            bind.genreCatalogueContainer.setVisibility(View.VISIBLE);
             genreCatalogueAdapter.setItems(genres);
         });
+
+        bind.genreCatalogueRecyclerView.setOnTouchListener((v, event) -> {
+            hideKeyboard(v);
+            return false;
+        });
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        inflater.inflate(R.menu.album_catalogue_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+
+        SearchView searchView = (SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searchView.clearFocus();
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                genreCatalogueAdapter.getFilter().filter(newText);
+                return false;
+            }
+        });
+
+        searchView.setPadding(-32, 0, 0, 0);
+    }
+
+    private void hideKeyboard(View view) {
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 }

app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java

@@ -1,10 +1,21 @@
 package com.cappielloantonio.play.ui.fragment;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.SearchView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -33,6 +44,12 @@ public class PlaylistCatalogueFragment extends Fragment {
 
     private PlaylistCatalogueAdapter playlistCatalogueAdapter;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         activity = (MainActivity) getActivity();
@@ -41,6 +58,7 @@ public class PlaylistCatalogueFragment extends Fragment {
         View view = bind.getRoot();
         playlistCatalogueViewModel = new ViewModelProvider(requireActivity()).get(PlaylistCatalogueViewModel.class);
 
+        initAppBar();
         initArtistCatalogueView();
 
         return view;
@@ -58,14 +76,73 @@ public class PlaylistCatalogueFragment extends Fragment {
         bind = null;
     }
 
+    private void initAppBar() {
+        activity.setSupportActionBar(bind.toolbar);
+
+        if (activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        bind.toolbar.setNavigationOnClickListener(v -> {
+            hideKeyboard(v);
+            activity.navController.navigateUp();
+        });
+
+
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
+                bind.toolbar.setTitle("Playlist Catalogue");
+            } else {
+                bind.toolbar.setTitle("");
+            }
+        });
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
     private void initArtistCatalogueView() {
         bind.playlistCatalogueRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         bind.playlistCatalogueRecyclerView.setHasFixedSize(true);
 
-        playlistCatalogueAdapter = new PlaylistCatalogueAdapter(requireContext());
+        playlistCatalogueAdapter = new PlaylistCatalogueAdapter(activity, requireContext());
         bind.playlistCatalogueRecyclerView.setAdapter(playlistCatalogueAdapter);
         playlistCatalogueViewModel.getPlaylistList().observe(requireActivity(), playlist -> {
             playlistCatalogueAdapter.setItems(playlist);
         });
+
+        bind.playlistCatalogueRecyclerView.setOnTouchListener((v, event) -> {
+            hideKeyboard(v);
+            return false;
+        });
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        inflater.inflate(R.menu.album_catalogue_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+
+        SearchView searchView = (SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searchView.clearFocus();
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                playlistCatalogueAdapter.getFilter().filter(newText);
+                return false;
+            }
+        });
+
+        searchView.setPadding(-32, 0, 0, 0);
+    }
+
+    private void hideKeyboard(View view) {
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 }

app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java

@@ -103,7 +103,7 @@ public class SearchFragment extends Fragment {
         bind.searchResultGenreRecyclerView.addItemDecoration(new GridItemDecoration(2, 16, false));
         bind.searchResultGenreRecyclerView.setHasFixedSize(true);
 
-        genreCatalogueAdapter = new GenreCatalogueAdapter(requireContext());
+        genreCatalogueAdapter = new GenreCatalogueAdapter(activity, requireContext());
         genreCatalogueAdapter.setClickListener((view, position) -> {
             Bundle bundle = new Bundle();
             bundle.putString(Song.BY_GENRE, Song.BY_GENRE);

app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java

@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -32,6 +33,7 @@ public class SongListPageFragment extends Fragment {
         songListPageViewModel = new ViewModelProvider(requireActivity()).get(SongListPageViewModel.class);
 
         init();
+        initAppBar();
         initSongListView();
 
         return view;
@@ -94,6 +96,27 @@ public class SongListPageFragment extends Fragment {
         }
     }
 
+    private void initAppBar() {
+        activity.setSupportActionBar(bind.toolbar);
+
+        if (activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        bind.toolbar.setNavigationOnClickListener(v -> {
+            activity.navController.navigateUp();
+        });
+
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
+                bind.toolbar.setTitle("Songs");
+            } else {
+                bind.toolbar.setTitle("");
+            }
+        });
+    }
+
     private void initSongListView() {
         bind.songListRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         bind.songListRecyclerView.setHasFixedSize(true);

app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java

@@ -15,6 +15,8 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
     private AlbumRepository albumRepository;
     public LiveData<List<Album>> albumList;
 
+    private String query = "";
+
     public AlbumCatalogueViewModel(@NonNull Application application) {
         super(application);
 
@@ -25,4 +27,12 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
         albumList = albumRepository.getListLiveAlbums();
         return albumList;
     }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
 }

app/src/main/res/drawable/ic_done.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="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>

app/src/main/res/drawable/ic_filter_list.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="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>

app/src/main/res/layout/fragment_album_catalogue.xml

@@ -1,42 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <ProgressBar
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/loading_progress_bar"
+        android:id="@+id/toolbar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:minWidth="128dp"
-        android:layout_centerInParent="true" />
-
-    <TextView
-        android:id="@+id/album_catalogue_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
-        android:fontFamily="@font/open_sans_font_family"
+        app:layout_collapseMode="pin"
-        android:paddingStart="16dp"
+        app:navigationIcon="@drawable/ic_arrow_back"
-        android:paddingTop="20dp"
+        android:theme="@style/SearchViewStyle" />
-        android:paddingEnd="16dp"
-        android:text="Album Catalogue"
-        android:textColor="@color/titleTextColor"
-        android:textSize="22sp"
-        android:textStyle="bold" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/album_catalogue_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
-        android:layout_marginTop="8dp"
+        android:paddingTop="8dp">
-        android:layout_marginBottom="8dp"
+
-        android:clipToPadding="false"
+        <com.google.android.material.appbar.AppBarLayout
-        android:paddingStart="16dp"
+            android:id="@+id/app_bar_layout"
-        android:paddingTop="8dp"
+            android:layout_width="match_parent"
-        android:paddingEnd="16dp"
+            android:layout_height="wrap_content"
-        android:layout_below="@+id/album_catalogue_label"
+            app:elevation="0dp">
-        android:paddingBottom="@dimen/global_padding_bottom"/>
+
-</RelativeLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/album_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="172dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/HeadlineTextView"
+                    android:text="Browse Albums"
+                    android:paddingTop="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="24dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/album_catalogue_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
 

app/src/main/res/layout/fragment_album_page.xml

@@ -165,7 +165,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/song_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:clipToPadding="false"
             android:paddingTop="8dp"
             android:paddingBottom="@dimen/global_padding_bottom"

app/src/main/res/layout/fragment_artist_catalogue.xml

@@ -1,42 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <ProgressBar
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/loading_progress_bar"
+        android:id="@+id/toolbar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:minWidth="128dp"
-        android:layout_centerInParent="true"/>
-
-    <TextView
-        android:id="@+id/artist_catalogue_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
-        android:fontFamily="@font/open_sans_font_family"
+        app:layout_collapseMode="pin"
-        android:paddingStart="16dp"
+        app:navigationIcon="@drawable/ic_arrow_back"
-        android:paddingTop="20dp"
+        app:titleTextColor="@color/titleTextColor"
-        android:paddingEnd="16dp"
+        app:queryBackground="@android:color/transparent"
-        android:text="Artist Catalogue"
+        android:theme="@style/SearchViewStyle" />
-        android:textColor="@color/titleTextColor"
-        android:textSize="22sp"
-        android:textStyle="bold" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/artist_catalogue_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
-        android:layout_marginTop="8dp"
+        android:paddingTop="8dp">
-        android:layout_marginBottom="8dp"
-        android:clipToPadding="false"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:layout_below="@+id/artist_catalogue_label"
-        android:paddingBottom="@dimen/global_padding_bottom"/>
-</RelativeLayout>
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/artist_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="172dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/HeadlineTextView"
+                    android:text="Browse Artists"
+                    android:paddingTop="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="24dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/artist_catalogue_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_filter.xml

@@ -1,75 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <ProgressBar
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/loading_progress_bar"
+        android:id="@+id/toolbar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
-        android:layout_width="wrap_content"
+        android:layout_height="?attr/actionBarSize"
-        android:layout_height="wrap_content"
+        app:layout_collapseMode="pin"
-        android:indeterminate="true"
+        app:navigationIcon="@drawable/ic_arrow_back"
-        android:minWidth="128dp"
+        android:theme="@style/SearchViewStyle" />
-        android:layout_centerInParent="true"/>
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/filter_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
+        android:paddingTop="8dp">
-        android:visibility="gone">
 
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            app:elevation="0dp">
-            android:paddingBottom="@dimen/global_padding_bottom">
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/genre_filter_info_sector"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="172dp"
-                android:orientation="horizontal"
+                android:clipChildren="false"
-                android:paddingStart="8dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp">
 
                 <TextView
-                    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="Filter"
-                    android:textColor="@color/titleTextColor"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/finish_filtering_text_view_clickable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/open_sans_font_family"
+                    style="@style/HeadlineTextView"
-                    android:paddingStart="8dp"
+                    android:text="Filter Genres"
-                    android:paddingTop="12dp"
+                    android:paddingTop="16dp"
-                    android:paddingEnd="8dp"
+                    android:paddingStart="16dp"
-                    android:text="Finish"
+                    android:paddingEnd="16dp"
-                    android:textColor="@color/subtitleTextColor"
+                    android:paddingBottom="24dp"
-                    android:textSize="14sp" />
+                    app:layout_constraintStart_toStartOf="parent"
-            </LinearLayout>
+                    app:layout_constraintBottom_toBottomOf="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_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" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <ProgressBar
+            android:id="@+id/loading_progress_bar"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            android:minWidth="128dp"
+            android:layout_gravity="center" />
+
+        <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">
 
             <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:paddingStart="16dp"
                 android:paddingTop="8dp"
-                android:paddingEnd="16dp"/>
+                android:paddingStart="16dp"
-        </LinearLayout>
+                android:paddingEnd="16dp"
-    </androidx.core.widget.NestedScrollView>
+                android:paddingBottom="@dimen/global_padding_bottom"/>
-</RelativeLayout>
+        </androidx.core.widget.NestedScrollView>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_genre_catalogue.xml

@@ -1,66 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <ProgressBar
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/loading_progress_bar"
+        android:id="@+id/toolbar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:minWidth="128dp"
-        android:layout_centerInParent="true"/>
-
-    <!--  Label and button  -->
-    <LinearLayout
-        android:id="@+id/genre_catalogue_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
-        android:orientation="horizontal"
+        app:layout_collapseMode="pin"
-        android:paddingStart="8dp"
+        app:navigationIcon="@drawable/ic_arrow_back"
-        android:paddingTop="8dp"
+        android:theme="@style/SearchViewStyle" />
-        android:paddingEnd="8dp">
 
-        <TextView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-            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="Genre Catalogue"
-            android:textColor="@color/titleTextColor"
-            android:textSize="22sp"
-            android:textStyle="bold" />
-
-
-        <TextView
-            android:id="@+id/filter_genres_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="Filter"
-            android:textColor="@color/subtitleTextColor"
-            android:textSize="14sp" />
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/genre_catalogue_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
-        android:layout_marginTop="8dp"
+        android:paddingTop="8dp">
-        android:layout_marginBottom="8dp"
-        android:clipToPadding="false"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="@dimen/global_padding_bottom"
-        android:layout_below="@+id/genre_catalogue_container"/>
-</RelativeLayout>
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/genre_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="172dp"
+                android:clipChildren="false"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/HeadlineTextView"
+                    android:text="Browse Genres"
+                    android:paddingTop="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="24dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintBottom_toBottomOf="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_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" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/genre_catalogue_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_playlist_catalogue.xml

@@ -1,32 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <!--  Label and button  -->
+    <androidx.appcompat.widget.Toolbar
-    <TextView
+        android:id="@+id/toolbar"
-        android:id="@+id/playlist_catalogue_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
-        android:fontFamily="@font/open_sans_font_family"
+        app:layout_collapseMode="pin"
-        android:paddingStart="16dp"
+        app:navigationIcon="@drawable/ic_arrow_back"
-        android:paddingTop="20dp"
+        android:theme="@style/SearchViewStyle" />
-        android:paddingEnd="16dp"
-        android:text="Playlist Catalogue"
-        android:textColor="@color/titleTextColor"
-        android:textSize="22sp"
-        android:textStyle="bold" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/playlist_catalogue_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
-        android:clipToPadding="false"
+        android:paddingTop="8dp">
-        android:paddingStart="16dp"
+
-        android:paddingTop="8dp"
+        <com.google.android.material.appbar.AppBarLayout
-        android:paddingEnd="16dp"
+            android:id="@+id/app_bar_layout"
-        android:paddingBottom="@dimen/global_padding_bottom"
+            android:layout_width="match_parent"
-        android:layout_below="@+id/playlist_catalogue_label"/>
+            android:layout_height="wrap_content"
-</RelativeLayout>
+            app:elevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/album_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="172dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/HeadlineTextView"
+                    android:text="Browse Playlists"
+                    android:paddingTop="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="24dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/playlist_catalogue_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
 

app/src/main/res/layout/fragment_song_list_page.xml

@@ -1,30 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <TextView
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/page_title_label"
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize"
-        android:fontFamily="@font/open_sans_font_family"
+        app:layout_collapseMode="pin"
-        android:paddingStart="16dp"
+        app:navigationIcon="@drawable/ic_arrow_back"
-        android:paddingTop="20dp"
+        android:theme="@style/SearchViewStyle" />
-        android:paddingEnd="16dp"
-        android:text="@string/label_placeholder"
-        android:textColor="@color/titleTextColor"
-        android:textSize="22sp"
-        android:textStyle="bold" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/song_list_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="8dp"
+        android:paddingTop="8dp">
-        android:layout_marginBottom="8dp"
+
-        android:clipToPadding="false"
+        <com.google.android.material.appbar.AppBarLayout
-        android:paddingTop="8dp"
+            android:id="@+id/app_bar_layout"
-        android:paddingBottom="@dimen/global_padding_bottom"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/album_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="172dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+                <TextView
+                    android:id="@+id/page_title_label"
+                    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:paddingEnd="16dp"
+                    android:paddingBottom="24dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/song_list_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:clipToPadding="false"
+            android:paddingBottom="@dimen/global_padding_bottom"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
+

app/src/main/res/menu/album_catalogue_menu.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search"
+        android:title="Search"
+        app:showAsAction="ifRoom"
+        android:iconTint="@color/titleTextColor"
+        app:actionViewClass="android.widget.SearchView"/>
+
+</menu>

app/src/main/res/values/styles.xml

@@ -29,6 +29,17 @@
         <item name="android:background">@color/dividerColor</item>
     </style>
 
+    <style name="SearchViewStyle" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <!--This line changes the color of text in Toolbar-->
+        <item name="android:textColorPrimary">@color/titleTextColor</item>
+        <!--This line changes the color of icons in toolbar (back, overflow menu icons)-->
+        <item name="android:textColorSecondary">@color/subtitleTextColor</item>
+        <!-- Gets rid of the search icon -->
+        <item name="searchIcon">@drawable/ic_search</item>
+        <!-- Gets rid of the "underline" in the text -->
+        <item name="queryBackground">@color/white</item>
+    </style>
+
     <!-- FONT STYLE -->
 
     <style name="InterFontFamily">