Skip to content

Commit f12d20c

Browse files
author
梁任彦
committed
标签文字颜色和背景支持设置颜色值;修复已知bug。
1 parent a961139 commit f12d20c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

labels/src/main/java/com/donkingliang/labels/LabelsView.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44
import android.content.res.ColorStateList;
55
import android.content.res.TypedArray;
6+
import android.graphics.Color;
67
import android.graphics.drawable.ColorDrawable;
78
import android.graphics.drawable.Drawable;
89
import android.os.Bundle;
@@ -119,7 +120,12 @@ private void getAttrs(Context context, AttributeSet attrs) {
119120
mLineMargin = mTypedArray.getDimensionPixelOffset(R.styleable.labels_view_lineMargin, 0);
120121
mWordMargin = mTypedArray.getDimensionPixelOffset(R.styleable.labels_view_wordMargin, 0);
121122
int labelBgResId = mTypedArray.getResourceId(R.styleable.labels_view_labelBackground, 0);
122-
mLabelBg = getResources().getDrawable(labelBgResId);
123+
if (labelBgResId != 0) {
124+
mLabelBg = getResources().getDrawable(labelBgResId);
125+
} else {
126+
int labelBgColor = mTypedArray.getColor(R.styleable.labels_view_labelBackground, Color.TRANSPARENT);
127+
mLabelBg = new ColorDrawable(labelBgColor);
128+
}
123129
mTypedArray.recycle();
124130
}
125131
}

labels/src/main/res/values/attr.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<enum name="SINGLE_IRREVOCABLY" value="3" />
88
<enum name="MULTI" value="4" />
99
</attr>
10-
<attr name="maxSelect" format="integer"/>
11-
<attr name="labelTextColor" format="reference" />
10+
<attr name="maxSelect" format="integer" />
11+
<attr name="labelTextColor" format="reference|color" />
1212
<attr name="labelTextSize" format="dimension" />
1313
<attr name="labelTextPaddingLeft" format="dimension" />
1414
<attr name="labelTextPaddingTop" format="dimension" />
1515
<attr name="labelTextPaddingRight" format="dimension" />
1616
<attr name="labelTextPaddingBottom" format="dimension" />
1717
<attr name="lineMargin" format="dimension" />
1818
<attr name="wordMargin" format="dimension" />
19-
<attr name="labelBackground" format="reference" />
19+
<attr name="labelBackground" format="reference|color" />
2020
</declare-styleable>
2121
</resources>

0 commit comments

Comments
 (0)