Merge pull request #5 from R12rus/develop

new methods has been added
RomanTcv · Oct 22, 2017 · 6250354 · 6250354
2 parents bf16441 + 89b9ec7
commit 6250354
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 11 deletions.
diff --git a/shadowframelayout/build.gradle b/shadowframelayout/build.gradle
@@ -7,7 +7,7 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 25
-        versionCode 1
+        versionCode 2
         versionName "1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/shadowframelayout/src/main/java/r12/shadowframelayout/ShadowFrameLayout.java b/shadowframelayout/src/main/java/r12/shadowframelayout/ShadowFrameLayout.java
@@ -1,17 +1,20 @@
 package r12.shadowframelayout;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.AttrRes;
+import android.support.annotation.DimenRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.annotation.StyleRes;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.widget.FrameLayout;
 
 /**
@@ -34,6 +37,8 @@ public class ShadowFrameLayout extends FrameLayout {
     private Drawable mShadowRightDrawable;
     private int mShadowRightHeight;
 
+    private Resources mResources;
+    private DisplayMetrics mDisplayMetrics;
 
     public ShadowFrameLayout(@NonNull Context context) {
         super(context);
@@ -56,7 +61,7 @@ public ShadowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs,
         init(context, attrs);
     }
 
-    private void init(Context context, AttributeSet attrs) {
+    private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
         if (attrs != null) {
             TypedArray styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.ShadowFrameLayout);
             mShadowTopHeight = styledAttrs.getDimensionPixelSize(R.styleable.ShadowFrameLayout_shadowTopHeight, DEFAULT_SHADOW_HEIGHT);
@@ -65,11 +70,13 @@ private void init(Context context, AttributeSet attrs) {
             mShadowRightHeight = styledAttrs.getDimensionPixelSize(R.styleable.ShadowFrameLayout_shadowRightHeight, DEFAULT_SHADOW_HEIGHT);
             styledAttrs.recycle();
         }
+        mResources = context.getResources();
+        mDisplayMetrics = mResources.getDisplayMetrics();
 
-        mShadowTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.bg_top_shadow);
-        mShadowBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.bg_bottom_shadow);
-        mShadowLeftDrawable = ContextCompat.getDrawable(getContext(), R.drawable.bg_left_shadow);
-        mShadowRightDrawable = ContextCompat.getDrawable(getContext(), R.drawable.bg_right_shadow);
+        mShadowTopDrawable = ContextCompat.getDrawable(context, R.drawable.bg_top_shadow);
+        mShadowBottomDrawable = ContextCompat.getDrawable(context, R.drawable.bg_bottom_shadow);
+        mShadowLeftDrawable = ContextCompat.getDrawable(context, R.drawable.bg_left_shadow);
+        mShadowRightDrawable = ContextCompat.getDrawable(context, R.drawable.bg_right_shadow);
     }
 
     @Override
@@ -89,12 +96,68 @@ private void drawShadow(Canvas canvas) {
         mShadowRightDrawable.draw(canvas);
     }
 
-    public void setShadowsHeight(int left, int top, int right, int bottom) {
-        mShadowLeftHeight = left;
-        mShadowTopHeight = top;
-        mShadowRightHeight = right;
-        mShadowBottomHeight = bottom;
+    public void setShadowsHeightInPixels(int left, int top, int right, int bottom) {
+        mShadowLeftHeight = convertPixelsToDp(left);
+        mShadowTopHeight = convertPixelsToDp(top);
+        mShadowRightHeight = convertPixelsToDp(right);
+        mShadowBottomHeight = convertPixelsToDp(bottom);
         invalidate();
     }
 
+    public void setShadowsHeightDimens(@DimenRes int left, @DimenRes int top, @DimenRes int right, @DimenRes int bottom) {
+        mShadowLeftHeight = mResources.getDimensionPixelOffset(left);
+        mShadowTopHeight = mResources.getDimensionPixelOffset(top);
+        mShadowRightHeight = mResources.getDimensionPixelOffset(right);
+        mShadowBottomHeight = mResources.getDimensionPixelOffset(bottom);
+        invalidate();
+    }
+
+    public void setLeftShadowInPixels(int size) {
+        mShadowLeftHeight = convertPixelsToDp(size);
+        invalidate();
+    }
+
+    public void setLeftShadowDimens(@DimenRes int resource) {
+        mShadowLeftHeight = mResources.getDimensionPixelOffset(resource);
+        invalidate();
+    }
+
+    public void setRightShadowInPixels(int size) {
+        mShadowRightHeight = convertPixelsToDp(size);
+        invalidate();
+    }
+
+    public void setRightShadowDimens(@DimenRes int resource) {
+        mShadowRightHeight = mResources.getDimensionPixelOffset(resource);
+        invalidate();
+    }
+
+    public void setTopShadowInPixels(int size) {
+        mShadowTopHeight = convertPixelsToDp(size);
+        invalidate();
+    }
+
+    public void setTopShadowDimens(@DimenRes int resource) {
+        mShadowTopHeight = mResources.getDimensionPixelOffset(resource);
+        invalidate();
+    }
+
+    public void setBottomShadowInPixels(int size) {
+        mShadowBottomHeight = convertPixelsToDp(size);
+        invalidate();
+    }
+
+    public void setBottomShadowDimens(@DimenRes int resource) {
+        mShadowBottomHeight = mResources.getDimensionPixelOffset(resource);
+        invalidate();
+    }
+
+    private int convertPixelsToDp(int px) {
+        return px / (mDisplayMetrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
+    private int convertDpToPixel(int dp) {
+        return dp * (mDisplayMetrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
 }