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

Merge remote-tracking branch 'origin/fragmented_player' into fragmented_player

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-01 21:56:43 +01:00
commit a53599b3f3
7 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -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'

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

@ -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();

7
app/src/main/res/drawable-hdpi/above_shadow.xml Normal file
View file

@ -0,0 +1,7 @@
<?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>

7
app/src/main/res/drawable-hdpi/below_shadow.xml Normal file
View file

@ -0,0 +1,7 @@
<?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>

10
app/src/main/res/layout/fragment_player.xml
View file

@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<com.sothree.slidinguppanel.SlidingUpPanelLayout
<com.kabouzeid.gramophone.views.SlidingUpPanelLayout
android:id="@+id/player_sliding_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/tools"
xmlns:sothree="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
android:clickable="false"
android:gravity="bottom"
sothree:umanoDragView="@+id/player_panel"
sothree:umanoFadeColor="#00000000"
@ -15,7 +12,8 @@
sothree:umanoPanelHeight="0dp"
sothree:umanoScrollableView="@+id/player_recycler_view"
sothree:umanoParallaxOffset="32dp"
sothree:umanoShadowHeight="0dp">
sothree:umanoShadowHeight="0dp"
xmlns:sothree="http://schemas.android.com/apk/res-auto">
<RelativeLayout
android:id="@+id/player_content"
@ -77,4 +75,4 @@
</FrameLayout>
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
</com.kabouzeid.gramophone.views.SlidingUpPanelLayout>

6
app/src/main/res/layout/sliding_music_panel_layout.xml
View file

@ -1,12 +1,10 @@
<com.sothree.slidinguppanel.SlidingUpPanelLayout
<com.kabouzeid.gramophone.views.SlidingUpPanelLayout
android:id="@+id/sliding_layout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:sothree="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
sothree:umanoScrollableView="@+id/sliding_panel"
sothree:umanoDragView="@+id/sliding_panel"
sothree:umanoPanelHeight="@dimen/mini_player_height"
sothree:umanoShadowHeight="@dimen/card_elevation">
@ -35,4 +33,4 @@
</FrameLayout>
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
</com.kabouzeid.gramophone.views.SlidingUpPanelLayout>

20
app/src/main/res/values/attrs.xml
View file

@ -13,4 +13,24 @@
<attr name="icon_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>