Merge branch 'shadowStyle'

hannesa2 · Nov 10, 2021 · 5c7d60d · 5c7d60d
2 parents f1673d8 + 3740325
commit 5c7d60d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/demo/src/main/res/drawable/my_above_shadow.xml b/demo/src/main/res/drawable/my_above_shadow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#FFDFC2"
+        android:endColor="@android:color/transparent"
+        android:angle="90" >
+    </gradient>
+</shape>
diff --git a/demo/src/main/res/layout/activity_demo.xml b/demo/src/main/res/layout/activity_demo.xml
@@ -9,7 +9,8 @@
     sothree:umanoPanelHeight="68dp"
     sothree:umanoParallaxOffset="100dp"
     sothree:umanoScrollableView="@+id/listView"
-    sothree:umanoShadowHeight="4dp">
+    sothree:umanoShadowHeight="50dp"
+    sothree:umanoAboveShadowStyle="@drawable/my_above_shadow">
 
     <!-- MAIN CONTENT -->
     <FrameLayout

diff --git a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
@@ -226,6 +226,12 @@ public enum PanelState {
      */
     private boolean mIsTouchEnabled;
 
+    /**
+     * Shadow style which will replace default if provided
+     */
+    private int mAboveShadowResId;
+    private int mBelowShadowResId;
+
     private float mPrevMotionX;
     private float mPrevMotionY;
     private float mInitialMotionX;
@@ -326,6 +332,9 @@ public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
                 mDragViewResId = ta.getResourceId(R.styleable.SlidingUpPanelLayout_umanoDragView, -1);
                 mScrollableViewResId = ta.getResourceId(R.styleable.SlidingUpPanelLayout_umanoScrollableView, -1);
 
+                mAboveShadowResId = ta.getResourceId(R.styleable.SlidingUpPanelLayout_umanoAboveShadowStyle, -1);
+                mBelowShadowResId = ta.getResourceId(R.styleable.SlidingUpPanelLayout_umanoBelowShadowStyle, -1);
+
                 mOverlayContent = ta.getBoolean(R.styleable.SlidingUpPanelLayout_umanoOverlay, DEFAULT_OVERLAY_FLAG);
                 mClipPanel = ta.getBoolean(R.styleable.SlidingUpPanelLayout_umanoClipPanel, DEFAULT_CLIP_PANEL_FLAG);
 
@@ -357,9 +366,17 @@ public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
         // If the shadow height is zero, don't show the shadow
         if (mShadowHeight > 0) {
             if (mIsSlidingUp) {
-                mShadowDrawable = ContextCompat.getDrawable(context, R.drawable.above_shadow);
+                if (mAboveShadowResId == -1) {
+                    mShadowDrawable = ContextCompat.getDrawable(context, R.drawable.above_shadow);
+                } else {
+                    mShadowDrawable = ContextCompat.getDrawable(context, mAboveShadowResId);
+                }
             } else {
-                mShadowDrawable = ContextCompat.getDrawable(context, R.drawable.below_shadow);
+                if (mBelowShadowResId == -1) {
+                    mShadowDrawable = ContextCompat.getDrawable(context, R.drawable.below_shadow);
+                } else {
+                    mShadowDrawable = ContextCompat.getDrawable(context, mBelowShadowResId);
+                }
             }
         } else {
             mShadowDrawable = null;

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -20,6 +20,8 @@
         </attr>
         <attr name="umanoScrollInterpolator" format="reference" />
         <attr name="umanoMaxSlidingOffset" format="float" />
+        <attr name="umanoAboveShadowStyle" format="reference" />
+        <attr name="umanoBelowShadowStyle" format="reference" />
     </declare-styleable>
 
 </resources>