diff --git a/app/build.gradle b/app/build.gradle index 001008b6..d1c3940a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,6 +119,7 @@ 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 c9c466e9..e62da28b 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.kabouzeid.gramophone.views.SlidingUpPanelLayout; +import com.sothree.slidinguppanel.SlidingUpPanelLayout; import butterknife.Bind; import butterknife.ButterKnife; @@ -67,8 +67,6 @@ 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 deleted file mode 100644 index c021bfcc..00000000 --- a/app/src/main/res/drawable-hdpi/above_shadow.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 224f9758..00000000 --- a/app/src/main/res/drawable-hdpi/below_shadow.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ 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 8469d9d7..27a8467a 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -1,10 +1,13 @@ - + sothree:umanoShadowHeight="0dp"> - + 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 42bc7627..315af03e 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -1,10 +1,12 @@ - @@ -33,4 +35,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 a1839cb9..4e44979f 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -13,24 +13,4 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file