From afcb4b102ce4a5948776696172b72c8ab3132645 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 16 Jul 2015 20:06:59 +0200 Subject: [PATCH] Fixed NPE when updating the play-pause buttons drawable. --- .../ui/activities/base/AbsSlidingMusicPanelActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java index b5c65fe0..c3cfdbdd 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -39,9 +39,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicStateActivity } private void setUpPlayPauseButton() { - if (playPauseDrawable == null) { - playPauseDrawable = new PlayPauseDrawable(this); - } + updateFabState(false); getPlayPauseFab().setImageDrawable(playPauseDrawable); final int accentColor = ThemeSingleton.get().positiveColor; @@ -52,7 +50,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicStateActivity getPlayPauseFab().getDrawable().clearColorFilter(); } - updateFabState(false); final GestureDetector gestureDetector = new GestureDetector(this, new SmallOnGestureListener() { @Override public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { @@ -99,6 +96,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicStateActivity } protected void updateFabState(boolean animate) { + if (playPauseDrawable == null) { + playPauseDrawable = new PlayPauseDrawable(this); + } if (MusicPlayerRemote.isPlaying()) { playPauseDrawable.setPause(animate); } else {