more bugfixes

Author: Sid Zi

app/src/main/java/com/sidzi/circleofmusic/recievers/MusicPlayerViewHandler.java

@@ -66,7 +66,7 @@ public MusicPlayerViewHandler(Context mContext) {
     @Override
     public void onReceive(final Context context, Intent intent) {
 
-        final Track temp_track = (Track) intent.getSerializableExtra("track_metadata");
+        final Track temp_track = MusicPlayerService.PLAYING_TRACK;
         context.bindService(new Intent(mContext, MusicPlayerService.class), mMusicServiceConnection, Context.BIND_AUTO_CREATE);
         final MusicPlayerService mpService = mMusicServiceConnection.getmMusicPlayerService();
 
@@ -94,7 +94,7 @@ public void onClick(View v) {
         ibPlayNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                mpService.next();
+                mpService.next(MusicPlayerService.PLAYING_BUCKET);
             }
         });
         switch (intent.getAction()) {

app/src/main/java/com/sidzi/circleofmusic/services/MusicPlayerService.java

@@ -29,6 +29,7 @@ public class MusicPlayerService extends Service {
     final public static String ACTION_PLAY = "com.sidzi.circleofmusic.PLAY";
     public static final String ACTION_CLOSE = "com.sidzi.circleofmusic.CLOSE";
     public static Track PLAYING_TRACK = null;
+    public static boolean PLAYING_BUCKET;
     private final IBinder mMIBinder = new MusicBinder();
     public MediaPlayer mMediaPlayer = null;
     private int PLAYING_TRACK_POSITION = -1;
@@ -85,13 +86,14 @@ public void play(String track_path) {
             mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
                 @Override
                 public void onCompletion(MediaPlayer mediaPlayer) {
-                    next();
+                    next(false);
                 }
             });
             mMediaPlayer.prepare();
             PLAYING_TRACK_POSITION = mTrackList.indexOf(new Track(track_path));
             PLAYING_TRACK = mTrackList.get(PLAYING_TRACK_POSITION);
-            uiUpdate(PLAYING_TRACK);
+            PLAYING_BUCKET = false;
+            uiUpdate(true);
             if (songsTillSleep == 0)
                 onDestroy();
             else
@@ -110,7 +112,7 @@ public void play(String Path, String Artist, String Name) {
             mMediaPlayer.prepareAsync();
             PLAYING_TRACK = new Track(Name, Path, Artist);
             PLAYING_TRACK.setBucket(false);
-            uiUpdate(PLAYING_TRACK);
+            uiUpdate(true);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -125,10 +127,7 @@ public void bucketPlay(String track_path) {
             mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
                 @Override
                 public void onCompletion(MediaPlayer mediaPlayer) {
-                    try {
-                        bucketPlay(mBucketList.get(++PLAYING_TRACK_POSITION).getPath());
-                    } catch (IndexOutOfBoundsException ignore) {
-                    }
+                    next(true);
                 }
             });
             mMediaPlayer.prepare();
@@ -137,7 +136,8 @@ public void onCompletion(MediaPlayer mediaPlayer) {
                 PLAYING_TRACK = mBucketList.get(PLAYING_TRACK_POSITION);
             } catch (IndexOutOfBoundsException | NullPointerException ignore) {
             }
-            uiUpdate(PLAYING_TRACK);
+            PLAYING_BUCKET = true;
+            uiUpdate(true);
             if (songsTillSleep == 0)
                 onDestroy();
             else
@@ -147,18 +147,24 @@ public void onCompletion(MediaPlayer mediaPlayer) {
         }
     }
 
-    public void next() {
-        play(mTrackList.get(++PLAYING_TRACK_POSITION).getPath());
+    public void next(boolean bucket) {
+        try {
+            if (!bucket)
+                play(mTrackList.get(++PLAYING_TRACK_POSITION).getPath());
+            else
+                bucketPlay(mBucketList.get(++PLAYING_TRACK_POSITION).getPath());
+        } catch (IndexOutOfBoundsException ignore) {
+        }
     }
 
     public void pause() {
         mMediaPlayer.pause();
-        uiUpdate(null);
+        uiUpdate(false);
     }
 
     public void unpause() {
         mMediaPlayer.start();
-        uiUpdate(null);
+        uiUpdate(false);
     }
 
     public boolean bucketOperation() {
@@ -167,10 +173,9 @@ public boolean bucketOperation() {
         return PLAYING_TRACK.getBucket();
     }
 
-    private void uiUpdate(Track track) {
-        String action = (track == null) ? (mMediaPlayer.isPlaying() ? ACTION_PLAY : ACTION_PAUSE) : ACTION_UPDATE_METADATA;
+    private void uiUpdate(boolean b) {
+        String action = (!b) ? (mMediaPlayer.isPlaying() ? ACTION_PLAY : ACTION_PAUSE) : ACTION_UPDATE_METADATA;
         Intent intent = new Intent(action);
-        intent.putExtra("track_metadata", track);
         localBroadcastManager.sendBroadcast(intent);
     }
 
@@ -185,7 +190,7 @@ private void init() {
             @Override
             public void onPrepared(MediaPlayer mediaPlayer) {
                 mediaPlayer.start();
-                uiUpdate(null);
+                uiUpdate(false);
             }
         });
     }

app/src/main/res/layout/layout_row_potm.xml

@@ -20,7 +20,8 @@
         android:id="@+id/tvPotmTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/tvPotmMonth" />
+        android:layout_below="@+id/tvPotmMonth"
+        android:textColor="@color/textPrimary" />
 
     <TextView
         android:id="@+id/tvPotmDescription"