tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed some methods

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-20 17:22:44 +01:00
commit 9e84e52907
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -56,7 +56,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
} }
slidingUpPanelLayout.setPanelSlideListener(this); slidingUpPanelLayout.setPanelSlideListener(this);
playerFragment.resetShowControlsAnimation(); playerFragment.show();
slidingUpPanelLayout.post(new Runnable() { slidingUpPanelLayout.post(new Runnable() {
@Override @Override
@ -98,7 +98,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
if (shouldColorNavigationBar()) { if (shouldColorNavigationBar()) {
super.setNavigationBarColor(navigationBarColor); super.setNavigationBarColor(navigationBarColor);
} }
playerFragment.resetShowControlsAnimation(); playerFragment.show();
} }
@Override @Override
@ -108,7 +108,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
if (shouldColorNavigationBar()) { if (shouldColorNavigationBar()) {
super.setNavigationBarColor(playerFragmentColor); super.setNavigationBarColor(playerFragmentColor);
} }
playerFragment.showControls(); playerFragment.hide();
} }
@Override @Override

4
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
View file

@ -267,7 +267,7 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
} }
} }
public void showControls() { public void hide() {
playPauseFab.animate() playPauseFab.animate()
.scaleX(1f) .scaleX(1f)
.scaleY(1f) .scaleY(1f)
@ -276,7 +276,7 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
.start(); .start();
} }
public void resetShowControlsAnimation() { public void show() {
playPauseFab.setScaleX(0f); playPauseFab.setScaleX(0f);
playPauseFab.setScaleY(0f); playPauseFab.setScaleY(0f);
playPauseFab.setRotation(0f); playPauseFab.setRotation(0f);

10
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
View file

@ -354,16 +354,16 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
return false; return false;
} }
public void showControls() { public void hide() {
playbackControlsFragment.showControls(); playbackControlsFragment.hide();
} }
public void resetShowControlsAnimation() { public void show() {
playbackControlsFragment.resetShowControlsAnimation(); playbackControlsFragment.show();
} }
public boolean onBackPressed() { public boolean onBackPressed() {
if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) { if (slidingUpPanelLayout.getPanelState() != SlidingUpPanelLayout.PanelState.COLLAPSED) {
slidingUpPanelLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); slidingUpPanelLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
return true; return true;
} }