diff --git a/app/build.gradle b/app/build.gradle index d1c3940a..001008b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,6 @@ dependencies { compile 'com.github.ksoichiro:android-observablescrollview:1.6.0' compile 'asia.ivity.android:drag-sort-listview:1.0' 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:converter-gson:2.0.0-beta2' compile 'com.squareup.okhttp:okhttp:2.5.0' 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 e62da28b..c9c466e9 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 @@ -14,7 +14,7 @@ import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.ui.fragments.player.MiniPlayerFragment; import com.kabouzeid.gramophone.ui.fragments.player.PlayerFragment; -import com.sothree.slidinguppanel.SlidingUpPanelLayout; +import com.kabouzeid.gramophone.views.SlidingUpPanelLayout; import butterknife.Bind; import butterknife.ButterKnife; @@ -67,6 +67,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } } }); + + slidingUpPanelLayout.setScrollingEnabled(false); } protected abstract View createContentView(); diff --git a/app/src/main/res/drawable-hdpi/above_shadow.xml b/app/src/main/res/drawable-hdpi/above_shadow.xml new file mode 100644 index 00000000..c021bfcc --- /dev/null +++ b/app/src/main/res/drawable-hdpi/above_shadow.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/below_shadow.xml b/app/src/main/res/drawable-hdpi/below_shadow.xml new file mode 100644 index 00000000..224f9758 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/below_shadow.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 27a8467a..8469d9d7 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -1,13 +1,10 @@ - + sothree:umanoShadowHeight="0dp" + xmlns:sothree="http://schemas.android.com/apk/res-auto"> - + diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml index 315af03e..42bc7627 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -1,12 +1,10 @@ - @@ -35,4 +33,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 4e44979f..a1839cb9 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -13,4 +13,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file