colors: Stop referring to black / grey / white directly
Prepare for Material You impl
This commit is contained in:
parent
6fae55fdbf
commit
4ea875be1a
|
@ -7,6 +7,7 @@
|
||||||
<entry key="app/src/main/res/drawable/circle_accent.xml" value="0.288" />
|
<entry key="app/src/main/res/drawable/circle_accent.xml" value="0.288" />
|
||||||
<entry key="app/src/main/res/layout/activity_main.xml" value="0.2838541666666667" />
|
<entry key="app/src/main/res/layout/activity_main.xml" value="0.2838541666666667" />
|
||||||
<entry key="app/src/main/res/layout/activity_settings.xml" value="0.19375" />
|
<entry key="app/src/main/res/layout/activity_settings.xml" value="0.19375" />
|
||||||
|
<entry key="app/src/main/res/layout/app_list_item.xml" value="0.2838541666666667" />
|
||||||
<entry key="app/src/main/res/menu/bottom_navigation.xml" value="0.2828125" />
|
<entry key="app/src/main/res/menu/bottom_navigation.xml" value="0.2828125" />
|
||||||
<entry key="app/src/main/res/menu/main_activity_menu.xml" value="0.2838541666666667" />
|
<entry key="app/src/main/res/menu/main_activity_menu.xml" value="0.2838541666666667" />
|
||||||
</map>
|
</map>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<item android:color="@color/colorAccent" android:state_checked="true" />
|
<item android:color="@color/colorAccent" android:state_checked="true" />
|
||||||
<item android:color="@color/black" android:state_checked="false" />
|
<item android:color="@color/colorTextPrimary" android:state_checked="false" />
|
||||||
</selector>
|
</selector>
|
|
@ -24,7 +24,7 @@
|
||||||
android:layout_marginStart="16dp"
|
android:layout_marginStart="16dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:layout_marginBottom="0dp"
|
android:layout_marginBottom="0dp"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/colorTextPrimary"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
app:layout_constraintStart_toEndOf="@id/list_app_icon"
|
app:layout_constraintStart_toEndOf="@id/list_app_icon"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
android:layout_marginStart="16dp"
|
android:layout_marginStart="16dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:layout_marginBottom="16dp"
|
android:layout_marginBottom="16dp"
|
||||||
android:textColor="@color/grey"
|
android:textColor="@color/colorTextSecondary"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
app:layout_constraintStart_toEndOf="@id/list_app_icon"
|
app:layout_constraintStart_toEndOf="@id/list_app_icon"
|
||||||
app:layout_constraintTop_toBottomOf="@id/list_app_title"
|
app:layout_constraintTop_toBottomOf="@id/list_app_title"
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
android:layout_marginTop="28dp"
|
android:layout_marginTop="28dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:textColor="@android:color/white"
|
android:textColor="@color/colorPrimary"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:background="@drawable/circle_accent"
|
android:background="@drawable/circle_accent"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
<color name="colorAccent">#009688</color>
|
<color name="colorAccent">#009688</color>
|
||||||
<color name="colorAccentSetupWizard">#FFC107</color>
|
<color name="colorAccentSetupWizard">#FFC107</color>
|
||||||
<color name="colorNavigationBar">#E0F2F1</color>
|
<color name="colorNavigationBar">#E0F2F1</color>
|
||||||
<color name="black">#333333</color>
|
<color name="colorTextPrimary">#333333</color>
|
||||||
<color name="grey">#999999</color>
|
<color name="colorTextSecondary">#999999</color>
|
||||||
<color name="disabledAppBackground">#E0F2F1</color>
|
<color name="disabledAppBackground">#E0F2F1</color>
|
||||||
<color name="selectedAppBackground">#EEEEEE</color>
|
<color name="selectedAppBackground">#EEEEEE</color>
|
||||||
<color name="selectedAndDisabledAppBackground">#CEE1E0</color>
|
<color name="selectedAndDisabledAppBackground">#CEE1E0</color>
|
||||||
|
|
Loading…
Reference in a new issue