feat: integrate sort recent searches chronologically

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

@@ -30,7 +30,7 @@ import com.cappielloantonio.tempo.subsonic.models.Playlist;
 
 @UnstableApi
 @Database(
-        version = 12,
+        version = 13,
         entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Chronology.class, Favorite.class, SessionMediaItem.class, Playlist.class, LyricsCache.class},
         autoMigrations = {@AutoMigration(from = 10, to = 11), @AutoMigration(from = 11, to = 12)}
 )

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

@@ -12,9 +12,12 @@ import java.util.List;
 
 @Dao
 public interface RecentSearchDao {
-    @Query("SELECT * FROM recent_search ORDER BY search DESC")
+    @Query("SELECT search FROM recent_search ORDER BY timestamp DESC")
     List<String> getRecent();
 
+    @Query("SELECT search FROM recent_search ORDER BY search DESC")
+    List<String> getAlpha();
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insert(RecentSearch search);
 

app/src/main/java/com/cappielloantonio/tempo/model/RecentSearch.kt

@@ -13,5 +13,8 @@ import kotlinx.parcelize.Parcelize
 data class RecentSearch(
     @PrimaryKey
     @ColumnInfo(name = "search")
-    var search: String
+    var search: String,
+
+    @ColumnInfo(name = "timestamp", defaultValue = "0")
+    var timestamp: Long
 ) : Parcelable

app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java

@@ -13,6 +13,7 @@ import com.cappielloantonio.tempo.subsonic.models.ArtistID3;
 import com.cappielloantonio.tempo.subsonic.models.Child;
 import com.cappielloantonio.tempo.subsonic.models.SearchResult2;
 import com.cappielloantonio.tempo.subsonic.models.SearchResult3;
+import com.cappielloantonio.tempo.util.Preferences;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -186,8 +187,13 @@ public class SearchingRepository {
 
         @Override
         public void run() {
+            if(Preferences.isSearchSortingChronologicallyEnabled()){
                 recent = recentSearchDao.getRecent();
             }
+            else {
+                recent = recentSearchDao.getAlpha();
+            }
+        }
 
         public List<String> getRecent() {
             return recent;

app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt

@@ -81,6 +81,7 @@ object Preferences {
     private const val ALBUM_SORT_ORDER = "album_sort_order"
     private const val DEFAULT_ALBUM_SORT_ORDER = Constants.ALBUM_ORDER_BY_NAME
     private const val ARTIST_SORT_BY_ALBUM_COUNT= "artist_sort_by_album_count"
+    private const val SORT_SEARCH_CHRONOLOGICALLY= "sort_search_chronologically"
 
     @JvmStatic
     fun getServer(): String? {
@@ -674,4 +675,9 @@ object Preferences {
         else
             return Constants.ARTIST_ORDER_BY_NAME
     }
+
+    @JvmStatic
+    fun isSearchSortingChronologicallyEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(SORT_SEARCH_CHRONOLOGICALLY, true)
+    }
 }

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

@@ -48,11 +48,11 @@ public class SearchViewModel extends AndroidViewModel {
     }
 
     public void insertNewSearch(String search) {
-        searchingRepository.insert(new RecentSearch(search));
+        searchingRepository.insert(new RecentSearch(search, System.currentTimeMillis() / 1000L));
     }
 
     public void deleteRecentSearch(String search) {
-        searchingRepository.delete(new RecentSearch(search));
+        searchingRepository.delete(new RecentSearch(search, 0));
     }
 
     public LiveData<List<String>> getSearchSuggestion(String query) {

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

@@ -539,4 +539,7 @@
     <string name="folder_play_collecting">Collecting songs from folder…</string>
     <string name="folder_play_playing">Playing %d songs</string>
     <string name="folder_play_no_songs">No songs found in folder</string>
+
+    <string name="search_sort_title">Sort recent searches chronologically</string>
+    <string name="search_sort_summary">If enabled, sort searches chronologically. Sort by name if disabled.</string>
 </resources>

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

@@ -122,6 +122,12 @@
             android:summary="@string/settings_artist_sort_by_album_count_summary"
             android:key="artist_sort_by_album_count" />
 
+        <SwitchPreference
+            android:title="@string/search_sort_title"
+            android:defaultValue="true"
+            android:summary="@string/search_sort_summary"
+            android:key="sort_search_chronologically" />
+
     </PreferenceCategory>
 
      <PreferenceCategory app:title="@string/settings_title_playlist">