From c4effb83c727c5aa0e0c00c617fca5e7cb5e602d Mon Sep 17 00:00:00 2001 From: Chaos Leung Date: Tue, 7 Aug 2018 20:21:48 +0800 Subject: [PATCH] [Fix] Fix issue of duplicate value for resource attr/itemBackground --- pinview/src/main/java/com/chaos/view/PinView.java | 4 ++-- pinview/src/main/res/values/attrs.xml | 2 +- simple/src/main/res/layout/activity_main.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pinview/src/main/java/com/chaos/view/PinView.java b/pinview/src/main/java/com/chaos/view/PinView.java index 595dff1..51f9611 100644 --- a/pinview/src/main/java/com/chaos/view/PinView.java +++ b/pinview/src/main/java/com/chaos/view/PinView.java @@ -146,7 +146,7 @@ public PinView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) mCursorWidth = a.getDimensionPixelSize(R.styleable.PinView_cursorWidth, res.getDimensionPixelSize(R.dimen.pv_pin_view_cursor_width)); - mItemBackground = a.getDrawable(R.styleable.PinView_itemBackground); + mItemBackground = a.getDrawable(R.styleable.PinView_android_itemBackground); a.recycle(); @@ -895,7 +895,7 @@ public int getCursorColor() { * a Drawable object or 0 to remove the item background. * * @param resId The identifier of the resource. - * @attr ref R.styleable#PinView_itemBackground + * @attr ref R.styleable#PinView_android_itemBackground */ public void setItemBackgroundResources(@DrawableRes int resId) { if (resId != 0 && mItemBackgroundResource != resId) { diff --git a/pinview/src/main/res/values/attrs.xml b/pinview/src/main/res/values/attrs.xml index 5aa104c..3431e5f 100644 --- a/pinview/src/main/res/values/attrs.xml +++ b/pinview/src/main/res/values/attrs.xml @@ -36,6 +36,6 @@ - + \ No newline at end of file diff --git a/simple/src/main/res/layout/activity_main.xml b/simple/src/main/res/layout/activity_main.xml index e04bf10..1833b03 100644 --- a/simple/src/main/res/layout/activity_main.xml +++ b/simple/src/main/res/layout/activity_main.xml @@ -33,13 +33,13 @@ android:cursorVisible="true" android:hint="Hint." android:inputType="text" + android:itemBackground="@mipmap/ic_launcher" android:padding="@dimen/common_padding" android:textColor="@color/text_colors" android:textSize="18sp" android:textStyle="bold" app:cursorColor="@color/line_selected" app:cursorWidth="2dp" - app:itemBackground="@mipmap/ic_launcher" app:itemCount="5" app:itemHeight="48dp" app:itemRadius="4dp"