Skip to content

Rename conflicting drawableTint attribute to richDrawableTint #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeffdgr8 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename conflicting drawableTint attribute to richDrawableTint #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This library is just an extension of Android's TextView.
app:compoundDrawableWidth="24dp"
app:drawableTopVector="@drawable/some_vector_drawble"
app:drawableEndVector="@drawable/another_vector_drawable"
app:drawableTint="@color/colorAccent" />
app:richDrawableTint="@color/colorAccent" />
```

* All customizable attributes:
Expand All @@ -46,7 +46,7 @@ This library is just an extension of Android's TextView.
<attr name="drawableTopVector" format="reference" />
<attr name="drawableEndVector" format="reference" />
<attr name="drawableBottomVector" format="reference" />
<attr name="drawableTint" format="reference" />
<attr name="richDrawableTint" format="reference" />
</declare-styleable>
```

Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/tolstykh/textviewrichdrawable/helper/RichDrawableHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public RichDrawableHelper(@NonNull Context context, AttributeSet attrs, int defS
mDrawableTopVectorId = array.getResourceId(R.styleable.TextViewRichDrawable_drawableTopVector, UNDEFINED);
mDrawableEndVectorId = array.getResourceId(R.styleable.TextViewRichDrawable_drawableEndVector, UNDEFINED);
mDrawableBottomVectorId = array.getResourceId(R.styleable.TextViewRichDrawable_drawableBottomVector, UNDEFINED);
mDrawableTint = array.getColor(R.styleable.TextViewRichDrawable_drawableTint, UNDEFINED);
mDrawableTint = array.getColor(R.styleable.TextViewRichDrawable_richDrawableTint, UNDEFINED);
} finally {
array.recycle();
}
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<attr name="drawableTopVector" format="reference" />
<attr name="drawableEndVector" format="reference" />
<attr name="drawableBottomVector" format="reference" />
<attr name="drawableTint" format="reference" />
<attr name="richDrawableTint" format="reference" />
</declare-styleable>
</resources>
12 changes: 6 additions & 6 deletions sample/src/main/res/layout/f_controls_all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@
android:layout_marginTop="@dimen/space_medium"
android:text="TextViewRichDrawable: VECTOR WITH TINT\ndrawableStartVector"
app:drawableEndVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>

<com.tolstykh.textviewrichdrawable.ButtonRichDrawable
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/space_medium"
android:text="Button"
app:drawableEndVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>

<com.tolstykh.textviewrichdrawable.CheckBoxRichDrawable
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/space_medium"
android:text="CheckBox"
app:drawableEndVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>

<com.tolstykh.textviewrichdrawable.EditTextRichDrawable
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/space_medium"
android:hint="EditText"
app:drawableEndVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>

<RadioGroup
android:layout_width="match_parent"
Expand All @@ -60,15 +60,15 @@
android:layout_marginTop="@dimen/space_medium"
android:text="RadioButton #1"
app:drawableEndVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>

<com.tolstykh.textviewrichdrawable.RadioButtonRichDrawable
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/space_medium"
android:text="RadioButton #2"
app:drawableEndVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>
</RadioGroup>
</LinearLayout>
</ScrollView>
2 changes: 1 addition & 1 deletion sample/src/main/res/layout/f_textviews.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@
android:layout_marginTop="@dimen/space_medium"
android:text="TextViewRichDrawable: VECTOR WITH TINT\ndrawableStartVector"
app:drawableStartVector="@drawable/ic_android_black_24dp"
app:drawableTint="@color/colorAccent"/>
app:richDrawableTint="@color/colorAccent"/>
</LinearLayout>
</ScrollView>