Updated libraries.
This commit is contained in:
parent
34f8ffbaf2
commit
373bba9e98
4 changed files with 39 additions and 43 deletions
|
|
@ -101,14 +101,14 @@ dependencies {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.8.5@aar') {
|
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.8.6@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
compile('com.github.afollestad.material-dialogs:core:0.8.5.5@aar') {
|
compile('com.github.afollestad.material-dialogs:core:0.8.5.6@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
compile('com.github.afollestad.material-dialogs:commons:0.8.5.5@aar') {
|
compile('com.github.afollestad.material-dialogs:commons:0.8.5.6@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -116,7 +116,7 @@ dependencies {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
compile('com.github.kabouzeid:app-theme-helper:0.7.15kmod@aar') {
|
compile('com.github.kabouzeid:app-theme-helper:1.0.1@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -132,16 +132,16 @@ dependencies {
|
||||||
compile 'com.android.support:percent:23.2.1'
|
compile 'com.android.support:percent:23.2.1'
|
||||||
compile 'com.android.support:preference-v7:23.2.1'
|
compile 'com.android.support:preference-v7:23.2.1'
|
||||||
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||||
compile 'com.github.kabouzeid:SeekArc:80bdd8330e'
|
compile 'com.github.kabouzeid:SeekArc:1.2-kmod'
|
||||||
compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.2.1'
|
compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.1-kmod'
|
||||||
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
|
compile 'com.squareup.retrofit2:retrofit:2.0.0'
|
||||||
compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4'
|
compile 'com.squareup.retrofit2:converter-gson:2.0.0'
|
||||||
compile 'com.jakewharton:butterknife:7.0.1'
|
compile 'com.jakewharton:butterknife:7.0.1'
|
||||||
//noinspection GradleDynamicVersion
|
//noinspection GradleDynamicVersion
|
||||||
compile 'com.anjlab.android.iab.v3:library:1.0.+'
|
compile 'com.anjlab.android.iab.v3:library:1.0.+'
|
||||||
compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
|
compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
|
||||||
compile 'com.github.bumptech.glide:glide:3.7.0'
|
compile 'com.github.bumptech.glide:glide:3.7.0'
|
||||||
compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
|
compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
|
||||||
compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.6-kmod'
|
compile 'com.github.kabouzeid:RecyclerView-FastScroll:1.8-kmod'
|
||||||
compile 'com.heinrichreimersoftware:material-intro:3ece4e7199'
|
compile 'com.heinrichreimersoftware:material-intro:b8ec16d3d6'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
|
||||||
if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToAutoDownload(context)) {
|
if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToAutoDownload(context)) {
|
||||||
Response<LastFmArtist> response = lastFMRestClient.getApiService().getArtistInfo(model.artistName, model.skipOkHttpCache ? "no-cache" : null).execute();
|
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());
|
throw new IOException("Request failed with code: " + response.code());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
slidingUpPanelLayout.setPanelSlideListener(this);
|
slidingUpPanelLayout.addPanelSlideListener(this);
|
||||||
|
|
||||||
playerFragment.onHide();
|
playerFragment.onHide();
|
||||||
}
|
}
|
||||||
|
|
@ -94,12 +94,23 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
setMiniPlayerAlphaProgress(slideOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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
|
// restore values
|
||||||
super.setLightStatusbar(lightStatusbar);
|
super.setLightStatusbar(lightStatusbar);
|
||||||
super.setTaskDescriptionColor(taskColor);
|
super.setTaskDescriptionColor(taskColor);
|
||||||
|
|
@ -110,8 +121,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
|
||||||
playerFragment.onHide();
|
playerFragment.onHide();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public void onPanelExpanded(View panel) {
|
||||||
public void onPanelExpanded(View view) {
|
|
||||||
// setting fragments values
|
// setting fragments values
|
||||||
int playerFragmentColor = playerFragment.getPaletteColor();
|
int playerFragmentColor = playerFragment.getPaletteColor();
|
||||||
super.setLightStatusbar(false);
|
super.setLightStatusbar(false);
|
||||||
|
|
@ -123,16 +133,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
|
||||||
playerFragment.onShow();
|
playerFragment.onShow();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPanelAnchored(View view) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPanelHidden(View view) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setMiniPlayerAlphaProgress(@FloatRange(from = 0, to = 1) float progress) {
|
private void setMiniPlayerAlphaProgress(@FloatRange(from = 0, to = 1) float progress) {
|
||||||
if (miniPlayerFragment.getView() == null) return;
|
if (miniPlayerFragment.getView() == null) return;
|
||||||
float alpha = 1 - progress;
|
float alpha = 1 - progress;
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
|
||||||
|
|
||||||
setUpRecyclerView();
|
setUpRecyclerView();
|
||||||
|
|
||||||
slidingUpPanelLayout.setPanelSlideListener(this);
|
slidingUpPanelLayout.addPanelSlideListener(this);
|
||||||
slidingUpPanelLayout.setAntiDragView(view.findViewById(R.id.draggable_area));
|
slidingUpPanelLayout.setAntiDragView(view.findViewById(R.id.draggable_area));
|
||||||
|
|
||||||
view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
|
view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
|
||||||
|
|
@ -121,6 +121,9 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroyView() {
|
public void onDestroyView() {
|
||||||
|
if (slidingUpPanelLayout != null) {
|
||||||
|
slidingUpPanelLayout.removePanelSlideListener(this);
|
||||||
|
}
|
||||||
if (recyclerViewDragDropManager != null) {
|
if (recyclerViewDragDropManager != null) {
|
||||||
recyclerViewDragDropManager.release();
|
recyclerViewDragDropManager.release();
|
||||||
recyclerViewDragDropManager = null;
|
recyclerViewDragDropManager = null;
|
||||||
|
|
@ -303,7 +306,15 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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();
|
resetToCurrentPosition();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -312,21 +323,6 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
|
||||||
layoutManager.scrollToPositionWithOffset(MusicPlayerRemote.getPosition() + 1, 0);
|
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 {
|
interface Impl {
|
||||||
void init(PlayerFragment fragment);
|
void init(PlayerFragment fragment);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue