Skip to content

Commit 6ffe04e

Browse files
committed
Remove references to support library for colors
1 parent 7f9c6c0 commit 6ffe04e

File tree

4 files changed

+48
-7
lines changed

4 files changed

+48
-7
lines changed

buffertextinputlayout/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
}
2222

2323
dependencies {
24-
final SUPPORT_LIBRARY_VERSION = '25.0.1'
24+
final SUPPORT_LIBRARY_VERSION = '25.1.0'
2525
compile "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
2626
compile fileTree(dir: 'libs', include: ['*.jar'])
2727
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2016 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18+
<item android:state_enabled="false" android:color="?android:attr/textColorTertiary"/>
19+
<item android:color="?attr/textColorError"/>
20+
</selector>

buffertextinputlayout/src/main/res/values/attrs.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@
3030
<!-- The characters remaining value for which the counter should be displayed at -->
3131
<attr name="displayFromCount" format="integer" />
3232
</declare-styleable>
33+
34+
<declare-styleable name="DesignTheme">
35+
<attr name="textColorError" format="color" />
36+
</declare-styleable>
3337
</resources>
Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<style name="BufferTextInputLayout" parent="android:Widget">
4-
<item name="hintTextAppearance">@style/TextAppearance.Design.Hint</item>
5-
<item name="errorTextAppearance">@style/TextAppearance.Design.Error</item>
6-
<item name="counterTextAppearance">@style/TextAppearance.Design.Counter</item>
7-
<item name="counterOverflowTextAppearance">@style/TextAppearance.Design.Counter.Overflow</item>
8-
<item name="passwordToggleDrawable">@drawable/design_ic_visibility</item>
9-
<item name="passwordToggleTint">@color/design_tint_password_toggle</item>
4+
<item name="hintTextAppearance">@style/HintTextAppearance</item>
5+
<item name="errorTextAppearance">@style/ErrorTextAppearance</item>
6+
<item name="counterTextAppearance">@style/CounterTextAppearance</item>
7+
<item name="counterOverflowTextAppearance">@style/OverflowTextAppearance</item>
108
</style>
9+
10+
<style name="HintTextAppearance" parent="CaptionTextAppearance">
11+
<item name="android:textColor">?android:attr/colorControlActivated</item>
12+
</style>
13+
14+
<style name="ErrorTextAppearance" parent="CaptionTextAppearance">
15+
<item name="android:textColor">@color/color_design_error</item>
16+
</style>
17+
18+
<style name="CounterTextAppearance" parent="CaptionTextAppearance"/>
19+
<style name="OverflowTextAppearance" parent="CaptionTextAppearance">
20+
<item name="android:textColor">?android:attr/textColorTertiary</item>
21+
</style>
22+
23+
<style name="CaptionTextAppearance">
24+
<item name="android:textSize">12sp</item>
25+
<item name="android:textColor">?android:textColorSecondary</item>
26+
</style>
27+
1128
</resources>

0 commit comments

Comments
 (0)