Revert latest commit
This commit is contained in:
parent
a53599b3f3
commit
f09b38f40e
7 changed files with 12 additions and 43 deletions
|
|
@ -119,6 +119,7 @@ dependencies {
|
||||||
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||||
compile 'asia.ivity.android:drag-sort-listview:1.0'
|
compile 'asia.ivity.android:drag-sort-listview:1.0'
|
||||||
compile 'com.github.semoncat.seekarc:library:0.1'
|
compile 'com.github.semoncat.seekarc:library:0.1'
|
||||||
|
compile 'com.sothree.slidinguppanel:library:3.2.0'
|
||||||
compile 'com.squareup.retrofit:retrofit:2.0.0-beta2'
|
compile 'com.squareup.retrofit:retrofit:2.0.0-beta2'
|
||||||
compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2'
|
compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2'
|
||||||
compile 'com.squareup.okhttp:okhttp:2.5.0'
|
compile 'com.squareup.okhttp:okhttp:2.5.0'
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ import com.kabouzeid.gramophone.R;
|
||||||
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
|
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
|
||||||
import com.kabouzeid.gramophone.ui.fragments.player.MiniPlayerFragment;
|
import com.kabouzeid.gramophone.ui.fragments.player.MiniPlayerFragment;
|
||||||
import com.kabouzeid.gramophone.ui.fragments.player.PlayerFragment;
|
import com.kabouzeid.gramophone.ui.fragments.player.PlayerFragment;
|
||||||
import com.kabouzeid.gramophone.views.SlidingUpPanelLayout;
|
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
|
||||||
|
|
||||||
import butterknife.Bind;
|
import butterknife.Bind;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
@ -67,8 +67,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
slidingUpPanelLayout.setScrollingEnabled(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract View createContentView();
|
protected abstract View createContentView();
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<gradient
|
|
||||||
android:startColor="#20000000"
|
|
||||||
android:endColor="@android:color/transparent"
|
|
||||||
android:angle="90"></gradient>
|
|
||||||
</shape>
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<gradient
|
|
||||||
android:startColor="#20000000"
|
|
||||||
android:endColor="@android:color/transparent"
|
|
||||||
android:angle="270"></gradient>
|
|
||||||
</shape>
|
|
||||||
|
|
@ -1,10 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<com.kabouzeid.gramophone.views.SlidingUpPanelLayout
|
<com.sothree.slidinguppanel.SlidingUpPanelLayout
|
||||||
android:id="@+id/player_sliding_layout"
|
android:id="@+id/player_sliding_layout"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/tools"
|
xmlns:app="http://schemas.android.com/tools"
|
||||||
|
xmlns:sothree="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:focusable="true"
|
||||||
|
android:clickable="false"
|
||||||
android:gravity="bottom"
|
android:gravity="bottom"
|
||||||
sothree:umanoDragView="@+id/player_panel"
|
sothree:umanoDragView="@+id/player_panel"
|
||||||
sothree:umanoFadeColor="#00000000"
|
sothree:umanoFadeColor="#00000000"
|
||||||
|
|
@ -12,8 +15,7 @@
|
||||||
sothree:umanoPanelHeight="0dp"
|
sothree:umanoPanelHeight="0dp"
|
||||||
sothree:umanoScrollableView="@+id/player_recycler_view"
|
sothree:umanoScrollableView="@+id/player_recycler_view"
|
||||||
sothree:umanoParallaxOffset="32dp"
|
sothree:umanoParallaxOffset="32dp"
|
||||||
sothree:umanoShadowHeight="0dp"
|
sothree:umanoShadowHeight="0dp">
|
||||||
xmlns:sothree="http://schemas.android.com/apk/res-auto">
|
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/player_content"
|
android:id="@+id/player_content"
|
||||||
|
|
@ -75,4 +77,4 @@
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
</com.kabouzeid.gramophone.views.SlidingUpPanelLayout>
|
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,12 @@
|
||||||
<com.kabouzeid.gramophone.views.SlidingUpPanelLayout
|
<com.sothree.slidinguppanel.SlidingUpPanelLayout
|
||||||
android:id="@+id/sliding_layout"
|
android:id="@+id/sliding_layout"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:sothree="http://schemas.android.com/apk/res-auto"
|
xmlns:sothree="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:gravity="bottom"
|
android:gravity="bottom"
|
||||||
|
sothree:umanoScrollableView="@+id/sliding_panel"
|
||||||
|
sothree:umanoDragView="@+id/sliding_panel"
|
||||||
sothree:umanoPanelHeight="@dimen/mini_player_height"
|
sothree:umanoPanelHeight="@dimen/mini_player_height"
|
||||||
sothree:umanoShadowHeight="@dimen/card_elevation">
|
sothree:umanoShadowHeight="@dimen/card_elevation">
|
||||||
|
|
||||||
|
|
@ -33,4 +35,4 @@
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
</com.kabouzeid.gramophone.views.SlidingUpPanelLayout>
|
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
|
||||||
|
|
@ -13,24 +13,4 @@
|
||||||
<attr name="icon_color" format="color" />
|
<attr name="icon_color" format="color" />
|
||||||
<attr name="divider_color" format="color" />
|
<attr name="divider_color" format="color" />
|
||||||
|
|
||||||
<declare-styleable name="SlidingUpPanelLayout">
|
|
||||||
<attr name="umanoPanelHeight" format="dimension" />
|
|
||||||
<attr name="umanoShadowHeight" format="dimension" />
|
|
||||||
<attr name="umanoParallaxOffset" format="dimension" />
|
|
||||||
<attr name="umanoFadeColor" format="color" />
|
|
||||||
<attr name="umanoFlingVelocity" format="integer" />
|
|
||||||
<attr name="umanoDragView" format="reference" />
|
|
||||||
<attr name="umanoScrollableView" format="reference" />
|
|
||||||
<attr name="umanoOverlay" format="boolean" />
|
|
||||||
<attr name="umanoClipPanel" format="boolean" />
|
|
||||||
<attr name="umanoAnchorPoint" format="float" />
|
|
||||||
<attr name="umanoInitialState" format="enum">
|
|
||||||
<enum name="expanded" value="0" />
|
|
||||||
<enum name="collapsed" value="1" />
|
|
||||||
<enum name="anchored" value="2" />
|
|
||||||
<enum name="hidden" value="3" />
|
|
||||||
</attr>
|
|
||||||
<attr name="umanoScrollInterpolator" format="reference" />
|
|
||||||
</declare-styleable>
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue