MiniPlayer now updates when MainActivity opened from notification

OffBy0x01 · OffBy0x01 · commit c6edf444cf82 · 2018-04-24T16:13:45.000+01:00
diff --git a/app/src/main/java/uk/arcalder/Kanta/ArtistListAdapter.java b/app/src/main/java/uk/arcalder/Kanta/ArtistListAdapter.java
@@ -0,0 +1,98 @@
+//package uk.arcalder.Kanta;
+//
+//import android.support.v7.widget.RecyclerView;
+//import android.util.Log;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.widget.ImageView;
+//import android.widget.TextView;
+//
+//import com.squareup.picasso.Picasso;
+//
+//import java.util.ArrayList;
+//
+///**
+// * Created by Zynch on 22/04/2018.
+// */
+//
+//public class ArtistListAdapter extends RecyclerView.Adapter<ArtistListAdapter.ViewHolder> {
+//    private static final String TAG = ArtistListAdapter.class.getSimpleName();
+//    // As per https://developer.android.com/guide/topics/ui/layout/recyclerview.html#java
+//
+//    public static final int PLAYTYPE_FROM_SONGS = 0;
+//    public static final int PLAYTYPE_FROM_ALBUM = 1;
+//    public static final int PLAYTYPE_FROM_ARTIST = 2;
+//
+//    private ArrayList<Artist> adapterArtists;
+//
+//    public static int addedItems = 0;
+//
+//    public int addItem(){
+//        return addedItems++;
+//    }
+//
+//    public class ViewHolder extends RecyclerView.ViewHolder {
+//
+//        public ImageView    albumListArtView;
+//        public TextView     albumListArtistView;
+//
+//        public ViewHolder(View itemView) {
+//            super(itemView);
+//            this.albumListArtView = (ImageView) itemView.findViewById(R.id.artist_item_art);
+//            this.albumListArtistView = (TextView) itemView.findViewById(R.id.artist_item_name);
+//        }
+//    }
+//
+//    public ArtistListAdapter(ArrayList<Artist> album){
+//        Log.d(TAG, "SongListAdapter created");
+//        this.adapterArtists = album;
+//    }
+//
+//    // Create new views (invoked by the layout manager)
+//    @Override
+//    public ArtistListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+//        // create a new view
+//        Log.d(TAG, "onCreateViewHolder");
+//        View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.artist_list_item, parent, false);
+//        return new ArtistListAdapter.ViewHolder(mView);
+//    }
+//
+//    // Replace the contents of a view (invoked by the layout manager)
+//    @Override
+//    public void onBindViewHolder(ViewHolder holder, int position) {
+//        Artist artist;
+//        try {
+//            artist = adapterArtists.get(position);
+//        } catch (Exception e){
+//            Log.e(TAG, "onBindViewHolder: ", e);
+//            return;
+//        }
+//
+//        // Set art
+//        if (artist.getName() != null){
+//            // Picasso doesn't need context, glide does
+//            // Glide is apparently better, but I can't be bothered adapting
+//            // all the code just for one lib
+//            // As per http://square.github.io/picasso/
+//            try {
+//                Picasso.get().load(artist.getAlbumArt()).fit().centerCrop().into(holder.albumListArtView);
+//            } catch (IllegalArgumentException iae){
+//                Log.d(TAG, "Picasso tried to load albums.getArt = " +artist.getAlbumArt());
+//            }
+//        }
+//
+//        // Set Title
+//        holder.albumListTitleView.setText(artist.getName());
+//        // Set Artist/Album
+//        holder.albumListArtistView.setText(String.format("%s", artist.getArtist()));
+//
+//    }
+//
+//    // Return the size of your dataset (invoked by the layout manager)
+//    @Override
+//    public int getItemCount() {
+//        return adapterArtists.size();
+//    }
+//
+//}
diff --git a/app/src/main/java/uk/arcalder/Kanta/MainActivity.java b/app/src/main/java/uk/arcalder/Kanta/MainActivity.java
@@ -87,6 +87,8 @@ public void onConnectionFailed() {
         }
     };
 
