From 9e84e52907ee3a4ca0cfeb507813cd68a0bdd9a2 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 20 Dec 2015 17:22:44 +0100
Subject: [PATCH] Renamed some methods

---
 .../activities/base/AbsSlidingMusicPanelActivity.java  |  6 +++---
 .../ui/fragments/player/PlaybackControlsFragment.java  |  4 ++--
 .../gramophone/ui/fragments/player/PlayerFragment.java | 10 +++++-----
 3 files changed, 10 insertions(+), 10 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 20cdcd15..513aa6df 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
@@ -56,7 +56,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         }
 
         slidingUpPanelLayout.setPanelSlideListener(this);
-        playerFragment.resetShowControlsAnimation();
+        playerFragment.show();
 
         slidingUpPanelLayout.post(new Runnable() {
             @Override
@@ -98,7 +98,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         if (shouldColorNavigationBar()) {
             super.setNavigationBarColor(navigationBarColor);
         }
-        playerFragment.resetShowControlsAnimation();
+        playerFragment.show();
     }
 
     @Override
@@ -108,7 +108,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         if (shouldColorNavigationBar()) {
             super.setNavigationBarColor(playerFragmentColor);
         }
-        playerFragment.showControls();
+        playerFragment.hide();
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
index 07d09f7b..5c00162c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
@@ -267,7 +267,7 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
         }
     }
 
-    public void showControls() {
+    public void hide() {
         playPauseFab.animate()
                 .scaleX(1f)
                 .scaleY(1f)
@@ -276,7 +276,7 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
                 .start();
     }
 
-    public void resetShowControlsAnimation() {
+    public void show() {
         playPauseFab.setScaleX(0f);
         playPauseFab.setScaleY(0f);
         playPauseFab.setRotation(0f);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
index 5ecff0a3..77a98b65 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
@@ -354,16 +354,16 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
         return false;
     }
 
-    public void showControls() {
-        playbackControlsFragment.showControls();
+    public void hide() {
+        playbackControlsFragment.hide();
     }
 
-    public void resetShowControlsAnimation() {
-        playbackControlsFragment.resetShowControlsAnimation();
+    public void show() {
+        playbackControlsFragment.show();
     }
 
     public boolean onBackPressed() {
-        if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
+        if (slidingUpPanelLayout.getPanelState() != SlidingUpPanelLayout.PanelState.COLLAPSED) {
             slidingUpPanelLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
             return true;
         }