Skip to content

Commit 7b14586

Browse files
vgondahitherejoe
authored andcommitted
Migrate to BDS colors (#3)
* Migrate to BDS colors * Remive unused import
1 parent afb2716 commit 7b14586

12 files changed

+19
-38
lines changed

app/src/main/java/org/buffer/android/components/RoundedButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.graphics.Typeface
66
import android.support.v4.content.ContextCompat
77
import android.support.v7.widget.AppCompatButton
88
import android.util.AttributeSet
9-
import android.view.Gravity.CENTER_HORIZONTAL
9+
import android.view.Gravity.CENTER
1010

1111
class RoundedButton @JvmOverloads constructor(
1212
context: Context,
@@ -16,7 +16,7 @@ class RoundedButton @JvmOverloads constructor(
1616

1717
init {
1818
setBackground(attrs)
19-
gravity = CENTER_HORIZONTAL
19+
gravity = CENTER
2020
isClickable = true
2121
typeface = Typeface.DEFAULT_BOLD
2222
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_enabled="false" android:color="@color/disabled_text" />
4-
<item android:color="@color/grey_text"/>
3+
<item android:state_enabled="false" android:color="@color/text_disabled" />
4+
<item android:color="@color/gray_dark"/>
55
</selector>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_enabled="false" android:color="@color/disabled_text" />
3+
<item android:state_enabled="false" android:color="@color/text_disabled" />
44
<item android:color="@color/white"/>
55
</selector>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_enabled="false" android:color="@color/disabled_text" />
3+
<item android:state_enabled="false" android:color="@color/text_disabled" />
44
<item android:color="@color/white"/>
55
</selector>

app/src/main/res/drawable/button_bfr_round_clear_disabled.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<corners android:radius="@dimen/corner_radius" />
5-
<solid android:color="@color/misty_grey" />
5+
<solid android:color="@color/gray" />
66
</shape>

app/src/main/res/drawable/button_bfr_round_clear_pressed.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<corners android:radius="@dimen/corner_radius" />
5-
<solid android:color="@color/light_grey" />
5+
<solid android:color="@color/gray_light" />
66
</shape>

app/src/main/res/drawable/button_bfr_round_dark_disabled.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<corners android:radius="@dimen/corner_radius" />
5-
<solid android:color="@color/misty_grey" />
5+
<solid android:color="@color/gray" />
66
</shape>

app/src/main/res/drawable/button_bfr_round_dark_pressed.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<corners android:radius="@dimen/corner_radius" />
5-
<solid android:color="@color/sidebar_blue_light" />
5+
<solid android:color="@color/gray_dark" />
66
</shape>

app/src/main/res/drawable/button_bfr_round_dark_unfocused.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<corners android:radius="@dimen/corner_radius" />
5-
<solid android:color="@color/outer_space" />
5+
<solid android:color="@color/gray_darker" />
66
</shape>

app/src/main/res/drawable/button_bfr_round_light_disabled.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<corners android:radius="@dimen/corner_radius" />
5-
<solid android:color="@color/misty_grey" />
5+
<solid android:color="@color/gray" />
66
</shape>

0 commit comments

Comments
 (0)