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

Updated libraries.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-03-13 16:17:16 +01:00
commit 373bba9e98
4 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java
View file

@ -51,7 +51,7 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToAutoDownload(context)) {
Response<LastFmArtist> response = lastFMRestClient.getApiService().getArtistInfo(model.artistName, model.skipOkHttpCache ? "no-cache" : null).execute();
if (!response.isSuccess()) {
if (!response.isSuccessful()) {
throw new IOException("Request failed with code: " + response.code());
}

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

@ -70,7 +70,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}
}
});
slidingUpPanelLayout.setPanelSlideListener(this);
slidingUpPanelLayout.addPanelSlideListener(this);
playerFragment.onHide();
}
@ -94,12 +94,23 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}
@Override
public void onPanelSlide(View view, @FloatRange(from = 0, to = 1) float slideOffset) {
public void onPanelSlide(View panel, @FloatRange(from = 0, to = 1) float slideOffset) {
setMiniPlayerAlphaProgress(slideOffset);
}
@Override
public void onPanelCollapsed(View view) {
public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
switch (newState) {
case COLLAPSED:
onPanelCollapsed(panel);
break;
case EXPANDED:
onPanelExpanded(panel);
break;
}
}
public void onPanelCollapsed(View panel) {
// restore values
super.setLightStatusbar(lightStatusbar);
super.setTaskDescriptionColor(taskColor);
@ -110,8 +121,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
playerFragment.onHide();
}
@Override
public void onPanelExpanded(View view) {
public void onPanelExpanded(View panel) {
// setting fragments values
int playerFragmentColor = playerFragment.getPaletteColor();
super.setLightStatusbar(false);
@ -123,16 +133,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
playerFragment.onShow();
}
@Override
public void onPanelAnchored(View view) {
}
@Override
public void onPanelHidden(View view) {
}
private void setMiniPlayerAlphaProgress(@FloatRange(from = 0, to = 1) float progress) {
if (miniPlayerFragment.getView() == null) return;
float alpha = 1 - progress;

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

@ -104,7 +104,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
setUpRecyclerView();
slidingUpPanelLayout.setPanelSlideListener(this);
slidingUpPanelLayout.addPanelSlideListener(this);
slidingUpPanelLayout.setAntiDragView(view.findViewById(R.id.draggable_area));
view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@ -121,6 +121,9 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
@Override
public void onDestroyView() {
if (slidingUpPanelLayout != null) {
slidingUpPanelLayout.removePanelSlideListener(this);
}
if (recyclerViewDragDropManager != null) {
recyclerViewDragDropManager.release();
recyclerViewDragDropManager = null;
@ -303,7 +306,15 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
}
@Override
public void onPanelCollapsed(View view) {
public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
switch (newState) {
case COLLAPSED:
onPanelCollapsed(panel);
break;
}
}
public void onPanelCollapsed(View panel) {
resetToCurrentPosition();
}
@ -312,21 +323,6 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
layoutManager.scrollToPositionWithOffset(MusicPlayerRemote.getPosition() + 1, 0);
}
@Override
public void onPanelExpanded(View view) {
}
@Override
public void onPanelAnchored(View view) {
}
@Override
public void onPanelHidden(View view) {
}
interface Impl {
void init(PlayerFragment fragment);