diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index b33968e923..7baf6b1ae2 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -280,7 +280,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) { binding.inputLayoutBookmarkUrl.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) binding.inputLayoutBookmarkUrl.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt index 6d6b0074e4..0e9db6597a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt @@ -248,7 +248,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) { layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) layout.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) } @@ -259,7 +259,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) { layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) layout.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) } @@ -282,7 +282,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) { layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) layout.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) } @@ -295,7 +295,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) { layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) layout.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt index 8afcadf445..699ddbd8f9 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt @@ -233,7 +233,7 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) { layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) layout.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) clearButton.isVisible = false @@ -250,7 +250,7 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) { layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding) layout.setErrorIconTintList( ColorStateList.valueOf( - ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme) + ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning) ) ) } diff --git a/app/src/main/res/layout/fragment_credit_card_editor.xml b/app/src/main/res/layout/fragment_credit_card_editor.xml index e4d7837f5a..44e412a159 100644 --- a/app/src/main/res/layout/fragment_credit_card_editor.xml +++ b/app/src/main/res/layout/fragment_credit_card_editor.xml @@ -182,7 +182,7 @@ android:padding="10dp" android:text="@string/credit_cards_delete_card_button" android:textAllCaps="false" - android:textColor="@color/destructive_normal_theme" + android:textColor="@color/fx_mobile_text_color_warning" android:visibility="gone" app:fontFamily="@font/metropolis_semibold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 3fbbf92690..b6df91c847 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -58,7 +58,7 @@ @color/photonLightGrey05A40 - @color/photonRed20 + @color/photonRed20 @color/photonRed70 @@ -131,7 +131,6 @@ @color/accent_normal_theme @color/photonGrey20 #1FFBFBFE - @color/photonRed40 @color/toggle_off_knob_dark_theme @color/toggle_off_track_dark_theme @color/photonViolet40 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3c5bb8d467..ecd9af82d8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -58,7 +58,7 @@ @color/photonDarkGrey90A40 - @color/photonRed70 + @color/photonRed70 @color/photonRed70 @@ -205,7 +205,6 @@ @color/photonInk20 @color/photonGrey30 @color/photonGrey20 - @color/photonRed70 @color/photonInk20 @color/photonYellow70 #FFFDE2 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 91004ed53d..589ea4813c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -25,9 +25,9 @@ @color/fx_mobile_text_color_accent @color/destructive_normal_theme + tools:ignore="UnusedResources">@color/fx_mobile_text_color_warning @color/destructive_normal_theme + tools:ignore="UnusedResources">@color/fx_mobile_text_color_warning @style/SelectPromptHeaderTextStyle @style/SelectPromptHeaderTextStyle @@ -59,7 +59,7 @@ @color/tab_ring_normal_theme @color/neutral_normal_theme @color/neutral_faded_normal_theme - @color/destructive_normal_theme + @color/fx_mobile_text_color_warning @color/fx_mobile_text_color_disabled @color/fx_mobile_layer_color_scrim_start @color/fx_mobile_layer_color_scrim_end @@ -327,8 +327,8 @@