Merge branch 'master' of github.com:DingMouRen/PaletteImageView

Author: DingMouRen

app/src/main/AndroidManifest.xml

@@ -9,16 +9,16 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity android:name=".SampleOneActivity"
             android:theme="@style/SampleOneStyle"
             >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity android:name=".SampleTwoActivity"
             android:theme="@style/SampleTwoStyle"

app/src/main/java/com/dingmouren/smaple/paletteimageview/Constant.java

@@ -40,11 +40,12 @@ public class Constant {
 
     public static int[] mHeros = new int[]{
             R.drawable.p1,
+            R.drawable.p5,
+            R.drawable.p6,
+            R.drawable.p15,
             R.drawable.p2,
             R.drawable.p3,
             R.drawable.p4,
-            R.drawable.p5,
-            R.drawable.p6,
             R.drawable.p7,
             R.drawable.p8,
             R.drawable.p9,
@@ -53,7 +54,6 @@ public class Constant {
             R.drawable.p12,
             R.drawable.p13,
             R.drawable.p14,
-            R.drawable.p15,
             R.drawable.p16,
             R.drawable.p17,
             R.drawable.p18,

app/src/main/java/com/dingmouren/smaple/paletteimageview/SampleOneActivity.java

@@ -35,48 +35,21 @@
 public class SampleOneActivity extends AppCompatActivity {
     private ViewPager mViewPager;
     private SampleOneAdapter mAdapter;
-    private RelativeLayout mActionBar;
-    private Window window;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sample_one);
-        window = SampleOneActivity.this.getWindow();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.setStatusBarColor(getResources().getColor(R.color.md_teal_A400));
-        }
         initView();
         initData();
     }
 
     private void initView() {
         mViewPager = (ViewPager) findViewById(R.id.viewpager);
-        mActionBar = (RelativeLayout) findViewById(R.id.action_bar);
     }
 
     private void initData(){
         mAdapter = new SampleOneAdapter(getSupportFragmentManager());
         mViewPager.setAdapter(mAdapter);
-        mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                int color = mAdapter.getList().get(position).paletteImageView.mMainColor;
-                mActionBar.setBackgroundColor(color);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    window.setStatusBarColor(color);
-                }
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
 
     }
 

app/src/main/java/com/dingmouren/smaple/paletteimageview/SampleOneAdapter.java

@@ -18,26 +18,15 @@
  */
 
 public class SampleOneAdapter extends FragmentStatePagerAdapter {
-    private Set<SampleOneFragment> mSet = new LinkedHashSet<>();
-    private  List<SampleOneFragment> mList = new ArrayList<>();
     public SampleOneAdapter(FragmentManager fm) {
         super(fm);
     }
 
     @Override
     public Fragment getItem(int position) {
         SampleOneFragment fragment = SampleOneFragment.newInstance(Constant.mHeros[position]);
-        mSet.add(fragment);
         return fragment;
     }
-    public List<SampleOneFragment> getList(){
-        mList.clear();
-        Iterator iterator = mSet.iterator();
-        while (iterator.hasNext()){
-            mList.add((SampleOneFragment) iterator.next());
-        }
-        return  mList;
-    }
     @Override
     public int getCount() {
         return Constant.mHeros.length;

app/src/main/java/com/dingmouren/smaple/paletteimageview/SampleOneFragment.java

@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/res/drawable-hdpi/p1.jpg

@@ -25,11 +25,11 @@
 
         <com.dingmouren.paletteimageview.PaletteImageView
             android:id="@+id/palette"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
             android:layout_gravity="center_horizontal"
-            app:palettePadding="20dp"
-            app:paletteSrc="@mipmap/meigui" />
+            app:palettePadding="30dp"
+            app:paletteSrc="@mipmap/test1" />
 
         <LinearLayout
             android:layout_width="match_parent"

app/src/main/res/drawable-hdpi/p1.png

@@ -9,8 +9,11 @@
         android:id="@+id/palette"
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        app:palettePadding="20dp"
+        app:palettePadding="30dp"
         app:paletteRadius="10dp"
+        app:paletteOffsetX="20dp"
+        app:paletteOffsetY="20dp"
+        app:paletteShadowRadius="10dp"
         android:layout_gravity="center_horizontal"
         />
 </LinearLayout>

app/src/main/res/drawable-hdpi/p10.jpg

@@ -8,6 +8,7 @@
         <item name="colorAccent">@color/md_teal_A400</item>
     </style>
     <style name="SampleOneStyle" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor" tools:ignore="NewApi">@color/md_teal_A400</item>
     </style>
     <style name="SampleTwoStyle" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/md_teal_A400</item>

app/src/main/res/drawable-hdpi/p10.png

@@ -29,6 +29,7 @@
 
 /**
  * Created by dingmouren on 2017/4/25.
+ *
  */
 
 public class PaletteImageView extends View implements ViewTreeObserver.OnGlobalLayoutListener {
@@ -58,6 +59,9 @@ public class PaletteImageView extends View implements ViewTreeObserver.OnGlobalL
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
+            if (mOffsetX < DEFAULT_OFFSET) mOffsetX = DEFAULT_OFFSET;
+            if (mOffsetY < DEFAULT_OFFSET) mOffsetY = DEFAULT_OFFSET;
+            if (mShadowRadius < DEFAULT_SHADOW_RADIUS) mShadowRadius = DEFAULT_SHADOW_RADIUS;
             mPaintShadow.setShadowLayer(mShadowRadius, mOffsetX, mOffsetY, mMainColor);
             invalidate();
         }
@@ -89,6 +93,9 @@ private void init(Context context, AttributeSet attrs) {
         mRadius = a.getDimensionPixelSize(R.styleable.PaletteImageView_paletteRadius, 0);
         mImgId = a.getResourceId(R.styleable.PaletteImageView_paletteSrc, 0);
         mPadding = a.getDimensionPixelSize(R.styleable.PaletteImageView_palettePadding, DEFAULT_PADDING);
+        mOffsetX = a.getDimensionPixelSize(R.styleable.PaletteImageView_paletteOffsetX,DEFAULT_OFFSET);
+        mOffsetY = a.getDimensionPixelSize(R.styleable.PaletteImageView_paletteOffsetY,DEFAULT_OFFSET);
+        mShadowRadius = a.getDimensionPixelSize(R.styleable.PaletteImageView_paletteShadowRadius,DEFAULT_SHADOW_RADIUS);
         a.recycle();
 
         setPadding(mPadding, mPadding, mPadding, mPadding);
@@ -115,15 +122,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         }
         if (mBitmap != null) {
             height = (int) ((width - mPadding * 2) * (mBitmap.getHeight() * 1.0f / mBitmap.getWidth())) + mPadding * 2;
-            Log.e(TAG, "bitmap宽高:" + mBitmap.getWidth() + "/" + mBitmap.getHeight() + "--" + (mBitmap.getRowBytes() * mBitmap.getHeight() / 1024 / 1024));
         }
         setMeasuredDimension(width, height);
     }
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        mBitmap = ratio(mBitmap);
         zipBitmap(mImgId, mBitmap, mOnMeasureHeightMode);
     }
 