+    private static int currentPlaybackState;
+
     // Controller callback
     private MediaControllerCompat.Callback mMediaControllerCompatCallback = new MediaControllerCompat.Callback() {
 
@@ -101,24 +103,29 @@ public void onPlaybackStateChanged(PlaybackStateCompat state) {
             switch( state.getState() ) {
                 case PlaybackStateCompat.STATE_PLAYING: {
                     Log.d(TAG, "onPlaybackStateChanged to: STATE_PLAYING");
+                    currentPlaybackState = PlaybackStateCompat.STATE_PLAYING;
                     miniPlayerFragment(true, true);
                     break;
                 }
                 case PlaybackStateCompat.STATE_PAUSED: {
-                    Log.d(TAG, "onPlaybackStateChanged to: STATE_PLAYING");
+                    Log.d(TAG, "onPlaybackStateChanged to: STATE_PAUSED");
+                    currentPlaybackState = PlaybackStateCompat.STATE_PAUSED;
                     miniPlayerFragment(false, true);
                     break;
                 }
                 case PlaybackStateCompat.STATE_SKIPPING_TO_NEXT:
                     Log.d(TAG, "onPlaybackStateChanged to: STATE_SKIPPING_TO_NEXT");
+                    currentPlaybackState = PlaybackStateCompat.STATE_SKIPPING_TO_NEXT;
                     miniPlayerFragment(true, true);
                     break;
                 case PlaybackStateCompat.STATE_SKIPPING_TO_PREVIOUS:
                     Log.d(TAG, "onPlaybackStateChanged to: STATE_SKIPPING_TO_PREVIOUS");
+                    currentPlaybackState = PlaybackStateCompat.STATE_SKIPPING_TO_PREVIOUS;
                     miniPlayerFragment(true, true);
                     break;
                 default:
                     Log.d(TAG, "onPlaybackStateChanged to: *STATE_NOT_CARE_ABOUT");
+                    currentPlaybackState = PlaybackStateCompat.STATE_NONE;
                     miniPlayerFragment(false, false);
             }
         }
@@ -226,6 +233,9 @@ protected void onResume() {
         super.onResume();
         Log.d(TAG, "onResume Called");
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        miniPlayerFragment((currentPlaybackState == PlaybackStateCompat.STATE_PLAYING),
+                (currentPlaybackState != PlaybackStateCompat.STATE_NONE &&
+                        currentPlaybackState != PlaybackStateCompat.STATE_STOPPED));
     }
 
     @Override
@@ -462,6 +472,5 @@ public void clickMiniPlayerPlayPause(boolean state) {
             Log.d(TAG, "clickMiniPlayerPlayPause: play");
             mMediaControllerCompat.getTransportControls().play();
         }
-
     }
 }
diff --git a/app/src/main/java/uk/arcalder/Kanta/MusicLibrary.java b/app/src/main/java/uk/arcalder/Kanta/MusicLibrary.java
@@ -364,11 +364,6 @@ public Song getNextSongFromAny(){
                 return playSet.get(current_position);
             }
             Log.d(TAG, "getCurrent: getting playSet song");
-
-        } else if (!allSongs.isEmpty()){
-            // get a random song
-            Log.d(TAG, "getCurrent: getting random song");
-            allSongs.get(ThreadLocalRandom.current().nextInt(0, allSongs.size()));
         }
 
         // Literally nothing
