Limited number of search items for each category

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

@@ -22,8 +22,8 @@ public interface AlbumDao {
     @Query("SELECT * FROM album ORDER BY RANDOM() LIMIT :number;")
     LiveData<List<Album>> getSample(int number);
 
-    @Query("SELECT * FROM album WHERE title LIKE '%' || :name || '%'")
+    @Query("SELECT * FROM album WHERE title LIKE '%' || :name || '%' LIMIT :limit")
-    LiveData<List<Album>> searchAlbum(String name);
+    LiveData<List<Album>> searchAlbum(String name, int limit);
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insert(Album album);

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

@@ -19,8 +19,8 @@ public interface ArtistDao {
     @Query("SELECT * FROM artist ORDER BY RANDOM() LIMIT :number;")
     LiveData<List<Artist>> getSample(int number);
 
-    @Query("SELECT * FROM artist WHERE name LIKE '%' || :name || '%'")
+    @Query("SELECT * FROM artist WHERE name LIKE '%' || :name || '%' LIMIT :limit")
-    LiveData<List<Artist>> searchArtist(String name);
+    LiveData<List<Artist>> searchArtist(String name, int limit);
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insertAll(List<Artist> artists);

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

@@ -29,8 +29,8 @@ public interface GenreDao {
     @Query("DELETE FROM genre")
     void deleteAll();
 
-    @Query("SELECT * FROM genre WHERE name LIKE '%' || :name || '%'")
+    @Query("SELECT * FROM genre WHERE name LIKE '%' || :name || '%' LIMIT :limit")
-    LiveData<List<Genre>> searchGenre(String name);
+    LiveData<List<Genre>> searchGenre(String name, int limit);
 
     @Query("SELECT name FROM genre WHERE name LIKE :query || '%' OR name like '% ' || :query || '%' GROUP BY name LIMIT :number")
     List<String> searchSuggestions(String query, int number);

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

@@ -21,8 +21,8 @@ public interface SongDao {
     @Query("SELECT * FROM song")
     List<Song> getAllList();
 
-    @Query("SELECT * FROM song WHERE title LIKE '%' || :title || '%'")
+    @Query("SELECT * FROM song WHERE title LIKE '%' || :title || '%' LIMIT :limit")
-    LiveData<List<Song>> searchSong(String title);
+    LiveData<List<Song>> searchSong(String title, int limit);
 
     // Da utilizzare in caso si decidesse di migliorare il viewpager nella home
     @Query("SELECT * FROM song WHERE id IN (:pseudoRandomNumber)")

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

@@ -41,8 +41,8 @@ public class AlbumRepository {
         return listLiveSampleAlbum;
     }
 
-    public LiveData<List<Album>> searchListLiveAlbum(String name) {
+    public LiveData<List<Album>> searchListLiveAlbum(String name, int limit) {
-        searchListLiveAlbum = albumDao.searchAlbum(name);
+        searchListLiveAlbum = albumDao.searchAlbum(name, limit);
         return searchListLiveAlbum;
     }
 

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

@@ -33,8 +33,8 @@ public class ArtistRepository {
         return listLiveSampleArtist;
     }
 
-    public LiveData<List<Artist>> searchListLiveArtist(String name) {
+    public LiveData<List<Artist>> searchListLiveArtist(String name, int limit) {
-        searchListLiveArtist = artistDao.searchArtist(name);
+        searchListLiveArtist = artistDao.searchArtist(name, limit);
         return searchListLiveArtist;
     }
 

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

@@ -114,8 +114,8 @@ public class GenreRepository {
         }
     }
 
-    public LiveData<List<Genre>> searchListLiveGenre(String name) {
+    public LiveData<List<Genre>> searchListLiveGenre(String name, int limit) {
-        searchListLiveGenre = genreDao.searchGenre(name);
+        searchListLiveGenre = genreDao.searchGenre(name, limit);
         return searchListLiveGenre;
     }
 

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

@@ -40,8 +40,8 @@ public class SongRepository {
         songGenreCrossDao = database.songGenreCrossDao();
     }
 
-    public LiveData<List<Song>> searchListLiveSong(String title) {
+    public LiveData<List<Song>> searchListLiveSong(String title, int limit) {
-        searchListLiveSongs = songDao.searchSong(title);
+        searchListLiveSongs = songDao.searchSong(title, limit);
         return searchListLiveSongs;
     }
 

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

@@ -1,6 +1,7 @@
 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;
@@ -26,6 +27,7 @@ import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration;
 import com.cappielloantonio.play.model.RecentSearch;
 import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.ui.activities.MainActivity;
+import com.cappielloantonio.play.util.PreferenceUtil;
 import com.cappielloantonio.play.viewmodel.SearchViewModel;
 import com.paulrybitskyi.persistentsearchview.adapters.model.SuggestionItem;
 import com.paulrybitskyi.persistentsearchview.listeners.OnSuggestionChangeListener;
@@ -70,6 +72,8 @@ public class SearchFragment extends Fragment {
     public void onResume() {
         super.onResume();
         inputFocus();
+
+        Log.i(TAG, "onResume: " + PreferenceUtil.getInstance(requireContext()).getSongNumber());
     }
 
     @Override
@@ -179,19 +183,19 @@ public class SearchFragment extends Fragment {
     }
 
     private void performSearch(String query) {
-        searchViewModel.searchSong(query).observe(requireActivity(), songs -> {
+        searchViewModel.searchSong(query, requireContext()).observe(requireActivity(), songs -> {
             if(bind != null) bind.searchSongSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
             songResultSearchAdapter.setItems(songs);
         });
-        searchViewModel.searchAlbum(query).observe(requireActivity(), albums -> {
+        searchViewModel.searchAlbum(query, requireContext()).observe(requireActivity(), albums -> {
             if(bind != null) bind.searchAlbumSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE);
             albumAdapter.setItems(albums);
         });
-        searchViewModel.searchArtist(query).observe(requireActivity(), artists -> {
+        searchViewModel.searchArtist(query, requireContext()).observe(requireActivity(), artists -> {
             if(bind != null) bind.searchArtistSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE);
             artistAdapter.setItems(artists);
         });
-        searchViewModel.searchGenre(query).observe(requireActivity(), genres -> {
+        searchViewModel.searchGenre(query, requireContext()).observe(requireActivity(), genres -> {
             if(bind != null) bind.searchGenreSector.setVisibility(!genres.isEmpty() ? View.VISIBLE : View.GONE);
             genreCatalogueAdapter.setItems(genres);
         });

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

@@ -14,6 +14,8 @@ import java.util.List;
 import java.util.Set;
 
 public class PreferenceUtil {
+    private static final String TAG = "PreferenceUtil";
+
     public static final String SERVER = "server";
     public static final String USER = "user";
     public static final String TOKEN = "token";
@@ -24,6 +26,7 @@ public class PreferenceUtil {
 
     public static final String SYNC = "sync";
     public static final String SONG_GENRE_SYNC = "song_genre_sync";
+    public static final String SEARCH_ELEMENT_PER_CATEGORY = "search_element_per_category";
 
     public static final String IMAGE_CACHE_SIZE = "image_cache_size";
     public static final String MEDIA_CACHE_SIZE = "media_cache_size";
@@ -141,6 +144,10 @@ public class PreferenceUtil {
         return Integer.parseInt(mPreferences.getString(INSTANT_MIX_SONG_NUMBER, "10"));
     }
 
+    public final int getSearchElementPerCategory() {
+        return Integer.parseInt(mPreferences.getString(SEARCH_ELEMENT_PER_CATEGORY, "10"));
+    }
+
     public final String getTranscodeCodec() {
         return mPreferences.getString(TRANSCODE_CODEC, "aac");
     }
@@ -178,10 +185,16 @@ public class PreferenceUtil {
         return mPreferences.getBoolean(AUDIO_DUCKING, true);
     }
 
+    /*
+     * Numero di canzoni salvate nel db
+     */
     public int getSongNumber() {
         return mPreferences.getInt(SONG_NUMBER, 0);
     }
 
+    /*
+     * Numero di canzoni salvate nel db
+     */
     public void setSongNumber(int number) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putInt(SONG_NUMBER, number);

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

@@ -1,6 +1,7 @@
 package com.cappielloantonio.play.viewmodel;
 
 import android.app.Application;
+import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
@@ -16,6 +17,7 @@ import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.GenreRepository;
 import com.cappielloantonio.play.repository.RecentSearchRepository;
 import com.cappielloantonio.play.repository.SongRepository;
+import com.cappielloantonio.play.util.PreferenceUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -59,23 +61,23 @@ public class SearchViewModel extends AndroidViewModel {
         }
     }
 
-    public LiveData<List<Song>> searchSong(String title) {
+    public LiveData<List<Song>> searchSong(String title, Context context) {
-        searchSong = songRepository.searchListLiveSong(title);
+        searchSong = songRepository.searchListLiveSong(title, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
         return searchSong;
     }
 
-    public LiveData<List<Album>> searchAlbum(String name) {
+    public LiveData<List<Album>> searchAlbum(String name, Context context) {
-        searchAlbum = albumRepository.searchListLiveAlbum(name);
+        searchAlbum = albumRepository.searchListLiveAlbum(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
         return searchAlbum;
     }
 
-    public LiveData<List<Artist>> searchArtist(String name) {
+    public LiveData<List<Artist>> searchArtist(String name, Context context) {
-        searchArtist = artistRepository.searchListLiveArtist(name);
+        searchArtist = artistRepository.searchListLiveArtist(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
         return searchArtist;
     }
 
-    public LiveData<List<Genre>> searchGenre(String name) {
+    public LiveData<List<Genre>> searchGenre(String name, Context context) {
-        searchGenre = genreRepository.searchListLiveGenre(name);
+        searchGenre = genreRepository.searchListLiveGenre(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
         return searchGenre;
     }
 

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

@@ -50,4 +50,16 @@
         <item>25</item>
         <item>50</item>
     </string-array>
+
+    <string-array name="search_element_per_category_titles">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+    </string-array>
+
+    <string-array name="search_element_per_category_values">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+    </string-array>
 </resources>

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

@@ -14,6 +14,7 @@
     <string name="label_dot_separator">•</string>
     <string name="save_filters">Save filters between sessions</string>
     <string name="instant_mix_song_number">Number of songs generated by Instant Mix</string>
+    <string name="search_element_per_category">Number of items searched for each category</string>
 
     <string name="sync_header">Synchronization</string>
     <string name="music_sync">Music sync</string>

app/src/main/res/xml/global_preferences.xml

@@ -36,6 +36,15 @@
             app:key="instant_mix_song_number"
             app:title="@string/instant_mix_song_number"
             app:useSimpleSummaryProvider="true" />
+
+        <ListPreference
+            app:defaultValue="10"
+            app:dialogTitle="@string/search_element_per_category"
+            app:entries="@array/search_element_per_category_titles"
+            app:entryValues="@array/search_element_per_category_values"
+            app:key="search_element_per_category"
+            app:title="@string/search_element_per_category"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/sync_header">