@@ -199,7 +204,6 @@ private void initShadow(Bitmap bitmap) {
 
 
     private void zipBitmap(int imgId, Bitmap bitmap, int heightNode) {
-        Log.e(TAG, "zip:" + bitmap.getWidth() + "/" + bitmap.getHeight());
         WeakReference<Matrix> weakMatrix = new WeakReference<Matrix>(new Matrix());
         if (weakMatrix.get() == null) return;
         Matrix matrix = weakMatrix.get();
@@ -244,36 +248,10 @@ private void zipBitmap(int imgId, Bitmap bitmap, int heightNode) {
             }
             mRealBitmap = Bitmap.createBitmap(bitmap, dx, dy, small, small, matrix, true);
         }
-        if (mRealBitmap != null)
-            Log.e(TAG, "mRealBitap:" + mRealBitmap.getWidth() + "/" + mRealBitmap.getHeight() + "--"/*(mBitmap.getRowBytes()* mRealBitmap.getHeight() /1024/1024)*/);
         initShadow(mRealBitmap);
 
     }
 
-    public Bitmap ratio(Bitmap image) {
-        Bitmap bitmap = null;
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        image.compress(Bitmap.CompressFormat.JPEG, 100, os);
-        if (os.toByteArray().length / 1024 > 1024) {//判断如果图片大于1M,进行压缩避免在生成图片（BitmapFactory.decodeStream）时溢出
-            os.reset();//重置baos即清空baos
-            image.compress(Bitmap.CompressFormat.JPEG, 50, os);//这里压缩50%，把压缩后的数据存放到baos中
-        }
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        BitmapFactory.Options newOpts = new BitmapFactory.Options();
-        //开始读入图片，此时把options.inJustDecodeBounds 设回true了
-        newOpts.inJustDecodeBounds = true;
-        newOpts.inPreferredConfig = Bitmap.Config.RGB_565;
-        bitmap = BitmapFactory.decodeStream(is, null, newOpts);
-        newOpts.inJustDecodeBounds = false;
-        int w = newOpts.outWidth;
-        int h = newOpts.outHeight;
-        newOpts.inSampleSize = calculateInSampleSize(w, h, getWidth() - mPadding * 2, getHeight() - mPadding * 2);//设置缩放比例
-        //重新读入图片，注意此时已经把options.inJustDecodeBounds 设回false了
-        is = new ByteArrayInputStream(os.toByteArray());
-        bitmap = BitmapFactory.decodeStream(is, null, newOpts);
-        return bitmap;
-    }
-
     /**
      * 计算inSampleSize
      *
@@ -285,7 +263,7 @@ private int calculateInSampleSize(int rawWidth, int rawHeight, int reqWidth, int
             int halfHeight = rawHeight / 2;
             int halfWidth = rawWidth / 2;
             while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth) {
-                inSampleSize *= 12;
+                inSampleSize *= 2;
             }
         }
         return inSampleSize;

app/src/main/res/drawable-hdpi/p11.jpg

@@ -5,6 +5,9 @@
         <attr name="paletteRadius" format="dimension" />
         <attr name="paletteSrc" format="reference" />
         <attr name="palettePadding" format="dimension" />
+        <attr name="paletteOffsetX" format="dimension" />
+        <attr name="paletteOffsetY" format="dimension" />
+        <attr name="paletteShadowRadius" format="dimension" />
 
     </declare-styleable>
 </resources>