diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 6a4cf05..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Deezer SDK Android Sample \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af47..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 1f212c7..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 59436c9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9085862..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 9d32e50..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/android-sample.iml b/android-sample.iml deleted file mode 100644 index 2a02201..0000000 --- a/android-sample.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index f67e8a7..0000000 --- a/app/app.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/build.gradle b/app/build.gradle index 8c539a9..93c3f81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,11 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "21.1.2" defaultConfig { applicationId "com.deezer.sdk.sample" - minSdkVersion 8 + minSdkVersion 14 targetSdkVersion 21 versionCode 1 diff --git a/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java b/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java index ae79160..d5009b9 100644 --- a/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java @@ -9,10 +9,10 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; import com.deezer.sdk.network.request.event.DeezerError; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.RadioPlayer; import com.deezer.sdk.player.RadioPlayer.RadioType; import com.deezer.sdk.player.event.RadioPlayerListener; @@ -107,9 +107,6 @@ private void createPlayer() { mRadioPlayer.addPlayerListener(this); setAttachedPlayer(mRadioPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (DeezerError e) { handleError(e); } @@ -152,26 +149,30 @@ public void onStopTrackingTouch(final SeekBar seekBar) { ////////////////////////////////////////////////////////////////////////////////////// // Radio Player Callbacks ////////////////////////////////////////////////////////////////////////////////////// - - + @Override - public void onPlayTrack(final Track track) { - displayTrack(track); - + public void onAllTracksEnded() { + } + + @Override + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); + mEqualizer = new Equalizer(0, mRadioPlayer.getAudioSessionId()); mEqualizer.setEnabled(true); - + int numBands = mEqualizer.getNumberOfBands(); Log.i("Equalizer", "Number of bands : " + numBands); - + mRange = mEqualizer.getBandLevelRange(); Log.i("Equalizer", "Level range : " + Arrays.toString(mRange) + " milliBels"); - + for (int i = 0; i < mSeekBars.length; ++i) { - + if (i < numBands) { mSeekBars[i].setVisibility(View.VISIBLE); - + int percent = ((mEqualizer.getBandLevel((short) i) - mRange[0]) * MAX_SEEK) / (mRange[1] - mRange[0]); mSeekBars[i].setOnSeekBarChangeListener(null); @@ -182,19 +183,16 @@ public void onPlayTrack(final Track track) { mSeekBars[i].setVisibility(View.GONE); mSeekBars[i].setOnSeekBarChangeListener(null); } - + } - - } - @Override - public void onTrackEnded(final Track track) { } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - - + + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/PlayerActivity.java b/app/src/main/java/com/deezer/sdk/sample/PlayerActivity.java index cdca8b0..eb25d46 100644 --- a/app/src/main/java/com/deezer/sdk/sample/PlayerActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/PlayerActivity.java @@ -6,6 +6,7 @@ import android.widget.TextView; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.player.PlayerWrapper; import com.deezer.sdk.player.PlayerWrapper.RepeatMode; diff --git a/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java b/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java index 16c0426..e3e6516 100644 --- a/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java @@ -6,6 +6,7 @@ import android.widget.ExpandableListView.OnChildClickListener; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Radio; import com.deezer.sdk.model.RadioCategory; import com.deezer.sdk.model.Track; @@ -14,7 +15,6 @@ import com.deezer.sdk.network.request.DeezerRequest; import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.network.request.event.RadioCategoriesRequestListener; import com.deezer.sdk.player.RadioPlayer; import com.deezer.sdk.player.RadioPlayer.RadioType; @@ -81,8 +81,6 @@ private void createPlayer() { new WifiAndMobileNetworkStateChecker()); mRadioPlayer.addPlayerListener(this); setAttachedPlayer(mRadioPlayer); - } catch (OAuthException e) { - handleError(e); } catch (DeezerError e) { handleError(e); } catch (TooManyPlayersExceptions e) { @@ -176,18 +174,19 @@ public void onException(final Exception exception, // Radio Player Callbacks ////////////////////////////////////////////////////////////////////////////////////// - @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); } @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } diff --git a/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java index 44d83bc..73e5bec 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java @@ -18,13 +18,13 @@ import com.deezer.sdk.model.AImageOwner.ImageSize; import com.deezer.sdk.model.Album; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; import com.deezer.sdk.network.request.DeezerRequest; import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; import com.deezer.sdk.network.request.event.JsonRequestListener; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.AlbumPlayer; import com.deezer.sdk.player.event.PlayerWrapperListener; import com.deezer.sdk.player.exception.TooManyPlayersExceptions; @@ -119,9 +119,6 @@ private void createPlayer() { mAlbumPlayer.addPlayerListener(this); setAttachedPlayer(mAlbumPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (TooManyPlayersExceptions e) { handleError(e); } @@ -190,18 +187,20 @@ protected void onSkipToPreviousTrack() { ////////////////////////////////////////////////////////////////////////////////////// @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } - + @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java index c6d330f..fc09f86 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java @@ -17,6 +17,7 @@ import android.widget.Toast; import com.deezer.sdk.model.Artist; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.model.AImageOwner.ImageSize; import com.deezer.sdk.network.connect.SessionStore; @@ -25,7 +26,6 @@ import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; import com.deezer.sdk.network.request.event.JsonRequestListener; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.ArtistRadioPlayer; import com.deezer.sdk.player.event.RadioPlayerListener; import com.deezer.sdk.player.exception.TooManyPlayersExceptions; @@ -136,9 +136,6 @@ private void createPlayer() { mArtistPlayer.addPlayerListener(this); setAttachedPlayer(mArtistPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (TooManyPlayersExceptions e) { handleError(e); } @@ -207,21 +204,23 @@ public void onTooManySkipsException() { Toast.makeText(this, R.string.deezer_too_many_skips, Toast.LENGTH_LONG).show(); } - + @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } - + @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - - + + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java index b8a62f0..1f44dcd 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java @@ -5,10 +5,10 @@ import android.os.Bundle; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; import com.deezer.sdk.network.request.event.DeezerError; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.CustomTrackListPlayer; import com.deezer.sdk.player.event.PlayerWrapperListener; import com.deezer.sdk.player.exception.TooManyPlayersExceptions; @@ -73,9 +73,6 @@ private void createPlayer() { mCustomPlayer.addPlayerListener(this); setAttachedPlayer(mCustomPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (TooManyPlayersExceptions e) { handleError(e); } @@ -108,18 +105,20 @@ private void playTrackList() { ////////////////////////////////////////////////////////////////////////////////////// @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } - + @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java index 7c91717..6194ac9 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java @@ -3,6 +3,7 @@ import android.os.Bundle; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.model.User; import com.deezer.sdk.network.connect.SessionStore; @@ -11,7 +12,6 @@ import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; import com.deezer.sdk.network.request.event.JsonRequestListener; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.RadioPlayer; import com.deezer.sdk.player.RadioPlayer.RadioType; import com.deezer.sdk.player.event.RadioPlayerListener; @@ -84,9 +84,6 @@ private void createPlayer() { mRadioPlayer.addPlayerListener(this); setAttachedPlayer(mRadioPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (DeezerError e) { handleError(e); } @@ -120,21 +117,23 @@ private void setupPlayerUI() { ////////////////////////////////////////////////////////////////////////////////////// // Radio Player Callbacks ////////////////////////////////////////////////////////////////////////////////////// - + @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } - + @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") { + displayTrack((Track)playableEntity); + } } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { } - - + + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java index 188aa5a..8eed31f 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java @@ -20,6 +20,7 @@ import android.widget.TextView; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Playlist; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; @@ -28,7 +29,6 @@ import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; import com.deezer.sdk.network.request.event.JsonRequestListener; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.PlaylistPlayer; import com.deezer.sdk.player.event.OnPlayerProgressListener; import com.deezer.sdk.player.event.PlayerWrapperListener; @@ -157,9 +157,6 @@ private void createPlayer() { mPlaylistPlayer.addOnPlayerProgressListener(this); setAttachedPlayer(mPlaylistPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (TooManyPlayersExceptions e) { handleError(e); } @@ -228,23 +225,25 @@ protected void onSkipToPreviousTrack() { ////////////////////////////////////////////////////////////////////////////////////// // Player listener ////////////////////////////////////////////////////////////////////////////////////// - + @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { + } + + @Override + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); if (mOption == Option.fade_in_out) { applyFadeInOut(0); } } - - @Override - public void onTrackEnded(final Track track) { - } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java index 9653af0..ce789fa 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java @@ -16,6 +16,7 @@ import android.widget.TextView; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Radio; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; @@ -24,7 +25,6 @@ import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; import com.deezer.sdk.network.request.event.JsonRequestListener; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.RadioPlayer; import com.deezer.sdk.player.event.RadioPlayerListener; import com.deezer.sdk.player.exception.TooManyPlayersExceptions; @@ -81,9 +81,6 @@ private void createPlayer() { mRadioPlayer.addPlayerListener(this); setAttachedPlayer(mRadioPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (DeezerError e) { handleError(e); } @@ -204,21 +201,22 @@ public void onException(final Exception exception, ////////////////////////////////////////////////////////////////////////////////////// // Radio Player Callbacks ////////////////////////////////////////////////////////////////////////////////////// - - + @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } - + @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java index 8af64ce..2f97fed 100644 --- a/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java @@ -15,6 +15,7 @@ import android.widget.TextView; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; import com.deezer.sdk.network.request.AsyncDeezerTask; @@ -22,7 +23,6 @@ import com.deezer.sdk.network.request.DeezerRequestFactory; import com.deezer.sdk.network.request.event.DeezerError; import com.deezer.sdk.network.request.event.JsonRequestListener; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.TrackPlayer; import com.deezer.sdk.player.event.PlayerWrapperListener; import com.deezer.sdk.player.exception.TooManyPlayersExceptions; @@ -124,9 +124,6 @@ private void createPlayer() { mTrackPlayer.addPlayerListener(this); setAttachedPlayer(mTrackPlayer); } - catch (OAuthException e) { - handleError(e); - } catch (TooManyPlayersExceptions e) { handleError(e); } @@ -184,20 +181,22 @@ public void onException(final Exception exception, ////////////////////////////////////////////////////////////////////////////////////// // Player listener ////////////////////////////////////////////////////////////////////////////////////// - + @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onAllTracksEnded() { } - + @Override - public void onTrackEnded(final Track track) { + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); } - + @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { + } - + @Override public void onRequestException(final Exception e, final Object requestId) { handleError(e); diff --git a/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java b/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java index 8d2c4b2..cd5fe57 100644 --- a/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java +++ b/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java @@ -9,10 +9,10 @@ import android.view.View; import android.widget.Toast; +import com.deezer.sdk.model.PlayableEntity; import com.deezer.sdk.model.Track; import com.deezer.sdk.network.connect.SessionStore; import com.deezer.sdk.network.request.event.DeezerError; -import com.deezer.sdk.network.request.event.OAuthException; import com.deezer.sdk.player.RadioPlayer; import com.deezer.sdk.player.RadioPlayer.RadioType; import com.deezer.sdk.player.event.RadioPlayerListener; @@ -122,8 +122,6 @@ private void createPlayer() { new WifiAndMobileNetworkStateChecker()); mRadioPlayer.addPlayerListener(this); setAttachedPlayer(mRadioPlayer); - } catch (OAuthException e) { - handleError(e); } catch (DeezerError e) { handleError(e); } catch (TooManyPlayersExceptions e) { @@ -136,10 +134,15 @@ private void createPlayer() { // Radio Player Callbacks ////////////////////////////////////////////////////////////////////////////////////// + @Override + public void onAllTracksEnded() { + stopVisualizer(); + } @Override - public void onPlayTrack(final Track track) { - displayTrack(track); + public void onPlayTrack(PlayableEntity playableEntity) { + if(playableEntity.getType()=="track") + displayTrack((Track)playableEntity); stopVisualizer(); @@ -176,12 +179,7 @@ public void onPlayTrack(final Track track) { } @Override - public void onTrackEnded(final Track track) { - stopVisualizer(); - } - - @Override - public void onAllTracksEnded() { + public void onTrackEnded(PlayableEntity playableEntity) { stopVisualizer(); } diff --git a/build.gradle b/build.gradle index 6356aab..2540ef4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/deezer-sdk/build.gradle b/deezer-sdk/build.gradle index 41c6e56..b6ddf08 100644 --- a/deezer-sdk/build.gradle +++ b/deezer-sdk/build.gradle @@ -1,2 +1,2 @@ configurations.create("default") -artifacts.add("default", file('deezer-sdk-0.10.17.aar')) \ No newline at end of file +artifacts.add("default", file('deezer-sdk-0.11.2.aar')) \ No newline at end of file diff --git a/deezer-sdk/deezer-sdk.iml b/deezer-sdk/deezer-sdk.iml deleted file mode 100644 index d934fef..0000000 --- a/deezer-sdk/deezer-sdk.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..16fe469 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Tue Mar 13 22:02:17 ART 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip