Add search

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

@@ -40,7 +40,7 @@ public class DiscoverSongAdapter extends PagerAdapter {
     @Override
     public Object instantiateItem(@NonNull ViewGroup container, final int position) {
         layoutInflater = LayoutInflater.from(context);
-        View view = layoutInflater.inflate(R.layout.item_discover_song, container, false);
+        View view = layoutInflater.inflate(R.layout.item_home_discover_song, container, false);
 
         TextView title;
         TextView desc;

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

@@ -1,7 +1,6 @@
 package com.cappielloantonio.play.adapter;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +13,9 @@ import com.cappielloantonio.play.model.Song;
 
 import java.util.List;
 
+/**
+ * Adapter per i brani recenti in home
+ */
 public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.ViewHolder> {
     private static final String TAG = "RecentMusicAdapter";
     private List<Song> songs;
@@ -27,10 +29,9 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
         this.songs = songs;
     }
 
-    // inflates the row layout from xml when needed
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = mInflater.inflate(R.layout.item_recent_track, parent, false);
+        View view = mInflater.inflate(R.layout.item_home_recent_track, parent, false);
         return new ViewHolder(view);
     }
 

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

@@ -0,0 +1,82 @@
+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.Playlist;
+import com.cappielloantonio.play.model.RecentSearch;
+
+import java.util.List;
+
+public class RecentSearchAdapter extends RecyclerView.Adapter<RecentSearchAdapter.ViewHolder> {
+    private static final String TAG = "GenreAdapter";
+    private List<RecentSearch> searches;
+    private LayoutInflater mInflater;
+    private Context context;
+    private ItemClickListener itemClickListener;
+
+    public RecentSearchAdapter(Context context, List<RecentSearch> searches) {
+        this.context = context;
+        this.mInflater = LayoutInflater.from(context);
+        this.searches = searches;
+    }
+
+    @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, getAdapterPosition());
+        }
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,91 @@
+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.Song;
+import com.cappielloantonio.play.util.Util;
+
+import java.util.List;
+
+/**
+ * Adapter per i brani ritrovati nella ricerca
+ */
+public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSearchAdapter.ViewHolder> {
+    private static final String TAG = "SongResultSearchAdapter";
+    private List<Song> songs;
+    private LayoutInflater mInflater;
+    private Context context;
+    private ItemClickListener itemClickListener;
+
+    public SongResultSearchAdapter(Context context, List<Song> songs) {
+        this.context = context;
+        this.mInflater = LayoutInflater.from(context);
+        this.songs = songs;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = mInflater.inflate(R.layout.item_search_result_song, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        Song song = songs.get(position);
+
+        holder.songTitle.setText(song.getTitle());
+        holder.songArtist.setText(song.getArtistName());
+        holder.songDuration.setText(Util.getReadableDurationString(song.getDuration()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return songs.size();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        TextView songTitle;
+        TextView songArtist;
+        TextView songDuration;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+
+            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);
+
+            itemView.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (itemClickListener != null)
+                itemClickListener.onItemClick(view, getAdapterPosition());
+        }
+    }
+
+    public void setItems(List<Song> songs) {
+        this.songs = songs;
+        notifyDataSetChanged();
+    }
+
+    public Song getItem(int id) {
+        return songs.get(id);
+    }
+
+    public void setClickListener(ItemClickListener itemClickListener) {
+        this.itemClickListener = itemClickListener;
+    }
+
+    public interface ItemClickListener {
+        void onItemClick(View view, int position);
+    }
+}

app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java

@@ -10,14 +10,16 @@ import com.cappielloantonio.play.database.dao.AlbumDao;
 import com.cappielloantonio.play.database.dao.ArtistDao;
 import com.cappielloantonio.play.database.dao.GenreDao;
 import com.cappielloantonio.play.database.dao.PlaylistDao;
+import com.cappielloantonio.play.database.dao.RecentSearchDao;
 import com.cappielloantonio.play.database.dao.SongDao;
 import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.model.Playlist;
+import com.cappielloantonio.play.model.RecentSearch;
 import com.cappielloantonio.play.model.Song;
 
-@Database(entities = {Album.class, Artist.class, Genre.class, Playlist.class, Song.class}, version = 2, exportSchema = false)
+@Database(entities = {Album.class, Artist.class, Genre.class, Playlist.class, Song.class, RecentSearch.class}, version = 3, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     private static final String TAG = "AppDatabase";
 
@@ -43,4 +45,6 @@ public abstract class AppDatabase extends RoomDatabase {
     public abstract PlaylistDao playlistDao();
 
     public abstract SongDao songDao();
+
+    public abstract RecentSearchDao recentSearchDao();
 }

app/src/main/java/com/cappielloantonio/play/database/dao/RecentSearchDao.java

@@ -0,0 +1,24 @@
+package com.cappielloantonio.play.database.dao;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+
+import com.cappielloantonio.play.model.RecentSearch;
+
+import java.util.List;
+
+@Dao
+public interface RecentSearchDao {
+    @Query("SELECT * FROM recent_search GROUP BY search ORDER BY id DESC LIMIT :limit")
+    LiveData<List<RecentSearch>> getLast(int limit);
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insert(RecentSearch search);
+
+    @Query("DELETE FROM recent_search")
+    void deleteAll();
+}

app/src/main/java/com/cappielloantonio/play/database/dao/SongDao.java

@@ -16,6 +16,9 @@ public interface SongDao {
     @Query("SELECT * FROM song")
     LiveData<List<Song>> getAll();
 
+    @Query("SELECT * FROM song WHERE title LIKE '%' || :title || '%'")
+    LiveData<List<Song>> searchSong(String title);
+
     @Query("SELECT EXISTS(SELECT * FROM song WHERE id = :id)")
     boolean exist(String id);
 

app/src/main/java/com/cappielloantonio/play/model/RecentSearch.java

@@ -0,0 +1,38 @@
+package com.cappielloantonio.play.model;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+@Entity(tableName = "recent_search")
+public class RecentSearch {
+    @NonNull
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id")
+    private int id;
+
+    @ColumnInfo(name = "search")
+    private String search;
+
+    public RecentSearch(String search) {
+        this.search = search;
+    }
+
+    @NonNull
+    public int getId() {
+        return id;
+    }
+
+    public void setId(@NonNull int id) {
+        this.id = id;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+}

app/src/main/java/com/cappielloantonio/play/repository/RecentSearchRepository.java

@@ -0,0 +1,67 @@
+package com.cappielloantonio.play.repository;
+
+import android.app.Application;
+
+import androidx.lifecycle.LiveData;
+
+import com.cappielloantonio.play.database.AppDatabase;
+import com.cappielloantonio.play.database.dao.RecentSearchDao;
+import com.cappielloantonio.play.model.RecentSearch;
+
+import java.util.List;
+
+public class RecentSearchRepository {
+    private RecentSearchDao recentSearchDao;
+    private LiveData<List<RecentSearch>> listLiveRecentSearches;
+
+    public RecentSearchRepository(Application application) {
+        AppDatabase database = AppDatabase.getInstance(application);
+        recentSearchDao = database.recentSearchDao();
+        listLiveRecentSearches = recentSearchDao.getLast(3);
+    }
+
+    public LiveData<List<RecentSearch>> getListLiveRecentSearches() {
+        return listLiveRecentSearches;
+    }
+
+    public void insert(RecentSearch recentSearch) {
+        InsertThreadSafe insert = new InsertThreadSafe(recentSearchDao, recentSearch);
+        Thread thread = new Thread(insert);
+        thread.start();
+    }
+
+    public void deleteAll() {
+        DeleteAllThreadSafe delete = new DeleteAllThreadSafe(recentSearchDao);
+        Thread thread = new Thread(delete);
+        thread.start();
+    }
+
+    private static class InsertThreadSafe implements Runnable {
+        private RecentSearchDao recentSearchDao;
+        private RecentSearch recentSearch;
+
+        public InsertThreadSafe(RecentSearchDao recentSearchDao, RecentSearch recentSearch) {
+            this.recentSearchDao = recentSearchDao;
+            this.recentSearch = recentSearch;
+        }
+
+        @Override
+        public void run() {
+            recentSearchDao.insert(recentSearch);
+        }
+    }
+
+
+    private static class DeleteAllThreadSafe implements Runnable {
+        private RecentSearchDao recentSearchDao;
+
+        public DeleteAllThreadSafe(RecentSearchDao recentSearchDao) {
+            this.recentSearchDao = recentSearchDao;
+        }
+
+        @Override
+        public void run() {
+            recentSearchDao.deleteAll();
+        }
+    }
+}

app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java

@@ -14,17 +14,23 @@ import java.util.List;
 public class SongRepository {
     private SongDao songDao;
     private LiveData<List<Song>> listLiveSongs;
+    private LiveData<List<Song>> searchListLiveSongs;
 
     public SongRepository(Application application) {
         AppDatabase database = AppDatabase.getInstance(application);
         songDao = database.songDao();
-        listLiveSongs = songDao.getAll();
     }
 
     public LiveData<List<Song>> getListLiveSongs() {
+        listLiveSongs = songDao.getAll();
         return listLiveSongs;
     }
 
+    public LiveData<List<Song>> searchListLiveSongs(String title) {
+        searchListLiveSongs = songDao.searchSong(title);
+        return searchListLiveSongs;
+    }
+
     public boolean exist(Song song) {
         boolean exist = false;
 
@@ -35,8 +41,7 @@ public class SongRepository {
         try {
             thread.join();
             exist = existThread.exist();
-        }
-        catch (InterruptedException e) {
+        } catch (InterruptedException e) {
             e.printStackTrace();
         }
 

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

@@ -0,0 +1,62 @@
+package com.cappielloantonio.play.ui.fragment;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.cappielloantonio.play.R;
+import com.cappielloantonio.play.databinding.FragmentFilterBinding;
+import com.cappielloantonio.play.model.Genre;
+import com.cappielloantonio.play.ui.activities.MainActivity;
+import com.cappielloantonio.play.viewmodel.SearchViewModel;
+import com.google.android.material.chip.Chip;
+
+public class FilterFragment extends Fragment {
+    private static final String TAG = "FilterFragment";
+
+    private MainActivity activity;
+    private FragmentFilterBinding bind;
+    private SearchViewModel searchViewModel;
+
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        activity = (MainActivity) getActivity();
+
+        bind = FragmentFilterBinding.inflate(inflater, container, false);
+        View view = bind.getRoot();
+        searchViewModel = new ViewModelProvider(requireActivity()).get(SearchViewModel.class);
+
+        setFilterChips();
+        return view;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        bind = null;
+    }
+
+    private void setFilterChips() {
+        searchViewModel.getGenreList().observe(requireActivity(), genres -> {
+            bind.loadingProgressBar.setVisibility(View.GONE);
+            for (Genre genre : genres) {
+                Chip mChip = (Chip) requireActivity().getLayoutInflater().inflate(R.layout.chip_search_filter_genre, null, false);
+                mChip.setText(genre.getName());
+
+                mChip.setOnCheckedChangeListener((buttonView, isChecked) -> Toast.makeText(requireContext(), buttonView.getText() + ": " + isChecked, Toast.LENGTH_SHORT).show());
+
+                bind.filtersChipsGroup.addView(mChip);
+            }
+        });
+    }
+}

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

@@ -1,31 +1,40 @@
 package com.cappielloantonio.play.ui.fragment;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.cappielloantonio.play.R;
+import com.cappielloantonio.play.adapter.RecentSearchAdapter;
+import com.cappielloantonio.play.adapter.SongResultSearchAdapter;
 import com.cappielloantonio.play.databinding.FragmentSearchBinding;
+import com.cappielloantonio.play.model.RecentSearch;
+import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.ui.activities.MainActivity;
-import com.paulrybitskyi.persistentsearchview.utils.VoiceRecognitionDelegate;
+import com.cappielloantonio.play.viewmodel.SearchViewModel;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class SearchFragment extends Fragment {
     private static final String TAG = "SearchFragment";
-    public static final int REQUEST_CODE = 64545;
 
     private FragmentSearchBinding bind;
     private MainActivity activity;
+    private SearchViewModel searchViewModel;
 
-    protected LinearLayout emptyLinearLayout;
-
-    protected String query = "";
+    private RecentSearchAdapter recentSearchAdapter;
+    private SongResultSearchAdapter songResultSearchAdapter;
 
     @Nullable
     @Override
@@ -34,8 +43,12 @@ public class SearchFragment extends Fragment {
 
         bind = FragmentSearchBinding.inflate(inflater, container, false);
         View view = bind.getRoot();
+        searchViewModel = new ViewModelProvider(requireActivity()).get(SearchViewModel.class);
 
-        searchInit();
+        init();
+        initRecentSearchView();
+        initSearchResultView();
+        initSearchView();
 
         return view;
     }
@@ -46,23 +59,38 @@ public class SearchFragment extends Fragment {
         bind = null;
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                String code = data.getStringExtra("result");
-                search(code);
-            }
-        }
-
-        VoiceRecognitionDelegate.handleResult(bind.persistentSearchView, requestCode, resultCode, data);
+    private void init() {
+        bind.clearAllSearchTextViewClickable.setOnClickListener(v -> searchViewModel.deleteAllRecentSearch());
     }
 
-    private void searchInit() {
-        bind.persistentSearchView.showRightButton();
+    private void initRecentSearchView() {
+        bind.recentlySearchedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
+        bind.recentlySearchedTracksRecyclerView.setHasFixedSize(true);
 
+        recentSearchAdapter = new RecentSearchAdapter(requireContext(), new ArrayList<>());
+        recentSearchAdapter.setClickListener((view, position) -> {
+            RecentSearch search = recentSearchAdapter.getItem(position);
+            search(search.getSearch());
+        });
+        bind.recentlySearchedTracksRecyclerView.setAdapter(recentSearchAdapter);
+
+        searchViewModel.getSearchList().observe(requireActivity(), recentSearches -> recentSearchAdapter.setItems(recentSearches));
+    }
+
+    private void initSearchResultView() {
+        bind.searchResultTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
+        bind.searchResultTracksRecyclerView.setHasFixedSize(true);
+
+        songResultSearchAdapter = new SongResultSearchAdapter(requireContext(), new ArrayList<>());
+        songResultSearchAdapter.setClickListener((view, position) -> {
+            Toast.makeText(requireContext(), "Song " + position, Toast.LENGTH_SHORT).show();
+        });
+        bind.searchResultTracksRecyclerView.setAdapter(songResultSearchAdapter);
+    }
+
+    private void initSearchView() {
+        bind.persistentSearchView.showRightButton();
+        
         bind.persistentSearchView.setOnSearchQueryChangeListener((searchView, oldQuery, newQuery) -> {
         });
 
@@ -70,49 +98,25 @@ public class SearchFragment extends Fragment {
         });
 
         bind.persistentSearchView.setOnRightBtnClickListener(view -> {
+            activity.navController.navigate(R.id.action_searchFragment_to_filterFragment);
         });
 
-        bind.persistentSearchView.setVoiceRecognitionDelegate(new VoiceRecognitionDelegate(this));
-
         bind.persistentSearchView.setOnSearchConfirmedListener((searchView, query) -> {
-            if (!query.equals("")) {
-                searchView.collapse();
-                search(query);
-            }
+            search(query);
         });
-
-        bind.persistentSearchView.setSuggestionsDisabled(true);
     }
 
     public void search(String query) {
-        emptyScreen();
-        this.query = query;
+        if (!query.equals("")) {
+            searchViewModel.insertNewSearch(query);
+            bind.persistentSearchView.collapse();
 
-        bind.persistentSearchView.setInputQuery(query);
-        performSearch(query);
+            bind.persistentSearchView.setInputQuery(query);
+            performSearch(query);
+        }
     }
 
     private void performSearch(String query) {
-
-    }
-
-    private void loadMoreItemSearch(String query, int page) {
-        manageProgressBar(true);
-
-    }
-
-    private void emptyScreen() {
-        emptyLinearLayout.setVisibility(View.GONE);
-    }
-
-
-    private void manageProgressBar(boolean show) {
-        if (show) {
-            bind.persistentSearchView.hideLeftButton();
-            bind.persistentSearchView.showProgressBar(true);
-        } else {
-            bind.persistentSearchView.showLeftButton();
-            bind.persistentSearchView.hideProgressBar(true);
-        }
+        searchViewModel.searchSong(query).observe(requireActivity(), songs -> songResultSearchAdapter.setItems(songs));
     }
 }

app/src/main/java/com/cappielloantonio/play/util/Util.java

@@ -0,0 +1,18 @@
+package com.cappielloantonio.play.util;
+
+import java.util.Locale;
+
+public class Util {
+    public static String getReadableDurationString(long songDurationMillis) {
+        long minutes = (songDurationMillis / 1000) / 60;
+        long seconds = (songDurationMillis / 1000) % 60;
+
+        if (minutes < 60) {
+            return String.format(Locale.getDefault(), "%01d:%02d", minutes, seconds);
+        } else {
+            long hours = minutes / 60;
+            minutes = minutes % 60;
+            return String.format(Locale.getDefault(), "%d:%02d:%02d", hours, minutes, seconds);
+        }
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.cappielloantonio.play.viewmodel;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+
+import com.cappielloantonio.play.model.Genre;
+import com.cappielloantonio.play.model.RecentSearch;
+import com.cappielloantonio.play.model.Song;
+import com.cappielloantonio.play.repository.GenreRepository;
+import com.cappielloantonio.play.repository.RecentSearchRepository;
+import com.cappielloantonio.play.repository.SongRepository;
+
+import java.util.List;
+
+public class SearchViewModel extends AndroidViewModel {
+    private SongRepository songRepository;
+    private GenreRepository genreRepository;
+    private RecentSearchRepository recentSearchRepository;
+
+    private LiveData<List<Song>> searchSong;
+    private LiveData<List<Genre>> allGenres;
+    private LiveData<List<RecentSearch>> recentSearches;
+
+    public SearchViewModel(@NonNull Application application) {
+        super(application);
+
+        songRepository = new SongRepository(application);
+        genreRepository = new GenreRepository(application);
+        recentSearchRepository = new RecentSearchRepository(application);
+    }
+
+    public LiveData<List<Song>> searchSong(String title) {
+        searchSong = songRepository.searchListLiveSongs(title);
+        return searchSong;
+    }
+
+    public LiveData<List<Genre>> getGenreList() {
+        allGenres = genreRepository.getListLiveGenres();
+        return allGenres;
+    }
+
+    public LiveData<List<RecentSearch>> getSearchList() {
+        recentSearches = recentSearchRepository.getListLiveRecentSearches();
+        return recentSearches;
+    }
+
+    public void insertNewSearch(String search) {
+        recentSearchRepository.insert(new RecentSearch(search));
+    }
+
+    public void deleteAllRecentSearch() {
+        recentSearchRepository.deleteAll();
+    }
+}

app/src/main/res/color/color_chip_status.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/chipSelectedBackgroundColor" android:state_checked="true" />
+    <item android:color="@color/chipUnelectedBackgroundColor" />
+</selector>

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/Widget.MaterialComponents.Chip.Choice"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:fontFamily="@font/open_sans_font_family"
+    android:gravity="center"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:textAppearance="?android:attr/textAppearance"
+    android:textColor="@color/titleTextColor"
+    app:chipBackgroundColor="@color/color_chip_status"
+    app:chipStrokeColor="@color/chipBorderColor"
+    app:chipStrokeWidth="1.5dp"
+    android:checkable="true"/>

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

@@ -0,0 +1,39 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    android:gravity="center">
+
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:minWidth="128dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="8dp">
+
+        <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" />
+    </ScrollView>
+
+</LinearLayout>

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

@@ -8,21 +8,19 @@
         android:id="@+id/persistentSearchView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="4dp"
-        android:paddingLeft="4dp"
-        android:paddingTop="4dp"
-        android:paddingEnd="4dp"
-        android:paddingRight="4dp"
+        android:paddingStart="8dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="8dp"
         app:areSuggestionsDisabled="true"
         app:cardBackgroundColor="@color/cardColor"
         app:cardCornerRadius="4dp"
-        app:cardElevation="2dp"
+        app:cardElevation="0dp"
         app:clearInputButtonDrawable="@drawable/ic_close"
         app:dividerColor="@color/dividerColor"
         app:isClearInputButtonEnabled="true"
         app:isDismissableOnTouchOutside="true"
         app:isProgressBarEnabled="true"
-        app:isVoiceInputButtonEnabled="true"
+        app:isVoiceInputButtonEnabled="false"
         app:leftButtonDrawable="@drawable/ic_search"
         app:progressBarColor="@color/colorAccent"
         app:queryInputBarIconColor="@color/darkIconColor"
@@ -31,18 +29,98 @@
         app:queryInputHintColor="@color/hintTextColor"
         app:queryInputTextColor="@color/hintTextColor"
         app:rightButtonDrawable="@drawable/ic_filter"
-        app:shouldDimBehind="true" />
+        app:shouldDimBehind="false" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="never"
-        android:paddingStart="2dp"
-        android:paddingLeft="2dp"
-        android:paddingTop="60dp"
-        android:paddingEnd="2dp"
-        android:paddingRight="2dp"
-        android:paddingBottom="4dp" />
+        android:layout_height="wrap_content"
+        android:layout_below="@id/persistentSearchView"
+        android:orientation="vertical">
+
+        <!--  Recent searched -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!--  Label and button  -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingStart="8dp"
+                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:paddingBottom="8dp"
+                    android:paddingEnd="8dp"
+                    android:text="Recent Searches"
+                    android:textColor="@color/titleTextColor"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/clear_all_search_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="Clear all"
+                    android:textColor="@color/subtitleTextColor"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recently_searched_tracks_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="4dp"
+                android:clipToPadding="false"
+                android:paddingStart="8dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="8dp" />
+        </LinearLayout>
+
+        <!-- Search result -->
+        <LinearLayout
+            android:id="@+id/search_result_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!--  Label -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/open_sans_font_family"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="8dp"
+                android:text="Search results"
+                android:textColor="@color/titleTextColor"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/search_result_tracks_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="4dp"
+                android:clipToPadding="false"
+                android:overScrollMode="never"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="56dp" />
+        </LinearLayout>
+    </LinearLayout>
 </RelativeLayout>

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

@@ -9,7 +9,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="136dp">
+        android:layout_height="156dp">
 
         <TextView
             android:id="@+id/title_discover_song_label"

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

@@ -7,8 +7,8 @@
 
     <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/card_view"
-        android:layout_width="172dp"
-        android:layout_height="172dp"
+        android:layout_width="156dp"
+        android:layout_height="156dp"
         android:layout_gravity="center"
         android:backgroundTint="@color/cardColor"
         card_view:cardCornerRadius="4dp"

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

@@ -7,8 +7,8 @@
 
     <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/card_view"
-        android:layout_width="172dp"
-        android:layout_height="172dp"
+        android:layout_width="156dp"
+        android:layout_height="156dp"
         android:layout_gravity="center"
         android:backgroundTint="@color/cardColor"
         card_view:cardCornerRadius="4dp"

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

@@ -0,0 +1,20 @@
+<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>

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

@@ -0,0 +1,68 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingEnd="4dp">
+
+    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/imageView"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="center"
+        android:backgroundTint="@color/colorAccent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/subtitleTextColor"
+        card_view:cardCornerRadius="4dp"
+        card_view:cardElevation="2dp"
+        card_view:cardPreventCornerOverlap="false"
+        card_view:cardUseCompatPadding="false"/>
+
+    <TextView
+        android:id="@+id/search_result_song_title_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/open_sans_font_family"
+        android:paddingStart="12dp"
+        android:paddingTop="4dp"
+        android:text="@string/label_placeholder"
+        android:textColor="@color/titleTextColor"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/search_result_song_artist_text_view"/>
+
+    <TextView
+        android:id="@+id/search_result_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:paddingBottom="4dp"
+        android:text="@string/label_placeholder"
+        android:textColor="@color/subtitleTextColor"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        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"
+        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" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/navigation/nav_graph.xml

@@ -52,7 +52,7 @@
         <action
             android:id="@+id/action_syncFragment_to_homeFragment"
             app:destination="@id/homeFragment"
-            app:popUpTo="@id/landingFragment"
+            app:popUpTo="@id/syncFragment"
             app:popUpToInclusive="true" />
     </fragment>
 
@@ -72,14 +72,24 @@
         android:name="com.cappielloantonio.play.ui.fragment.LibraryFragment"
         android:label="LibraryFragment"
         tools:layout="@layout/fragment_library"/>
-    <fragment
-        android:id="@+id/searchFragment"
-        android:name="com.cappielloantonio.play.ui.fragment.SearchFragment"
-        android:label="SearchFragment"
-        tools:layout="@layout/fragment_search"/>
     <fragment
         android:id="@+id/settingsFragment"
         android:name="com.cappielloantonio.play.ui.fragment.SettingsFragment"
         android:label="SettingsFragment"
         tools:layout="@layout/fragment_settings"/>
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="com.cappielloantonio.play.ui.fragment.SearchFragment"
+        android:label="SearchFragment"
+        tools:layout="@layout/fragment_search">
+        <action
+            android:id="@+id/action_searchFragment_to_filterFragment"
+            app:destination="@id/filterFragment"
+            app:launchSingleTop="true" />
+    </fragment>
+    <fragment
+        android:id="@+id/filterFragment"
+        android:name="com.cappielloantonio.play.ui.fragment.FilterFragment"
+        android:label="FilterFragment"
+        tools:layout="@layout/fragment_filter" />
 </navigation>

app/src/main/res/values-night/colors.xml

@@ -26,6 +26,7 @@
     <color name="hintTextColor">#CFCFCF</color>
     <color name="iconSearchBarColor">#CFCFCF</color>
     <color name="contentContainerColor">#121212</color>
+    <color name="searchBackgroundColor">#101010</color>
 
     <color name="navigationDrawerTextColor">#F3F3F3</color>
     <color name="navigationDrawerIconColor">#A0A0A0</color>
@@ -33,5 +34,9 @@
     <color name="bottomNavIconPressedColor">#FFFFFF</color>
     <color name="bottomNavIconSelectedColor">#EEEEEE</color>
     <color name="bottomNavIconColor">#707070</color>
+
+    <color name="chipBorderColor">#707070</color>
+    <color name="chipSelectedBackgroundColor">#444444</color>
+    <color name="chipUnelectedBackgroundColor">#1D1D1D</color>
 </resources>
 

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

@@ -27,6 +27,7 @@
     <color name="hintTextColor">#303030</color>
     <color name="iconSearchBarColor">#303030</color>
     <color name="contentContainerColor">#EEEEEE</color>
+    <color name="searchBackgroundColor">#EFEFEF</color>
 
     <color name="navigationDrawerTextColor">#383838</color>
     <color name="navigationDrawerIconColor">#757575</color>
@@ -34,4 +35,8 @@
     <color name="bottomNavIconPressedColor">#252525</color>
     <color name="bottomNavIconSelectedColor">#303030</color>
     <color name="bottomNavIconColor">#AFAFAF</color>
+
+    <color name="chipBorderColor">#AFAFAF</color>
+    <color name="chipSelectedBackgroundColor">#EBEBEB</color>
+    <color name="chipUnelectedBackgroundColor">#FFFFFF</color>
 </resources>