Style info color

pull/171/head
M66B 6 years ago
parent 1ca1427abb
commit d3be9afeea

@ -24,7 +24,7 @@ public class ToastEx extends Toast {
view.setBackground(context.getResources().getDrawable(R.drawable.toast_background, context.getTheme())); view.setBackground(context.getResources().getDrawable(R.drawable.toast_background, context.getTheme()));
TextView tv = view.findViewById(android.R.id.message); TextView tv = view.findViewById(android.R.id.message);
tv.setTextColor(Helper.resolveColor(context, R.attr.colorToastForeground)); tv.setTextColor(Helper.resolveColor(context, R.attr.colorInfoForeground));
tv.setText(text); tv.setText(text);
toast.setView(view); toast.setView(view);
toast.setDuration(duration); toast.setDuration(duration);

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners android:radius="12dp" /> <corners android:radius="12dp" />
<solid android:color="?attr/colorToastBackground" /> <solid android:color="?attr/colorInfoBackground" />
</shape> </shape>

@ -843,9 +843,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/title_setup_help" android:text="@string/title_setup_help"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbTrust" /> app:layout_constraintTop_toBottomOf="@id/cbTrust" />
@ -855,9 +855,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/menu_faq" android:text="@string/menu_faq"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbTrust" /> app:layout_constraintTop_toBottomOf="@id/cbTrust" />

@ -133,9 +133,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/menu_faq" android:text="@string/menu_faq"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDraftsHint" /> app:layout_constraintTop_toBottomOf="@id/tvDraftsHint" />

@ -646,9 +646,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/title_setup_help" android:text="@string/title_setup_help"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbTrust" /> app:layout_constraintTop_toBottomOf="@id/cbTrust" />
@ -658,9 +658,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/menu_faq" android:text="@string/menu_faq"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbTrust" /> app:layout_constraintTop_toBottomOf="@id/cbTrust" />

@ -108,9 +108,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/menu_faq" android:text="@string/menu_faq"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailDraftsHint" /> app:layout_constraintTop_toBottomOf="@id/tvGmailDraftsHint" />

@ -121,9 +121,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/title_setup_help" android:text="@string/title_setup_help"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" /> app:layout_constraintTop_toBottomOf="@id/tvError" />
@ -133,9 +133,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:text="@string/menu_faq" android:text="@string/menu_faq"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" /> app:layout_constraintTop_toBottomOf="@id/tvError" />

@ -85,11 +85,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorPrimary" android:backgroundTint="?attr/colorInfoBackground"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/title_setup_help" android:text="@string/title_setup_help"
android:textColor="@android:color/white" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuick" /> app:layout_constraintTop_toBottomOf="@id/tvQuick" />

@ -207,11 +207,11 @@
style="?android:attr/buttonStyleSmall" style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/title_setup_help" android:text="@string/title_setup_help"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" /> app:layout_constraintTop_toBottomOf="@id/tvError" />

@ -245,11 +245,11 @@
style="?android:attr/buttonStyleSmall" style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="?attr/colorAccent" android:backgroundTint="?attr/colorInfoBackground"
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/title_setup_help" android:text="@string/title_setup_help"
android:textColor="@android:color/black" android:textColor="?attr/colorInfoForeground"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" /> app:layout_constraintTop_toBottomOf="@id/tvError" />

@ -15,8 +15,8 @@
<attr name="colorActionBackground" format="reference" /> <attr name="colorActionBackground" format="reference" />
<attr name="colorFabForeground" format="reference" /> <attr name="colorFabForeground" format="reference" />
<attr name="colorFabBackground" format="reference" /> <attr name="colorFabBackground" format="reference" />
<attr name="colorToastForeground" format="reference" /> <attr name="colorInfoForeground" format="reference" />
<attr name="colorToastBackground" format="reference" /> <attr name="colorInfoBackground" format="reference" />
<attr name="activatableItemBackground" format="reference" /> <attr name="activatableItemBackground" format="reference" />
<style name="AppThemeBaseLight" parent="Base.Theme.AppCompat.Light.DarkActionBar"> <style name="AppThemeBaseLight" parent="Base.Theme.AppCompat.Light.DarkActionBar">
@ -108,8 +108,8 @@
<item name="colorFabBackground">@color/colorAccent</item> <item name="colorFabBackground">@color/colorAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/black</item>
<item name="colorToastBackground">@color/colorPrimaryDark</item> <item name="colorInfoBackground">@color/colorAccent</item>
<item name="android:textColorLink">@color/colorAccentDark</item> <item name="android:textColorLink">@color/colorAccentDark</item>
</style> </style>
@ -123,8 +123,8 @@
<item name="colorFabBackground">@color/lightPurpleAccent</item> <item name="colorFabBackground">@color/lightPurpleAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/white</item>
<item name="colorToastBackground">@color/lightPurpleAccent</item> <item name="colorInfoBackground">@color/lightPurpleAccent</item>
<item name="android:textColorLink">@color/lightPurpleAccent</item> <item name="android:textColorLink">@color/lightPurpleAccent</item>
</style> </style>
@ -138,8 +138,8 @@
<item name="colorFabBackground">@color/lightGreenAccent</item> <item name="colorFabBackground">@color/lightGreenAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/white</item>
<item name="colorToastBackground">@color/lightGreenAccent</item> <item name="colorInfoBackground">@color/lightGreenAccent</item>
<item name="android:textColorLink">@color/lightGreenAccent</item> <item name="android:textColorLink">@color/lightGreenAccent</item>
</style> </style>
@ -155,8 +155,8 @@
<item name="colorFabBackground">@color/colorAccent</item> <item name="colorFabBackground">@color/colorAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/black</item>
<item name="colorToastBackground">@color/darkColorPrimary</item> <item name="colorInfoBackground">@color/colorAccent</item>
</style> </style>
<style name="AppThemeYellowPurpleDark" parent="AppThemeBaseDark"> <style name="AppThemeYellowPurpleDark" parent="AppThemeBaseDark">
@ -168,8 +168,8 @@
<item name="colorFabBackground">@color/darkPurpleAccent</item> <item name="colorFabBackground">@color/darkPurpleAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/white</item>
<item name="colorToastBackground">@color/darkPurpleAccent</item> <item name="colorInfoBackground">@color/darkPurpleAccent</item>
<item name="android:textColorLink">@color/darkPurpleAccent</item> <item name="android:textColorLink">@color/darkPurpleAccent</item>
</style> </style>
@ -183,8 +183,8 @@
<item name="colorFabBackground">@color/darkGreenAccent</item> <item name="colorFabBackground">@color/darkGreenAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/black</item>
<item name="colorToastBackground">@color/darkGreenAccent</item> <item name="colorInfoBackground">@color/darkGreenAccent</item>
<item name="android:textColorLink">@color/darkGreenAccent</item> <item name="android:textColorLink">@color/darkGreenAccent</item>
</style> </style>
@ -209,8 +209,8 @@
<item name="colorFabBackground">@color/greyAccent</item> <item name="colorFabBackground">@color/greyAccent</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/white</item>
<item name="colorToastBackground">@color/greyAccent</item> <item name="colorInfoBackground">@color/greyAccent</item>
</style> </style>
<style name="AppThemeGreySteelBlueDark" parent="AppThemeBlack"> <style name="AppThemeGreySteelBlueDark" parent="AppThemeBlack">
@ -225,8 +225,8 @@
<item name="colorFabBackground">@color/greyAccentDark</item> <item name="colorFabBackground">@color/greyAccentDark</item>
<item name="colorToastForeground">@color/white</item> <item name="colorInfoForeground">@color/white</item>
<item name="colorToastBackground">@color/greyAccentDark</item> <item name="colorInfoBackground">@color/greyAccentDark</item>
</style> </style>
<style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar"> <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">

Loading…
Cancel
Save