@@ -400,10 +395,7 @@ public int getSizeOfPlaySet(){
     // get next queued song
     public Song getNextQueueSong(){
         Log.d(TAG, "getNextQueueSong");
-        if (!songQueue.isEmpty()) {
-            return songQueue.remove(0);
-        }
-        return null;
+        return songQueue.remove(0);
     }
 
     // add a song to the queue
diff --git a/app/src/main/java/uk/arcalder/Kanta/MusicPlayerService.java b/app/src/main/java/uk/arcalder/Kanta/MusicPlayerService.java
@@ -134,8 +134,25 @@ public void onReceive(Context context, Intent intent) {
 
         @Override
         public void onPlay() {
-            super.onPlay();
 
+            if( !mMediaPlayer.isPlaying() ) {
+                mMediaPlayer.start();
+                //Doesn't update itself
+                setMediaPlaybackState(PlaybackStateCompat.STATE_PLAYING);
+            }
+
+            // Try to get focus
+            if(!getAudioFocus()){
+                Log.d(TAG, "onPlayFromMediaId: Couldn't get audio focus");
+            }
+
+            //Should be started but sometimes not :s
+            if(!isServiceStarted){
+                Log.d(TAG, "onPlay: Starting Service");
+                startService(new Intent(getApplicationContext(), MusicPlayerService.class));
+            }
+
+            super.onPlay();
             // TODO NOTE: onPlay is really onResume/onNowPlaying, don't try to play songs here
 //            //Might have been playing something else
 //            mMediaPlayer.reset();
@@ -175,7 +192,6 @@ public void onPause() {
             if( mMediaPlayer.isPlaying() ) {
                 mMediaPlayer.pause();
                 removeNoisyReceiver();
-                setMediaPlaybackState(PlaybackState.STATE_PAUSED);
                 //TODO fix?
                 //Notifications
                 setMediaPlaybackState(PlaybackStateCompat.STATE_PAUSED);
@@ -253,14 +269,16 @@ public void onStop() {
 
         @Override
         public void onSkipToNext() {
-            Song nextSong = mMusicLibrary.getCurrentSong(); // TODO GET NEXT SONG
-            if (null != nextSong){
+            Song nextSong = mMusicLibrary.getNextSongFromAny(); // TODO GET NEXT SONG
+            if (null != nextSong) {
+                Log.d(TAG, "onSkipToNext: nextSong was null");
                 mMusicLibrary.setCurrentSong(nextSong);
-
+            } else {
+                Log.d(TAG, "onSkipToNext: nextSong was null");
             }
-            super.onSkipToNext();
             // TODO REMOVE - JUST FOR TESTING
             onPlay();
+            super.onSkipToNext();
         }
 
         @Override
@@ -409,17 +427,19 @@ private void removeNoisyReceiver(){
     }
 
     private void initMediaPlayer() {
-        mAudioManager = (AudioManager) getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-        mMediaPlayer = (mMediaPlayer == null) ? new MediaPlayer() : mMediaPlayer;
-        mMediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
-        mMediaPlayer.setAudioAttributes(new AudioAttributes.Builder()
-            .setUsage(AudioAttributes.USAGE_MEDIA)
-            .setFlags(AudioAttributes.CONTENT_TYPE_MUSIC)
-            .build());
-        mMediaPlayer.setVolume(1.0f, 1.0f);
-
-        mMediaPlayer.setOnPreparedListener(this);
-        mMediaPlayer.setOnCompletionListener(this);
+        mAudioManager = (mAudioManager == null) ? (AudioManager) getApplicationContext().getSystemService(Context.AUDIO_SERVICE) : mAudioManager;
+        if ( mMediaPlayer == null) {
+            mMediaPlayer = new MediaPlayer();
+            mMediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
+            mMediaPlayer.setAudioAttributes(new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_MEDIA)
+                    .setFlags(AudioAttributes.CONTENT_TYPE_MUSIC)
+                    .build());
+            mMediaPlayer.setVolume(1.0f, 1.0f);
+
+            mMediaPlayer.setOnPreparedListener(this);
+            mMediaPlayer.setOnCompletionListener(this);
+        }
     }
 
     private void initMediaSession() {
@@ -436,6 +456,8 @@ private void initMediaSession() {
         mMediaSession.setPlaybackState( new PlaybackStateCompat.Builder()
                                                 .setActions(
                                                     PlaybackState.ACTION_PLAY |
+                                                    PlaybackState.ACTION_SKIP_TO_NEXT |
+                                                    PlaybackState.ACTION_SKIP_TO_PREVIOUS |
                                                     PlaybackState.ACTION_PLAY_PAUSE).build());
 
         Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 13 22:30:30 GMT 2018
+#Tue Apr 24 14:25:42 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.1.2'`
`11`	`11`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`