From 8f08b12b6962c82382f51af8c8e29d6821ef407b Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Wed, 28 Jul 2021 18:53:42 +0200
Subject: [PATCH] Fix song duration visualization

---
 .../play/adapter/PlayerSongQueueAdapter.java     |  2 +-
 .../play/adapter/SongHorizontalAdapter.java      |  2 +-
 .../play/database/AppDatabase.java               |  2 +-
 .../com/cappielloantonio/play/model/Queue.java   | 14 +++++++++++++-
 .../com/cappielloantonio/play/model/Song.java    |  1 +
 .../ui/fragment/PlayerBottomSheetFragment.java   |  4 ++--
 .../cappielloantonio/play/util/MusicUtil.java    | 16 +++++++++++++---
 .../cappielloantonio/play/util/QueueUtil.java    |  4 ++--
 8 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
index 856aa0c7..5ea7d73e 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
@@ -50,7 +50,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
 
         holder.songTitle.setText(song.getTitle());
         holder.songArtist.setText(song.getArtistName());
-        holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration()));
+        holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
 
         CustomGlideRequest.Builder
                 .from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
index 424ffc44..1c299c9f 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
@@ -52,7 +52,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
 
         holder.songTitle.setText(song.getTitle());
         holder.songArtist.setText(song.getArtistName());
-        holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration()));
+        holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
 
         if (song.isOffline()) {
             holder.downloadIndicator.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
index 18d60013..7295d7a7 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
@@ -12,7 +12,7 @@ import com.cappielloantonio.play.model.Queue;
 import com.cappielloantonio.play.model.RecentSearch;
 import com.cappielloantonio.play.model.Song;
 
-@Database(entities = {Queue.class, RecentSearch.class}, version = 2, exportSchema = false)
+@Database(entities = {Queue.class, RecentSearch.class}, version = 3, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
     private static final String TAG = "AppDatabase";
 
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Queue.java b/app/src/main/java/com/cappielloantonio/play/model/Queue.java
index 3f76dd5f..319d3e89 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Queue.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Queue.java
@@ -33,7 +33,10 @@ public class Queue {
     @ColumnInfo(name = "primary")
     private String primary;
 
-    public Queue(int trackOrder, String songID, String title, String albumId, String albumName, String artistId, String artistName, String primary) {
+    @ColumnInfo(name = "duration")
+    private long duration;
+
+    public Queue(int trackOrder, String songID, String title, String albumId, String albumName, String artistId, String artistName, String primary, long duration) {
         this.trackOrder = trackOrder;
         this.songID = songID;
         this.title = title;
@@ -42,6 +45,7 @@ public class Queue {
         this.artistId = artistId;
         this.artistName = artistName;
         this.primary = primary;
+        this.duration = duration;
     }
 
     public int getTrackOrder() {
@@ -107,4 +111,12 @@ public class Queue {
     public void setPrimary(String primary) {
         this.primary = primary;
     }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Song.java b/app/src/main/java/com/cappielloantonio/play/model/Song.java
index 6e71e67b..8fed53cb 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Song.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Song.java
@@ -86,6 +86,7 @@ public class Song implements Parcelable {
         this.artistId = queue.getArtistId();
         this.artistName = queue.getArtistName();
         this.primary = queue.getPrimary();
+        this.duration = queue.getDuration();
     }
 
     public String getId() {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index 5e9773e0..c1a3d157 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -336,7 +336,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
         bind.playerBodyLayout.playerBigSeekBar.setMax(total);
         bind.playerBodyLayout.playerBigSeekBar.setProgress(progress);
 
-        bind.playerBodyLayout.playerBigSongTimeIn.setText(MusicUtil.getReadableDurationString(progress));
-        bind.playerBodyLayout.playerBigSongDuration.setText(MusicUtil.getReadableDurationString(total));
+        bind.playerBodyLayout.playerBigSongTimeIn.setText(MusicUtil.getReadableDurationString(progress, true));
+        bind.playerBodyLayout.playerBigSongDuration.setText(MusicUtil.getReadableDurationString(total, true));
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
index 4e472d49..e4ec0523 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
@@ -31,9 +31,19 @@ public class MusicUtil {
                 "&id=" + song.getId();
     }
 
-    public static String getReadableDurationString(long songDurationMillis) {
-        long minutes = (songDurationMillis / 1000) / 60;
-        long seconds = (songDurationMillis / 1000) % 60;
+    public static String getReadableDurationString(long duration, boolean millis) {
+        long minutes = 0;
+        long seconds = 0;
+
+        if(millis) {
+            minutes = (duration / 1000) / 60;
+            seconds = (duration / 1000) % 60;
+        }
+        else {
+            minutes = duration / 60;
+            seconds = duration % 60;
+        }
+
 
         if (minutes < 60) {
             return String.format(Locale.getDefault(), "%01d:%02d", minutes, seconds);
diff --git a/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java b/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java
index f9787398..2ddce499 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java
@@ -10,7 +10,7 @@ public class QueueUtil {
     private static final String TAG = "QueueUtil";
 
     public static Queue getQueueElementFromSong(Song song, int startingPosition) {
-        return new Queue(startingPosition, song.getId(), song.getTitle(), song.getAlbumId(), song.getAlbumName(), song.getArtistId(), song.getArtistName(), song.getPrimary());
+        return new Queue(startingPosition, song.getId(), song.getTitle(), song.getAlbumId(), song.getAlbumName(), song.getArtistId(), song.getArtistName(), song.getPrimary(), song.getDuration());
     }
 
     public static List<Queue> getQueueElementsFromSongs(List<Song> songs) {
@@ -18,7 +18,7 @@ public class QueueUtil {
         List<Queue> queue = new ArrayList<>();
 
         for (Song song : songs) {
-            queue.add(new Queue(counter, song.getId(), song.getTitle(), song.getAlbumId(), song.getAlbumName(), song.getArtistId(), song.getArtistName(), song.getPrimary()));
+            queue.add(new Queue(counter, song.getId(), song.getTitle(), song.getAlbumId(), song.getAlbumName(), song.getArtistId(), song.getArtistName(), song.getPrimary(), song.getDuration()));
             counter++;
         }