From 780f1c3a2ebf6427bd02d4caeace07287081ecf8 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Wed, 20 Nov 2024 23:02:43 +0100
Subject: [PATCH] feat: implemented additional sorting options for albums in
 the catalog screen

---
 .../cappielloantonio/tempo/subsonic/models/AlbumID3.kt    | 6 ++++--
 .../tempo/ui/adapter/AlbumCatalogueAdapter.java           | 8 ++++++++
 .../tempo/ui/fragment/AlbumCatalogueFragment.java         | 6 ++++++
 .../java/com/cappielloantonio/tempo/util/Constants.kt     | 2 ++
 app/src/main/res/menu/sort_album_popup_menu.xml           | 6 ++++++
 app/src/main/res/values/strings.xml                       | 2 ++
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/tempo/subsonic/models/AlbumID3.kt b/app/src/main/java/com/cappielloantonio/tempo/subsonic/models/AlbumID3.kt
index 79870135..3072a3a4 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/models/AlbumID3.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/models/AlbumID3.kt
@@ -4,6 +4,8 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
+import java.time.Instant
+import java.time.LocalDate
 import java.util.*
 
 @Keep
@@ -17,12 +19,12 @@ open class AlbumID3 : Parcelable {
     var coverArtId: String? = null
     var songCount: Int? = 0
     var duration: Int? = 0
-    var playCount: Long? = null
+    var playCount: Long? = 0
     var created: Date? = null
     var starred: Date? = null
     var year: Int = 0
     var genre: String? = null
-    var played: String? = null
+    var played: Date? = Date(0)
     var userRating: Int? = 0
     var recordLabels: List<RecordLabel>? = null
     var musicBrainzId: String? = null
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
index 8ad36b33..1fc970ab 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
@@ -169,6 +169,14 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
                 albums.sort(Comparator.comparing(AlbumID3::getCreated));
                 Collections.reverse(albums);
                 break;
+            case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
+                albums.sort(Comparator.comparing(AlbumID3::getPlayed));
+                Collections.reverse(albums);
+                break;
+            case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
+                albums.sort(Comparator.comparing(AlbumID3::getPlayCount));
+                Collections.reverse(albums);
+                break;
         }
 
         notifyDataSetChanged();
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java
index e33b5142..bb62e939 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/AlbumCatalogueFragment.java
@@ -187,6 +187,12 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
             } else if (menuItem.getItemId() == R.id.menu_album_sort_recently_added) {
                 albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_ADDED);
                 return true;
+            } else if (menuItem.getItemId() == R.id.menu_album_sort_recently_played) {
+                albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED);
+                return true;
+            } else if (menuItem.getItemId() == R.id.menu_album_sort_most_played) {
+                albumAdapter.sort(Constants.ALBUM_ORDER_BY_MOST_PLAYED);
+                return true;
             }
 
             return false;
diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt b/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
index aa788c3f..2299eafe 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Constants.kt
@@ -31,6 +31,8 @@ object Constants {
     const val ALBUM_ORDER_BY_YEAR = "ALBUM_ORDER_BY_YEAR"
     const val ALBUM_ORDER_BY_RANDOM = "ALBUM_ORDER_BY_RANDOM"
     const val ALBUM_ORDER_BY_RECENTLY_ADDED = "ALBUM_ORDER_BY_RECENTLY_ADDED"
+    const val ALBUM_ORDER_BY_RECENTLY_PLAYED = "ALBUM_ORDER_BY_RECENTLY_PLAYED"
+    const val ALBUM_ORDER_BY_MOST_PLAYED = "ALBUM_ORDER_BY_MOST_PLAYED"
 
     const val ARTIST_DOWNLOADED = "ARTIST_DOWNLOADED"
     const val ARTIST_STARRED = "ARTIST_STARRED"
diff --git a/app/src/main/res/menu/sort_album_popup_menu.xml b/app/src/main/res/menu/sort_album_popup_menu.xml
index 2f7a9d93..f3cd2106 100644
--- a/app/src/main/res/menu/sort_album_popup_menu.xml
+++ b/app/src/main/res/menu/sort_album_popup_menu.xml
@@ -15,4 +15,10 @@
     <item
         android:id="@+id/menu_album_sort_recently_added"
         android:title="@string/menu_sort_recently_added" />
+    <item
+        android:id="@+id/menu_album_sort_recently_played"
+        android:title="@string/menu_sort_recently_played" />
+    <item
+        android:id="@+id/menu_album_sort_most_played"
+        android:title="@string/menu_sort_most_played" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91d532af..21d34bea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,6 +176,8 @@
     <string name="menu_sort_name">Name</string>
     <string name="menu_sort_random">Random</string>
     <string name="menu_sort_recently_added">Recently added</string>
+    <string name="menu_sort_recently_played">Recently played</string>
+    <string name="menu_sort_most_played">Most played</string>
     <string name="menu_pin_button">Add to home screen</string>
     <string name="menu_unpin_button">Remove from home screen</string>
     <string name="menu_sort_year">Year</string>