Replace fab_text with colorOnSecondary

pull/848/head
Alex Baker 5 years ago
parent 606d29ee15
commit 7bab3b87d0

@ -303,7 +303,7 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked} new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked}
}, },
new int[] { new int[] {
ResourceResolver.getData(context, R.attr.fab_text), ResourceResolver.getData(context, R.attr.colorOnSecondary),
getColor(context, R.color.text_primary) getColor(context, R.color.text_primary)
}); });
int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset); int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset);

@ -77,7 +77,6 @@
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
android:padding="0dp" android:padding="0dp"
android:src="@drawable/ic_outline_gps_fixed_24px" android:src="@drawable/ic_outline_gps_fixed_24px"
app:tint="?attr/fab_text"
app:backgroundTint="?attr/colorAccent" app:backgroundTint="?attr/colorAccent"
app:borderWidth="0dp" app:borderWidth="0dp"
app:layout_constraintBottom_toBottomOf="@id/map" app:layout_constraintBottom_toBottomOf="@id/map"

@ -31,7 +31,7 @@
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first" android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first" android:paddingRight="@dimen/keyline_first"
app:backgroundTint="?fab_text"/> app:backgroundTint="?attr/colorOnSecondary"/>
</FrameLayout> </FrameLayout>

@ -52,7 +52,6 @@
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
android:padding="0dp" android:padding="0dp"
android:src="@drawable/ic_outline_add_24px" android:src="@drawable/ic_outline_add_24px"
app:tint="?attr/fab_text"
app:backgroundTint="?attr/colorAccent" app:backgroundTint="?attr/colorAccent"
app:borderWidth="0dp"/> app:borderWidth="0dp"/>

@ -13,4 +13,4 @@
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="?fab_text"/> android:textColor="?attr/colorOnSecondary"/>

@ -17,7 +17,6 @@
<attr format="boolean" name="dark_status_bar"/> <attr format="boolean" name="dark_status_bar"/>
<attr format="dimension" name="alpha_secondary"/> <attr format="dimension" name="alpha_secondary"/>
<attr format="dimension" name="alpha_disabled"/> <attr format="dimension" name="alpha_disabled"/>
<attr format="color" name="fab_text"/>
<attr format="color" name="colorAccentDialog"/> <attr format="color" name="colorAccentDialog"/>
<attr format="dimension" name="card_elevation"/> <attr format="dimension" name="card_elevation"/>

@ -43,11 +43,11 @@
</style> </style>
<style name="WhiteTint"> <style name="WhiteTint">
<item name="fab_text">@color/white_100</item> <item name="colorOnSecondary">@color/white_100</item>
</style> </style>
<style name="BlackTint"> <style name="BlackTint">
<item name="fab_text">@color/black_87</item> <item name="colorOnSecondary">@color/black_87</item>
</style> </style>
<style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"> <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">

Loading…
Cancel
Save