renamed attr to prevent conflict

uucky · Mar 19, 2015 · 30dd3c3 · 30dd3c3
1 parent a407df1
commit 30dd3c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/library/src/main/java/me/uucky/colorpicker/internal/ColorView.java b/library/src/main/java/me/uucky/colorpicker/internal/ColorView.java
@@ -62,8 +62,8 @@ public ColorView(final Context context, final AttributeSet attrs, final int defS
         final Bitmap bitmap = Utils.getAlphaPatternBitmap(Math.round(getResources().getDisplayMetrics().density * 8));
         mAlphaPatternPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mAlphaPatternPaint.setShader(new BitmapShader(bitmap, TileMode.REPEAT, TileMode.REPEAT));
-        mRadius = a.getDimension(R.styleable.ColorView_cornerRadius, 0);
-        ViewCompat.setElevation(this, a.getDimension(R.styleable.ColorView_viewElevation, 0));
+        mRadius = a.getDimension(R.styleable.ColorView_cp_cornerRadius, 0);
+        ViewCompat.setElevation(this, a.getDimension(R.styleable.ColorView_cp_elevation, 0));
         a.recycle();
         if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
             Internal.setOutlineProvider(this);

diff --git a/library/src/main/res/layout/cp__adapter_item_color_picker_preset.xml b/library/src/main/res/layout/cp__adapter_item_color_picker_preset.xml
@@ -32,6 +32,6 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentTop="true"
         android:padding="8dp"
-        app:cornerRadius="2dp"/>
+        app:cp_cornerRadius="2dp"/>
 
 </me.uucky.colorpicker.internal.SquareRelativeLayout>
diff --git a/library/src/main/res/layout/cp__dialog_color_picker.xml b/library/src/main/res/layout/cp__dialog_color_picker.xml
@@ -60,14 +60,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dp"
-                    app:cornerRadius="2dp"/>
+                    app:cp_cornerRadius="2dp"/>
 
                 <me.uucky.colorpicker.internal.ColorView
                     android:id="@+id/new_color"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_gravity="right"
-                    app:cornerRadius="2dp"/>
+                    app:cp_cornerRadius="2dp"/>
             </FrameLayout>
         </LinearLayout>
 

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="ColorView">
-        <attr name="cornerRadius" format="dimension"/>
-        <attr name="viewElevation" format="dimension"/>
+        <attr name="cp_cornerRadius" format="dimension"/>
+        <attr name="cp_elevation" format="dimension"/>
     </declare-styleable>
 </resources>