From d3c3fe8f08f665101d5bb26cbcfa5f1290ca31bb Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 6 Jun 2017 19:51:21 +0200
Subject: [PATCH] Add another space to the playlist duration. Clean up the
 code.

---
 .../kabouzeid/gramophone/helper/MusicPlayerRemote.java |  2 +-
 .../com/kabouzeid/gramophone/service/MusicService.java | 10 +++++-----
 .../ui/fragments/player/card/CardPlayerFragment.java   |  4 ++--
 .../ui/fragments/player/flat/FlatPlayerFragment.java   |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
index f9a0da14..c43dc5b2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
@@ -239,7 +239,7 @@ public class MusicPlayerRemote {
         return -1;
     }
 
-    public static int getQueueDurationMillis(int position) {
+    public static long getQueueDurationMillis(int position) {
         if (musicService != null) {
             return musicService.getQueueDurationMillis(position);
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index adf24b6d..de5e1999 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -946,11 +946,11 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         return playback.duration();
     }
 
-    public int getQueueDurationMillis(int position) {
-        int ret=0;
-        for(int i=position+1;i<playingQueue.size();i++)
-            ret+=playingQueue.get(i).duration;
-        return ret;
+    public long getQueueDurationMillis(int position) {
+        long duration = 0;
+        for (int i = position + 1; i < playingQueue.size(); i++)
+            duration += playingQueue.get(i).duration;
+        return duration;
     }
 
     public int seek(int millis) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
index f821d381..db89eded 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
@@ -198,7 +198,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueue() {
         playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
+        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
@@ -206,7 +206,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueuePosition() {
         playingQueueAdapter.setCurrent(MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
+        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
index 4f7af034..6387f179 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
@@ -194,7 +194,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueue() {
         playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
+        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
@@ -202,7 +202,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueuePosition() {
         playingQueueAdapter.setCurrent(MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next)+" • "+ MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis( MusicPlayerRemote.getPosition())));
+        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }