Skip to content

Commit e927a97

Browse files
JavaNooberJavaNoober
committed
代码优化
1 parent 06af470 commit e927a97

10 files changed

Lines changed: 34 additions & 35 deletions

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎library/src/main/java/com/noober/background/BackgroundFactory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import android.widget.TextView;
2323

2424
import com.noober.background.drawable.DrawableFactory;
25-
import com.noober.background.view.Const;
2625

2726
import java.lang.reflect.Constructor;
2827
import java.lang.reflect.InvocationTargetException;

‎library/src/main/java/com/noober/background/drawable/AnimationDrawableCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public AnimationDrawableCreator(TypedArray animationTa) {
1818
}
1919

2020
@Override
21-
public Drawable create() throws Exception {
21+
public AnimationDrawable create() {
2222
for(int i = 0; i < animationTa.getIndexCount(); i ++){
2323
int attr = animationTa.getIndex(i);
2424
if(attr == R.styleable.bl_anim_bl_duration){

‎library/src/main/java/com/noober/background/drawable/ButtonDrawableCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public ButtonDrawableCreator(TypedArray typedArray, TypedArray buttonTa) {
1919
}
2020

2121
@Override
22-
public Drawable create() throws Exception {
22+
public StateListDrawable create() throws Exception {
2323
StateListDrawable stateListDrawable = new StateListDrawable();
2424

2525
for (int i = 0; i < buttonTa.getIndexCount(); i++) {

‎library/src/main/java/com/noober/background/drawable/ColorStateCreator.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,50 @@ public ColorStateList create() {
2424
for (int i = 0; i < textTa.getIndexCount(); i++) {
2525
int attr = textTa.getIndex(i);
2626
if (attr == R.styleable.text_selector_bl_checkable_textColor) {
27-
setStateColor(textTa, attr, android.R.attr.state_checkable);
27+
setStateColor(attr, android.R.attr.state_checkable);
2828
} else if (attr == R.styleable.text_selector_bl_unCheckable_textColor) {
29-
setStateColor(textTa, attr, -android.R.attr.state_checkable);
29+
setStateColor(attr, -android.R.attr.state_checkable);
3030
} else if (attr == R.styleable.text_selector_bl_checked_textColor) {
31-
setStateColor(textTa, attr, android.R.attr.state_checked);
31+
setStateColor(attr, android.R.attr.state_checked);
3232
} else if (attr == R.styleable.text_selector_bl_unChecked_textColor) {
33-
setStateColor(textTa, attr, -android.R.attr.state_checked);
33+
setStateColor(attr, -android.R.attr.state_checked);
3434
} else if (attr == R.styleable.text_selector_bl_enabled_textColor) {
35-
setStateColor(textTa, attr, android.R.attr.state_enabled);
35+
setStateColor(attr, android.R.attr.state_enabled);
3636
} else if (attr == R.styleable.text_selector_bl_unEnabled_textColor) {
37-
setStateColor(textTa, attr, -android.R.attr.state_enabled);
37+
setStateColor(attr, -android.R.attr.state_enabled);
3838
} else if (attr == R.styleable.text_selector_bl_selected_textColor) {
39-
setStateColor(textTa, attr, android.R.attr.state_selected);
39+
setStateColor(attr, android.R.attr.state_selected);
4040
} else if (attr == R.styleable.text_selector_bl_unSelected_textColor) {
41-
setStateColor(textTa, attr, -android.R.attr.state_selected);
41+
setStateColor(attr, -android.R.attr.state_selected);
4242
} else if (attr == R.styleable.text_selector_bl_pressed_textColor) {
43-
setStateColor(textTa, attr, android.R.attr.state_pressed);
43+
setStateColor(attr, android.R.attr.state_pressed);
4444
} else if (attr == R.styleable.text_selector_bl_unPressed_textColor) {
45-
setStateColor(textTa, attr, -android.R.attr.state_pressed);
45+
setStateColor(attr, -android.R.attr.state_pressed);
4646
} else if (attr == R.styleable.text_selector_bl_focused_textColor) {
47-
setStateColor(textTa, attr, android.R.attr.state_focused);
47+
setStateColor(attr, android.R.attr.state_focused);
4848
} else if (attr == R.styleable.text_selector_bl_unFocused_textColor) {
49-
setStateColor(textTa, attr, -android.R.attr.state_focused);
49+
setStateColor(attr, -android.R.attr.state_focused);
5050
} else if (attr == R.styleable.text_selector_bl_activated_textColor) {
51-
setStateColor(textTa, attr, android.R.attr.state_activated);
51+
setStateColor(attr, android.R.attr.state_activated);
5252
} else if (attr == R.styleable.text_selector_bl_unActivated_textColor) {
53-
setStateColor(textTa, attr, -android.R.attr.state_active);
53+
setStateColor(attr, -android.R.attr.state_active);
5454
} else if (attr == R.styleable.text_selector_bl_active_textColor) {
55-
setStateColor(textTa, attr, android.R.attr.state_active);
55+
setStateColor(attr, android.R.attr.state_active);
5656
} else if (attr == R.styleable.text_selector_bl_unActive_textColor) {
57-
setStateColor(textTa, attr, -android.R.attr.state_activated);
57+
setStateColor(attr, -android.R.attr.state_activated);
5858
} else if (attr == R.styleable.text_selector_bl_expanded_textColor) {
59-
setStateColor(textTa, attr, android.R.attr.state_expanded);
59+
setStateColor(attr, android.R.attr.state_expanded);
6060
} else if (attr == R.styleable.text_selector_bl_unExpanded_textColor) {
61-
setStateColor(textTa, attr, -android.R.attr.state_expanded);
61+
setStateColor(attr, -android.R.attr.state_expanded);
6262
}
6363

6464
}
6565
return new ColorStateList(states, colors);
6666
}
6767

68-
private void setStateColor(TypedArray selectorTa, int attr, @AttrRes int functionId) {
68+
private void setStateColor(int attr, @AttrRes int functionId) {
6969
states[index] = new int[]{functionId};
70-
colors[index] = selectorTa.getColor(attr, 0);
70+
colors[index] = textTa.getColor(attr, 0);
7171
index++;
7272
}
7373
}

‎library/src/main/java/com/noober/background/drawable/DrawableFactory.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public class DrawableFactory {
1616

1717
//获取shape属性的drawable
1818
public static GradientDrawable getDrawable(TypedArray typedArray) throws XmlPullParserException {
19-
return (GradientDrawable) new GradientDrawableCreator(typedArray).create();
19+
return new GradientDrawableCreator(typedArray).create();
2020
}
2121

2222
//获取selector属性的drawable
2323
public static StateListDrawable getSelectorDrawable(TypedArray typedArray, TypedArray selectorTa) throws Exception {
24-
return (StateListDrawable) new SelectorDrawableCreator(typedArray, selectorTa).create();
24+
return new SelectorDrawableCreator(typedArray, selectorTa).create();
2525
}
2626

2727
//获取button 属性的drawable
2828
public static StateListDrawable getButtonDrawable(TypedArray typedArray, TypedArray buttonTa) throws Exception {
29-
return (StateListDrawable) new ButtonDrawableCreator(typedArray, buttonTa).create();
29+
return new ButtonDrawableCreator(typedArray, buttonTa).create();
3030
}
3131

3232
//获取text selector属性关于text的color
@@ -37,16 +37,16 @@ public static ColorStateList getTextSelectorColor(TypedArray textTa) {
3737
//适配早期版本的属性
3838
public static StateListDrawable getPressDrawable(GradientDrawable drawable, TypedArray typedArray, TypedArray pressTa)
3939
throws Exception {
40-
return (StateListDrawable) new PressDrawableCreator(drawable, typedArray, pressTa).create();
40+
return new PressDrawableCreator(drawable, typedArray, pressTa).create();
4141
}
4242

4343
//获取AnimationDrawable属性的drawable
44-
public static AnimationDrawable getAnimationDrawable(TypedArray animTa) throws Exception {
45-
return (AnimationDrawable) new AnimationDrawableCreator(animTa).create();
44+
public static AnimationDrawable getAnimationDrawable(TypedArray animTa) {
45+
return new AnimationDrawableCreator(animTa).create();
4646
}
4747

4848
public static StateListDrawable getMultiSelectorDrawable(Context context, TypedArray selectorTa, TypedArray typedArray) {
49-
return (StateListDrawable) new MultiSelectorDrawableCreator(context, selectorTa, typedArray).create();
49+
return new MultiSelectorDrawableCreator(context, selectorTa, typedArray).create();
5050
}
5151

5252
public static ColorStateList getMultiTextColorSelectorColorCreator(Context context, TypedArray selectorTa) {

‎library/src/main/java/com/noober/background/drawable/GradientDrawableCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class GradientDrawableCreator implements ICreateDrawable {
2525
}
2626

2727
@Override
28-
public Drawable create() throws XmlPullParserException {
28+
public GradientDrawable create() throws XmlPullParserException {
2929
GradientDrawable drawable = new GradientDrawable();
3030
float[] cornerRadius = new float[8];
3131
float sizeWidth = 0;

‎library/src/main/java/com/noober/background/drawable/MultiSelectorDrawableCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public MultiSelectorDrawableCreator(Context context, TypedArray selectorTa, Type
2525
}
2626

2727
@Override
28-
public Drawable create() {
28+
public StateListDrawable create() {
2929
StateListDrawable stateListDrawable = new StateListDrawable();
3030

3131
for (int i = 0; i < selectorTa.getIndexCount(); i++) {

‎library/src/main/java/com/noober/background/drawable/PressDrawableCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class PressDrawableCreator implements ICreateDrawable {
2020
}
2121

2222
@Override
23-
public Drawable create() throws Exception{
23+
public StateListDrawable create() throws Exception{
2424
StateListDrawable stateListDrawable = new StateListDrawable();
2525
for (int i = 0; i < pressTa.getIndexCount(); i++) {
2626
int attr = pressTa.getIndex(i);

‎library/src/main/java/com/noober/background/drawable/SelectorDrawableCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public SelectorDrawableCreator(TypedArray typedArray, TypedArray selectorTa) {
1919
}
2020

2121
@Override
22-
public Drawable create() throws Exception {
22+
public StateListDrawable create() throws Exception {
2323
StateListDrawable stateListDrawable = new StateListDrawable();
2424

2525
for (int i = 0; i < selectorTa.getIndexCount(); i++) {

0 commit comments

Comments
 (0)